basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes
author: takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> 2020-11-02 11:07:33 +0900
committer: takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> 2020-11-02 11:07:33 +0900
commit: 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch)
tree: cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-graphics
parent: 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff)
167 files changed, 4118 insertions, 30920 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb b/external/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb
deleted file mode 100644
index 9d8c90fd..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library"
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-
-inherit gnomebase
-
-SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.1/${BP}.tar.bz2"
-SRC_URI[md5sum] = "cc53d8474a43aafb7cdaccea56cfde44"
-SRC_URI[sha256sum] = "63f3ed23e72a857a0e6df53d9d968a325024177b01edbe314a0c98b499eb8603"
-
-FILES_${PN} += "${libdir}/babl-*/*.so"
-FILES_${PN}-dev += "${libdir}/babl-*/*.la"
-FILES_${PN}-dbg += "${libdir}/babl-*/.debug/"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
index 96aa3111..65fd89e6 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -21,7 +21,8 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g
            file://use-PTHREAD_MUTEX_RECURSIVE.patch \
            file://fix-client-gfx_state-initialisation.patch \
            file://fix-tslib-version-check.patch \
-          "
+           file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+           "
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000..2f766465
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,139 @@
+From 0b66557f2e924023b12006b58d8e86149c745aed Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 20:34:33 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ inputdrivers/linux_input/linux_input.c | 36 ++++++++++++++++++--------
+ 1 file changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c
+index 7e9a6ad..03deebc 100644
+--- a/inputdrivers/linux_input/linux_input.c
++++ b/inputdrivers/linux_input/linux_input.c
+@@ -42,6 +42,11 @@ typedef unsigned long kernel_ulong_t;
+ 
+ #include <linux/input.h>
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #ifndef KEY_OK
+ /* Linux kernel 2.5.42+ defines additional keys in linux/input.h */
+ #include "input_fake.h"
+@@ -754,7 +759,8 @@ translate_event( const LinuxInputData     *data,
+                  DFBInputEvent            *devt )
+ {
+      devt->flags     = DIEF_TIMESTAMP;
+-     devt->timestamp = levt->time;
++     devt->timestamp.tv_sec = levt->input_event_sec;
++     devt->timestamp.tv_usec = levt->input_event_usec;
+ 
+      switch (levt->type) {
+           case EV_KEY:
+@@ -2139,7 +2145,8 @@ touchpad_translate( struct touchpad_fsm_state *state,
+      int abs, rel;
+ 
+      devt->flags     = DIEF_TIMESTAMP | (dfb_config->linux_input_touch_abs ? DIEF_AXISABS : DIEF_AXISREL);
+-     devt->timestamp = levt->time;
++     devt->timestamp.tv_sec = levt->input_event_sec;
++     devt->timestamp.tv_usec = levt->input_event_usec;
+      devt->type      = DIET_AXISMOTION;
+ 
+      switch (levt->code) {
+@@ -2204,7 +2211,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+               DFBInputEvent             *devt )
+ {
+      struct timeval timeout = { 0, 125000 };
+-
++     struct timeval tval;
+      /* select() timeout? */
+      if (!levt) {
+           /* Check if button release is due. */
+@@ -2223,6 +2230,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+           return 0;
+      }
+ 
++     tval.tv_sec = levt->input_event_sec;
++     tval.tv_usec = levt->input_event_usec;
+      /* More or less ignore these events for now */
+      if ((levt->type == EV_SYN && levt->code == SYN_REPORT) ||
+          (levt->type == EV_ABS && levt->code == ABS_PRESSURE) ||
+@@ -2233,7 +2242,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ 
+           /* Check if button release is due. */
+           if (state->fsm_state == TOUCHPAD_FSM_DRAG_START &&
+-              timeout_passed( &state->timeout, &levt->time )) {
++              timeout_passed( &state->timeout, &tval )) {
+                devt->flags     = DIEF_TIMESTAMP;
+                devt->timestamp = state->timeout; /* timeout of levt->time? */
+                devt->type      = DIET_BUTTONRELEASE;
+@@ -2255,7 +2264,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+      case TOUCHPAD_FSM_START:
+           if (touchpad_finger_landing( levt )) {
+                state->fsm_state = TOUCHPAD_FSM_MAIN;
+-               state->timeout = levt->time;
++               state->timeout.tv_sec = levt->input_event_sec;
++               state->timeout.tv_usec = levt->input_event_usec;
+                timeout_add( &state->timeout, &timeout );
+           }
+           return 0;
+@@ -2268,15 +2278,17 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+                }
+           }
+           else if (touchpad_finger_leaving( levt )) {
+-               if (!timeout_passed( &state->timeout, &levt->time )) {
++               if (!timeout_passed( &state->timeout, &tval )) {
+                     devt->flags     = DIEF_TIMESTAMP;
+-                    devt->timestamp = levt->time;
++                    devt->timestamp.tv_sec = levt->input_event_sec;
++                    devt->timestamp.tv_usec = levt->input_event_usec;
+                     devt->type      = DIET_BUTTONPRESS;
+                     devt->button    = DIBI_FIRST;
+ 
+                     touchpad_fsm_init( state );
+                     state->fsm_state = TOUCHPAD_FSM_DRAG_START;
+-                    state->timeout = levt->time;
++                    state->timeout.tv_sec = levt->input_event_sec;
++                    state->timeout.tv_usec = levt->input_event_usec;
+                     timeout_add( &state->timeout, &timeout );
+                     return 1;
+                }
+@@ -2287,7 +2299,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+           return 0;
+ 
+      case TOUCHPAD_FSM_DRAG_START:
+-          if (timeout_passed( &state->timeout, &levt->time )){
++          if (timeout_passed( &state->timeout, &tval )){
+                devt->flags     = DIEF_TIMESTAMP;
+                devt->timestamp = state->timeout; /* timeout of levt->time? */
+                devt->type      = DIET_BUTTONRELEASE;
+@@ -2299,7 +2311,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+           else {
+                if (touchpad_finger_landing( levt )) {
+                     state->fsm_state = TOUCHPAD_FSM_DRAG_MAIN;
+-                    state->timeout = levt->time;
++                    state->timeout.tv_sec = levt->input_event_sec;
++                    state->timeout.tv_usec = levt->input_event_usec;
+                     timeout_add( &state->timeout, &timeout );
+                }
+           }
+@@ -2314,7 +2327,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+           }
+           else if (touchpad_finger_leaving( levt )) {
+                devt->flags     = DIEF_TIMESTAMP;
+-               devt->timestamp = levt->time;
++               devt->timestamp.tv_sec = levt->input_event_sec;
++               devt->timestamp.tv_usec = levt->input_event_usec;
+                devt->type      = DIET_BUTTONRELEASE;
+                devt->button    = DIBI_FIRST;
+ 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 46d4dbde..6a7b1bf3 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -9,12 +9,12 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c66b39..1489ef6 100644
+index 230c87b..e699e83 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -19,7 +19,7 @@ else(NOT SPHINX_EXECUTABLE-NOTFOUND)
- 	message(STATUS "Could NOT find sphinx-build.")
- endif(NOT SPHINX_EXECUTABLE-NOTFOUND)
+@@ -19,7 +19,7 @@ else(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
+ 	message(STATUS "Found sphinx-build: ${SPHINX_EXECUTABLE}")
+ endif(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
  
 -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
 +#execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
@@ -22,5 +22,5 @@ index 7c66b39..1489ef6 100644
  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION)
  message(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
 -- 
-2.7.4
+2.17.1
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
deleted file mode 100644
index 75b6b8fd..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15d0afcfa4868b7b072b3434bac0064617d61f99 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui@cn.fujitsu.com>
-Date: Tue, 19 Dec 2017 14:53:14 +0900
-Subject: [PATCH] Run python scripts using env
-
-Otherwise the build tools hardcode the python path into them.
-
-Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
----
- bin/dnfdragora | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/dnfdragora b/bin/dnfdragora
-index b8e0550..cd80f7f 100755
---- a/bin/dnfdragora
-+++ b/bin/dnfdragora
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- # vim: set et ts=4 sw=4:
- #    Copyright 2016-2017 Angelo Naselli <anaselli@linux.it>
- #
--- 
-2.7.4
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
index 90ce1d0a..bef47118 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
@@ -3,7 +3,8 @@ From: Lei Maohui <leimaohui@cn.fujitsu.com>
 Date: Tue, 19 Dec 2017 11:15:29 +0900
 Subject: [PATCH] To fix error when do_package
 
-QA Issue: nativesdk-dnfdragora: Files/directories were installed but not shipped in any package:
+QA Issue: nativesdk-dnfdragora: Files/directories were installed but not
+shipped in any package:
   /etc
   /etc/dnfdragora
   /etc/dnfdragora/dnfdragora.yaml
@@ -14,18 +15,18 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c66b39..a5659f7 100644
+index 230c87b..1b8d800 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ endif(ENABLE_COMPS)
+@@ -68,7 +68,7 @@ endif(ENABLE_COMPS)
  set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
  set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share")
  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
--set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc")
-+set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc")
+-set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc" CACHE PATH "sysconfig directory (default /etc)")
++set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc" CACHE PATH "sysconfig directory (default /etc)")
  
  # Configure files
  configure_file(${CMAKE_SOURCE_DIR}/etc/dnfdragora.yaml.in ${CMAKE_BINARY_DIR}/etc/dnfdragora.yaml @ONLY)
 -- 
-2.7.4
+2.17.1
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
index 88bb6341..c8b105ea 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
@@ -9,17 +9,17 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c66b39..fc32750 100644
+index 230c87b..1624998 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -65,7 +65,6 @@ endif(GETTEXT_FOUND)
+@@ -81,7 +81,6 @@ endif(GETTEXT_FOUND)
  
  # Build and install the man-pages
- if(NOT SPHINX_EXECUTABLE-NOTFOUND)
+ if(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
 -	add_subdirectory(man)
- endif(NOT SPHINX_EXECUTABLE-NOTFOUND)
+ endif(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
  
  # Installing application code
 -- 
-2.7.4
+2.17.1
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
index 9cd1efb8..00738510 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
@@ -7,15 +7,14 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git \
            file://0001-disable-build-manpages.patch \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            file://0001-To-fix-error-when-do_package.patch \
-           file://0001-Run-python-scripts-using-env.patch \
            "
 
-PV = "1.0.1+git${SRCPV}"
-SRCREV = "4fef4ce889b8e4fa03191d414f63bfd50796152a"
+PV = "1.1.2+git${SRCPV}"
+SRCREV = "19e123132cfd4efd860e5204261c3c228bfe80a8"
 
 S = "${WORKDIR}/git"
 
-inherit cmake gettext pkgconfig python3-dir python3native distutils3-base
+inherit cmake gettext pkgconfig python3-dir python3native distutils3-base mime-xdg
 
 DEPENDS += "dnf python3 "
 #DEPENDS_class-nativesdk += "nativesdk-python3"
@@ -27,4 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
 
 BBCLASSEXTEND = "nativesdk"
 
-FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora "
+FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora ${sysconfdir}/xdg"
+
+PNBLACKLIST[dnfdragora] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb
index e12bc094..e3dff919 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb
@@ -1,15 +1,15 @@
 SUMMARY = "FBGrab is a framebuffer screenshot program"
-HOMEPAGE = "http://fbgrab.monells.se/"
+HOMEPAGE = "https://github.com/GunnarMonell/fbgrab"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a"
 SECTION = "console/utils"
 DEPENDS = "libpng zlib"
-SRC_URI = "http://fbgrab.monells.se/${BP}.tar.gz"
+SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https"
 
-inherit autotools-brokensep
+SRCREV = "b179e2a42b8a5d72516b9c8d91713c9025cf6044"
+S = "${WORKDIR}/git"
 
-SRC_URI[md5sum] = "7d8c24081c681dfbba21f2934c1ac656"
-SRC_URI[sha256sum] = "5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed"
+inherit autotools-brokensep
 
 do_configure_prepend() {
     sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch b/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch
new file mode 100644
index 00000000..54ff7b76
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch
@@ -0,0 +1,29 @@
+From 798f2816130838f3618212291de6ab0ea814c868 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 29 Sep 2019 20:39:02 -0700
+Subject: [PATCH] include sys/select on non-glibc platforms
+
+musl needs sys/select.h for defining fd_set
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdraw/gdraw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c
+index 24591b778..217c63140 100644
+--- a/gdraw/gdraw.c
++++ b/gdraw/gdraw.c
+@@ -32,7 +32,7 @@
+ #include "gkeysym.h"
+ #include "ustring.h"
+ 
+-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
++#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ || !defined(__GLIBC__)
+ #  include <sys/select.h>
+ #endif
+ 
+-- 
+2.23.0
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb b/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
deleted file mode 100644
index 947d36eb..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY = "A font editor"
-HOMEPAGE = "http://fontforge.github.io/en-US/"
-LICENSE = "BSD-3-Clause & GPLv3"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \
-"
-
-DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib gettext-native"
-DEPENDS_append_class-target = " libxi"
-
-inherit autotools pkgconfig pythonnative distro_features_check gettext
-
-REQUIRED_DISTRO_FEATURES_append_class-target = " x11"
-
-SRC_URI = "git://github.com/${BPN}/${BPN}.git"
-# tag 20170731
-SRCREV = "b9149c13e8f9464fc21473f1f676b36a2130775d"
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF_append_class-native = " with_x=no"
-
-do_configure_prepend() {
-    # uthash sources are expected in uthash/src
-    currdir=`pwd`
-    cd ${S}
-
-    mkdir -p uthash/src
-    cp ${STAGING_INCDIR}/ut*.h uthash/src
-
-    # avoid bootstrap cloning gnulib on every configure
-    cat >.gitmodules <<EOF
-[submodule "gnulib"]
-       path = gnulib
-       url = git://git.sv.gnu.org/gnulib
-EOF
-    cp -rf ${STAGING_DATADIR}/gnulib ${S}
-
-    # --force to avoid errors on reconfigure e.g if recipes changed we depend on
-    # | bootstrap: running: libtoolize --quiet
-    # | libtoolize:   error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite
-    # | ...
-    ./bootstrap --force
-
-    cd $currdir
-}
-
-PACKAGES =+ "${PN}-python"
-
-RPROVIDES_${PN}-dbg += "${PN}-python-dbg"
-
-FILES_${PN} += " \
-    ${datadir}/mime \
-    ${datadir}/icons \
-"
-
-FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${PN}/python"
-RDEPENDS_${PN}-python = "python"
-
-# for e.g kde's oxygen-fonts
-BBCLASSEXTEND = "native"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb b/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb
new file mode 100644
index 00000000..1863f95f
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb
@@ -0,0 +1,47 @@
+SUMMARY = "A font editor"
+HOMEPAGE = "http://fontforge.github.io/en-US/"
+LICENSE = "BSD-3-Clause & GPLv3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE;md5=d042f3d2a8fd7208b704a499168e3c89 \
+"
+
+DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native"
+DEPENDS_append_class-target = " libxi"
+
+inherit autotools pkgconfig python3native features_check gettext gtk-icon-cache mime mime-xdg
+
+REQUIRED_DISTRO_FEATURES_append_class-target = " x11"
+
+# tag 20190801
+SRCREV = "ac635b818e38ddb8e7e2e1057330a32b4e25476e"
+SRC_URI = "git://github.com/${BPN}/${BPN}.git \
+           file://0001-include-sys-select-on-non-glibc-platforms.patch \
+"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF += "--without-libuninameslist  --enable-python-scripting --enable-python-extension"
+EXTRA_OECONF_append_class-native = " with_x=no"
+
+LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
+BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
+
+#do_configure_prepend() {
+# uthash sources are expected in uthash/src
+#    mkdir -p ${S}/uthash/src
+#    cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src
+#}
+
+PACKAGES =+ "${PN}-python"
+
+FILES_${PN} += " \
+    ${datadir}/appdata \
+    ${datadir}/metainfo \
+    ${datadir}/mime \
+"
+
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${BPN}/python"
+RDEPENDS_${PN}-python = "python3"
+
+# for e.g kde's oxygen-fonts
+BBCLASSEXTEND = "native"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/external/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
index d54fafc8..851641c0 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
@@ -4,10 +4,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb"
 
 SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "90c3ca4dd9d51cf32276bc5344ec9754"
-SRC_URI[sha256sum] = "2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2"
+SRC_URI[md5sum] = "cd5c670c1086358598a6d4a9d166949d"
+SRC_URI[sha256sum] = "d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68"
 
-inherit cmake distro_features_check
+inherit cmake features_check
 
 # depends on virtual/libx11, virtual/libgl
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch
new file mode 100644
index 00000000..385bff8d
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch
@@ -0,0 +1,38 @@
+From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 9 Feb 2019 08:28:09 -0800
+Subject: [PATCH] Explicit typecast to avoid implicit double to float
+ conversion
+
+fixes compile errors e.g.
+
+../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to
+      'float' in initializer list [-Wc++11-narrowing]
+                          (t3 + 2.0) / 3, 0.3 };
+                          ^~~~~~~~~~~~~~
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ demo/simple.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/demo/simple.cpp b/demo/simple.cpp
+index 532e862..aba55b4 100644
+--- a/demo/simple.cpp
++++ b/demo/simple.cpp
+@@ -105,9 +105,9 @@ static void RenderScene(void)
+     float t2 = sin(n / 50 + 1);
+     float t3 = sin(n / 30 + 2);
+ 
+-    float ambient[4]  = { (t1 + 2.0) / 3,
+-                          (t2 + 2.0) / 3,
+-                          (t3 + 2.0) / 3, 0.3 };
++    float ambient[4]  = { float(t1 + 2.0) / 3,
++                          float(t2 + 2.0) / 3,
++                          float(t3 + 2.0) / 3, 0.3 };
+     float diffuse[4]  = { 1.0, 0.9, 0.9, 1.0 };
+     float specular[4] = { 1.0, 0.7, 0.7, 1.0 };
+     float position[4] = { 100.0, 100.0, 0.0, 1.0 };
+-- 
+2.20.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch
new file mode 100644
index 00000000..cf03cd0f
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch
@@ -0,0 +1,38 @@
+From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 23 Oct 2016 22:46:43 +0200
+Subject: [PATCH] use pkg-config to find freetype2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 53560ea..b5bb6a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup)
+ 
+ AC_PATH_X
+ 
+-AC_CHECK_FT2([9.0.3],[],
+-             [AC_MSG_ERROR([FreeType2 is required to compile this library])])
++PKG_CHECK_MODULES(FT2, freetype2,
++    CFLAGS="$CFLAGS $FT2_CFLAGS"
++    LIBS="$LIBS $FT2_LIBS",
++    AC_MSG_ERROR([FreeType2 is required to compile this library])
++)
++AC_SUBST([FT2_CFLAGS])
++AC_SUBST([FT2_LIBS])
+ 
+ AC_PATH_XTRA
+ 
+-- 
+2.5.5
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch
new file mode 100644
index 00000000..830783e2
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch
@@ -0,0 +1,38 @@
+From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 23 Oct 2016 23:54:14 +0200
+Subject: [PATCH] Makefile.am: remove useless and breaking code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 89a8a7f..e582a34 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,15 +24,6 @@ EXTRA_DIST = \
+ 	m4 \
+ 	$(NULL)
+ 
+-# Print out an informative summary.
+-all-local:
+-	@$(ECHO) "Done."
+-	@$(ECHO)
+-	@if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
+-	  $(ECHO) "---" ;\
+-	  $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
+-	fi
+-	@$(ECHO)
+ 
+ # Upload documentation
+ DOC = docs/html docs/latex/ftgl.pdf
+-- 
+2.5.5
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
new file mode 100644
index 00000000..65f72747
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
@@ -0,0 +1,27 @@
+SUMMARY = "OpenGL frontend to Freetype 2"
+HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
+
+inherit autotools pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl x11"
+
+DEPENDS += " \
+    freetype \
+    freeglut \
+"
+
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+    file://0001-use-pkg-config-to-find-freetype2.patch \
+    file://0002-Makefile.am-remove-useless-and-breaking-code.patch \
+    file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \
+"
+SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503"
+SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59"
+
+S = "${WORKDIR}/ftgl-2.1.3~rc5"
+
+# undefined reference to symbol 'sin@@GLIBC_2.4'
+CFLAGS += "-lm"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
index 5a764745..50003e33 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
@@ -10,10 +10,6 @@ COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system
 most definitely is not.  It is accomplished by trying to execute
 a program, which does not work when cross compiling.
 
-The fvwm(1) man page is created from Docbook XML which is set for
-a Windows code page that is not available when compiling.  Easiest is
-to just not create the man page as those are not needed on the monitor.
-
 Upstream-Status: inappropriate [OE specific]
 Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi>
 Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com>
@@ -27,22 +23,7 @@ diff --git a/configure.ac b/configure.ac
 index 48ce264..fab7b44 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1413,23 +1413,7 @@ else
-   problem_gdkimlib=": Failed on gdk-imlib, see config.log"
- fi
- 
--GNOME_INIT_HOOK
--
--# Unfortunately we have 2 gnome supports: WM hints and gnome libs.
--# The $with_gnomehints below refers to the first, not GNOME_INIT_HOOK.
--if test ! x"$enable_gnome_hints" = xno; then
--  with_gnomehints=yes
--  problem_gnomehints=""
--else
--  with_gnomehints=no
--  problem_gnomehints=": Explicitly disabled"
--fi
--
+@@ -1413,8 +1413,4 @@ else
  # Define some compatibility macros needed for config.h.
 -mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
 -  [defined XK_Page_Up && defined XK_Page_Down],
@@ -51,19 +32,6 @@ index 48ce264..fab7b44 100644
  AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
  [#ifdef COMPAT_OLD_KEYSYMDEF
  #  define XK_Page_Up   XK_Prior
-diff --git a/doc/fvwm/Makefile.am b/doc/fvwm/Makefile.am
-index cddb102..ff00149 100755
---- a/doc/fvwm/Makefile.am
-+++ b/doc/fvwm/Makefile.am
-@@ -10,7 +10,7 @@ XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl
- HTML_FILES = fvwm.man.html
- XML_FILES = @DOC_SECTIONS_XML_PATH@
- EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections
--man_MANS = fvwm.1
-+man_MANS =
- 
- if FVWM_BUILD_HTMLDOC
- doc_DATA = $(HTML_FILES)
 -- 
 1.9.1
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch
deleted file mode 100644
index 756cc86e..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
-Date: Tue, 29 Auf 2017 16:08:42 +0200
-Subject: [PATCH] Avoid absolute symlinks
-
-Avoid usage of absolute symlinks, which breaks yocto builds
-since pyro.
-
-Upstream-Status: Pending
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
-
-diff --git a/default-config/Makefile.am b/default-config/Makefile.am
-index 5e16d095a137..5404145a742c 100644
---- a/default-config/Makefile.am
-+++ b/default-config/Makefile.am
-@@ -17,9 +17,9 @@ EXTRA_DIST  = images \
- 
- install-data-hook:
- 	cp -r $(srcdir)/images $(inst_location)
--	ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/..
--	ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/..
--	ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/..
-+	ln -sf default-config/FvwmScript-DateTime $(inst_location)/..
-+	ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/..
-+	ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/..
- 
- uninstall-hook:
- 	rm -fr $(DESTDIR)/$(configdir)
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb
index cb851bfd..51f5a4ec 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb
@@ -2,7 +2,7 @@ SUMMARY = "F Virtual Window Manager "
 HOMEPAGE = "http://www.fvwm.org/"
 SECTION = "x11/wm"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=363fbcfb59124689af72c914560eaf6e"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f8204787357db6ea518dcc9b6cf08388"
 
 DEPENDS = " \
     bison-native \
@@ -31,19 +31,16 @@ DEPENDS = " \
     zlib \
 "
 
-PV = "2.6.7+git${SRCPV}"
-
 SRC_URI = " \
     git://github.com/fvwmorg/fvwm.git;protocol=https \
     file://0001-Fix-compilation-for-disabled-gnome.patch \
-    file://0002-Avoid-absolute-symlinks.patch \
 "
 
-SRCREV = "597a4e296da4f21e71a17facab297e016a3a80a8"
+SRCREV = "88eab6dc16da6e5dd25fe97fbb56b96ef0d58657"
 
 S = "${WORKDIR}/git"
 
-inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check
+inherit autotools gettext update-alternatives pkgconfig python3native perlnative features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -54,10 +51,8 @@ ALTERNATIVE_PRIORITY[x-window-manager] = "20"
 EXTRA_OECONF = " \
     --disable-bidi \
     --disable-fontconfigtest \
-    --disable-freetypetest \
     --disable-htmldoc \
     --disable-imlibtest \
-    --disable-mandoc \
     --disable-nls \
     --disable-perllib \
     --disable-rsvg \
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/external/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
deleted file mode 100644
index d145b625..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: gegl-0.2.0/configure.ac
-===================================================================
---- gegl-0.2.0.orig/configure.ac	2012-04-02 21:56:49.000000000 +0000
-+++ gegl-0.2.0/configure.ac	2014-07-17 21:34:15.312546602 +0000
-@@ -765,15 +765,7 @@
- 
- have_sdl="no"
- if test "x$with_sdl" != "xno"; then
--  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
--  if test "$SDL_CONFIG" = "no"; then
--    have_sdl="no  (SDL library not found)"
--    AC_MSG_RESULT([*** Check for SDL library failed.])
--  else
--    have_sdl="yes"
--    SDL_CFLAGS=`$SDL_CONFIG --cflags`
--    SDL_LIBS=`$SDL_CONFIG --libs`
--  fi
-+  PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no  (SDL library not found)"])
- fi
- 
- AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes")
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/external/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb
deleted file mode 100644
index 0053c0c6..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework"
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl json-glib intltool-native"
-
-EXTRA_OECONF = "--disable-docs"
-
-inherit distro_features_check gnomebase vala gobject-introspection
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
-PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav"
-PACKAGECONFIG[lcms] = "--with-lcms,--without-lcms,lcms"
-PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff"
-PACKAGECONFIG[webp] = "--with-webp,--without-webp,webp"
-
-SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.3/${BP}.tar.bz2 \
-           file://pkgconfig.patch "
-SRC_URI[md5sum] = "6e5c6f229261478dc436a38c84405b2a"
-SRC_URI[sha256sum] = "d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb"
-
-LDFLAGS += "-lm"
-
-# There are a couple of non-symlink .so files installed into libdir, which need to go into main package
-FILES_${PN}_append = " ${libdir}/gegl-0.3/*.so ${libdir}/gegl-0.3/*.json ${libdir}/libgegl-npd-0.3.so ${libdir}/libgegl-sc-0.3.so"
-FILES_${PN}-dev_append = " ${libdir}/gegl-0.3/*.la ${libdir}/libgegl-0.3.so"
-FILES_${PN}-dev_remove = "${libdir}/lib*.so"
-
-# Fails to build with thumb-1 (qemuarm)
-# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process':
-# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275
-ARM_INSTRUCTION_SET = "arm"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
deleted file mode 100644
index fecd0121..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 72ad76841d87e857428693d812a961935284ac62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 12 Feb 2015 15:57:47 +0100
-Subject: [PATCH] configure-ac: do not check for freetype-config
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-freetype-config is not allowed in our environment - see also binconfig-disabled
-
-Upstream-Status: inappropriate [OE specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 26812b6..abec714 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -647,13 +647,6 @@ if test "x$fontconfig_ok" = xno; then
- fi
- 
- 
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--if test "x$FREETYPE_CONFIG" != "xno" ; then
--  AC_MSG_CHECKING([for freetype libraries])
--  FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
--  AC_MSG_RESULT($FREETYPE_LIBS)
--fi
--AC_SUBST(FREETYPE_LIBS)
- 
- 
- ##########################################
--- 
-1.9.3
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
deleted file mode 100644
index 7da78e20..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 29 Jun 2017 10:32:14 -0700
-Subject: [PATCH 3/3] Fix use of gegl API
-
-newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE
-
-| core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate':
-| /usr/src/debug/gimp/2.8.22-r0/gimp-2.8.22/app/core/../../../../../../../../../workspace/sources/gimp/app/core/gimpparamspecs-duplicate.c:70: undefined reference to `GEGL_IS_PARAM_SPEC_MULTILINE'
-| collect2: error: ld returned 1 exit status
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- app/core/gimpparamspecs-duplicate.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c
-index c0b7426..2efaf23 100644
---- a/app/core/gimpparamspecs-duplicate.c
-+++ b/app/core/gimpparamspecs-duplicate.c
-@@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec)
-                                      spec->default_value,
-                                      pspec->flags);
- 
--          if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
-+          if (gegl_param_spec_get_property_key(pspec, "multiline"))
-             {
-               g_param_spec_set_qdata (new, multiline_quark,
-                                       GINT_TO_POINTER (TRUE));
--- 
-2.13.2
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
deleted file mode 100644
index b71bf329..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Bump acceptable versions of babl and gegl.
-
-Patch is taken from debian:
-https://packages.debian.org/stretch/gimp
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-diff --git a/app/sanity.c b/app/sanity.c
-index febddfb..85fea55 100644
---- a/app/sanity.c
-+++ b/app/sanity.c
-@@ -351,7 +351,7 @@ sanity_check_babl (void)
- 
- #define BABL_REQUIRED_MAJOR 0
- #define BABL_REQUIRED_MINOR 1
--#define BABL_REQUIRED_MICRO 10
-+#define BABL_REQUIRED_MICRO 12
- 
-   babl_get_version (&babl_major_version,
-                     &babl_minor_version,
-@@ -388,7 +388,7 @@ sanity_check_gegl (void)
-   gint gegl_micro_version;
- 
- #define GEGL_REQUIRED_MAJOR 0
--#define GEGL_REQUIRED_MINOR 2
-+#define GEGL_REQUIRED_MINOR 3
- #define GEGL_REQUIRED_MICRO 0
- 
-   gegl_get_version (&gegl_major_version,
-diff --git a/configure.ac b/configure.ac
-index 26812b6..4252fe9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,8 +40,8 @@ m4_define([gimp_stable],
- m4_define([gimp_full_name], [GNU Image Manipulation Program])
- 
- # required versions of other packages
--m4_define([babl_required_version], [0.1.10])
--m4_define([gegl_required_version], [0.2.0])
-+m4_define([babl_required_version], [0.1.12])
-+m4_define([gegl_required_version], [0.3.0])
- m4_define([glib_required_version], [2.30.2])
- m4_define([atk_required_version], [2.2.0])
- m4_define([gtk_required_version], [2.24.10])
-@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
- ###############################
- 
- PKG_CHECK_MODULES(BABL, babl >= babl_required_version)
--PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version)
-+PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
- PKG_CHECK_MODULES(ATK, atk >= atk_required_version)
- 
- AM_PATH_GLIB_2_0(glib_required_version, :,
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
deleted file mode 100644
index 943986e7..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "The GIMP is the GNU Image Manipulation Program"
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-DEPENDS = " \
-    gdk-pixbuf-native \
-    intltool-native \
-    libxslt-native \
-    gtk+ \
-    babl \
-    gegl \
-    jpeg \
-    libpng \
-    libexif \
-    tiff \
-    lcms \
-    poppler \
-    jasper \
-    bzip2 \
-    libgudev \
-    libmng \
-"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}"
-
-inherit distro_features_check gnome gtk-doc
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \
-           file://0001-configure-ac-do-not-check-for-freetype-config.patch \
-           file://bump_Babl-GEGL_versions.patch \
-           file://0003-Fix-use-of-gegl-API.patch \
-           "
-SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d"
-SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a"
-
-EXTRA_OECONF = "--disable-python \
-                --without-webkit \
-                --without-wmf"
-
-do_configure_append() {
-    find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-    find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
-}
-
-CFLAGS += "-fPIC"
-
-FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
-FILES_${PN}  += "${datadir}/appdata"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch b/external/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch
deleted file mode 100644
index d69c5af3..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch
+++ /dev/null
@@ -1,860 +0,0 @@
-From 99a9676a0193f6291d7202d7af72e24580abe565 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 16 Mar 2018 13:55:29 +0100
-Subject: [PATCH 1/2] Make GLM_ENABLE_EXPERIMENTAL a configurable option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It seems that erroring out if GLM_ENABLE_EXPERIMENTAL is not set turns into
-packagers nightmare: There are packages around expecting glx headers. E.g
-libgltf [1] fails during configure checking for usable headers AND during
-compile. Paticularly fixing configure for those packages is time-consuming:
-The only way (correct me if I am wrong) is creating a patch adding
-
-AC_DEFINE([GLM_ENABLE_EXPERIMENTAL], [1], [glm needs this for gtx headers])
-
-By adding a configure option 'GLM_ENABLE_EXPERIMENTAL', the decision to use
-glm/glx is done at one (and the right) place.
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
-[1] https://gerrit.libreoffice.org/gitweb?p=libgltf.git
-
-Uptream-Status: Submitted [2]
-
-[2] https://github.com/g-truc/glm/pull/741
----
- CMakeLists.txt                      | 6 ++++++
- glm/CMakeLists.txt                  | 2 ++
- glm/experimental.hpp.in             | 1 +
- glm/ext.hpp                         | 1 +
- glm/gtx/associated_min_max.hpp      | 1 +
- glm/gtx/bit.hpp                     | 1 +
- glm/gtx/closest_point.hpp           | 1 +
- glm/gtx/color_space.hpp             | 1 +
- glm/gtx/color_space_YCoCg.hpp       | 1 +
- glm/gtx/common.hpp                  | 1 +
- glm/gtx/compatibility.hpp           | 1 +
- glm/gtx/component_wise.hpp          | 1 +
- glm/gtx/dual_quaternion.hpp         | 1 +
- glm/gtx/euler_angles.hpp            | 1 +
- glm/gtx/extend.hpp                  | 1 +
- glm/gtx/extended_min_max.hpp        | 1 +
- glm/gtx/fast_exponential.hpp        | 1 +
- glm/gtx/fast_square_root.hpp        | 1 +
- glm/gtx/fast_trigonometry.hpp       | 1 +
- glm/gtx/gradient_paint.hpp          | 1 +
- glm/gtx/handed_coordinate_space.hpp | 1 +
- glm/gtx/hash.hpp                    | 1 +
- glm/gtx/integer.hpp                 | 1 +
- glm/gtx/intersect.hpp               | 1 +
- glm/gtx/io.hpp                      | 1 +
- glm/gtx/log_base.hpp                | 1 +
- glm/gtx/matrix_cross_product.hpp    | 1 +
- glm/gtx/matrix_decompose.hpp        | 1 +
- glm/gtx/matrix_factorisation.hpp    | 1 +
- glm/gtx/matrix_interpolation.hpp    | 1 +
- glm/gtx/matrix_major_storage.hpp    | 1 +
- glm/gtx/matrix_operation.hpp        | 1 +
- glm/gtx/matrix_query.hpp            | 1 +
- glm/gtx/matrix_transform_2d.hpp     | 1 +
- glm/gtx/mixed_product.hpp           | 1 +
- glm/gtx/norm.hpp                    | 1 +
- glm/gtx/normal.hpp                  | 1 +
- glm/gtx/normalize_dot.hpp           | 1 +
- glm/gtx/number_precision.hpp        | 1 +
- glm/gtx/optimum_pow.hpp             | 1 +
- glm/gtx/orthonormalize.hpp          | 1 +
- glm/gtx/perpendicular.hpp           | 1 +
- glm/gtx/polar_coordinates.hpp       | 1 +
- glm/gtx/projection.hpp              | 1 +
- glm/gtx/quaternion.hpp              | 1 +
- glm/gtx/range.hpp                   | 1 +
- glm/gtx/raw_data.hpp                | 1 +
- glm/gtx/rotate_normalized_axis.hpp  | 1 +
- glm/gtx/rotate_vector.hpp           | 1 +
- glm/gtx/scalar_multiplication.hpp   | 1 +
- glm/gtx/scalar_relational.hpp       | 1 +
- glm/gtx/spline.hpp                  | 1 +
- glm/gtx/std_based_type.hpp          | 1 +
- glm/gtx/string_cast.hpp             | 1 +
- glm/gtx/texture.hpp                 | 1 +
- glm/gtx/transform.hpp               | 1 +
- glm/gtx/transform2.hpp              | 1 +
- glm/gtx/type_aligned.hpp            | 1 +
- glm/gtx/type_trait.hpp              | 1 +
- glm/gtx/vec_swizzle.hpp             | 1 +
- glm/gtx/vector_angle.hpp            | 1 +
- glm/gtx/vector_query.hpp            | 1 +
- glm/gtx/wrap.hpp                    | 1 +
- 63 files changed, 69 insertions(+)
- create mode 100644 glm/experimental.hpp.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e5159b0f..bd4dd654 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,6 +82,11 @@ option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF)
- option(GLM_TEST_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF)
- option(GLM_TEST_FORCE_PURE "Force 'pure' instructions" OFF)
- 
-+option(GLM_ENABLE_EXPERIMENTAL "Enable experimental GLM_GTX" OFF)
-+configure_file(glm/experimental.hpp.in experimental.hpp @ONLY)
-+include_directories(${CMAKE_BINARY_DIR}/glm)
-+include_directories(${CMAKE_BINARY_DIR})
-+
- if(GLM_TEST_FORCE_PURE)
- 	add_definitions(-DGLM_FORCE_PURE)
- 
-@@ -167,6 +172,7 @@ option(GLM_INSTALL_ENABLE "GLM install" ON)
- set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")
- if (GLM_INSTALL_ENABLE)
- 	install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm)
- endif()
- 
- write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion)
-diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
-index df9c9ee5..dc5db4bc 100644
---- a/glm/CMakeLists.txt
-+++ b/glm/CMakeLists.txt
-@@ -43,6 +43,8 @@ source_group("SIMD Files" FILES ${SIMD_INLINE})
- source_group("SIMD Files" FILES ${SIMD_HEADER})
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-+# make out-of tree builds find experimental.hpp
-+include_directories(${CMAKE_BINARY_DIR}/glm)
- 
- if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE)
- 	if(GLM_STATIC_LIBRARY_ENABLE)
-diff --git a/glm/experimental.hpp.in b/glm/experimental.hpp.in
-new file mode 100644
-index 00000000..bfab5138
---- /dev/null
-+++ b/glm/experimental.hpp.in
-@@ -0,0 +1 @@
-+#cmakedefine GLM_ENABLE_EXPERIMENTAL
-diff --git a/glm/ext.hpp b/glm/ext.hpp
-index d085bfd5..a2948447 100644
---- a/glm/ext.hpp
-+++ b/glm/ext.hpp
-@@ -39,6 +39,7 @@
- #	include "./gtc/type_aligned.hpp"
- #endif
- 
-+#include "experimental.hpp"
- #ifdef GLM_ENABLE_EXPERIMENTAL
- #include "./gtx/associated_min_max.hpp"
- #include "./gtx/bit.hpp"
-diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp
-index 0c9935f3..d00c2bc4 100644
---- a/glm/gtx/associated_min_max.hpp
-+++ b/glm/gtx/associated_min_max.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp
-index 1447fa00..31957083 100644
---- a/glm/gtx/bit.hpp
-+++ b/glm/gtx/bit.hpp
-@@ -15,6 +15,7 @@
- // Dependencies
- #include "../gtc/bitfield.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp
-index 6859bb96..ebd9fe5a 100644
---- a/glm/gtx/closest_point.hpp
-+++ b/glm/gtx/closest_point.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp
-index d1e655c3..51416819 100644
---- a/glm/gtx/color_space.hpp
-+++ b/glm/gtx/color_space.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp
-index e82cbd8b..7ae71041 100644
---- a/glm/gtx/color_space_YCoCg.hpp
-+++ b/glm/gtx/color_space_YCoCg.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp
-index 8081bff7..57a68a8d 100644
---- a/glm/gtx/common.hpp
-+++ b/glm/gtx/common.hpp
-@@ -18,6 +18,7 @@
- #include "../vec4.hpp"
- #include "../gtc/vec1.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp
-index e5b60399..9876669c 100644
---- a/glm/gtx/compatibility.hpp
-+++ b/glm/gtx/compatibility.hpp
-@@ -16,6 +16,7 @@
- #include "../glm.hpp"
- #include "../gtc/quaternion.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp
-index 39bab5d5..4fe0e4e2 100644
---- a/glm/gtx/component_wise.hpp
-+++ b/glm/gtx/component_wise.hpp
-@@ -18,6 +18,7 @@
- #include "../detail/setup.hpp"
- #include "../detail/qualifier.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp
-index c4343e9d..d59fb459 100644
---- a/glm/gtx/dual_quaternion.hpp
-+++ b/glm/gtx/dual_quaternion.hpp
-@@ -20,6 +20,7 @@
- #include "../gtc/constants.hpp"
- #include "../gtc/quaternion.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp
-index e66e9281..ad5988c1 100644
---- a/glm/gtx/euler_angles.hpp
-+++ b/glm/gtx/euler_angles.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp
-index eda4e470..cde6db63 100644
---- a/glm/gtx/extend.hpp
-+++ b/glm/gtx/extend.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp
-index 3e767b0c..0bcffcc6 100644
---- a/glm/gtx/extended_min_max.hpp
-+++ b/glm/gtx/extended_min_max.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp
-index 2d4918e7..e6d11f0a 100644
---- a/glm/gtx/fast_exponential.hpp
-+++ b/glm/gtx/fast_exponential.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp
-index 1e1ec3cf..f758aeef 100644
---- a/glm/gtx/fast_square_root.hpp
-+++ b/glm/gtx/fast_square_root.hpp
-@@ -19,6 +19,7 @@
- #include "../exponential.hpp"
- #include "../geometric.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp
-index 739065fb..f1332958 100644
---- a/glm/gtx/fast_trigonometry.hpp
-+++ b/glm/gtx/fast_trigonometry.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../gtc/constants.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp
-index 2713cec0..d4703991 100644
---- a/glm/gtx/gradient_paint.hpp
-+++ b/glm/gtx/gradient_paint.hpp
-@@ -17,6 +17,7 @@
- #include "../glm.hpp"
- #include "../gtx/optimum_pow.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp
-index 1d0d4104..3a52ddcf 100644
---- a/glm/gtx/handed_coordinate_space.hpp
-+++ b/glm/gtx/handed_coordinate_space.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp
-index fe8a3efd..92bfc9b2 100644
---- a/glm/gtx/hash.hpp
-+++ b/glm/gtx/hash.hpp
-@@ -12,6 +12,7 @@
- 
- #pragma once
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp
-index 96637a13..5d1a16c6 100644
---- a/glm/gtx/integer.hpp
-+++ b/glm/gtx/integer.hpp
-@@ -16,6 +16,7 @@
- #include "../glm.hpp"
- #include "../gtc/integer.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp
-index 61e2226a..4895ba93 100644
---- a/glm/gtx/intersect.hpp
-+++ b/glm/gtx/intersect.hpp
-@@ -21,6 +21,7 @@
- #include "../gtx/closest_point.hpp"
- #include "../gtx/vector_query.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp
-index 49a1ec11..ae39cd60 100644
---- a/glm/gtx/io.hpp
-+++ b/glm/gtx/io.hpp
-@@ -23,6 +23,7 @@
- #include "../glm.hpp"
- #include "../gtx/quaternion.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp
-index e873e356..45b8d53c 100644
---- a/glm/gtx/log_base.hpp
-+++ b/glm/gtx/log_base.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp
-index 967743b8..52d6c173 100644
---- a/glm/gtx/matrix_cross_product.hpp
-+++ b/glm/gtx/matrix_cross_product.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp
-index b7ec0e83..6793fee2 100644
---- a/glm/gtx/matrix_decompose.hpp
-+++ b/glm/gtx/matrix_decompose.hpp
-@@ -20,6 +20,7 @@
- #include "../gtc/quaternion.hpp"
- #include "../gtc/matrix_transform.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp
-index e30a7746..79c293be 100644
---- a/glm/gtx/matrix_factorisation.hpp
-+++ b/glm/gtx/matrix_factorisation.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp
-index 89c4596c..799983bb 100644
---- a/glm/gtx/matrix_interpolation.hpp
-+++ b/glm/gtx/matrix_interpolation.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp
-index 7f264a59..e68467cd 100644
---- a/glm/gtx/matrix_major_storage.hpp
-+++ b/glm/gtx/matrix_major_storage.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp
-index bce938bb..1e85bb5e 100644
---- a/glm/gtx/matrix_operation.hpp
-+++ b/glm/gtx/matrix_operation.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp
-index 5df5f52f..eec1eec0 100644
---- a/glm/gtx/matrix_query.hpp
-+++ b/glm/gtx/matrix_query.hpp
-@@ -18,6 +18,7 @@
- #include "../gtx/vector_query.hpp"
- #include <limits>
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp
-index 239ab9f4..3ca8d2f2 100644
---- a/glm/gtx/matrix_transform_2d.hpp
-+++ b/glm/gtx/matrix_transform_2d.hpp
-@@ -17,6 +17,7 @@
- #include "../mat3x3.hpp"
- #include "../vec2.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp
-index 58562aab..5c7460d5 100644
---- a/glm/gtx/mixed_product.hpp
-+++ b/glm/gtx/mixed_product.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp
-index 46474e07..3cf2c3ea 100644
---- a/glm/gtx/norm.hpp
-+++ b/glm/gtx/norm.hpp
-@@ -17,6 +17,7 @@
- #include "../geometric.hpp"
- #include "../gtx/quaternion.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp
-index 15cec9c2..7bb4c096 100644
---- a/glm/gtx/normal.hpp
-+++ b/glm/gtx/normal.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp
-index 86048e70..c6604da4 100644
---- a/glm/gtx/normalize_dot.hpp
-+++ b/glm/gtx/normalize_dot.hpp
-@@ -16,6 +16,7 @@
- // Dependency:
- #include "../gtx/fast_square_root.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp
-index 3732a56c..b48845f7 100644
---- a/glm/gtx/number_precision.hpp
-+++ b/glm/gtx/number_precision.hpp
-@@ -18,6 +18,7 @@
- #include "../glm.hpp"
- #include "../gtc/type_precision.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp
-index eb09f1c3..94a6bbb2 100644
---- a/glm/gtx/optimum_pow.hpp
-+++ b/glm/gtx/optimum_pow.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp
-index 2a684ee4..4ff47e53 100644
---- a/glm/gtx/orthonormalize.hpp
-+++ b/glm/gtx/orthonormalize.hpp
-@@ -18,6 +18,7 @@
- #include "../mat3x3.hpp"
- #include "../geometric.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp
-index 35601ac7..17251ebe 100644
---- a/glm/gtx/perpendicular.hpp
-+++ b/glm/gtx/perpendicular.hpp
-@@ -17,6 +17,7 @@
- #include "../glm.hpp"
- #include "../gtx/projection.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp
-index b8421db4..5125215d 100644
---- a/glm/gtx/polar_coordinates.hpp
-+++ b/glm/gtx/polar_coordinates.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp
-index 9a24abf9..4d5bf76f 100644
---- a/glm/gtx/projection.hpp
-+++ b/glm/gtx/projection.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../geometric.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp
-index c3d99a5c..808ba0fd 100644
---- a/glm/gtx/quaternion.hpp
-+++ b/glm/gtx/quaternion.hpp
-@@ -19,6 +19,7 @@
- #include "../gtc/quaternion.hpp"
- #include "../gtx/norm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp
-index e0ef46af..03c797c3 100644
---- a/glm/gtx/range.hpp
-+++ b/glm/gtx/range.hpp
-@@ -15,6 +15,7 @@
- // Dependencies
- #include "../detail/setup.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp
-index fb34c8cb..0084fec6 100644
---- a/glm/gtx/raw_data.hpp
-+++ b/glm/gtx/raw_data.hpp
-@@ -16,6 +16,7 @@
- #include "../detail/setup.hpp"
- #include "../detail/type_int.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp
-index eee90d6e..82612928 100644
---- a/glm/gtx/rotate_normalized_axis.hpp
-+++ b/glm/gtx/rotate_normalized_axis.hpp
-@@ -19,6 +19,7 @@
- #include "../gtc/epsilon.hpp"
- #include "../gtc/quaternion.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp
-index c8ace89e..e954b041 100644
---- a/glm/gtx/rotate_vector.hpp
-+++ b/glm/gtx/rotate_vector.hpp
-@@ -17,6 +17,7 @@
- #include "../glm.hpp"
- #include "../gtx/transform.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp
-index b73edf67..22baa52a 100644
---- a/glm/gtx/scalar_multiplication.hpp
-+++ b/glm/gtx/scalar_multiplication.hpp
-@@ -16,6 +16,7 @@
- 
- #include "../detail/setup.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp
-index 7fc8c1cc..f21f3b2b 100644
---- a/glm/gtx/scalar_relational.hpp
-+++ b/glm/gtx/scalar_relational.hpp
-@@ -15,6 +15,7 @@
- // Dependency:
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp
-index f96d7e07..76359cfd 100644
---- a/glm/gtx/spline.hpp
-+++ b/glm/gtx/spline.hpp
-@@ -16,6 +16,7 @@
- #include "../glm.hpp"
- #include "../gtx/optimum_pow.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp
-index 55a2f074..92532b9e 100644
---- a/glm/gtx/std_based_type.hpp
-+++ b/glm/gtx/std_based_type.hpp
-@@ -17,6 +17,7 @@
- #include "../glm.hpp"
- #include <cstdlib>
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp
-index 4b4e280f..dfcd5085 100644
---- a/glm/gtx/string_cast.hpp
-+++ b/glm/gtx/string_cast.hpp
-@@ -24,6 +24,7 @@
- #include <string>
- #include <cmath>
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp
-index 312bf398..7af185f6 100644
---- a/glm/gtx/texture.hpp
-+++ b/glm/gtx/texture.hpp
-@@ -17,6 +17,7 @@
- #include "../gtc/integer.hpp"
- #include "../gtx/component_wise.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp
-index d23b99ce..5a5d9619 100644
---- a/glm/gtx/transform.hpp
-+++ b/glm/gtx/transform.hpp
-@@ -19,6 +19,7 @@
- #include "../glm.hpp"
- #include "../gtc/matrix_transform.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp
-index 85f5bea4..5d7c83fc 100644
---- a/glm/gtx/transform2.hpp
-+++ b/glm/gtx/transform2.hpp
-@@ -17,6 +17,7 @@
- #include "../glm.hpp"
- #include "../gtx/transform.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp
-index 6ff9f276..6ad92fad 100644
---- a/glm/gtx/type_aligned.hpp
-+++ b/glm/gtx/type_aligned.hpp
-@@ -18,6 +18,7 @@
- // Dependency:
- #include "../gtc/type_precision.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp
-index 637bbd19..65519cab 100644
---- a/glm/gtx/type_trait.hpp
-+++ b/glm/gtx/type_trait.hpp
-@@ -12,6 +12,7 @@
- 
- #pragma once
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp
-index daebac38..13d523dc 100644
---- a/glm/gtx/vec_swizzle.hpp
-+++ b/glm/gtx/vec_swizzle.hpp
-@@ -14,6 +14,7 @@
- 
- #include "../glm.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp
-index 401a47eb..98c9d110 100644
---- a/glm/gtx/vector_angle.hpp
-+++ b/glm/gtx/vector_angle.hpp
-@@ -20,6 +20,7 @@
- #include "../gtx/quaternion.hpp"
- #include "../gtx/rotate_vector.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp
-index 6560eaa5..5ab1ffda 100644
---- a/glm/gtx/vector_query.hpp
-+++ b/glm/gtx/vector_query.hpp
-@@ -17,6 +17,7 @@
- #include <cfloat>
- #include <limits>
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
-diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp
-index 2c4b55df..5bf26a33 100644
---- a/glm/gtx/wrap.hpp
-+++ b/glm/gtx/wrap.hpp
-@@ -16,6 +16,7 @@
- #include "../glm.hpp"
- #include "../gtc/vec1.hpp"
- 
-+#include "../experimental.hpp"
- #ifndef GLM_ENABLE_EXPERIMENTAL
- #	error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- #endif
--- 
-2.14.3
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch b/external/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch
deleted file mode 100644
index 1be3318c..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7fdd36d7496238e03e43fcc32839f75588116c5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 16 Mar 2018 15:44:48 +0100
-Subject: [PATCH 2/2] glm: install headers only
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Plausibility check in root source path
-
-$ find glm -type f ! -name '*.hpp' ! -name '*.h' ! -name '*.inl'
-glm/detail/glm.cpp
-glm/detail/dummy.cpp
-glm/experimental.hpp.in
-glm/CMakeLists.txt
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
-Uptream-Status: Submitted [1]
-
-[1] https://github.com/g-truc/glm/pull/741
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd4dd654..113dd735 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -171,7 +171,12 @@ option(GLM_INSTALL_ENABLE "GLM install" ON)
- 
- set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")
- if (GLM_INSTALL_ENABLE)
--	install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+	install(DIRECTORY glm
-+		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+		FILES_MATCHING
-+			PATTERN "*.h"
-+			PATTERN "*.hpp"
-+			PATTERN "*.inl")
- 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm)
- endif()
- 
--- 
-2.14.3
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch
new file mode 100644
index 00000000..2eb50a5a
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch
@@ -0,0 +1,158 @@
+From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 27 Dec 2019 18:42:51 -0800
+Subject: [PATCH] Fix Wimplicit-int-float-conversion warnings with clang 10+
+
+This is a new warning in clang which will be available in clang 10
+onwards
+
+Fixes
+error: implicit conversion from 'const int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion]
+
+Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/986]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ glm/gtx/scalar_multiplication.hpp  |  2 +-
+ test/gtx/gtx_fast_trigonometry.cpp | 32 +++++++++++++++---------------
+ 2 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp
+index f391f8de..496ba193 100644
+--- a/glm/gtx/scalar_multiplication.hpp
++++ b/glm/gtx/scalar_multiplication.hpp
+@@ -54,7 +54,7 @@ namespace glm
+ 	template<typename T> \
+ 	return_type_scalar_multiplication<T, Vec> \
+ 	operator/(Vec lh, T const& s){ \
+-		return lh *= 1.0f / s; \
++		return lh *= 1.0f / static_cast<float>(s); \
+ 	}
+ 
+ GLM_IMPLEMENT_SCAL_MULT(vec2)
+diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp
+index f3bf17bf..f3c4e957 100644
+--- a/test/gtx/gtx_fast_trigonometry.cpp
++++ b/test/gtx/gtx_fast_trigonometry.cpp
+@@ -239,12 +239,12 @@ namespace taylorCos
+ 		std::vector<glm::vec4> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * i));
++			Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i)));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -280,12 +280,12 @@ namespace taylorCos
+ 		std::vector<glm::vec4> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * i));
++			Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i)));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -327,12 +327,12 @@ namespace taylorCos
+ 		std::vector<glm::vec4> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * i));
++			Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i)));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -349,12 +349,12 @@ namespace taylorCos
+ 		std::vector<glm::vec4> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * i));
++			Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i)));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -371,12 +371,12 @@ namespace taylorCos
+ 		std::vector<glm::vec4> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * i));
++			Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i)));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -466,12 +466,12 @@ namespace taylor2
+ 		std::vector<float> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = taylorCosA(AngleShift.x + Begin + Steps * i);
++			Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -488,12 +488,12 @@ namespace taylor2
+ 		std::vector<float> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = taylorCosB(AngleShift.x + Begin + Steps * i);
++			Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+@@ -510,12 +510,12 @@ namespace taylor2
+ 		std::vector<float> Results;
+ 		Results.resize(Samples);
+ 
+-		float Steps = (End - Begin) / Samples;
++		float Steps = (End - Begin) / float(Samples);
+ 
+ 		std::clock_t const TimeStampBegin = std::clock();
+ 
+ 		for(std::size_t i = 0; i < Samples; ++i)
+-			Results[i] = taylorCosC(AngleShift.x + Begin + Steps * i);
++			Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i));
+ 
+ 		std::clock_t const TimeStampEnd = std::clock();
+ 
+-- 
+2.24.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glm.pc.in b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glm.pc.in
new file mode 100644
index 00000000..54052e28
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glm.pc.in
@@ -0,0 +1,7 @@
+prefix=/usr
+includedir=${prefix}/include
+
+Name: GLM
+Description: OpenGL Mathematics
+Version: @VERSION@
+Cflags: -I${includedir}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in
new file mode 100644
index 00000000..8ab23a18
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in
@@ -0,0 +1,20 @@
+set(GLM_VERSION "@VERSION@")
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+####################################################################################
+
+set_and_check(GLM_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
+
+if (NOT CMAKE_VERSION VERSION_LESS "3.0")
+    include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
+endif()
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in
new file mode 100644
index 00000000..561a0db6
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in
@@ -0,0 +1,31 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "@VERSION@")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+   return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+   math(EXPR installedBits "8 * 8")
+   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+   set(PACKAGE_VERSION_UNSUITABLE FALSE)
+endif()
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake
new file mode 100644
index 00000000..905b6773
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake
@@ -0,0 +1,107 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
+   message(FATAL_ERROR "CMake >= 2.6.0 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.6)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
+foreach(_expectedTarget glm)
+  list(APPEND _expectedTargets ${_expectedTarget})
+  if(NOT TARGET ${_expectedTarget})
+    list(APPEND _targetsNotDefined ${_expectedTarget})
+  endif()
+  if(TARGET ${_expectedTarget})
+    list(APPEND _targetsDefined ${_expectedTarget})
+  endif()
+endforeach()
+if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
+  unset(_targetsDefined)
+  unset(_targetsNotDefined)
+  unset(_expectedTargets)
+  set(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT "${_targetsDefined}" STREQUAL "")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
+endif()
+unset(_targetsDefined)
+unset(_targetsNotDefined)
+unset(_expectedTargets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+# Use original install prefix when loaded through a
+# cross-prefix symbolic link such as /lib -> /usr/lib.
+get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
+get_filename_component(_realOrig "/usr/lib/cmake/glm" REALPATH)
+if(_realCurr STREQUAL _realOrig)
+  set(_IMPORT_PREFIX "/usr/lib/cmake/glm")
+endif()
+unset(_realOrig)
+unset(_realCurr)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target glm
+add_library(glm INTERFACE IMPORTED)
+
+set_target_properties(glm PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+)
+
+if(CMAKE_VERSION VERSION_LESS 3.0.0)
+  message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
+endif()
+
+# Load information for each installed configuration.
+get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+file(GLOB CONFIG_FILES "${_DIR}/glmTargets-*.cmake")
+foreach(f ${CONFIG_FILES})
+  include(${f})
+endforeach()
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(target ${_IMPORT_CHECK_TARGETS} )
+  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
+    if(NOT EXISTS "${file}" )
+      message(FATAL_ERROR "The imported target \"${target}\" references the file
+   \"${file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_IMPORT_CHECK_FILES_FOR_${target})
+endforeach()
+unset(_IMPORT_CHECK_TARGETS)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
deleted file mode 100644
index 7f16708e..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "OpenGL Mathematics Library"
-DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \
-mathematics library for graphics software based on the OpenGL \
-Shading Language (GLSL) specifications."
-HOMEPAGE = "https://glm.g-truc.net"
-BUGTRACKER = "https://github.com/g-truc/glm/issues"
-SECTION = "libs"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790"
-
-SRC_URI = " \
-    git://github.com/g-truc/glm;branch=master \
-    file://0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch \
-    file://0002-glm-install-headers-only.patch \
-"
-SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON"
-
-RDEPENDS_${PN}-dev = ""
-
-BBCLASSEXTEND = "native"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb
new file mode 100644
index 00000000..e2f4dbeb
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb
@@ -0,0 +1,39 @@
+SUMMARY = "OpenGL Mathematics Library"
+DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \
+mathematics library for graphics software based on the OpenGL \
+Shading Language (GLSL) specifications."
+HOMEPAGE = "https://glm.g-truc.net"
+BUGTRACKER = "https://github.com/g-truc/glm/issues"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://copying.txt;md5=4a735e33f271f57404fda17e80085411"
+
+SRC_URI = " \
+    git://github.com/g-truc/glm;branch=master \
+    file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \
+    file://glmConfig.cmake.in \
+    file://glmConfigVersion.cmake.in \
+    file://glm.pc.in \
+    file://glmTargets.cmake \
+"
+SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+do_install() {
+    install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm
+    cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir}
+    cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm
+    rm ${D}${includedir}/glm/CMakeLists.txt
+    sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake
+    sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake
+    sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc
+    install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake
+
+}
+
+RDEPENDS_${PN}-dev = ""
+
+BBCLASSEXTEND = "native"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb b/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb
index 75ad7f4f..ef3100f6 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb
@@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \
            file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \
 "
 
-SRC_URI[gphoto2.md5sum] = "6c6a21b5e879330cdd71ef92dce36399"
-SRC_URI[gphoto2.sha256sum] = "9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c"
+SRC_URI[gphoto2.md5sum] = "0abd5ae8315109ae66bf06ac37902678"
+SRC_URI[gphoto2.sha256sum] = "df87092100e7766c9d0a4323217c91908a9c891c0d3670ebf40b76903be458d1"
 
 inherit autotools pkgconfig gettext
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi b/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi
deleted file mode 100644
index 3977064f..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi
+++ /dev/null
@@ -1,9533 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-<!-- This file was generated by libgphoto2 print-camera-list - - fdi-device -->
-<!--+
-    | Created from this library:
-    |   libgphoto2      2.5.8          all camlibs, gcc, ltdl, no EXIF
-    |   libgphoto2_port 0.12.0         gcc, ltdl, no USB, serial without locking
-    +-->
-<deviceinfo version="0.2">
- <device>
-  <match key="info.subsystem" string="usb">
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13251">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13252">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13891">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13628">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13869">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13702">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13128">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13129">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13130">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13272">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13180">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13181">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13259">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13093">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13121">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13124">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13125">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13193">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13194">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13176">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13588">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13736">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13892">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="14117">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13833">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13427">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13663">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13911">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13226">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13796">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1282">
-    <match key="usb_device.product_id" int="13853">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5845">
-    <match key="usb_device.product_id" int="32774">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5845">
-    <match key="usb_device.product_id" int="32773">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1725">
-    <match key="usb_device.product_id" int="1027">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1725">
-    <match key="usb_device.product_id" int="1028">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20555">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20554">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2250">
-    <match key="usb_device.product_id" int="273">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20554">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20555">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="360">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="40974">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="61443">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="36941">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7099">
-    <match key="usb_device.product_id" int="359">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="2048">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="7">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="8">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="10">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="12">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="18">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="11">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="13">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="5">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6473">
-    <match key="usb_device.product_id" int="242">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="548">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4762">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4779">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4752">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4754">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4756">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4759">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4768">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4776">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4753">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4755">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1452">
-    <match key="usb_device.product_id" int="4761">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="20488">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="20489">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="16386">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5416">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5417">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5433">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5432">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5305">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5448">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4618">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4893">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4620">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4865">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4867">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4881">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4897">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="12787">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4913">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4915">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="12841">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4871">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4951">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4945">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4873">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4875">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4883">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4885">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4917">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4877">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4879">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4889">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5359">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5480">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5481">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5311">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5400">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5384">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5385">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5293">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5274">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5227">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5214">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="5208">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="12715">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4615">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4929">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4891">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3705">
-    <match key="usb_device.product_id" int="4616">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37180">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="23055">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19680">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19681">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="20815">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="30579">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21519">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21535">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21775">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21760">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19664">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19665">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21023">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21007">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19648">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19649">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21600">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21608">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21504">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21520">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21521">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21606">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="30578">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21766">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21857">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="20992">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="20993">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21008">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21009">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21012">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21024">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21025">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21040">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21041">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19968">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19969">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19983">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19999">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19712">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19713">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19584">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19585">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19600">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19601">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19616">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="19617">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="22047">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="24322">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="22543">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="22559">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21632">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21633">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="30593">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21648">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2821">
-    <match key="usb_device.product_id" int="21649">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36945">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8320">
-    <match key="usb_device.product_id" int="6">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8320">
-    <match key="usb_device.product_id" int="5">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1189">
-    <match key="usb_device.product_id" int="12291">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7493">
-    <match key="usb_device.product_id" int="17821">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10823">
-    <match key="usb_device.product_id" int="32528">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10823">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10823">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12359">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12738">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12733">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12774">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12787">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12904">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12480">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12365">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12791">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12390">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12479">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12405">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12474">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12558">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12468">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12543">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12572">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12542">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12623">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12530">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12622">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12566">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12676">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12569">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12660">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12598">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12660">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12565">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12740">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12619">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12639">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12659">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12691">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12737">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12443">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12443">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12484">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12402">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12470">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12532">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12370">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12389">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12400">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12401">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12529">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12526">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12394">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12424">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12423">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12453">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12667">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12912">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12419">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12476">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12823">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12927">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12522">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12615">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12752">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12825">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12523">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12524">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12420">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12441">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12563">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12527">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12526">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12526">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12560">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12614">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12613">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12751">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12699">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12778">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12545">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12546">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12697">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12858">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12824">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12821">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12859">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12880">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12914">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12883">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12698">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12911">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12356">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12384">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12420">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12441">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12560">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12420">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12441">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12526">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12560">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12613">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12751">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12861">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12953">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12751">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12613">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12430">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12865">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12969">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12837">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12774">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12691">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12358">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12363">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12484">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12395">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12438">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12412">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12410">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12448">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12438">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12430">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12417">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12416">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12457">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12395">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12429">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12418">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12415">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12416">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12395">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12438">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12457">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12549">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12430">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12367">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12385">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12686">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12739">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12862">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12900">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12366">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12386">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12689">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12734">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12842">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12874">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12873">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12913">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12898">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12377">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12406">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12786">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12472">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12785">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12897">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12376">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12471">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12867">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12537">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12559">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12536">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12629">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12617">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12666">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12735">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12783">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12482">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12481">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12582">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12571">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12624">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12621">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12620">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12663">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12662">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12404">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12541">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12540">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12602">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12601">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12635">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12403">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12567">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12600">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12637">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12469">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12442">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12838">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12863">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12473">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12475">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12732">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12936">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12937">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12360">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12851">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12687">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12767">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12888">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12373">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12398">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12399">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12421">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12467">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12581">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12634">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12443">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12361">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12444">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12353">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12854">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12357">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12369">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12891">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12917">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12528">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12355">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12389">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12400">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12401">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12570">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12375">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12364">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12390">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12374">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12405">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12474">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12396">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12397">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12616">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12407">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12468">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12466">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12465">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12538">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12818">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12443">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12402">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12623">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12470">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12676">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12740">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12788">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12484">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12480">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12599">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12529">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12543">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12530">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12572">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12542">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12569">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12622">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12661">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12738">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12660">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12619">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12694">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12565">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12774">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12737">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12691">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12685">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12638">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12690">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12768">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12817">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12852">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12890">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12918">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12772">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12736">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12790">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12844">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12840">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12869">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12868">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12895">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12856">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12892">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12919">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12955">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12368">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12380">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12778">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12823">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12859">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1193">
-    <match key="usb_device.product_id" int="12408">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1999">
-    <match key="usb_device.product_id" int="4169">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1999">
-    <match key="usb_device.product_id" int="4162">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1999">
-    <match key="usb_device.product_id" int="4173">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1999">
-    <match key="usb_device.product_id" int="4172">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1999">
-    <match key="usb_device.product_id" int="4474">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1375">
-    <match key="usb_device.product_id" int="49664">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1207">
-    <match key="usb_device.product_id" int="34985">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="4098">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1943">
-    <match key="usb_device.product_id" int="32769">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="548">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7796">
-    <match key="usb_device.product_id" int="25874">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7763">
-    <match key="usb_device.product_id" int="5">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1000">
-    <match key="usb_device.product_id" int="8578">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1000">
-    <match key="usb_device.product_id" int="8576">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2386">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="1809">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="1873">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2321">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2369">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2049">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2161">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2193">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2145">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2177">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2337">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2305">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="1793">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="1889">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3617">
-    <match key="usb_device.product_id" int="2353">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16406">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16391">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16394">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16402">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16395">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16403">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16675">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16727">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16688">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16700">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16691">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16737">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16695">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16701">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16689">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16720">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16728">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16722">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16671">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16723">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16702">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16721">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16738">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16745">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16680">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4204">
-    <match key="usb_device.product_id" int="12821">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2125">
-    <match key="usb_device.product_id" int="3">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3428">
-    <match key="usb_device.product_id" int="4129">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1000">
-    <match key="usb_device.product_id" int="8496">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32768">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16690">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="16687">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16700">
-    <match key="usb_device.product_id" int="45323">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16700">
-    <match key="usb_device.product_id" int="45338">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16700">
-    <match key="usb_device.product_id" int="45339">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16700">
-    <match key="usb_device.product_id" int="17664">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7994">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1498">
-    <match key="usb_device.product_id" int="4120">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4483">
-    <match key="usb_device.product_id" int="1">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1498">
-    <match key="usb_device.product_id" int="4128">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2726">
-    <match key="usb_device.product_id" int="24609">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36944">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36946">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4310">
-    <match key="usb_device.product_id" int="8704">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1208">
-    <match key="usb_device.product_id" int="1027">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1208">
-    <match key="usb_device.product_id" int="1026">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10608">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10608">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6018">
-    <match key="usb_device.product_id" int="16385">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1747">
-    <match key="usb_device.product_id" int="8634">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3530">
-    <match key="usb_device.product_id" int="2">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3530">
-    <match key="usb_device.product_id" int="2">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="330">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="466">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="454">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="467">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="539">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="403">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="480">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="448">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="484">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="411">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="449">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="453">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="468">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="486">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="506">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="526">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="557">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="625">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="592">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="477">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="475">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="495">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="512">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="488">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="521">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="576">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="637">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="613">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="664">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="452">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="471">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="447">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="322">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="399">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="668">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="563">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="622">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="611">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="678">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="648">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="472">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="513">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="525">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="510">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="693">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1227">
-    <match key="usb_device.product_id" int="451">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1221">
-    <match key="usb_device.product_id" int="4416">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1221">
-    <match key="usb_device.product_id" int="4923">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2334">
-    <match key="usb_device.product_id" int="9605">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1112">
-    <match key="usb_device.product_id" int="28677">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1037">
-    <match key="usb_device.product_id" int="34908">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1044">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1044">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="7">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="6">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20033">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20034">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="19983">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="19712">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="11522">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="29706">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="53514">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="53513">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20193">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20194">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="45066">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="28840">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20005">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20006">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="1459">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="28930">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6353">
-    <match key="usb_device.product_id" int="20197">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="9842">
-    <match key="usb_device.product_id" int="17">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1943">
-    <match key="usb_device.product_id" int="32796">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4866">
-    <match key="usb_device.product_id" int="4118">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4866">
-    <match key="usb_device.product_id" int="4119">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="32285">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="23837">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="23581">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4251">
-    <match key="usb_device.product_id" int="37126">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4251">
-    <match key="usb_device.product_id" int="37129">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4251">
-    <match key="usb_device.product_id" int="37125">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="25858">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="25090">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="31746">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="32002">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="25346">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="26114">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="29698">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="30722">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="29186">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="28162">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="30978">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="27906">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="25346">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="16642">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="26626">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="28930">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="27394">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="25602">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="30210">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="26370">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="27650">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="27138">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="16898">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="30466">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="32258">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="17154">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="16642">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="17410">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="17666">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="16642">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="24578">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="61443">
-    <match key="usb_device.product_id" int="24578">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="35586">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="35842">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="29954">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="31490">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="29442">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="31234">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="32770">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="33026">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="33282">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="39682">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="33794">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="34050">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="38402">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="38658">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="34562">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1008">
-    <match key="usb_device.product_id" int="34818">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="26716">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="26720">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3782">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3773">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3583">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3219">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3240">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3582">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3556">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="1533">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3541">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3633">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3634">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3573">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="1966">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3546">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3985">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3940">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3939">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3975">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3935">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3936">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3562">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3538">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="1994">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3877">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="1562">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="4020">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="4021">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="1995">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="2009">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3308">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3576">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3577">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3578">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3579">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3580">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3581">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="2008">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="8210">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="1547">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="3533">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="61642">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="2977">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2996">
-    <match key="usb_device.product_id" int="2978">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4817">
-    <match key="usb_device.product_id" int="4226">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4817">
-    <match key="usb_device.product_id" int="13839">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4817">
-    <match key="usb_device.product_id" int="13855">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4817">
-    <match key="usb_device.product_id" int="4177">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4817">
-    <match key="usb_device.product_id" int="4178">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37203">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1161">
-    <match key="usb_device.product_id" int="49189">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6655">
-    <match key="usb_device.product_id" int="771">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6655">
-    <match key="usb_device.product_id" int="777">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6655">
-    <match key="usb_device.product_id" int="775">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="32903">
-    <match key="usb_device.product_id" int="2655">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="32903">
-    <match key="usb_device.product_id" int="2581">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="32903">
-    <match key="usb_device.product_id" int="2582">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="32902">
-    <match key="usb_device.product_id" int="1584">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="32903">
-    <match key="usb_device.product_id" int="2654">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="32903">
-    <match key="usb_device.product_id" int="2555">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4394">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4390">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4417">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4418">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4434">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4455">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4433">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="8449">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="8453">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="8450">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4102">
-    <match key="usb_device.product_id" int="12292">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4104">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4386">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4102">
-    <match key="usb_device.product_id" int="16386">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4102">
-    <match key="usb_device.product_id" int="16387">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4423">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4371">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4384">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4375">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4373">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4372">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4376">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4377">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4435">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4404">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4162">
-    <match key="usb_device.product_id" int="4419">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7784">
-    <match key="usb_device.product_id" int="4098">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4374">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="16642">
-    <match key="usb_device.product_id" int="4402">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2848">
-    <match key="usb_device.product_id" int="56814">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1924">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="13056">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1498">
-    <match key="usb_device.product_id" int="4102">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="0">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10545">
-    <match key="usb_device.product_id" int="2561">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10545">
-    <match key="usb_device.product_id" int="2565">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1265">
-    <match key="usb_device.product_id" int="24837">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2126">
-    <match key="usb_device.product_id" int="1">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2856">
-    <match key="usb_device.product_id" int="4108">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8759">
-    <match key="usb_device.product_id" int="53512">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8759">
-    <match key="usb_device.product_id" int="53513">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8759">
-    <match key="usb_device.product_id" int="45320">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1559">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1547">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1406">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1418">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1420">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1421">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1417">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1450">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1434">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1442">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1463">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1466">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1447">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1455">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1454">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1475">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1449">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1478">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1436">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1376">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1376">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1333">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1382">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1382">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1396">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1395">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1393">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1412">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1401">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1400">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1400">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1402">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1403">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1414">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1404">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="288">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="289">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="272">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="273">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="304">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="274">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="306">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="352">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="305">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1317">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1280">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1296">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1328">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="368">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1365">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1398">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1360">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1392">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1394">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1397">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1405">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1407">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1399">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="768">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1344">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1384">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1385">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1381">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1383">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1486">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1536">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1439">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1473">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1453">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1413">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1024">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1426">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1427">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1422">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1423">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1425">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1440">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1452">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1451">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1464">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1437">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1438">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1415">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1459">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1460">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1408">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1416">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1027">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1461">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1429">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1487">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1485">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1034">
-    <match key="usb_device.product_id" int="1472">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1224">
-    <match key="usb_device.product_id" int="1826">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4907">
-    <match key="usb_device.product_id" int="1">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4907">
-    <match key="usb_device.product_id" int="25">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4907">
-    <match key="usb_device.product_id" int="9">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4907">
-    <match key="usb_device.product_id" int="7">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4907">
-    <match key="usb_device.product_id" int="24">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4907">
-    <match key="usb_device.product_id" int="34">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7994">
-    <match key="usb_device.product_id" int="4102">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1154">
-    <match key="usb_device.product_id" int="2425">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1154">
-    <match key="usb_device.product_id" int="2064">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1154">
-    <match key="usb_device.product_id" int="1393">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1154">
-    <match key="usb_device.product_id" int="1434">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36945">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9077">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6808">
-    <match key="usb_device.product_id" int="2">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30519">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30507">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29848">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30140">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30142">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30018">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30077">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30440">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29706">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30851">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30133">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30554">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29900">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29847">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29862">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29944">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30488">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29724">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30450">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30698">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30463">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="30641">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25073">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25081">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25215">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25198">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="24859">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="24719">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="24882">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25406">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25145">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25149">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25116">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25125">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="24986">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1086">
-    <match key="usb_device.product_id" int="28736">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1086">
-    <match key="usb_device.product_id" int="28849">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25372">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="25189">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="24592">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4100">
-    <match key="usb_device.product_id" int="24581">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5073">
-    <match key="usb_device.product_id" int="28674">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1133">
-    <match key="usb_device.product_id" int="2304">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1133">
-    <match key="usb_device.product_id" int="2384">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="13056">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20555">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1647">
-    <match key="usb_device.product_id" int="33900">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3725">
-    <match key="usb_device.product_id" int="80">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1032">
-    <match key="usb_device.product_id" int="45066">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6127">
-    <match key="usb_device.product_id" int="29827">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20554">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8709">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16642">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1647">
-    <match key="usb_device.product_id" int="34128">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1647">
-    <match key="usb_device.product_id" int="34184">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1032">
-    <match key="usb_device.product_id" int="45065">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4721">
-    <match key="usb_device.product_id" int="8210">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8222">
-    <match key="usb_device.product_id" int="17067">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10821">
-    <match key="usb_device.product_id" int="8200">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10821">
-    <match key="usb_device.product_id" int="3074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4310">
-    <match key="usb_device.product_id" int="8960">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3504">
-    <match key="usb_device.product_id" int="21874">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="1600">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="1570">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="1260">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="1808">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="1598">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="61642">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="201">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1118">
-    <match key="usb_device.product_id" int="1601">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32776">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2125">
-    <match key="usb_device.product_id" int="3">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="24778">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28808">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="25807">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11826">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11827">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11879">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11941">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11944">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11880">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="16854">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="16858">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="17063">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="17279">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="17267">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="18449">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="16860">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28874">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11894">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11906">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11908">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11874">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11875">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11878">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="25619">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="25781">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="25782">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11856">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="11857">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="25621">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="10853">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28835">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28840">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28841">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="17169">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="17158">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="16847">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28941">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="28942">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8888">
-    <match key="usb_device.product_id" int="17250">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1375">
-    <match key="usb_device.product_id" int="49664">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1375">
-    <match key="usb_device.product_id" int="41808">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1375">
-    <match key="usb_device.product_id" int="49696">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1375">
-    <match key="usb_device.product_id" int="50208">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1375">
-    <match key="usb_device.product_id" int="50464">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2726">
-    <match key="usb_device.product_id" int="38401">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1033">
-    <match key="usb_device.product_id" int="806">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1033">
-    <match key="usb_device.product_id" int="1074">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1033">
-    <match key="usb_device.product_id" int="578">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1026">
-    <match key="usb_device.product_id" int="22120">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="770">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="279">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="290">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="291">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="265">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="277">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="289">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="273">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="285">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="301">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="516">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="267">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="304">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="305">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="297">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="275">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="518">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="281">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="302">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="269">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="309">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="313">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="311">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="287">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="259">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="295">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="274">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="401">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="258">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="550">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="392">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="520">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="779">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="777">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="382">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="351">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="389">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="789">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="792">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="791">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="804">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="835">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="773">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="402">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="320">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="381">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="322">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="545">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="524">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="361">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="388">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="347">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="547">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="355">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="552">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="785">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="367">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="383">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="395">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="549">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="553">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="363">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="364">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="371">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="823">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="838">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="334">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="353">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="375">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="376">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="801">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="813">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="831">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="795">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="800">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="820">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="810">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="324">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="809">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="349">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="544">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="334">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="369">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="542">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="540">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="343">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="543">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="546">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="390">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="403">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="843">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1028">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1036">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1032">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1052">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1034">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1026">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1040">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1046">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1050">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1060">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1061">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1063">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1068">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1075">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1062">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1056">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1067">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1044">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1048">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1077">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1059">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1065">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1071">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1073">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1054">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1069">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1030">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1058">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1064">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1038">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1072">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1079">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1042">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1066">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1070">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1078">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1057">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1538">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1539">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1541">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1545">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1542">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1537">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1200">
-    <match key="usb_device.product_id" int="1540">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20554">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="548">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="705">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="101">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="95">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1122">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="494">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="521">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1214">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="738">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1210">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="108">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="234">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1150">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="553">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1204">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="340">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="341">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="345">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="46">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="152">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="141">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="60">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="663">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1491">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1426">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="961">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="973">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="463">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="815">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="377">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="229">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="820">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="821">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="228">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="417">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="545">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1788">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1638">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1633">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1316">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1160">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1233">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1249">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="121">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="390">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="766">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="770">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1265">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="10">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="116">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="146">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1306">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1157">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1144">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1253">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1263">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="110">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="978">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="57">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="501">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="619">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="500">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="628">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1057">
-    <match key="usb_device.product_id" int="1768">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5891">
-    <match key="usb_device.product_id" int="1">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5891">
-    <match key="usb_device.product_id" int="2">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2389">
-    <match key="usb_device.product_id" int="28841">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2389">
-    <match key="usb_device.product_id" int="46080">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2389">
-    <match key="usb_device.product_id" int="52999">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2389">
-    <match key="usb_device.product_id" int="52994">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2389">
-    <match key="usb_device.product_id" int="28928">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2389">
-    <match key="usb_device.product_id" int="28930">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7763">
-    <match key="usb_device.product_id" int="6">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="272">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="303">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="303">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="278">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="275">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="303">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="276">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="278">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1972">
-    <match key="usb_device.product_id" int="278">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8921">
-    <match key="usb_device.product_id" int="10085">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8921">
-    <match key="usb_device.product_id" int="10100">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8921">
-    <match key="usb_device.product_id" int="10099">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="9076">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="8517">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1242">
-    <match key="usb_device.product_id" int="8536">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4204">
-    <match key="usb_device.product_id" int="61443">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7501">
-    <match key="usb_device.product_id" int="20534">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7501">
-    <match key="usb_device.product_id" int="20533">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7501">
-    <match key="usb_device.product_id" int="20554">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="9723">
-    <match key="usb_device.product_id" int="357">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2583">
-    <match key="usb_device.product_id" int="13">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2583">
-    <match key="usb_device.product_id" int="247">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2726">
-    <match key="usb_device.product_id" int="38658">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8316">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8377">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8504">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="357">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8311">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8334">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8196">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="2135">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="2126">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8194">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="335">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8309">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8315">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8375">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8421">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="333">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="332">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="491">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="331">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="6411">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8592">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="32257">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="385">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="356">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="8226">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1137">
-    <match key="usb_device.product_id" int="370">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2276">
-    <match key="usb_device.product_id" int="322">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2276">
-    <match key="usb_device.product_id" int="328">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1924">
-    <match key="usb_device.product_id" int="10376">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1350">
-    <match key="usb_device.product_id" int="8245">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1350">
-    <match key="usb_device.product_id" int="3503">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10724">
-    <match key="usb_device.product_id" int="4611">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10724">
-    <match key="usb_device.product_id" int="4355">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1924">
-    <match key="usb_device.product_id" int="21248">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="65535">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="34816">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="61443">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="553">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="12694">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="26468">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="26469">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="36921">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1478">
-    <match key="usb_device.product_id" int="36901">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3530">
-    <match key="usb_device.product_id" int="4">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1924">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="4704">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="4712">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8715">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8707">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8708">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8712">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8716">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="805">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8724">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="813">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8717">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8722">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="811">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8723">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8726">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="815">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8727">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8730">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="272">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8706">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="829">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8717">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4042">
-    <match key="usb_device.product_id" int="32775">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8719">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8719">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37181">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37181">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37181">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32771">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32771">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32771">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26726">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26407">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26720">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26716">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26743">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26450">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26799">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="57868">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26649">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="1188">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20255">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26420">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26178">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="5132">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="4996">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26698">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26467">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26377">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26793">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="26370">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20526">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20509">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20514">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20527">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20516">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="23055">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20531">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="1033">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20567">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20609">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20570">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20760">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20611">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20762">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20757">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20765">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20784">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20773">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20751">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20782">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20625">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20619">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20618">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20551">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20607">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20564">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20605">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20627">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20769">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20791">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1256">
-    <match key="usb_device.product_id" int="20540">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29712">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29776">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29778">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29746">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29748">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29924">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29904">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29824">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29728">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29730">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29792">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29888">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29890">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29920">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29697">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29696">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29744">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1921">
-    <match key="usb_device.product_id" int="29872">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1140">
-    <match key="usb_device.product_id" int="560">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1943">
-    <match key="usb_device.product_id" int="35073">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1943">
-    <match key="usb_device.product_id" int="35081">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1943">
-    <match key="usb_device.product_id" int="35089">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2125">
-    <match key="usb_device.product_id" int="4097">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="851">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="8718">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1482">
-    <match key="usb_device.product_id" int="807">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1245">
-    <match key="usb_device.product_id" int="38497">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1245">
-    <match key="usb_device.product_id" int="38602">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1161">
-    <match key="usb_device.product_id" int="49189">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1647">
-    <match key="usb_device.product_id" int="40976">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3191">
-    <match key="usb_device.product_id" int="4113">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3191">
-    <match key="usb_device.product_id" int="4117">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3191">
-    <match key="usb_device.product_id" int="4098">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3191">
-    <match key="usb_device.product_id" int="4112">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3428">
-    <match key="usb_device.product_id" int="4097">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3191">
-    <match key="usb_device.product_id" int="4097">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6390">
-    <match key="usb_device.product_id" int="258">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6390">
-    <match key="usb_device.product_id" int="272">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="13056">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7132">
-    <match key="usb_device.product_id" int="64191">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3530">
-    <match key="usb_device.product_id" int="2">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3783">
-    <match key="usb_device.product_id" int="4104">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1870">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1990">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2391">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2279">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2382">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2231">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2387">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2381">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2388">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2274">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="4756">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="704">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="743">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1347">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1567">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1774">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1169">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="2221">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1323">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1322">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1867">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="662">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="662">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="835">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="760">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1340">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20853">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="41333">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="45429">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="370">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20850">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16754">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="390">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20870">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16774">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="361">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20841">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16745">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="373">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16757">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="374">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16758">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="375">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20855">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16759">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="41335">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="45431">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="376">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20856">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16760">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="386">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20866">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16770">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="371">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20851">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16755">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="41331">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="45427">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1839">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1656">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="860">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="805">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="859">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1028">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="878">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="984">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1214">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1434">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1673">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1020">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1227">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="901">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1021">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1446">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="806">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1022">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="807">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="910">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="858">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="908">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1228">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1448">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="904">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1211">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="919">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="920">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="78">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1191">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="801">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1187">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1641">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1846">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1847">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1396">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1653">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20854">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="41334">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="45430">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="385">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20865">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16769">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1233">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1459">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1356">
-    <match key="usb_device.product_id" int="1460">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="369">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="368">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20848">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16752">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="384">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20864">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16768">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20849">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16753">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="382">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20862">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16766">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="41342">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="45438">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="365">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="408">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20888">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="419">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20899">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16803">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="396">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20876">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16780">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="444">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20924">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="444">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="459">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20939">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16843">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="392">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20872">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16776">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="402">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20882">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16786">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="411">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20891">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16795">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="427">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20907">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16811">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="426">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20906">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16810">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="405">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20885">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16789">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="397">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="404">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20877">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20884">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16781">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16788">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="403">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20883">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16787">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="438">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="406">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="412">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20918">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20886">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20892">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16796">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="423">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16807">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20903">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="414">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20894">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16798">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="431">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20911">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16815">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="443">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20923">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16827">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="442">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20922">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16826">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="393">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20873">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16777">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="407">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20887">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="326">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20806">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="217">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="212">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="239">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="343">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20823">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16727">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="334">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="53572">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="324">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="57344">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="117">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20815">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="335">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="346">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20826">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="342">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20822">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="349">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20829">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="358">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20838">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="359">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20839">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="360">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20840">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="16744">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="353">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20833">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="251">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="307">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="314">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="4296">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="243">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="261">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="198">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="179">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="245">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="118">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="218">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="274">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4046">
-    <match key="usb_device.product_id" int="20845">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37181">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1105">
-    <match key="usb_device.product_id" int="53512">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5073">
-    <match key="usb_device.product_id" int="28695">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2726">
-    <match key="usb_device.product_id" int="12305">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1691">
-    <match key="usb_device.product_id" int="12341">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1691">
-    <match key="usb_device.product_id" int="1911">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1691">
-    <match key="usb_device.product_id" int="1908">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1691">
-    <match key="usb_device.product_id" int="1916">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1691">
-    <match key="usb_device.product_id" int="12314">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1691">
-    <match key="usb_device.product_id" int="12328">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2329">
-    <match key="usb_device.product_id" int="256">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="5008">
-    <match key="usb_device.product_id" int="21589">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4571">
-    <match key="usb_device.product_id" int="4096">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="2403">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="12">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="9">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="29">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="26">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="24">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="17">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="15">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="16">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="25">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="22">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="20">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4402">
-    <match key="usb_device.product_id" int="17207">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4402">
-    <match key="usb_device.product_id" int="17202">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4402">
-    <match key="usb_device.product_id" int="17205">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="4402">
-    <match key="usb_device.product_id" int="17204">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2352">
-    <match key="usb_device.product_id" int="28928">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="13056">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3478">
-    <match key="usb_device.product_id" int="16640">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7784">
-    <match key="usb_device.product_id" int="2">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1026">
-    <match key="usb_device.product_id" int="1553">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1647">
-    <match key="usb_device.product_id" int="33834">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2125">
-    <match key="usb_device.product_id" int="3">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1750">
-    <match key="usb_device.product_id" int="46">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1750">
-    <match key="usb_device.product_id" int="45">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2250">
-    <match key="usb_device.product_id" int="272">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1276">
-    <match key="usb_device.product_id" int="20554">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1943">
-    <match key="usb_device.product_id" int="32794">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1363">
-    <match key="usb_device.product_id" int="514">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3428">
-    <match key="usb_device.product_id" int="4097">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8711">
-    <match key="usb_device.product_id" int="1">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8711">
-    <match key="usb_device.product_id" int="17">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1032">
-    <match key="usb_device.product_id" int="14489">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="37152">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2425">
-    <match key="usb_device.product_id" int="551">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="270">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="2362">
-    <match key="usb_device.product_id" int="271">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32778">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1161">
-    <match key="usb_device.product_id" int="57617">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1161">
-    <match key="usb_device.product_id" int="49190">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1161">
-    <match key="usb_device.product_id" int="57408">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1329">
-    <match key="usb_device.product_id" int="8193">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="3141">
-    <match key="usb_device.product_id" int="32769">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7763">
-    <match key="usb_device.product_id" int="7">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="4968">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="4680">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="4672">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="61443">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="36921">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="65352">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="872">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="864">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10007">
-    <match key="usb_device.product_id" int="1632">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="8711">
-    <match key="usb_device.product_id" int="6">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10518">
-    <match key="usb_device.product_id" int="37197">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10518">
-    <match key="usb_device.product_id" int="61443">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="7871">
-    <match key="usb_device.product_id" int="32553">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="1054">
-    <match key="usb_device.product_id" int="24576">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="10096">
-    <match key="usb_device.product_id" int="36956">
-     <append key="info.capabilities" type="strlist">camera</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="835">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="65486">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="580">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="581">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="774">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="775">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-   <match key="usb_device.vendor_id" int="6610">
-    <match key="usb_device.product_id" int="899">
-     <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    </match>
-   </match>
-  </match>
- </device>
-</deviceinfo>
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi b/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi
deleted file mode 100644
index 00427e7d..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi
+++ /dev/null
@@ -1,19018 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-<!-- This file was generated by libgphoto2 print-camera-list - - fdi -->
-<!--+
-    | Created from this library:
-    |   libgphoto2      2.5.8          all camlibs, gcc, ltdl, no EXIF
-    |   libgphoto2_port 0.12.0         gcc, ltdl, no USB, serial without locking
-    +-->
-<deviceinfo version="0.2">
- <device>
-  <match key="info.subsystem" string="usb">
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string"> JL2005B/C/D camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13251">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer E350 Liquid Gallant Duo (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13252">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer E350 Liquid Gallant Duo (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13891">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer E39</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13628">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia A1-810</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13869">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia A1-840FHD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13702">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia A3-A11</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13128">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A100 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13129">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A100 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13130">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A101 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13272">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A110</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13180">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A200 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13181">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A200 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13259">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A210</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13093">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A500 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13121">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A500 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13124">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A501 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13125">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A501 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13193">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A510 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13194">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A510 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13176">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Iconia TAB A700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13588">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Liquid E2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13736">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Liquid E3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13892">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer liquid e700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="14117">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Liquid S56</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13833">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Liquid X1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13427">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Liquid Z120 MT65xx Android Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13663">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Liquid Z130 MT65xx Android Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13911">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer One 7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13226">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer S500 CloudMobile</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13796">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Z150</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1282">
-    <match key="usb.product_id" int="13853">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acer Z160</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5845">
-    <match key="usb.product_id" int="32774">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acromag Inc. XO Learning Tablet (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5845">
-    <match key="usb.product_id" int="32773">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Acromag Inc. XO Learning Tablet (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">AEG Snap 300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1725">
-    <match key="usb.product_id" int="1027">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Agfa ePhoto CL18</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1725">
-    <match key="usb.product_id" int="1028">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Agfa ePhoto CL20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20555">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek 1.3 mega PocketCam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek PalmCam Trio</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20554">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek Pencam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek PenCam Trio</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2250">
-    <match key="usb.product_id" int="273">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek PenCam VGA+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20554">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek Pencam without flash</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20555">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aiptek Smart Megacam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="360">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel 6030a</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel One Touch 997D (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel One Touch 997D (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="40974">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel OneTouch 5042D (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="61443">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel OneTouch 6034R</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="36941">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel/Bouygues BS472</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7099">
-    <match key="usb.product_id" int="359">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Alcatel/TCT 6010D/TCL S950</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Amazing Spiderman</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="2048">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Fire Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="7">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="8">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="10">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="12">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID4)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="18">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID5)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="11">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID6)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="13">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire (ID7)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="5">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire 2G (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6473">
-    <match key="usb.product_id" int="242">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Amazon Kindle Fire HD6</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="548">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">American Idol Keychain Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4762">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPad (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4779">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPad Air</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4752">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPhone (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4754">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPhone 3G (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4756">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPhone 3GS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4759">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPhone 4 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4768">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPhone 4S (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4776">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPhone 5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4753">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPod Touch (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4755">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPod Touch 2G (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1452">
-    <match key="usb.product_id" int="4761">
-     <match key="usb.interface.class" int="6">
-      <match key="usb.interface.subclass" int="1">
-       <match key="usb.interface.protocol" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Apple iPod Touch 3rd Gen (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-       </match>
-      </match>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="20488">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos (for Tesco) Hudl (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="20489">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos (for Tesco) Hudl (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="16386">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 G4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5416">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 G9 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5417">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 G9 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5433">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 G9 Turbo</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5432">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 G9 Turbo 250 HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5305">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 Titanium</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5448">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 101 XS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4618">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 104 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4893">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 105 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4620">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 204 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4865">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 404 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4867">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 404CAM (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4881">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 405 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4897">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 405HDD (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="12787">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 45 Neon</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4913">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 5 (MTP mode 1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4915">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 5 (MTP mode 2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="12841">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 50 Diamond</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4871">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 504 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 50c</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4951">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 5H IT (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4945">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 5S IT (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4873">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 604 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4875">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 604WIFI (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4883">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 605 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4885">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 605F (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4917">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 7 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4877">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 704 mobile dvr</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4879">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 704TV (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4889">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 705 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5359">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 70b Titanium</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5480">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 70it2 (ID 1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5481">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 70it2 (ID 2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5311">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 80 Titanium</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5400">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 80G9</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5384">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 8o G9 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5385">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 8o G9 Turbo (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5293">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 97 Titanium</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5274">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos 97 Xenon</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5227">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos Arnova 10bG3 Tablet</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5214">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos Arnova 8c G3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="5208">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos Arnova Childpad</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="12715">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos C40</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4615">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos Gmini XS100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4929">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos SPOD (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4891">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos TV+ (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3705">
-    <match key="usb.product_id" int="4616">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Archos XS202 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus Bean Sprout</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC-1500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC-1510</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC-1610</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC-1620</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37180">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC-1730</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC-2200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus DC1512e</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Argus QuickClix</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aries ATC-0017</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Aries Digital Keychain Camera, I</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="23055">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus A450CG (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19680">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Asus Fonepad Note 6 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19681">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Asus Fonepad Note 6 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="20815">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Fonepad</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="30579">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Fonepad 7 (FE375CXG)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21519">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Fonepad 7 LTE ME372CL (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21535">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Fonepad 7 LTE ME372CL (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21775">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus K00E (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21760">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus K010 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19664">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ME301T MeMo Pad Smart 10 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19665">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ME301T MeMo Pad Smart 10 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21023">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ME302C MemoPad (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21007">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ME302C MemoPad (MTP+?)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19648">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ME302KL MeMo Pad FHD10 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19649">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ME302KL MeMo Pad FHD10 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21600">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Memo K00F (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21608">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Memo K00F (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21504">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Memo ME172V (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21520">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Memo ME173X (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21521">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Memo ME173X (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21606">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Memo Pad 8 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="30578">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus MemoPad 7 (ME572CL)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21766">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus MemoPad 7 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21857">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus MemoPad 8 ME181 CX (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="20992">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="20993">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21008">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone 2 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21009">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone 2 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21012">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone 2 (PTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21024">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone Infinity (2nd ID) (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21025">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone Infinity (2nd ID) (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21040">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone Infinity (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21041">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus PadFone Infinity (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19968">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus SL101 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19969">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus SL101 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19983">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF101 Eeepad Transformer (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19999">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF101 Eeepad Transformer (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19712">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF201 Transformer Prime (keyboard dock)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19713">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF201 Transformer Prime (tablet only)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19584">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF300 Transformer (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19585">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF300 Transformer (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19600">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF700 Transformer (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19601">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF700 Transformer (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19616">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF701T Transformer Pad (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="19617">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TF701T Transformer Pad (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="22047">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus TX201LA (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="24322">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus Zenfone 2 ZE550ML (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="22543">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 4 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="22559">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 4 A400CG (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21632">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 5 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21633">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 5 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="30593">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 5 A500KL (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21648">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 6 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2821">
-    <match key="usb.product_id" int="21649">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Asus ZenFone 6 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36945">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Barbie Camera (Digital Blue)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8320">
-    <match key="usb.product_id" int="6">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Barnes&amp;Noble Nook HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8320">
-    <match key="usb.product_id" int="5">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Barnes&amp;Noble Nook HD+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1189">
-    <match key="usb.product_id" int="12291">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Benq DC1300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7493">
-    <match key="usb.product_id" int="17821">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">BenQ F5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10823">
-    <match key="usb.product_id" int="32528">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">bq Aquarius E5-4G</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10823">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">bq Krillin (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10823">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">bq Krillin (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12359">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12738">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 100 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12733">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 110 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12774">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 120 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12787">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 130</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12904">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 255HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12480">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 30 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12365">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12791">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 300 HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12390">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12479">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 40 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12405">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 400 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12474">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 430 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12558">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 50 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12468">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12543">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 55 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12572">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 60 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12542">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 65 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12623">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 70 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12530">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12622">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 75 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12566">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 750 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12676">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 80 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12569">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 800 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12660">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 85 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12598">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 850 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 860 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12660">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 90 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12565">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 900Ti (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12740">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 95 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12619">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 950 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12639">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 960 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12659">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 970 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12691">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 980 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12737">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS 990 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12443">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12443">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS i (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12484">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS i5 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12402">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS II (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12470">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS IIs (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12532">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS iZ (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12370">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS v</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12389">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS v2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12400">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS v3 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12401">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS v3 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12529">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital IXUS Wireless (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12526">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital Rebel XT (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12394">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Digital unknown 3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12424">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Elura 50 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12423">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Elura 50 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12453">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Elura 65 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12667">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1000D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12912">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 100D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12419">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 10D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12476">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 10D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12823">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1100D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12927">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1200D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12522">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1D Mark II (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12615">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1D Mark III (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12752">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1D Mark IV</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12825">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 1D X</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12523">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 20D (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12524">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 20D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12420">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 300D (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12441">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 300D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12563">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 30D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12527">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 350D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12526">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 350D (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12526">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 350D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12560">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 400D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12614">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 40D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12613">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 450D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12751">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 500D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12699">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 50D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12778">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 550D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12545">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 5D (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12546">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 5D (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12697">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 5D Mark II</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12858">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 5D Mark III</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12824">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 600D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12821">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 60D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12859">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 650D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12880">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 6D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12914">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 700D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12883">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 70D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12698">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 7D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12911">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS 7D MarkII</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12356">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS D30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12384">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS D60</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12420">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Digital Rebel (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12441">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Digital Rebel (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12560">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Digital Rebel XTi (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12420">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Kiss Digital (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12441">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Kiss Digital (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12526">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Kiss Digital N (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12560">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Kiss Digital X (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12613">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Kiss X2 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12751">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Kiss X3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12861">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS M</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12953">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS M3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12751">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Rebel T1i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12613">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon EOS Rebel XSi (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12430">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon FV M1 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12865">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXUS 125HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12969">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXUS 165</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12837">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXUS 310IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12774">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY 220 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12691">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY 3000 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12358">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY DIGITAL</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12363">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY DIGITAL 300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12484">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY Digital L2 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12395">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY DV M</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12438">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon IXY DV M2 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12412">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MV630i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12410">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MV650i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12448">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MV750i (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12438">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX 10i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12430">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX 3i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12417">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX100i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12416">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX150i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12457">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX25i (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12395">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX2i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12429">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon MVX3i (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12418">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12415">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12416">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 20 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12395">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 200 MC</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12438">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 300 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12457">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 40 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12549">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura 600 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12430">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Optura Xi (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12367">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12385">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12686">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A1000 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12739">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A1100 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12862">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A1300IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12900">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A1400</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12366">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12386">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12689">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2000 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12734">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2100 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12842">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12874">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2300IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12873">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2400IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12913">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12898">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A2600</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12377">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12406">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12786">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A3000 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12472">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A310 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12785">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A3100 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12897">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A3500IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12376">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A40</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12471">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A400 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12867">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A4000IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12537">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A410 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12559">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A420 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12536">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A430 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12629">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A450 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12617">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A460 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12666">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A470</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12735">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A480</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12783">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot A495</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12482">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A510 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12481">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A520 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12582">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A530 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12571">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A540 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12624">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A550 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12621">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A560 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12620">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A570 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12663">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A580</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12662">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A590 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12404">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A60 (PTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12541">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A610 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12540">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A620 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12602">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A630 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12601">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A640 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12635">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A650IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12403">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A70 (PTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12567">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12600">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A710 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12637">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A720 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12469">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A75 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12442">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A80 (PTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12838">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12863">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A810</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12473">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A85 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12475">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot A95 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12732">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot D10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12936">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot Elph135</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12937">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot Elph340HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12360">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12851">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G1 X</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12687">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12767">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G11</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12888">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G15</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12373">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12398">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G3 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12399">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G3 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12421">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12467">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot G6 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12581">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G7 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12634">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot G9 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12443">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot IXY Digital L (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12361">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot Pro90 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12444">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S1 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12353">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12854">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12357">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S100 (2000)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12369">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S110 (2001)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12891">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S110 (PTP Mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12917">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S120</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12528">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S2 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12355">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12389">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12400">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S230 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12401">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S230 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12570">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S3 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12375">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12364">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12390">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12374">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S40</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12405">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S400 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12474">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S410 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12396">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S45 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12397">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S45 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12616">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S5 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12407">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S50 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12468">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12466">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot S60 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12465">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot S70 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12538">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S80 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12818">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot S95</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12443">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD10 Digital ELPH (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12402">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12623">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD1000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12470">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD110 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12676">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot SD1100 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12740">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot SD1200 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12788">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD1300 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12484">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD20 (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12480">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12599">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD40 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12529">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD430 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12543">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD450 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12530">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12572">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD600 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12542">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD630 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12569">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12622">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD750 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12661">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD770 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12738">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD780 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12660">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot SD790 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12619">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD850 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12694">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD880 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12565">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD900 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12774">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD940 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12737">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD970 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12691">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SD990</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12685">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX10 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12638">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Powershot SX100 IS (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12690">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX110 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12768">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX120 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12817">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX130 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12852">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX150 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12890">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX160IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12918">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX170 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12772">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX20 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12736">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX200 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12790">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX210 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12844">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX220HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12840">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX230HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12869">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX240HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12868">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX260HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12895">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX280HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12856">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX40HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12892">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX500IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12919">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX510 HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12955">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot SX520 HS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12368">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot unknown 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12380">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon PowerShot unknown 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12778">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Rebel T2i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12823">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Rebel T3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12859">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon Rebel T4i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1193">
-    <match key="usb.product_id" int="12408">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Canon ZR70MC (normal mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1999">
-    <match key="usb.product_id" int="4169">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Casio EX-S770</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1999">
-    <match key="usb.product_id" int="4162">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Casio EX-Z120</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1999">
-    <match key="usb.product_id" int="4173">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Casio EX-Z65</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1999">
-    <match key="usb.product_id" int="4172">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Casio EX-Z700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1999">
-    <match key="usb.product_id" int="4474">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Casio EX-ZR700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1375">
-    <match key="usb.product_id" int="49664">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Casio LV 10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1207">
-    <match key="usb.product_id" int="34985">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Caterpillar Cat S50</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Che-ez Snap</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Che-Ez Snap SNAP-U</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Che-ez! Babe</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="4098">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Che-ez! Splash</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Che-ez! SPYZ</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1943">
-    <match key="usb.product_id" int="32769">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Clever CAM 360</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="548">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Cobra DC125</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Cobra Digital Camera DC150</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7796">
-    <match key="usb.product_id" int="25874">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Coby COBY MP705</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7763">
-    <match key="usb.product_id" int="5">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Conceptronic CMTD2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Concord Eye-Q Duo</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Concord Eye-Q Easy</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Concord EyeQ 4330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1000">
-    <match key="usb.product_id" int="8578">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Concord EyeQMini_1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1000">
-    <match key="usb.product_id" int="8576">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Concord EyeQMini_2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">CoolCam CP086</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2386">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio 10 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="1809">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio 6 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="1873">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio 7 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2321">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio 9 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2369">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio C2 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2049">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio D2 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2161">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio D2+ DAB FW 4.x (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2193">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio D2+ DMB FW 1.x (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2145">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio D2+ FW 2.x (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2177">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio D2+ FW 3.x (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2337">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio J3 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2305">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio S9 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="1793">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio U3 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="1889">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio U5 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3617">
-    <match key="usb.product_id" int="2353">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Cowon iAudio X7 (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16406">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Creative CardCam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16391">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Creative Go Mini</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16394">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Creative PC-CAM 300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16402">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Creative PC-CAM350</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16395">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Creative PC-CAM600</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16403">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Creative PC-CAM750</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16675">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative Portable Media Center</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16727">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16688">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Micro (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16700">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN MicroPhoto</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16691">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN MicroPhoto (alternate version)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16737">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Mozaic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16695">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Sleek (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16701">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Sleek Photo</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16689">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Touch (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16720">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN V</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16728">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN V 2GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16722">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN V Plus</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16671">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Vision</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16723">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Vision W</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16702">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Vision:M</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16721">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Vision:M (DVP-HD0004)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16738">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN X-Fi</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16745">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN X-Fi 3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16680">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Creative ZEN Xtra (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4204">
-    <match key="usb.product_id" int="12821">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Curitel Communications, Inc. Verizon Wireless Device</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2125">
-    <match key="usb.product_id" int="3">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">D-Link DSC 350+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3428">
-    <match key="usb.product_id" int="4129">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">D-Link DSC 350F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1000">
-    <match key="usb.product_id" int="8496">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">D-MAX DM3588</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DC-N130t</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DC-N130ta</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32768">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DC31VC</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16690">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dell Dell Pocket DJ (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="16687">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dell DJ (2nd generation)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16700">
-    <match key="usb.product_id" int="45323">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dell Inc Dell Streak 7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16700">
-    <match key="usb.product_id" int="45338">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dell Inc Dell Venue 7 inch</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16700">
-    <match key="usb.product_id" int="45339">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dell Inc Dell Venue 7 inch (2nd ID)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16700">
-    <match key="usb.product_id" int="17664">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dell Inc DJ Itty</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Digigr8</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7994">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">DigiLand DL701Q</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Digital camera, CD302N</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DIGITAL MID#0020509 (no-name camera)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1498">
-    <match key="usb.product_id" int="4120">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream Enigma1.3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream l'elegante</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream l'elite</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream l'espion</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4483">
-    <match key="usb.product_id" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream l'espion XS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1498">
-    <match key="usb.product_id" int="4128">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream l'espion xtra</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream l'esprit</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">DigitalDream la ronde</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2726">
-    <match key="usb.product_id" int="24609">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Disney MixMax</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36944">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Disney pix micro</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36946">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Disney pix micro 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4310">
-    <match key="usb.product_id" int="8704">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Dunlop MP3 player 1GB / EGOMAN MD223AFD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Elta Medi@ digi-cam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Emprex PCD3600</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1208">
-    <match key="usb.product_id" int="1027">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Epson PhotoPC 3000z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1208">
-    <match key="usb.product_id" int="1026">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Epson PhotoPC 850z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10608">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Fly Evo Tech 4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10608">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Fly iq4415 era style 3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6018">
-    <match key="usb.product_id" int="16385">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Fly iq449</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1747">
-    <match key="usb.product_id" int="8634">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">FOMA D905i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3530">
-    <match key="usb.product_id" int="2">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji Axia Eyeplate</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3530">
-    <match key="usb.product_id" int="2">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji Axia Slimshot</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="330">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix A330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="466">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix A800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="454">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix A820</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="467">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix A920</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="539">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix AV-150</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="403">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix E900</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="480">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F100fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="448">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="484">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F200 EXR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="411">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="449">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F31fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="453">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F40fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="468">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F50fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="486">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F60fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="506">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F70 EXR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="526">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix F80EXR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="557">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix H20EXR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="625">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix HS30EXR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="592">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix JX370</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="477">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S1000fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="475">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S100fs</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="495">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S1500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="512">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S1800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="488">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S2000HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="521">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S2500HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="576">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S2950</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="637">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S2980</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="613">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S4300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="664">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S4850</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="452">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S5700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="471">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S5800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="447">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S6500fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="322">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S7000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="399">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix S9500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="668">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix SL1000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="563">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix T200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="622">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix X-S1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="611">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix X10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="678">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix X20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="648">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix XF1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="472">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix Z100fd</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="513">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix Z35</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="525">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji FinePix Z700EXR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="510">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji Fujifilm A220</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="693">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji Fujifilm X-E2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji IX-1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1227">
-    <match key="usb.product_id" int="451">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Fuji S5 Pro</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">FujiFilm @xia ix-100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1221">
-    <match key="usb.product_id" int="4416">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Fujitsu, Ltd F903iX HIGH-SPEED</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1221">
-    <match key="usb.product_id" int="4923">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Fujitsu, Ltd STYLISTIC M532</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2334">
-    <match key="usb.product_id" int="9605">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Garmin Monterra</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Gear to go</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Generic SoundVision Clarity2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1112">
-    <match key="usb.product_id" int="28677">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Genius Smart 300, version 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1037">
-    <match key="usb.product_id" int="34908">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Gensis GT-7305 </merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1044">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Gigabyte RCT6773W22 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1044">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Gigabyte RCT6773W22 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Global Point 3 in 1 Digital Fun Graffiti 00044</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Global Point Clipster</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Global Point Splash Mini (underwater camera)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="7">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Ainol Novo) Fire/Flame</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="6">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Allwinner) A31 SoC</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20033">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Asus) Nexus 7 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20034">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Asus) Nexus 7 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="19983">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Asus) TF101 Transformer</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="19712">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Asus) TF201 Transformer</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="11522">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Barnes &amp; Noble) Nook Color</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="29706">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Lenovo) Ideapad K1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="53514">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for LG Electronics) P990/Optimus</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="53513">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for LG Electronics) P990/Optimus (Cyanogen)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20193">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for LG Electronics/Samsung) Nexus 4/5/7/10 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20194">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for LG Electronics/Samsung) Nexus 4/5/7/10 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="45066">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Medion) MD99000 (P9514)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="28840">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Motorola) Xoom (MZ604)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20005">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Samsung) Nexus S (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20006">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Samsung) Nexus S (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="1459">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Sony) S1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="28930">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Inc (for Toshiba) Thrive 7/AT105</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6353">
-    <match key="usb.product_id" int="20197">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Google Nexus 5 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="9842">
-    <match key="usb.product_id" int="17">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">GoPro HERO3+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1943">
-    <match key="usb.product_id" int="32796">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">GrandTek ScopeCam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">GTW Electronics</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4866">
-    <match key="usb.product_id" int="4118">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Haier Ibiza Rhapsody 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4866">
-    <match key="usb.product_id" int="4119">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Haier Ibiza Rhapsody 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Haimei Electronics HE-501A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Hawking DC120 Pocketcam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="32285">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Hewlett-Packard Slate 10 HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="23837">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Hewlett-Packard Slate 7 2800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="23581">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Hewlett-Packard Slate 7 4600</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4251">
-    <match key="usb.product_id" int="37126">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Hisense E860 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4251">
-    <match key="usb.product_id" int="37129">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Hisense E860 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4251">
-    <match key="usb.product_id" int="37125">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HiSense Sero 7 Pro</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="25858">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 120 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="25090">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 215</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="31746">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 217 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="32002">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 317 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="25346">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 318 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="26114">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 320 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="29698">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 407 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="30722">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 417 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="29186">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 43x (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="28162">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 507 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="30978">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 517 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="27906">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 607 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="25346">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 612 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="16642">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 618</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="26626">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 620 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="28930">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 635 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="27394">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 707 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="25602">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 715 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="30210">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 717 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="26370">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 720 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="27650">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 733 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="27138">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 735 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="16898">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 812 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="30466">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 817 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="32258">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 818 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="17154">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 850 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="16642">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 912</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="17410">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 935 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="17666">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart 945 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="16642">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart C500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="24578">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart C500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="61443">
-    <match key="usb.product_id" int="24578">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart C500 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="35586">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart E327 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="35842">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart E427 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="29954">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M22 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="31490">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M23 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="29442">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M307 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="31234">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M415 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="32770">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M425 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="33026">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M525 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="33282">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M527 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="39682">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M547 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="33794">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M725 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="34050">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M727 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="38402">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart M737 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="38658">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart R742 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="34562">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart R927 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1008">
-    <match key="usb.product_id" int="34818">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">HP PhotoSmart R967 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="26716">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC (for Hewlett-Packard) HP Touchpad (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="26720">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC (for Hewlett-Packard) HP Touchpad (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Android Device ID1 (Zopo, HD2, Bird...)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Android Device ID2 (Zopo, HD2...)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3782">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Desire 310 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3773">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Droid DNA (MTP+UMS)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3583">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Droid DNA (MTP+UMS+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3219">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC EVO 4G LTE/One V (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3240">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC EVO 4G LTE/One V (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3582">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Butterfly (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3556">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Butterfly X290d</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="1533">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Desire 510 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3541">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Desire X</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3633">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Droid Incredible 4G LTE (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3634">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Droid Incredible 4G LTE (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3573">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC Evo 4G LTE (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="1966">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (HTC6500LVW)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3546">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3985">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3940">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3939">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3975">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (MTP+ADB+?)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3935">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (MTP+ADB+CDC)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3936">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (MTP+CDC)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3562">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One (MTP+UMS+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3538">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One 802w (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="1994">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One M8 (HTC6525LVW)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3877">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One M8 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="1562">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One M8 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="4020">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One M8 (MTP+ADB+UMS)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="4021">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One M8 (MTP+UMS)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="1995">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One M8 (Verizon) (HTC6525LVW)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="2009">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One Remix (HTC6515LVW)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3308">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One S (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3576">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One S (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3577">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One S (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3578">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One X (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3579">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One X (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3580">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One X (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3581">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC One X (ID4)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="2008">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC HTC6515LVW/One Remix</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="8210">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Motorola Razr D1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="1547">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC One M8 Google Play Edition (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="3533">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC One Mini (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="61642">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Windows Phone 8s ID1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="2977">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Windows Phone 8X ID1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2996">
-    <match key="usb.product_id" int="2978">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">HTC Windows Phone 8X ID2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4817">
-    <match key="usb.product_id" int="4226">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Huawei Ascend P8 </merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4817">
-    <match key="usb.product_id" int="13839">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Huawei Mediapad (mode 0)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4817">
-    <match key="usb.product_id" int="13855">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Huawei Mediapad (mode 1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4817">
-    <match key="usb.product_id" int="4177">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Huawei MTP device (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4817">
-    <match key="usb.product_id" int="4178">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Huawei MTP device (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37203">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">iClick 5X</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">iConcepts digital camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1161">
-    <match key="usb.product_id" int="49189">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">InFocus M810</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">INNOVAGE Mini Digital, CD302N</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6655">
-    <match key="usb.product_id" int="771">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Insignia NS-DV45</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6655">
-    <match key="usb.product_id" int="777">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Insignia Pilot 4GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6655">
-    <match key="usb.product_id" int="775">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Insignia Sport Player</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="32903">
-    <match key="usb.product_id" int="2655">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Intel Chuwi vi8</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="32903">
-    <match key="usb.product_id" int="2581">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Intel Foxconn iView i700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="32903">
-    <match key="usb.product_id" int="2582">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Intel Noblex T7A21</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="32902">
-    <match key="usb.product_id" int="1584">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Intel Pocket PC Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="32903">
-    <match key="usb.product_id" int="2654">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Intel Telcast Air 3G</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="32903">
-    <match key="usb.product_id" int="2555">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Intel Xolo 900/AZ210A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">IOMagic MagicImage 400</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ION digital camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4394">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver Clix</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4390">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver Clix2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4417">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver E100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4418">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver E100 v2/Lplayer</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4434">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver E150</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4455">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver E30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4433">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver E50</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="8449">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver H10 20GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="8453">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver H10 5.6GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="8450">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver H10 5GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4102">
-    <match key="usb.product_id" int="12292">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver H300 Series MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4104">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver iFP-880</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4386">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver N12</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4102">
-    <match key="usb.product_id" int="16386">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver Portable Media Center 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4102">
-    <match key="usb.product_id" int="16387">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver Portable Media Center 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4423">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver Spinn</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4371">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4384">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T10 2GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4375">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T10b</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4373">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4372">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T20 FM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4376">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T20b</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4377">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4435">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4404">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T60</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4162">
-    <match key="usb.product_id" int="4419">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver T7 Volcano</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7784">
-    <match key="usb.product_id" int="4098">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver Tolino Tab 7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4374">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver U10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="16642">
-    <match key="usb.product_id" int="4402">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">iRiver X20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2848">
-    <match key="usb.product_id" int="56814">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Isabella Her Prototype</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1924">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ixla DualCam 640</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jazwares Star Wars no. 15256</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jazz JDC9</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jazz JDK235</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="13056">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jenoptik JD-3300z3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jenoptik JD-4100z3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1498">
-    <match key="usb.product_id" int="4102">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jenoptik JD350 entrance</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="0">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jenoptik JD350 video</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Jenoptik JDC 350</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10545">
-    <match key="usb.product_id" int="2561">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Jolla Sailfish (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10545">
-    <match key="usb.product_id" int="2565">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Jolla Sailfish (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1265">
-    <match key="usb.product_id" int="24837">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">JVC Alneo XA-HD500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2126">
-    <match key="usb.product_id" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">KBGear JamCam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2856">
-    <match key="usb.product_id" int="4108">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kenwood Media Keg HD10GB7 Sport Player</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8759">
-    <match key="usb.product_id" int="53512">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kobo Arc (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8759">
-    <match key="usb.product_id" int="53513">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kobo Arc (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8759">
-    <match key="usb.product_id" int="45320">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kobo Arc 7 HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1559">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C1530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1547">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C183</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1406">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1418">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C310</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1420">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1421">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C340</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1417">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C360</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1450">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C433</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1434">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1442">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C533</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1463">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C613</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1466">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C633</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1447">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C643</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1455">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C653</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1454">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C743</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1475">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C813</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1449">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C875</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1478">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak C913</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1436">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CD33</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1376">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX4200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1376">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX4210</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1333">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX4230</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1382">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX4300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1382">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX4310</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1396">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX6200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1395">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX6230</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1393">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX6330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1412">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX6445</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1401">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7220</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1400">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1400">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7310</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1402">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1403">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7430</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1414">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7525</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1404">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak CX7530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC220</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="288">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC240</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="289">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC240 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="272">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC260</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="273">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC265</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="304">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC280</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="274">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC290</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="306">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC3400</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="352">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC4800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="305">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DC5000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1317">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX3215</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1280">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX3500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1296">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX3600</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1328">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX3700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="368">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX3900</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1365">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX4330</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1398">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX4530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1360">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX4900</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1392">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX6340</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1394">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX6440</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1397">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX6490</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1405">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX7440</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1407">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX7590</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1399">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak DX7630</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="768">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak EZ200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1344">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak LS420</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1384">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak LS443</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1385">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak LS663</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1381">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak LS743</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1383">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak LS753</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1486">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak M1063</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1536">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak M531</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1439">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak M753</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1473">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak M863</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1453">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak M883</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1413">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak M893 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1024">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak MC3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1426">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak P850</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1427">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak P880</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1422">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1423">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V550</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1425">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V570</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1440">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V603</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1452">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V610</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1451">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V705</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1464">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak V803</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1437">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z612</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1438">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z650</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1415">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1459">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z710</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1460">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z712 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1408">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z730</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1416">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z740</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1027">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z7590</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1461">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z812 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1429">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z8612 IS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1487">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z915</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1485">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak Z950</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1034">
-    <match key="usb.product_id" int="1472">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Kodak ZD710</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1224">
-    <match key="usb.product_id" int="1826">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica e-mini</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4907">
-    <match key="usb.product_id" int="1">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica-Minolta DiMAGE A2 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4907">
-    <match key="usb.product_id" int="25">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica-Minolta DiMAGE A200 (PictBridge mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4907">
-    <match key="usb.product_id" int="9">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica-Minolta DiMAGE X21 (PictBridge mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4907">
-    <match key="usb.product_id" int="7">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica-Minolta DiMAGE Z2 (PictBridge mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4907">
-    <match key="usb.product_id" int="24">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica-Minolta DiMAGE Z3 (PictBridge mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4907">
-    <match key="usb.product_id" int="34">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Konica-Minolta DiMAGE Z5 (PictBridge mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7994">
-    <match key="usb.product_id" int="4102">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kurio 7S</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1154">
-    <match key="usb.product_id" int="2425">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kyocera DuraForce</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1154">
-    <match key="usb.product_id" int="2064">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kyocera KYL22</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1154">
-    <match key="usb.product_id" int="1393">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kyocera Rise</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1154">
-    <match key="usb.product_id" int="1434">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Kyocera Torque Model E6715</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36945">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Lego Bionicle</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9077">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Leica D-LUX 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6808">
-    <match key="usb.product_id" int="2">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Leica M9</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30519">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo A3500-F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30507">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo A5500-F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29848">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo A820</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30140">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo IdeaPad A3000 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30142">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo IdeaPad A3000 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30018">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo IdeaTab A2109A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30077">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo IdeaTab S2210a</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30440">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo IdeaTab S5000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29706">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo K1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30851">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo K3 Note</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30133">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo K900 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30554">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo LifeTab E733X</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29900">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo Lifetab S9512</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo P70-A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29847">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo P700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29862">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo P780</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29944">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo S660</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30488">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo S930</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29724">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo ThinkPad Tablet</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30450">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo Toga Tablet B6000-F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30698">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo Vibe Z2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30463">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo Yoga Tablet 10 B8000-H</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="30641">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Lenovo Yoga Tablet 2 Pro</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25073">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. Android phone (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25081">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. Android phone (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25215">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. G3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25198">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. G3 (VS985)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="24859">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. GR-500 Music Player</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="24719">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. KC910 Renoir Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="24882">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. KM900</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25406">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. LG G Flex 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25145">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. LG VS870</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25149">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. LG VS890</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25116">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. LG VS980</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25125">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. LG2 Optimus</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="24986">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. LG8575</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1086">
-    <match key="usb.product_id" int="28736">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. T54</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1086">
-    <match key="usb.product_id" int="28849">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. UP3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25372">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. Various E and P models</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="25189">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. VK810</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="24592">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">LG Electronics Inc. VX8550 V CAST Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4100">
-    <match key="usb.product_id" int="24581">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">LG T5100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Lifetec LT 5995</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5073">
-    <match key="usb.product_id" int="28674">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Logik LOG DAX MP3 and DAB Player</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1133">
-    <match key="usb.product_id" int="2304">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Logitech Clicksmart 310</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1133">
-    <match key="usb.product_id" int="2384">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Logitech Pocket Digital</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Maginon SX-410z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="13056">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Maginon SX330z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Magpix B350</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20555">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Maxell Max Pocket</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1647">
-    <match key="usb.product_id" int="33900">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Maxfield G-Flash NG 1GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Media-Tech mt-406</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3725">
-    <match key="usb.product_id" int="80">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">MediaTek Inc MT5xx and MT6xx SoCs</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1032">
-    <match key="usb.product_id" int="45066">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Medion Lifetab P9514</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6127">
-    <match key="usb.product_id" int="29827">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Medion Lifetab P9516</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20554">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD 5319</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD 6000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8709">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD 6126</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16642">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD 9700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1647">
-    <match key="usb.product_id" int="34128">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD8333 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1647">
-    <match key="usb.product_id" int="34184">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD8333 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1032">
-    <match key="usb.product_id" int="45065">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Medion MD99000 (P9514)/Olivetti Olipad 110</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4721">
-    <match key="usb.product_id" int="8210">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Megafon Login+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8222">
-    <match key="usb.product_id" int="17067">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Megafon MFLogin3T</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10821">
-    <match key="usb.product_id" int="8200">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Meizu MX Phone (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10821">
-    <match key="usb.product_id" int="3074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Meizu MX Phone (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4310">
-    <match key="usb.product_id" int="8960">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Memorex or iRiver MMP 8585/8586 or iRiver E200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3504">
-    <match key="usb.product_id" int="21874">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Micro-Star International P610/Model MS-5557</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Micromaxx Digital Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="1600">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft Kin 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="1570">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft Windows MTP Simulator</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="1260">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft Windows Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="1808">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft Zune</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="1598">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft Zune HD</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="61642">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft/HTC HTC 8S</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="201">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft/Intel Bandon Portable Media Center</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1118">
-    <match key="usb.product_id" int="1601">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Microsoft/Sharp/nVidia Kin TwoM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32776">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mini Shotz ms-350</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2125">
-    <match key="usb.product_id" int="3">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Minton S-Cam F5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mitek CD10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mitek CD30P</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="24778">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola A1200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28808">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Atrix MB860 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="25807">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Atrix XT687 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11826">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Atrix/Razr HD (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11827">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Atrix/Razr HD (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11879">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Droid Maxx (XT1080)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11941">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Droid Turbo (XT1254)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11944">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Droid Turbo Verizon</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11880">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Droid Ultra</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="16854">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Droid X/MB525 (Defy)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="16858">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola DROID2 (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="17063">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola DROID2 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="17279">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola DROID4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="17267">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola DROID4 (PTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="18449">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola IdeaPad K1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="16860">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Milestone / Verizon Droid</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28874">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Milestone X2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11894">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Moto G (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11906">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Moto G (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11908">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Moto G (XT1032)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11874">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Moto X (XT1053)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11875">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Moto X (XT1058)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11878">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Moto X (XT1080)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="25619">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola MTP Test Command Interface</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="25781">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Razr D1/D3/i (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="25782">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Razr D1/D3/i (MTP+?)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11856">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola RAZR M XT907 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="11857">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola RAZR M XT907 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="25621">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola RAZR2 V8/U9/Z6</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="10853">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola V3m/V750 verizon</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28835">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Xoom (Factory test)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28840">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Xoom (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28841">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Xoom (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="17169">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Xoom 2 Media Edition</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="17158">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Xoom 2 Media Edition (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="16847">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola Xoom 2 Media Edition (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28941">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola XT890/907/Razr (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="28942">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola XT890/907/Razr (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8888">
-    <match key="usb.product_id" int="17250">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Motorola XT912/XT928</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1375">
-    <match key="usb.product_id" int="49664">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mustek gSmart 300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1375">
-    <match key="usb.product_id" int="41808">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mustek gSmart 350</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1375">
-    <match key="usb.product_id" int="49696">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mustek gSmart mini</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1375">
-    <match key="usb.product_id" int="50208">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mustek gSmart mini 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1375">
-    <match key="usb.product_id" int="50464">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Mustek gSmart mini 3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2726">
-    <match key="usb.product_id" int="38401">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">MyMusix PD-6070</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1033">
-    <match key="usb.product_id" int="806">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">NEC Casio C811</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1033">
-    <match key="usb.product_id" int="1074">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">NEC Casio CA-201L</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1033">
-    <match key="usb.product_id" int="578">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">NEC FOMA N01A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1026">
-    <match key="usb.product_id" int="22120">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nextar MA715A-8R</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nexxtech Mini Digital Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="770">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 2000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="279">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 2100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="290">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 2200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="291">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 2200v1.1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="265">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 2500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="277">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 3100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="289">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 3200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="273">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 3500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="285">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 3700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="301">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="516">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="267">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="304">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4600 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="305">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4600a (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="297">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 4800 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="275">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 5000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="518">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 5200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="281">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 5400 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="302">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 5600 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="269">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 5700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="309">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 5900 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="313">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 7600 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="311">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 7900 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="287">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 8700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="259">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon CoolPix 880</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="295">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 8800 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="274">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 885 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="401">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix 9400  (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="258">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon CoolPix 990</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="550">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix A (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="392">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix AW100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="520">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="779">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L10 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="777">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L11 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="382">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L110 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="351">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L12 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="389">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L120 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="789">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L16 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="792">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L19 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="791">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L20 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="804">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L23 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="835">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L27</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="773">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L4 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="402">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix L820  (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="320">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="381">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="322">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P2 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="545">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P330 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="524">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P4 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="361">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P50 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="388">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="347">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P5000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="547">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P510 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="355">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P5100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="552">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P520 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="785">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P60 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="367">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P6000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="383">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P7000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="395">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P7100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="549">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P7700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="553">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P7800 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="363">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P80 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="364">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P80 v1.1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="371">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix P90 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="823">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S01</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="838">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S02</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="334">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S2 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="353">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="375">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S220 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="376">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S225 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="801">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S2500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="813">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S2600 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="831">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S2700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="795">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S3000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="800">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S3100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="820">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S3200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="810">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S3300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="324">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S4 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="809">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S4300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="349">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="544">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S5100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="334">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S6 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="369">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S60 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="542">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S6000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="540">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S620 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="343">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S7c (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="543">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S8000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="546">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S8200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="390">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S9100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="403">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S9500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="843">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix S9700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon Coolpix SQ (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1028">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon D2H SLR (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1036">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon D2Hs (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1032">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon D2X SLR (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1052">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon D3 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1034">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon D50 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1026">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1040">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1046">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D2Xs (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1050">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1060">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D3000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1061">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D300s (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1063">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D3100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1068">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D3200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1075">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D3300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1062">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D3s (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1056">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D3x (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1067">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1044">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D40 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1048">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D40x (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1077">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D4s</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1059">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D5000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1065">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D5100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1071">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D5200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1073">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D5300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1054">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D60 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1069">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D600</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D610</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1030">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D70 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1058">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D700 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1064">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D7000 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1038">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D70s (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1072">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D7100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1079">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D750</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1042">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D80 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1066">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D800</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1070">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D800E</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1078">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D810</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1057">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon DSC D90 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1538">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon J1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1539">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon J2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1541">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon J3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1545">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon J4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1542">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon S1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1537">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon V1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1200">
-    <match key="usb.product_id" int="1540">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nikon V2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20554">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">nisis Quickpix Qp3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="548">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">NogaNet TDC-15</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="705">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 2710</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="101">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 3109c Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="95">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 3110c Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1122">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 3250 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="494">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 3710</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="521">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5130 XpressMusic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1214">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5200 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="738">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5230</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1210">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5300 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="108">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5310 XpressMusic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="234">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5320 XpressMusic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1150">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5500 Sport Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="553">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1204">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5700 XpressMusic Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="340">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5800 XpressMusic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="341">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5800 XpressMusic v2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="345">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 5800 XpressMusic v3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="46">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 6120c Classic Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="152">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 6210 Navigator</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="141">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 6220 Classic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="60">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 6500c Classic Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="663">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 6600i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1491">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia 808 PureView</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1426">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia C5-00</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="961">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia C7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="973">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia C7 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="463">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E52</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="815">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E6</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="377">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E63</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="229">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E66</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="820">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="821">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E7 (Ovi mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="228">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E71</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="417">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E71x</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="545">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia E72</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1788">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia Lumia (RM-975)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1638">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia Lumia 301</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1633">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia Lumia WP8</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1316">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1160">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N73</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1233">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N73 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1249">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N75 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="121">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N78 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="390">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N79</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="766">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N8</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="770">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N8 (Ovi mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1265">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N80 Internet Edition (Media Player)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="10">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N81 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="116">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N82 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="146">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N85 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1306">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N9</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1157">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N91 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1144">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N93 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1253">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N93i Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1263">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N95 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="110">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N95 Mobile Phone 8GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="978">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N950</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="57">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N96 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="501">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N97</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="619">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N97 mini</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="500">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia N97-1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="628">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia X6</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1057">
-    <match key="usb.product_id" int="1768">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Nokia XL</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5891">
-    <match key="usb.product_id" int="1">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">NormSoft, Inc. Pocket Tunes</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5891">
-    <match key="usb.product_id" int="2">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">NormSoft, Inc. Pocket Tunes 4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2389">
-    <match key="usb.product_id" int="28841">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">nVidia CM9-Adam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2389">
-    <match key="usb.product_id" int="46080">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">nVidia Shield (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2389">
-    <match key="usb.product_id" int="52999">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">nVidia Shield (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2389">
-    <match key="usb.product_id" int="52994">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">nVidia Tegra Note</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2389">
-    <match key="usb.product_id" int="28928">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">nVidia Various tablets (ID1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2389">
-    <match key="usb.product_id" int="28930">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">nVidia Various tablets (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7763">
-    <match key="usb.product_id" int="6">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">O2 Sistemas ZoltarTV</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-2100UZ</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-3000Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-3030Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-310Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-350Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-5500Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus C-55Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus D-540Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus D-560Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="272">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus E series (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="303">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus E-M5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="303">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus E-PL5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="278">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus FE4000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus IR-300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="275">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus mju 500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="303">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus SP-720UZ</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus X-100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="276">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus X-250</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="278">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus X920</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1972">
-    <match key="usb.product_id" int="278">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Olympus X925</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8921">
-    <match key="usb.product_id" int="10085">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Oppo Find 7 (ID 1)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8921">
-    <match key="usb.product_id" int="10100">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Oppo Find 7 (ID 2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8921">
-    <match key="usb.product_id" int="10099">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Oppo X9006</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Oregon Scientific DShot II</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Oregon Scientific DShot III</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-FS62</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-FZ20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-FZ38</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-FZ45</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-FZ50</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-GF1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-LS2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-LS3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-LX7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-TZ15</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-TZ18</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="9076">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic DMC-TZ8</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="8517">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic P905i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1242">
-    <match key="usb.product_id" int="8536">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Panasonic P906i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4204">
-    <match key="usb.product_id" int="61443">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Pantech Crux</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7501">
-    <match key="usb.product_id" int="20534">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Pegatron Chagall</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7501">
-    <match key="usb.product_id" int="20533">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Pegatron Chagall (ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7501">
-    <match key="usb.product_id" int="20554">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Pegatron Hudl 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pencam TEVION MD 9456</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="9723">
-    <match key="usb.product_id" int="357">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pentax K3 (PTP Mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2583">
-    <match key="usb.product_id" int="13">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pentax Optio 43WR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2583">
-    <match key="usb.product_id" int="247">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pentax Optio W90</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2726">
-    <match key="usb.product_id" int="38658">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Perception Digital, Ltd Gigaware GX400</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8316">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear Aria</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8377">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear Ariaz</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8504">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear Ariaz/97</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="357">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear Audio</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8311">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear Muse</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8334">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear SA1VBE08KX/78</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8196">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear SA3345</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="2135">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear SA5145</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="2126">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear SA6014/SA6015/SA6024/SA6025/SA6044/SA6045</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8194">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear SA6125/SA6145/SA6185</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="335">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear SA9200</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8309">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear ViBE SA1VBE04</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8315">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear ViBE SA1VBE04/08</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8375">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear VIBE SA2VBE[08|16]K/02</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8421">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips GoGear Vibe/02</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="333">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips HDD085/00 or HDD082/17</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="332">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips HDD14XX,HDD1620 or HDD1630/17</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="491">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips HDD6320</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="331">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips HDD6320/00 or HDD6330/17</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="6411">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips i908</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Philips P44417B keychain camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8592">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips PI3900B2/58 </merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="32257">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips PSA235</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="385">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips PSA610</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="356">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips SA1115/55</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="8226">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips SA5285</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1137">
-    <match key="usb.product_id" int="370">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Philips Shoqbox</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Phoebe Smartcam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2276">
-    <match key="usb.product_id" int="322">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pioneer DVR-LX60D</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2276">
-    <match key="usb.product_id" int="328">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Pioneer XMP3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pixart Gemini Keychain Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pixie Princess Jelly-Soft</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">PockCam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1924">
-    <match key="usb.product_id" int="10376">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Polaroid DC700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1350">
-    <match key="usb.product_id" int="8245">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Polaroid Freescape/MPU-433158</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1350">
-    <match key="usb.product_id" int="3503">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Polaroid PDC 2300Z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Praktica Slimpix</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Precision Mini Digital Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Precision Mini, Model HA513A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10724">
-    <match key="usb.product_id" int="4611">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Prestigio 5504 DUO </merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10724">
-    <match key="usb.product_id" int="4355">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Prestigio 5505 DUO </merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1924">
-    <match key="usb.product_id" int="21248">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Pretec dc530</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="65535">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">PureDigital Ritz Disposable</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="34816">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for Gigabyte) GSmart G1342</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="61443">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for Highscreen) Omega Prime S</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="553">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for Nokia) 5530 Xpressmusic</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="12694">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for Nokia/Verizon) 6205 Balboa/Verizon Music Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="26468">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for OnePlus) One (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="26469">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for OnePlus) One (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="36921">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for PhiComm) C230w (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1478">
-    <match key="usb.product_id" int="36901">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Qualcomm (for Smartfren) Andromax U</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">QuickPix QP1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3530">
-    <match key="usb.product_id" int="4">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Radioshack Flatfoto</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1924">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">RCA CDS1005</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="4704">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Redmi 1S (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="4712">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Redmi HM 1S (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Request Ultra Slim</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8715">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Capilo RX</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8707">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio 300G</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8708">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio G3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8712">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio G4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8716">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio GX</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="805">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio GX (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8724">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio GX 8</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="813">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio GX 8 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8717">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8722">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R1v</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="811">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R1v (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8723">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8726">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="815">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R3 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8727">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8730">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="272">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio R5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8706">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio RR30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="829">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio RR750 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8717">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Ricoh Caplio RZ1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4042">
-    <match key="usb.product_id" int="32775">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">RIM BlackBerry Storm/9650</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8719">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Rollei dr5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8719">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Rollei dr5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37181">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar 23070  Crayola Digital Cam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37181">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar 28290 and 28292  Digital C</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37181">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar 92045  Spiderman</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar clipshot no. 1169x</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32771">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Digital Keychain 11199</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32771">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Digital no, 6637x</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32771">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Digital no, 67480</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Digital no. 56379 Spyshot</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Digital no. 77379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Dora the Explorer no. 88067</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Hello Kitty no. 94009</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Kidz Cam 86379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Kidz-Cam no. 88379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Micro Digital 2428x</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Nickelodeon iCarly no. 88061</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar no. 1638x CyberPix</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar no. 75379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar no. 81890</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar no. 91379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar no. 98379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Star Wars kit no. 92022</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sakar Sticker Wizard no. 59379</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26726">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Samsung EK-GC100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26407">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung F250 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26720">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung Galaxy models (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26716">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung Galaxy models (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26743">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung Galaxy models Kies mode</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26450">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung GT-B2700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26799">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung GT-B2710/Xcover 271</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="57868">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung GT-S5230</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26649">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung GT-S8500</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="1188">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung I550W Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20255">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung Jet S8000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26420">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung Juke (SCH-U470)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26178">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung M7600 Beat/GT-S8300T/SGH-F490/S8300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="5132">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Samsung NX1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="4996">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Samsung NX1000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26698">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Samsung S5620</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26467">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung SAMSUNG Trance</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26377">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung U600 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26793">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung Vibrant SGH-T959/Captivate/Media player mode</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="26370">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung X830 Mobile Phone</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20526">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-820</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20509">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-920 (501d)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20514">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-920 (5022)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20527">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-925(-GS)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20516">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-925GS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="23055">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-999 Portable Media Center/SGH-A707/SGH-L760V/SGH-U900/Verizon Intensity/Fascinate</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20531">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YH-J70J</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="1033">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-900</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20567">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-F2J</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20609">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-K3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20570">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-K5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20760">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-M1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20611">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-P2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20762">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-P3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20757">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-Q1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20765">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-Q2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20784">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-Q3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20773">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-R0</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20751">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-R1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20782">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-R2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20625">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-S3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20619">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-S5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20618">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-T10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20551">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-T7J</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20607">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-T9</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20564">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-U2J (YP-U2JXB/XAA)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20605">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-U3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20627">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-U4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20769">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-U5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20791">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-Z3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1256">
-    <match key="usb.product_id" int="20540">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Samsung YP-Z5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29712">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa c150</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29776">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa c240/c250</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29778">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa c250 v2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29746">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Clip</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29748">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Clip v2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29924">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Clip Zip</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29904">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Clip+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29824">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Connect</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29728">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa e200/e250/e260/e270/e280</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29730">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa e260/e280 v2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29792">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Express</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29888">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Fuze</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29890">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Fuze v2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29920">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa Fuze+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29697">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa m200-tcc (MTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29696">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa m230/m240</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29744">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa m240/m250</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1921">
-    <match key="usb.product_id" int="29872">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SanDisk Sansa View</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1140">
-    <match key="usb.product_id" int="560">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sanyo VPC-C5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1943">
-    <match key="usb.product_id" int="35073">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ScanHex SX-35a</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1943">
-    <match key="usb.product_id" int="35081">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ScanHex SX-35b</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1943">
-    <match key="usb.product_id" int="35089">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ScanHex SX-35c</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2125">
-    <match key="usb.product_id" int="4097">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ScanHex SX-35d</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Scott APX 30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="851">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sea &amp; Sea 2G (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="8718">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sea &amp; Sea 5000G</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1482">
-    <match key="usb.product_id" int="807">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sea &amp; Sea 5000G (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Shark 2-in-1 Mini</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Shark SDC-513</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Shark SDC-519</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1245">
-    <match key="usb.product_id" int="38497">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SHARP Corporation SBM203SH</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1245">
-    <match key="usb.product_id" int="38602">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SHARP Corporation SH-06E</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1161">
-    <match key="usb.product_id" int="49189">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SHARP Corporation SH930W</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Shift3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1647">
-    <match key="usb.product_id" int="40976">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SigmaTel Inc. MTPMSCN Audio Player</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3191">
-    <match key="usb.product_id" int="4113">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SiPix Blink 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3191">
-    <match key="usb.product_id" int="4117">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SiPix CAMeleon</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3191">
-    <match key="usb.product_id" int="4098">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SiPix SC2100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3191">
-    <match key="usb.product_id" int="4112">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SiPix Snap</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3428">
-    <match key="usb.product_id" int="4097">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SiPix Stylecam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3191">
-    <match key="usb.product_id" int="4097">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SiPix Web2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6390">
-    <match key="usb.product_id" int="258">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sirius Stiletto</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6390">
-    <match key="usb.product_id" int="272">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sirius Stiletto 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="13056">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Skanhex SX-330z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7132">
-    <match key="usb.product_id" int="64191">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Slacker Inc. Slacker Portable Media Player</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3530">
-    <match key="usb.product_id" int="2">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SMaL Ultra-Pocket</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3783">
-    <match key="usb.product_id" int="4104">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">So. Show 301</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1870">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A3000</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1990">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A5000 (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2391">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A5100 (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2279">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A5100 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2382">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A6000 (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2231">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A6000 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2387">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A77 M2 (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2381">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A7r (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2388">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A7S (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2274">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony Alpha-A7S (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="4756">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony DCR-SR75</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="704">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-A100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="743">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-A900 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-F707V (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-F717 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-F828 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-H1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-H2 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-H5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1347">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-HX100V (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1567">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-HX200V (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1774">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-HX300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1169">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-HX5V (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="2221">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-HX60V (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-N2 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P10 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P120 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P30 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P31 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P32 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P41 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P43 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P5 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P50 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P51 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P52 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P71 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P72 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P73 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P92 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-P93 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-R1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1323">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-RX1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1322">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-RX100 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1867">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-RX100M2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-S40 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-S60 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="662">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-S730 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-S75 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="662">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-S780 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-S85 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-T1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-T10 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-T3 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-U10 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-U20 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-V1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W1 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W12 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="835">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W130 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="760">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W200 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W35 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1340">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W510 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony DSC-W55 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20853">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY IS12S Xperia Acro HD MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="41333">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY IS12S Xperia Acro HD MTP+UMS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="45429">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY IS12S Xperia Acro MTP+UMS+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="370">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT22i Xperia P MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20850">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT22i Xperia P MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16754">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT22i Xperia P MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="390">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT25i Xperia V MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20870">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT25i Xperia V MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16774">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT25i Xperia V MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="361">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26i Xperia S MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20841">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26i Xperia S MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16745">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26i Xperia S MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="373">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26w Xperia Acro HD IS12S MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16757">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26w Xperia Acro HD IS12S MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="374">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26w Xperia Acro HD SO-03D MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16758">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT26w Xperia Acro HD SO-03D MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="375">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT28at Xperia Ion MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20855">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT28at Xperia Ion MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16759">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT28at Xperia Ion MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="41335">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT28at Xperia Ion MTP+UMS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="45431">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT28at Xperia Ion MTP+UMS+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="376">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT29i Xperia GX MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20856">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT29i Xperia GX MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16760">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT29i Xperia GX MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="386">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT30p Xperia T MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20866">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT30p Xperia T MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16770">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY LT30p Xperia T MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="371">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY MT27i Xperia Sola MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20851">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY MT27i Xperia Sola MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16755">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY MT27i Xperia Sola MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="41331">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY MT27i Xperia Sola MTP+UMS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="45427">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY MT27i Xperia Sola MTP+UMS+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony MVC-CD300 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony MVC-CD500 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1839">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony NEX-3N (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1656">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony NEX-6</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="860">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-A726/NWZ-A728/NWZ-A768</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="805">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-A815/NWZ-A818</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="859">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-A826/NWZ-A828/NWZ-A829</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1028">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-A845</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="878">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-B135</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="984">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-B142F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1214">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-B153F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1434">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-B163F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1673">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-B173F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1020">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-E344/E345</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1227">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-E354</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="901">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-E436F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1021">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-E445</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1446">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-E464</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="806">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S516</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1022">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S545</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="807">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S615F/NWZ-S616F/NWZ-S618F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="910">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S638F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="858">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S716F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="908">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S739F</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1228">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S754</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1448">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-S765</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="904">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-W202</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1211">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-W252B</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="919">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-X1050B/NWZ-X1060B</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="920">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony NWZ-X1051/NWZ-X1061</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="78">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony PTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1191">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A35 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="801">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A350 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1187">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A55 (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1641">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A57</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1846">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A58</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1847">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A58 (Control)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1396">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A65V (PTP mode)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1653">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">ptp</merge>
-     <merge key="camera.libgphoto2.name" type="string">Sony SLT-A99v</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20854">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY SO-03D Xperia Acro HD MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="41334">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY SO-03D Xperia Acro HD MTP+UMS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="45430">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY SO-03D Xperia Acro MTP+UMS+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="385">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY SO-05D Xperia SX MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20865">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY SO-05D Xperia SX MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16769">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY SO-05D Xperia SX MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1233">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony Sony Tablet P1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1459">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony Sony Tablet S</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1356">
-    <match key="usb.product_id" int="1460">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Sony Sony Tablet S1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="369">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST15i Xperia U MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="368">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST21i Xperia Tipo MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20848">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST21i Xperia Tipo MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16752">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST21i Xperia Tipo MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="384">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST23i Xperia Miro MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20864">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST23i Xperia Miro MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16768">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST23i Xperia Miro MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20849">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST25i Xperia U MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16753">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST25i Xperia U MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="382">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST27i/ST27a Xperia go MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20862">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST27i/ST27a Xperia go MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16766">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST27i/ST27a Xperia go MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="41342">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST27i/ST27a Xperia go MTP+UMS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="45438">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY ST27i/ST27a Xperia go MTP+UMS+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="365">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY WT19i Live Walkman MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="408">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia A MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20888">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia A MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="419">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia C MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20899">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia C MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16803">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia C MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="396">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia E MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20876">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia E MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16780">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia E MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="444">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia E3 MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20924">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia E3 MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="444">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia E3 MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="459">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY XPeria E4g MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20939">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY XPeria E4g MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16843">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY XPeria E4g MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="392">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia J MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20872">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia J MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16776">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia J MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="402">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia L MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20882">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia L MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16786">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia L MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="411">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20891">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16795">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="427">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M2 Dual MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20907">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M2 Dual MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16811">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M2 Dual MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="426">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M2 MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20906">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M2 MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16810">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia M2 MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="405">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia SP MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20885">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia SP MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16789">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia SP MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="397">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Tablet Z MTP 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="404">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Tablet Z MTP 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20877">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Tablet Z MTP+ADB 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20884">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Tablet Z MTP+ADB 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16781">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Tablet Z MTP+CDROM 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16788">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Tablet Z MTP+CDROM 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="403">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20883">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16787">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="438">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="406">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="412">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20918">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20886">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP+ADB (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20892">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP+ADB (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16796">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z Ultra MTP+CDROM (ID3)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="423">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z1 Compact D5503</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16807">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z1 Compact D5503 MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20903">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z1 Compact MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="414">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z1 MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20894">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z1 MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16798">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z1 MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="431">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z2 MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20911">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z2 MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16815">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z2 MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="443">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z3 Compact MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20923">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z3 Compact MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16827">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z3 Compact MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="442">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z3 MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20922">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z3 MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16826">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia Z3 MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="393">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia ZL MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20873">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia ZL MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16777">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia ZL MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="407">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia ZR MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20887">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SONY Xperia ZR MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="326">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson c1605 Xperia Dual E MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20806">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson c1605 Xperia Dual E MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="217">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson C702</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="212">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson C902</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="239">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson C905</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="343">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson IS12S Xperia Acro MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20823">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson IS12S Xperia Acro MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16727">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson IS12S Xperia Acro MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="334">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson j108i (Cedar)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="53572">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson j10i (Elm)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="324">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson j10i2 (Elm)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="57344">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson K550i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="117">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson K850i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20815">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson LT15i Xperia Arc MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="335">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson LT15i Xperia arc S MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="346">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson MK16i Xperia MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20826">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson MK16i Xperia MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="342">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson MT11i Xperia Neo MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20822">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson MT11i Xperia Neo MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="349">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson R800/R88i Xperia Play MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20829">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson R800/R88i Xperia Play MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="358">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson SK17i Xperia Mini Pro MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20838">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson SK17i Xperia Mini Pro MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="359">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST15i Xperia Mini MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20839">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST15i Xperia Mini MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="360">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST17i Xperia Active MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20840">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST17i Xperia Active MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="16744">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST17i Xperia Active MTP+CDROM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="353">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST18a Xperia Ray MTP</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20833">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson ST18i Xperia Ray MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="251">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson T700</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="307">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson U5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="314">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson U8i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="4296">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W302</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="243">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W595</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="261">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W705/W715</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="198">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W760i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="179">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W890i</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="245">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W902</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="118">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W910</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="218">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W980</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="274">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson W995</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4046">
-    <match key="usb.product_id" int="20845">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">SonyEricsson WT19i Live Walkman MTP+ADB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Soundstar TDC-35</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SpyPen Axys</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SpyPen Cleo</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SpyPen Luxo</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SpyPen Memo</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SpyPen Xion</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SQ chip camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">StarCam CP086</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">STM USB Dual-mode camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Stop &amp; Shop 87096</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">STV0680</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37181">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Suprema Digital Keychain Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">SY-2107C</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1105">
-    <match key="usb.product_id" int="53512">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">TCL Alcatel one touch 986+</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5073">
-    <match key="usb.product_id" int="28695">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Technika MP-709</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2726">
-    <match key="usb.product_id" int="12305">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Tevion MD 81488</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1691">
-    <match key="usb.product_id" int="12341">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Thomson / RCA Lyra HC308A</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1691">
-    <match key="usb.product_id" int="1911">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Thomson / RCA Opal / Lyra MC4002</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1691">
-    <match key="usb.product_id" int="1908">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Thomson EM28 Series</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1691">
-    <match key="usb.product_id" int="1916">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Thomson Lyra MC5104B (M51 Series)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1691">
-    <match key="usb.product_id" int="12314">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Thomson RCA H106</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1691">
-    <match key="usb.product_id" int="12328">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Thomson scenium E308</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2329">
-    <match key="usb.product_id" int="256">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Tiger Fast Flicks</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Timlex CP075</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="5008">
-    <match key="usb.product_id" int="21589">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">TomTom Rider 40</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4571">
-    <match key="usb.product_id" int="4096">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Topfield TF5000PVR</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="2403">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Excite AT300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="12">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="9">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat MEGF-40</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="29">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat MET401</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="26">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat MEU201</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="24">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat MEU202</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="17">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat P10</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="15">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat P20</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="16">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat S</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="25">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat T</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="22">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat U</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="20">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Gigabeat V30</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4402">
-    <match key="usb.product_id" int="17207">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba PDR-M11</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4402">
-    <match key="usb.product_id" int="17202">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba PDR-M60</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4402">
-    <match key="usb.product_id" int="17205">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba PDR-M61</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="4402">
-    <match key="usb.product_id" int="17204">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba PDR-M65</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2352">
-    <match key="usb.product_id" int="28928">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Toshiba Thrive AT100/AT105</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="13056">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Traveler SX330z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3478">
-    <match key="usb.product_id" int="16640">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Traveler SX410z</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7784">
-    <match key="usb.product_id" int="2">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">TrekStor i.Beat Organix 2.0</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1026">
-    <match key="usb.product_id" int="1553">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">TrekStor i.Beat Sweez FM</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1647">
-    <match key="usb.product_id" int="33834">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">TrekStor Vibez 8/12GB</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2125">
-    <match key="usb.product_id" int="3">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Trust Familycam 300</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1750">
-    <match key="usb.product_id" int="46">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Trust PowerC@m 350FS</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1750">
-    <match key="usb.product_id" int="45">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Trust PowerC@m 350FT</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2250">
-    <match key="usb.product_id" int="272">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Trust Spyc@m 100</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1276">
-    <match key="usb.product_id" int="20554">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Trust Spyc@m 500F FLASH</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1943">
-    <match key="usb.product_id" int="32794">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Typhoon StyloCam</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1363">
-    <match key="usb.product_id" int="514">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">UMAX AstraPen</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3428">
-    <match key="usb.product_id" int="4097">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">UMAX AstraPix 320s</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.interface.class" int="6">
-    <match key="usb.interface.subclass" int="1">
-     <match key="usb.interface.protocol" int="1">
-      <merge key="info.category" type="string">camera</merge>
-      <addset key="info.capabilities" type="strlist">camera</addset>
-      <merge key="camera.access_method" type="string">ptp</merge>
-      <merge key="camera.libgphoto2.name" type="string">USB PTP Class Camera</merge>
-      <merge key="camera.libgphoto2.support" type="bool">true</merge>
-     </match>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8711">
-    <match key="usb.product_id" int="1">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Various Viewpia DR/bq Kepler</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8711">
-    <match key="usb.product_id" int="17">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Various Viewpia DR/bq Kepler Debugging</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1032">
-    <match key="usb.product_id" int="14489">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Verizon Ellipsis 7</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ViviCam3350</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="37152">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ViviCam5B</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2425">
-    <match key="usb.product_id" int="551">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Vivitar Freelance</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="270">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Vivitar Mini Digital Camera</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="2362">
-    <match key="usb.product_id" int="271">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Vivitar Vivicam 55</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32778">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Vivitar Vivicam3350B</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Vivitar Vivicam35</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1161">
-    <match key="usb.product_id" int="57617">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Vizio (for Lenovo) LIFETAB S9714</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1161">
-    <match key="usb.product_id" int="49190">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Vizio Unknown 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1161">
-    <match key="usb.product_id" int="57408">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Vizio VTAB1008</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1329">
-    <match key="usb.product_id" int="8193">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Wacom Cintiq Companion Hybrid (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="3141">
-    <match key="usb.product_id" int="32769">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">Wild Planet Digital Spy Camera 70137</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7763">
-    <match key="usb.product_id" int="7">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Wyplay Wyplayer</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="4968">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi HM NOTE 1LTEW MIUI (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="4680">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Hongmi (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="4672">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Hongmi (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="61443">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Mi-2 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="36921">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Mi-2 (MTP+ADB)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="65352">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Mi-2s (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="872">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Mi-3 (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="864">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi Mi-3w (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10007">
-    <match key="usb.product_id" int="1632">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Xiaomi MiPad (MTP)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="8711">
-    <match key="usb.product_id" int="6">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">YiFang BQ Tesla</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10518">
-    <match key="usb.product_id" int="37197">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Yota Phone 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10518">
-    <match key="usb.product_id" int="61443">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">Yota Phone 2 (ID2)</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="7871">
-    <match key="usb.product_id" int="32553">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">YU Yureka Vodafone smart turbo 4</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="1054">
-    <match key="usb.product_id" int="24576">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZiiLABS Zii EGG</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="10096">
-    <match key="usb.product_id" int="36956">
-     <merge key="info.category" type="string">camera</merge>
-     <addset key="info.capabilities" type="strlist">camera</addset>
-     <merge key="camera.access_method" type="string">proprietary</merge>
-     <merge key="camera.libgphoto2.name" type="string">ZINA Mini Digital Keychain Camer</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="835">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE Grand X In</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="65486">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE V5</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="580">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE V55 ID 1</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="581">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE V55 ID 2</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="774">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE V790/Blade 3</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="775">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE V880E</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-   <match key="usb.vendor_id" int="6610">
-    <match key="usb.product_id" int="899">
-     <merge key="info.category" type="string">portable_audio_player</merge>
-     <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
-     <merge key="portable_audio_player.access_method" type="string">user</merge>
-     <merge key="portable_audio_player.type" type="string">mtp</merge>
-     <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-     <merge key="camera.libgphoto2.name" type="string">ZTE V985</merge>
-     <merge key="camera.libgphoto2.support" type="bool">true</merge>
-    </match>
-   </match>
-  </match>
- </device>
-</deviceinfo>
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb b/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb
index 91c5ed21..8daf737a 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb
@@ -10,14 +10,12 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
 # They are release specific, so please regen when adding new releases
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
-           file://10-camera-libgphoto2-device.fdi \
-           file://10-camera-libgphoto2.fdi \
            file://40-libgphoto2.rules \
            file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
 "
 
-SRC_URI[libgphoto2.md5sum] = "ae78e7a7936a6962c3a22b256bee1869"
-SRC_URI[libgphoto2.sha256sum] = "417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555"
+SRC_URI[libgphoto2.md5sum] = "39999aa4bdd3bf849b5716153c659405"
+SRC_URI[libgphoto2.sha256sum] = "7c0e98f438c2b128186afe16ce7833a12fa36f87d01467e837b9d27e7a167f3a"
 
 inherit autotools pkgconfig gettext lib_package
 
@@ -35,11 +33,8 @@ do_configure_append() {
 }
 
 do_install_append() {
-    install -d ${D}${datadir}/hal/fdi/information/20thirdparty
-    install -m 0644 ${WORKDIR}/*.fdi ${D}${datadir}/hal/fdi/information/20thirdparty/
-
     install -d ${D}${sysconfdir}/udev/rules.d/
-    install -m 0755 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 PACKAGES =+ "libgphotoport libgphoto2-camlibs"
@@ -48,7 +43,7 @@ RRECOMMENDS_${PN} = "libgphoto2-camlibs"
 
 FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*"
 
-FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal"
+FILES_${PN} += "${nonarch_base_libdir}/udev/*"
 FILES_${PN}-dbg += "${libdir}/*/*/.debug"
 FILES_${PN}-dev += "${libdir}/*/*/*.la"
 FILES_${PN}-doc += "${datadir}/libgphoto2_port/0.12.0/vcamera/README.txt"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
new file mode 100644
index 00000000..21bf1bcd
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
@@ -0,0 +1,33 @@
+From 564901ab78da2b2b1bed92351dc3c102dc0a8154 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 6 Aug 2019 17:51:39 -0700
+Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled
+
+Upstream-Status: Inappropriate [Cross-compile specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1676,7 +1676,7 @@ AC_ARG_ENABLE(tcl,
+   [], [enable_tcl=yes])
+ 
+ if test "x$enable_tcl" != "xyes"; then
+-  use_tcl="No (disabled)"
++  use_tcl=""
+ fi
+ 
+ if test "x$use_tcl" = "x"; then
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra
+ man_MANS = graphviz.7
+ 
+ # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
+-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests
++SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests
+ 
+ .PHONY: doxygen
+ doxygen:
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch
new file mode 100644
index 00000000..eb51d03d
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch
@@ -0,0 +1,31 @@
+From 5e53b643615fd53f3ff960521bbe9d95641e5f68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 20 Jan 2019 23:58:29 +0100
+Subject: [PATCH] Use native mkdefs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ lib/gvpr/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
+index ac3c098..4914854 100644
+--- a/lib/gvpr/Makefile.am
++++ b/lib/gvpr/Makefile.am
+@@ -57,7 +57,7 @@ endif
+ mkdefs_SOURCES = mkdefs.c
+ 
+ gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT)
+-	./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
++	mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
+ 
+ EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj*
+ 
+-- 
+2.20.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch
new file mode 100644
index 00000000..a9b03524
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch
@@ -0,0 +1,38 @@
+From 926d9285f3367ae1bdb9ce1dce95f7de73b3a980 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 6 Aug 2019 12:42:19 -0700
+Subject: [PATCH] plugin/pango: Include freetype headers explicitly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do not depend on pango automatically adding these headers
+Fixes
+| gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’
+|          FT_Face face;
+|          ^~~~~~~
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plugin/pango/gvtextlayout_pango.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
+index d620b29..b0da11c 100644
+--- a/plugin/pango/gvtextlayout_pango.c
++++ b/plugin/pango/gvtextlayout_pango.c
+@@ -15,6 +15,10 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++
++#include <ft2build.h>
++#include FT_FREETYPE_H
++
+ #include "gvplugin_render.h"
+ #include "agxbuf.h"
+ #include "utils.h"
+-- 
+2.22.0
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
new file mode 100644
index 00000000..12ecb990
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
@@ -0,0 +1,77 @@
+SUMMARY = "Graph Visualization Tools"
+HOMEPAGE = "http://www.graphviz.org"
+LICENSE = "EPL-1.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04"
+
+DEPENDS = " \
+    intltool-native \
+    bison-native \
+    groff-native \
+    libtool \
+    gdk-pixbuf \
+    librsvg \
+    cairo \
+    pango \
+    expat \
+    freetype \
+"
+DEPENDS_append_class-target = " ${BPN}-native"
+
+inherit autotools-brokensep pkgconfig gettext
+
+# The source tarball suggested at
+# https://graphviz.gitlab.io/_pages/Download/Download_source.html has no
+# version in its name. So once graphviz is updgraded, only first time users will
+# get checksum errors. Fedora people seem to expect same so they use a versioned
+# source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec
+
+SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \
+           file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \
+"
+# Use native mkdefs
+SRC_URI_append_class-target = "\
+           file://0001-Use-native-mkdefs.patch \
+           file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
+"
+SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072"
+SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a"
+
+S = "${WORKDIR}/${BPN}-stable_release_${PV}"
+
+EXTRA_OECONF_class-target = "\
+                --with-expatincludedir=${STAGING_INCDIR} \
+                --with-expatlibdir=${STAGING_LIBDIR} \
+                --without-included-ltdl \
+                --disable-java \
+                --disable-tcl \
+                --disable-r \
+                --disable-sharp \
+                "
+CFLAGS_append_class-target = " -D_typ_ssize_t=1 -D_long_double=1"
+do_configure_prepend() {
+    cd ${S}
+    # create version.m4 and ignore libtoolize errors
+    ./autogen.sh NOCONFIG || true
+}
+
+do_install_append_class-native() {
+    # install mkdefs for target build
+    install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir}
+}
+
+PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo"
+
+FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/"
+FILES_${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/"
+FILES_${PN}-demo += "${datadir}/graphviz/demo/"
+
+RDEPENDS_${PN}-perl += "perl"
+RDEPENDS_${PN}-python += "python3"
+RDEPENDS_${PN}-demo += "python3 perl"
+
+INSANE_SKIP_${PN}-perl = "dev-so"
+INSANE_SKIP_${PN}-python = "dev-so"
+
+FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}"
+
+BBCLASSEXTEND = "native"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch b/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch
new file mode 100644
index 00000000..4a727d3c
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch
@@ -0,0 +1,36 @@
+Fix build with gettext 0.20.x
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+ 
+-SUBDIRS = intl po src pixmaps
++SUBDIRS = po src pixmaps
+ 
+ gtkperfdocdir = ${prefix}/doc/gtkperf
+ gtkperfdoc_DATA = \
+--- a/configure.in
++++ b/configure.in
+@@ -31,8 +31,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
+ 
+ dnl Languages which your application supports
+ ALL_LINGUAS=""
+-AM_GNU_GETTEXT
+-AM_GNU_GETTEXT_VERSION(0.10.40)
++AM_GNU_GETTEXT([external])
+ 
+ dnl Set PACKAGE_LOCALE_DIR in config.h.
+ if test "x${prefix}" = "xNONE"; then
+@@ -100,7 +99,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "
+ 
+ AC_OUTPUT([
+ Makefile
+-intl/Makefile
+ po/Makefile.in
+ src/Makefile
+ pixmaps/Makefile
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
index 4094513b..b4d94ff6 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
@@ -7,6 +7,7 @@ SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \
            file://Makevars \
            file://0001-Include-stdlib.h-for-exit-API.patch \
            file://0002-timing.c-Fix-format-security-errors.patch \
+           file://gettext.patch \
            "
 
 SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53"
@@ -16,7 +17,7 @@ DEPENDS = "gtk+"
 
 S = "${WORKDIR}/${BPN}"
 
-inherit distro_features_check autotools binconfig pkgconfig gettext
+inherit features_check autotools binconfig pkgconfig gettext
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb b/external/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb
new file mode 100644
index 00000000..6c22f0e0
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb
@@ -0,0 +1,23 @@
+SUMMARY = "VCD (Value Change Dump) file waveform viewer"
+DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) "
+HOMEPAGE = "http://gtkwave.sourceforge.net/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
+
+SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "23879689ecf7e2cdd2cd5a91c5c601da"
+SRC_URI[sha256sum] = "d20dd1a9307b908439c68122a9f81d3ff434a6bfa5439f0cb01398fec650894f"
+
+inherit pkgconfig autotools gettext texinfo mime mime-xdg
+DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0"
+RDEPENDS_${PN} += "tk-lib"
+
+# depends on gtk+ which has this restriction
+inherit features_check
+ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+
+EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update"
+
+FILES_${PN} = "${bindir} ${datadir}"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
deleted file mode 100644
index cc6a694c..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Jpeg 2000 implementation"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=baa697d7510288a9cdcce9bd7edaf9bc"
-
-PR = "r1"
-
-SRC_URI = "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip"
-
-inherit autotools lib_package
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg"
-PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,freeglut"
-
-EXTRA_OECONF = "--enable-shared"
-
-SRC_URI[md5sum] = "a342b2b4495b3e1394e161eb5d85d754"
-SRC_URI[sha256sum] = "6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb b/external/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb
new file mode 100644
index 00000000..1d5a2943
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Jpeg 2000 implementation"
+HOMEPAGE = "https://github.com/mdadams/jasper"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb"
+
+SRC_URI = "git://github.com/mdadams/jasper.git;protocol=https"
+SRCREV = "9aef6d91a82a8a6aecb575cbee57f74470603cc2"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg"
+PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut"
+
+EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true"
+
+do_install_append() {
+    chrpath -d ${D}${bindir}/jasper
+    chrpath -d ${D}${bindir}/imginfo
+    chrpath -d ${D}${bindir}/imgcmp
+    chrpath -d ${D}${libdir}/libjasper.so.*
+}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb b/external/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
index 91fa00cc..249e96f1 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
@@ -3,7 +3,7 @@ DEPENDS = "jpeg tiff libpng zlib"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=34aa579294e8284b7b848c8d5d361e8f"
 
-SRC_URI = "http://leptonica.com/source/leptonica-${PV}.tar.gz"
+SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz"
 SRC_URI[md5sum] = "4f32be9bd2e2c142ba018037ab5d746f"
 SRC_URI[sha256sum] = "29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch
new file mode 100644
index 00000000..db400f70
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch
@@ -0,0 +1,12 @@
+diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am
+--- xforms-1.2.3.orig/fdesign/Makefile.am	2019-02-24 12:58:51.968645873 +0000
++++ xforms-1.2.3/fdesign/Makefile.am	2019-02-24 13:00:48.500635163 +0000
+@@ -11,7 +11,7 @@
+ fdesign.1:
+ 	cp -p $(srcdir)/fdesign.man fdesign.1
+ 
+-INCLUDES = -I./xpm $(X_CFLAGS)
++INCLUDES = -I./xpm -I$(srcdir)/xpm $(X_CFLAGS)
+ 
+ bin_PROGRAMS = fdesign
+ 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch
new file mode 100644
index 00000000..c95bd18d
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch
@@ -0,0 +1,12 @@
+diff -Naur xforms-1.2.3.orig/lib/Makefile.am xforms-1.2.3/lib/Makefile.am
+--- xforms-1.2.3.orig/lib/Makefile.am	2019-02-24 12:53:58.340678373 +0000
++++ xforms-1.2.3/lib/Makefile.am	2019-02-24 12:54:33.096674102 +0000
+@@ -25,7 +25,7 @@
+ man_MANS = xforms.5
+ 
+ xforms.5:
+-	cp -p ./xforms.man xforms.5
++	cp -p $(srcdir)/xforms.man xforms.5
+ 
+ libforms_la_SOURCES = \
+ 	align.c \
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch
new file mode 100644
index 00000000..73956dee
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch
@@ -0,0 +1,12 @@
+diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am
+--- xforms-1.2.3.orig/fdesign/Makefile.am	2019-02-24 13:08:48.412603250 +0000
++++ xforms-1.2.3/fdesign/Makefile.am	2019-02-24 13:09:18.412601874 +0000
+@@ -15,7 +15,7 @@
+ 
+ bin_PROGRAMS = fdesign
+ 
+-fdesign_LDADD = $(top_srcdir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
++fdesign_LDADD = $(top_builddir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+ 
+ fdesign_SOURCES = \
+ 	fd_attribs.c \
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
new file mode 100644
index 00000000..999d53d4
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "The XForms graphical interface widget library	"
+HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/"
+PR = "r0"
+
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar.gz \
+           file://fix-link-to-xforms-man.patch \
+           file://add-absolute-path-for-include-dir.patch \
+           file://fix-path-fdesign_LDADD.patch \
+          "
+
+SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b"
+SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61"
+
+inherit autotools features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl x11"
+
+S = "${WORKDIR}/xforms-${PV}"
+
+DEPENDS = "libxpm jpeg libx11 mesa"
+RDEPENDS_${PN} = "bash"
+
+EXTRA_OECONF = "--with-extra-inc=${S}/lib" 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
new file mode 100644
index 00000000..ec8c0fd4
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
@@ -0,0 +1,73 @@
+From 44e4bb4cfb81024c8f5fd2e179e8a32c42756a2f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 23 Jul 2017 16:52:43 -0700
+Subject: [PATCH] build: Pass --tag=CC explictly when using libtool
+
+Do not depend solely on libtool heuristics which fail
+in OE case when building with external compiler and
+hardening flags
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in              | 4 ++--
+ build-scripts/makedep.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ab51035..743ce30 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -72,10 +72,10 @@ depend:
+ include $(depend)
+ 
+ $(objects)/$(TARGET): $(OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
+ 
+ 
+ install: all install-bin install-hdrs install-lib install-data install-man
+diff --git a/build-scripts/makedep.sh b/build-scripts/makedep.sh
+index 3b3863b..dba28f2 100755
+--- a/build-scripts/makedep.sh
++++ b/build-scripts/makedep.sh
+@@ -51,19 +51,19 @@ do  echo "Generating dependencies for $src"
+     case $ext in
+         c) cat >>${output}.new <<__EOF__
+ 
+-	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
++	\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
+ 
+ __EOF__
+         ;;
+         cc) cat >>${output}.new <<__EOF__
+ 
+-	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
++	\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
+ 
+ __EOF__
+         ;;
+         m) cat >>${output}.new <<__EOF__
+ 
+-	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
++	\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
+ 
+ __EOF__
+         ;;
+@@ -75,7 +75,7 @@ __EOF__
+         ;;
+         S) cat >>${output}.new <<__EOF__
+ 
+-	\$(LIBTOOL)  --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
++	\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
+ 
+ __EOF__
+         ;;
+-- 
+2.13.3
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7572.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7572.patch
new file mode 100644
index 00000000..c41c2de0
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7572.patch
@@ -0,0 +1,114 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560182231 25200
+#      Mon Jun 10 08:57:11 2019 -0700
+# Branch SDL-1.2
+# Node ID a8afedbcaea0e84921dc770195c4699bda3ccdc5
+# Parent  faf9abbcfb5fe0d0ca23c4bf0394aa226ceccf02
+CVE-2019-7572: Fix a buffer overwrite in IMA_ADPCM_decode
+If data chunk was longer than expected based on a WAV format
+definition, IMA_ADPCM_decode() tried to write past the output
+buffer. This patch fixes it.
+
+Based on patch from
+<https://bugzilla.libsdl.org/show_bug.cgi?id=4496>.
+
+CVE-2019-7572
+https://bugzilla.libsdl.org/show_bug.cgi?id=4495
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560041863 25200
+#      Sat Jun 08 17:57:43 2019 -0700
+# Branch SDL-1.2
+# Node ID e52413f5258600878f9a10d2f92605a729aa8976
+# Parent  4e73be7b47877ae11d2279bd916910d469d18f8e
+CVE-2019-7572: Fix a buffer overread in IMA_ADPCM_nibble
+If an IMA ADPCM block contained an initial index out of step table
+range (loaded in IMA_ADPCM_decode()), IMA_ADPCM_nibble() blindly used
+this bogus value and that lead to a buffer overread.
+
+This patch fixes it by moving clamping the index value at the
+beginning of IMA_ADPCM_nibble() function instead of the end after
+an update.
+
+CVE-2019-7572
+https://bugzilla.libsdl.org/show_bug.cgi?id=4495
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7572
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r faf9abbcfb5f -r a8afedbcaea0 src/audio/SDL_wave.c
+--- a/src/audio/SDL_wave.c	Mon Jun 10 08:54:29 2019 -0700
++++ b/src/audio/SDL_wave.c	Mon Jun 10 08:57:11 2019 -0700
+@@ -346,7 +346,7 @@
+ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ {
+ 	struct IMA_ADPCM_decodestate *state;
+-	Uint8 *freeable, *encoded, *encoded_end, *decoded;
++	Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
+ 	Sint32 encoded_len, samplesleft;
+ 	unsigned int c, channels;
+ 
+@@ -373,6 +373,7 @@
+ 		return(-1);
+ 	}
+ 	decoded = *audio_buf;
++	decoded_end = decoded + *audio_len;
+ 
+ 	/* Get ready... Go! */
+ 	while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
+@@ -392,6 +393,7 @@
+ 			}
+ 
+ 			/* Store the initial sample we start with */
++			if (decoded + 2 > decoded_end) goto invalid_size;
+ 			decoded[0] = (Uint8)(state[c].sample&0xFF);
+ 			decoded[1] = (Uint8)(state[c].sample>>8);
+ 			decoded += 2;
+@@ -402,6 +404,8 @@
+ 		while ( samplesleft > 0 ) {
+ 			for ( c=0; c<channels; ++c ) {
+ 				if (encoded + 4 > encoded_end) goto invalid_size;
++				if (decoded + 4 * 4 * channels > decoded_end)
++					goto invalid_size;
+ 				Fill_IMA_ADPCM_block(decoded, encoded,
+ 						c, channels, &state[c]);
+ 				encoded += 4;
+
+diff -r 4e73be7b4787 -r e52413f52586 src/audio/SDL_wave.c
+--- a/src/audio/SDL_wave.c	Sat Jun 01 18:27:46 2019 +0100
++++ b/src/audio/SDL_wave.c	Sat Jun 08 17:57:43 2019 -0700
+@@ -264,6 +264,14 @@
+ 	};
+ 	Sint32 delta, step;
+ 
++	/* Clamp index value. The inital value can be invalid. */
++	if ( state->index > 88 ) {
++		state->index = 88;
++	} else
++	if ( state->index < 0 ) {
++		state->index = 0;
++	}
++
+ 	/* Compute difference and new sample value */
+ 	step = step_table[state->index];
+ 	delta = step >> 3;
+@@ -275,12 +283,6 @@
+ 
+ 	/* Update index value */
+ 	state->index += index_table[nybble];
+-	if ( state->index > 88 ) {
+-		state->index = 88;
+-	} else
+-	if ( state->index < 0 ) {
+-		state->index = 0;
+-	}
+ 
+ 	/* Clamp output sample */
+ 	if ( state->sample > max_audioval ) {
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7574.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7574.patch
new file mode 100644
index 00000000..9fd53da2
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7574.patch
@@ -0,0 +1,68 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560181859 25200
+#      Mon Jun 10 08:50:59 2019 -0700
+# Branch SDL-1.2
+# Node ID a6e3d2f5183e1cc300ad993e10e9ce077e13bd9c
+# Parent  388987dff7bf8f1e214e69c2e4f1aa31e06396b5
+CVE-2019-7574: Fix a buffer overread in IMA_ADPCM_decode
+If data chunk was shorter than expected based on a WAV format
+definition, IMA_ADPCM_decode() tried to read past the data chunk
+buffer. This patch fixes it.
+
+CVE-2019-7574
+https://bugzilla.libsdl.org/show_bug.cgi?id=4496
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7574
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r 388987dff7bf -r a6e3d2f5183e src/audio/SDL_wave.c
+--- a/src/audio/SDL_wave.c	Sat Jun 08 18:02:09 2019 -0700
++++ b/src/audio/SDL_wave.c	Mon Jun 10 08:50:59 2019 -0700
+@@ -331,7 +331,7 @@
+ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ {
+ 	struct IMA_ADPCM_decodestate *state;
+-	Uint8 *freeable, *encoded, *decoded;
++	Uint8 *freeable, *encoded, *encoded_end, *decoded;
+ 	Sint32 encoded_len, samplesleft;
+ 	unsigned int c, channels;
+ 
+@@ -347,6 +347,7 @@
+ 	/* Allocate the proper sized output buffer */
+ 	encoded_len = *audio_len;
+ 	encoded = *audio_buf;
++	encoded_end = encoded + encoded_len;
+ 	freeable = *audio_buf;
+ 	*audio_len = (encoded_len/IMA_ADPCM_state.wavefmt.blockalign) * 
+ 				IMA_ADPCM_state.wSamplesPerBlock*
+@@ -362,6 +363,7 @@
+ 	while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
+ 		/* Grab the initial information for this block */
+ 		for ( c=0; c<channels; ++c ) {
++			if (encoded + 4 > encoded_end) goto invalid_size;
+ 			/* Fill the state information for this block */
+ 			state[c].sample = ((encoded[1]<<8)|encoded[0]);
+ 			encoded += 2;
+@@ -384,6 +386,7 @@
+ 		samplesleft = (IMA_ADPCM_state.wSamplesPerBlock-1)*channels;
+ 		while ( samplesleft > 0 ) {
+ 			for ( c=0; c<channels; ++c ) {
++				if (encoded + 4 > encoded_end) goto invalid_size;
+ 				Fill_IMA_ADPCM_block(decoded, encoded,
+ 						c, channels, &state[c]);
+ 				encoded += 4;
+@@ -395,6 +398,10 @@
+ 	}
+ 	SDL_free(freeable);
+ 	return(0);
++invalid_size:
++	SDL_SetError("Unexpected chunk length for an IMA ADPCM decoder");
++	SDL_free(freeable);
++	return(-1);
+ }
+ 
+ SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc,
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7575.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7575.patch
new file mode 100644
index 00000000..a3e8416d
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7575.patch
@@ -0,0 +1,81 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560183905 25200
+#      Mon Jun 10 09:25:05 2019 -0700
+# Branch SDL-1.2
+# Node ID a936f9bd3e381d67d8ddee8b9243f85799ea4798
+# Parent  fcbecae427951bac1684baaba2ade68221315140
+CVE-2019-7575: Fix a buffer overwrite in MS_ADPCM_decode
+If a WAV format defines shorter audio stream and decoded MS ADPCM data chunk
+is longer, decoding continued past the output audio buffer.
+
+This fix is based on a patch from
+<https://bugzilla.libsdl.org/show_bug.cgi?id=4492>.
+
+https://bugzilla.libsdl.org/show_bug.cgi?id=4493
+CVE-2019-7575
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7575
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r fcbecae42795 -r a936f9bd3e38 src/audio/SDL_wave.c
+--- a/src/audio/SDL_wave.c	Mon Jun 10 09:06:23 2019 -0700
++++ b/src/audio/SDL_wave.c	Mon Jun 10 09:25:05 2019 -0700
+@@ -122,7 +122,7 @@
+ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ {
+ 	struct MS_ADPCM_decodestate *state[2];
+-	Uint8 *freeable, *encoded, *encoded_end, *decoded;
++	Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
+ 	Sint32 encoded_len, samplesleft;
+ 	Sint8 nybble, stereo;
+ 	Sint16 *coeff[2];
+@@ -142,6 +142,7 @@
+ 		return(-1);
+ 	}
+ 	decoded = *audio_buf;
++	decoded_end = decoded + *audio_len;
+ 
+ 	/* Get ready... Go! */
+ 	stereo = (MS_ADPCM_state.wavefmt.channels == 2);
+@@ -149,7 +150,7 @@
+ 	state[1] = &MS_ADPCM_state.state[stereo];
+ 	while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) {
+ 		/* Grab the initial information for this block */
+-		if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto too_short;
++		if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto invalid_size;
+ 		state[0]->hPredictor = *encoded++;
+ 		if ( stereo ) {
+ 			state[1]->hPredictor = *encoded++;
+@@ -179,6 +180,7 @@
+ 		coeff[1] = MS_ADPCM_state.aCoeff[state[1]->hPredictor];
+ 
+ 		/* Store the two initial samples we start with */
++		if (decoded + 4 + (stereo ? 4 : 0) > decoded_end) goto invalid_size;
+ 		decoded[0] = state[0]->iSamp2&0xFF;
+ 		decoded[1] = state[0]->iSamp2>>8;
+ 		decoded += 2;
+@@ -200,7 +202,8 @@
+ 		samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)*
+ 					MS_ADPCM_state.wavefmt.channels;
+ 		while ( samplesleft > 0 ) {
+-			if (encoded + 1 > encoded_end) goto too_short;
++			if (encoded + 1 > encoded_end) goto invalid_size;
++			if (decoded + 4 > decoded_end) goto invalid_size;
+ 
+ 			nybble = (*encoded)>>4;
+ 			new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]);
+@@ -223,8 +226,8 @@
+ 	}
+ 	SDL_free(freeable);
+ 	return(0);
+-too_short:
+-	SDL_SetError("Too short chunk for a MS ADPCM decoder");
++invalid_size:
++	SDL_SetError("Unexpected chunk length for a MS ADPCM decoder");
+ 	SDL_free(freeable);
+ 	return(-1);
+ invalid_predictor:
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7576.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7576.patch
new file mode 100644
index 00000000..d9a50521
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7576.patch
@@ -0,0 +1,80 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560182783 25200
+#      Mon Jun 10 09:06:23 2019 -0700
+# Branch SDL-1.2
+# Node ID fcbecae427951bac1684baaba2ade68221315140
+# Parent  a8afedbcaea0e84921dc770195c4699bda3ccdc5
+CVE-2019-7573, CVE-2019-7576: Fix buffer overreads in InitMS_ADPCM
+If MS ADPCM format chunk was too short, InitMS_ADPCM() parsing it
+could read past the end of chunk data. This patch fixes it.
+
+CVE-2019-7573
+https://bugzilla.libsdl.org/show_bug.cgi?id=4491
+CVE-2019-7576
+https://bugzilla.libsdl.org/show_bug.cgi?id=4490
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7573
+CVE: CVE-2019-7576
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r a8afedbcaea0 -r fcbecae42795 src/audio/SDL_wave.c
+--- a/src/audio/SDL_wave.c	Mon Jun 10 08:57:11 2019 -0700
++++ b/src/audio/SDL_wave.c	Mon Jun 10 09:06:23 2019 -0700
+@@ -44,12 +44,13 @@
+ 	struct MS_ADPCM_decodestate state[2];
+ } MS_ADPCM_state;
+ 
+-static int InitMS_ADPCM(WaveFMT *format)
++static int InitMS_ADPCM(WaveFMT *format, int length)
+ {
+-	Uint8 *rogue_feel;
++	Uint8 *rogue_feel, *rogue_feel_end;
+ 	int i;
+ 
+ 	/* Set the rogue pointer to the MS_ADPCM specific data */
++	if (length < sizeof(*format)) goto too_short;
+ 	MS_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
+ 	MS_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
+ 	MS_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
+@@ -58,9 +59,11 @@
+ 	MS_ADPCM_state.wavefmt.bitspersample =
+ 					 SDL_SwapLE16(format->bitspersample);
+ 	rogue_feel = (Uint8 *)format+sizeof(*format);
++	rogue_feel_end = (Uint8 *)format + length;
+ 	if ( sizeof(*format) == 16 ) {
+ 		rogue_feel += sizeof(Uint16);
+ 	}
++	if (rogue_feel + 4 > rogue_feel_end) goto too_short;
+ 	MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]);
+ 	rogue_feel += sizeof(Uint16);
+ 	MS_ADPCM_state.wNumCoef = ((rogue_feel[1]<<8)|rogue_feel[0]);
+@@ -70,12 +73,16 @@
+ 		return(-1);
+ 	}
+ 	for ( i=0; i<MS_ADPCM_state.wNumCoef; ++i ) {
++		if (rogue_feel + 4 > rogue_feel_end) goto too_short;
+ 		MS_ADPCM_state.aCoeff[i][0] = ((rogue_feel[1]<<8)|rogue_feel[0]);
+ 		rogue_feel += sizeof(Uint16);
+ 		MS_ADPCM_state.aCoeff[i][1] = ((rogue_feel[1]<<8)|rogue_feel[0]);
+ 		rogue_feel += sizeof(Uint16);
+ 	}
+ 	return(0);
++too_short:
++	SDL_SetError("Unexpected length of a chunk with a MS ADPCM format");
++	return(-1);
+ }
+ 
+ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
+@@ -495,7 +502,7 @@
+ 			break;
+ 		case MS_ADPCM_CODE:
+ 			/* Try to understand this */
+-			if ( InitMS_ADPCM(format) < 0 ) {
++			if ( InitMS_ADPCM(format, lenread) < 0 ) {
+ 				was_error = 1;
+ 				goto done;
+ 			}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch
new file mode 100644
index 00000000..63680b8b
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch
@@ -0,0 +1,118 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560182051 25200
+#      Mon Jun 10 08:54:11 2019 -0700
+# Branch SDL-1.2
+# Node ID 416136310b88cbeeff8773e573e90ac1e22b3526
+# Parent  a6e3d2f5183e1cc300ad993e10e9ce077e13bd9c
+CVE-2019-7577: Fix a buffer overread in MS_ADPCM_decode
+If RIFF/WAV data chunk length is shorter then expected for an audio
+format defined in preceeding RIFF/WAV format headers, a buffer
+overread can happen.
+
+This patch fixes it by checking a MS ADPCM data to be decoded are not
+past the initialized buffer.
+
+CVE-2019-7577
+Reproducer: https://bugzilla.libsdl.org/show_bug.cgi?id=4492
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560182069 25200
+#      Mon Jun 10 08:54:29 2019 -0700
+# Branch SDL-1.2
+# Node ID faf9abbcfb5fe0d0ca23c4bf0394aa226ceccf02
+# Parent  416136310b88cbeeff8773e573e90ac1e22b3526
+CVE-2019-7577: Fix a buffer overread in MS_ADPCM_nibble and MS_ADPCM_decode
+If a chunk of RIFF/WAV file with MS ADPCM encoding contains an invalid
+predictor (a valid predictor's value is between 0 and 6 inclusive),
+a buffer overread can happen when the predictor is used as an index
+into an array of MS ADPCM coefficients.
+
+The overead happens when indexing MS_ADPCM_state.aCoeff[] array in
+MS_ADPCM_decode() and later when dereferencing a coef pointer in
+MS_ADPCM_nibble().
+
+This patch fixes it by checking the MS ADPCM predictor values fit
+into the valid range.
+
+CVE-2019-7577
+Reproducer: https://bugzilla.libsdl.org/show_bug.cgi?id=4492
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7577
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+Refresh CVE-2019-7577.patch as it can't be applyed when using PATCHTOOL = "patch".
+Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
+---
+ src/audio/SDL_wave.c | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
+index b4ad6c7..0bcf7e2 100644
+--- a/src/audio/SDL_wave.c
++++ b/src/audio/SDL_wave.c
+@@ -115,7 +115,7 @@ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
+ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ {
+ 	struct MS_ADPCM_decodestate *state[2];
+-	Uint8 *freeable, *encoded, *decoded;
++	Uint8 *freeable, *encoded, *encoded_end, *decoded;
+ 	Sint32 encoded_len, samplesleft;
+ 	Sint8 nybble, stereo;
+ 	Sint16 *coeff[2];
+@@ -124,6 +124,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ 	/* Allocate the proper sized output buffer */
+ 	encoded_len = *audio_len;
+ 	encoded = *audio_buf;
++	encoded_end = encoded + encoded_len;
+ 	freeable = *audio_buf;
+ 	*audio_len = (encoded_len/MS_ADPCM_state.wavefmt.blockalign) * 
+ 				MS_ADPCM_state.wSamplesPerBlock*
+@@ -141,10 +142,14 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ 	state[1] = &MS_ADPCM_state.state[stereo];
+ 	while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) {
+ 		/* Grab the initial information for this block */
++		if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto too_short;
+ 		state[0]->hPredictor = *encoded++;
+ 		if ( stereo ) {
+ 			state[1]->hPredictor = *encoded++;
+ 		}
++		if (state[0]->hPredictor >= 7 || state[1]->hPredictor >= 7) {
++			goto invalid_predictor;
++		}
+ 		state[0]->iDelta = ((encoded[1]<<8)|encoded[0]);
+ 		encoded += sizeof(Sint16);
+ 		if ( stereo ) {
+@@ -188,6 +193,8 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ 		samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)*
+ 					MS_ADPCM_state.wavefmt.channels;
+ 		while ( samplesleft > 0 ) {
++			if (encoded + 1 > encoded_end) goto too_short;
++
+ 			nybble = (*encoded)>>4;
+ 			new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]);
+ 			decoded[0] = new_sample&0xFF;
+@@ -209,6 +216,14 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
+ 	}
+ 	SDL_free(freeable);
+ 	return(0);
++too_short:
++	SDL_SetError("Too short chunk for a MS ADPCM decoder");
++	SDL_free(freeable);
++	return(-1);
++invalid_predictor:
++	SDL_SetError("Invalid predictor value for a MS ADPCM decoder");
++	SDL_free(freeable);
++	return(-1);
+ }
+ 
+ struct IMA_ADPCM_decodestate {
+-- 
+2.7.4
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7578.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7578.patch
new file mode 100644
index 00000000..70288903
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7578.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560042129 25200
+#      Sat Jun 08 18:02:09 2019 -0700
+# Branch SDL-1.2
+# Node ID 388987dff7bf8f1e214e69c2e4f1aa31e06396b5
+# Parent  e52413f5258600878f9a10d2f92605a729aa8976
+CVE-2019-7578: Fix a buffer overread in InitIMA_ADPCM
+If IMA ADPCM format chunk was too short, InitIMA_ADPCM() parsing it
+could read past the end of chunk data. This patch fixes it.
+
+CVE-2019-7578
+https://bugzilla.libsdl.org/show_bug.cgi?id=4494
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7578
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r e52413f52586 -r 388987dff7bf src/audio/SDL_wave.c
+--- a/src/audio/SDL_wave.c	Sat Jun 08 17:57:43 2019 -0700
++++ b/src/audio/SDL_wave.c	Sat Jun 08 18:02:09 2019 -0700
+@@ -222,11 +222,12 @@
+ 	struct IMA_ADPCM_decodestate state[2];
+ } IMA_ADPCM_state;
+ 
+-static int InitIMA_ADPCM(WaveFMT *format)
++static int InitIMA_ADPCM(WaveFMT *format, int length)
+ {
+-	Uint8 *rogue_feel;
++	Uint8 *rogue_feel, *rogue_feel_end;
+ 
+ 	/* Set the rogue pointer to the IMA_ADPCM specific data */
++	if (length < sizeof(*format)) goto too_short;
+ 	IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
+ 	IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
+ 	IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
+@@ -235,11 +236,16 @@
+ 	IMA_ADPCM_state.wavefmt.bitspersample =
+ 					 SDL_SwapLE16(format->bitspersample);
+ 	rogue_feel = (Uint8 *)format+sizeof(*format);
++	rogue_feel_end = (Uint8 *)format + length;
+ 	if ( sizeof(*format) == 16 ) {
+ 		rogue_feel += sizeof(Uint16);
+ 	}
++	if (rogue_feel + 2 > rogue_feel_end) goto too_short;
+ 	IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]);
+ 	return(0);
++too_short:
++	SDL_SetError("Unexpected length of a chunk with an IMA ADPCM format");
++	return(-1);
+ }
+ 
+ static Sint32 IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state,Uint8 nybble)
+@@ -471,7 +477,7 @@
+ 			break;
+ 		case IMA_ADPCM_CODE:
+ 			/* Try to understand this */
+-			if ( InitIMA_ADPCM(format) < 0 ) {
++			if ( InitIMA_ADPCM(format, lenread) < 0 ) {
+ 				was_error = 1;
+ 				goto done;
+ 			}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7635.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7635.patch
new file mode 100644
index 00000000..78af1b06
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7635.patch
@@ -0,0 +1,63 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1560259692 25200
+#      Tue Jun 11 06:28:12 2019 -0700
+# Branch SDL-1.2
+# Node ID f1f5878be5dbf63c1161a8ee52b8a86ece30e552
+# Parent  a936f9bd3e381d67d8ddee8b9243f85799ea4798
+CVE-2019-7635: Reject BMP images with pixel colors out the palette
+If a 1-, 4-, or 8-bit per pixel BMP image declares less used colors
+than the palette offers an SDL_Surface with a palette of the indicated
+number of used colors is created. If some of the image's pixel
+refer to a color number higher then the maximal used colors, a subsequent
+bliting operation on the surface will look up a color past a blit map
+(that is based on the palette) memory. I.e. passing such SDL_Surface
+to e.g. an SDL_DisplayFormat() function will result in a buffer overread in
+a blit function.
+
+This patch fixes it by validing each pixel's color to be less than the
+maximal color number in the palette. A validation failure raises an
+error from a SDL_LoadBMP_RW() function.
+
+CVE-2019-7635
+https://bugzilla.libsdl.org/show_bug.cgi?id=4498
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7635
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r a936f9bd3e38 -r f1f5878be5db src/video/SDL_bmp.c
+--- a/src/video/SDL_bmp.c	Mon Jun 10 09:25:05 2019 -0700
++++ b/src/video/SDL_bmp.c	Tue Jun 11 06:28:12 2019 -0700
+@@ -308,6 +308,12 @@
+ 				}
+ 				*(bits+i) = (pixel>>shift);
+ 				pixel <<= ExpandBMP;
++				if ( bits[i] >= biClrUsed ) {
++					SDL_SetError(
++						"A BMP image contains a pixel with a color out of the palette");
++					was_error = SDL_TRUE;
++					goto done;
++				}
+ 			} }
+ 			break;
+ 
+@@ -318,6 +324,16 @@
+ 				was_error = SDL_TRUE;
+ 				goto done;
+ 			}
++			if ( 8 == biBitCount && palette && biClrUsed < (1 << biBitCount ) ) {
++				for ( i=0; i<surface->w; ++i ) {
++					if ( bits[i] >= biClrUsed ) {
++						SDL_SetError(
++							"A BMP image contains a pixel with a color out of the palette");
++						was_error = SDL_TRUE;
++						goto done;
++					}
++				}
++			}
+ #if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ 			/* Byte-swap the pixels if needed. Note that the 24bpp
+ 			   case has already been taken care of above. */
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7637.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7637.patch
new file mode 100644
index 00000000..c95338e6
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7637.patch
@@ -0,0 +1,192 @@
+# HG changeset patch
+# User Petr Písař <ppisar@redhat.com>
+# Date 1552788984 25200
+#      Sat Mar 16 19:16:24 2019 -0700
+# Branch SDL-1.2
+# Node ID 9b0e5c555c0f5ce6d2c3c19da6cc2c7fb5048bf2
+# Parent  4646533663ae1d80c2cc6b2d6dbfb37c62491c1e
+CVE-2019-7637: Fix in integer overflow in SDL_CalculatePitch
+If a too large width is passed to SDL_SetVideoMode() the width travels
+to SDL_CalculatePitch() where the width (e.g. 65535) is multiplied by
+BytesPerPixel (e.g. 4) and the result is stored into Uint16 pitch
+variable. During this arithmetics an integer overflow can happen (e.g.
+the value is clamped as 65532). As a result SDL_Surface with a pitch
+smaller than width * BytesPerPixel is created, too small pixel buffer
+is allocated and when the SDL_Surface is processed in SDL_FillRect()
+a buffer overflow occurs.
+
+This can be reproduced with "./graywin -width 21312312313123213213213"
+command.
+
+This patch fixes is by using a very careful arithmetics in
+SDL_CalculatePitch(). If an overflow is detected, an error is reported
+back as a special 0 value. We assume that 0-width surfaces do not
+occur in the wild. Since SDL_CalculatePitch() is a private function,
+we can change the semantics.
+
+CVE-2019-7637
+https://bugzilla.libsdl.org/show_bug.cgi?id=4497
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+CVE: CVE-2019-7637
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/SDL_pixels.c
+--- a/src/video/SDL_pixels.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/SDL_pixels.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -286,26 +286,53 @@
+ 	}
+ }
+ /* 
+- * Calculate the pad-aligned scanline width of a surface
++ * Calculate the pad-aligned scanline width of a surface. Return 0 in case of
++ * an error.
+  */
+ Uint16 SDL_CalculatePitch(SDL_Surface *surface)
+ {
+-	Uint16 pitch;
++	unsigned int pitch = 0;
+ 
+ 	/* Surface should be 4-byte aligned for speed */
+-	pitch = surface->w*surface->format->BytesPerPixel;
++	/* The code tries to prevent from an Uint16 overflow. */;
++	for (Uint8 byte = surface->format->BytesPerPixel; byte; byte--) {
++		pitch += (unsigned int)surface->w;
++		if (pitch < surface->w) {
++			SDL_SetError("A scanline is too wide");
++			return(0);
++		}
++	}
+ 	switch (surface->format->BitsPerPixel) {
+ 		case 1:
+-			pitch = (pitch+7)/8;
++			if (pitch % 8) {
++				pitch = pitch / 8 + 1;
++			} else {
++				pitch = pitch / 8;
++			}
+ 			break;
+ 		case 4:
+-			pitch = (pitch+1)/2;
++			if (pitch % 2) {
++				pitch = pitch / 2 + 1;
++			} else {
++				pitch = pitch / 2;
++			}
+ 			break;
+ 		default:
+ 			break;
+ 	}
+-	pitch = (pitch + 3) & ~3;	/* 4-byte aligning */
+-	return(pitch);
++	/* 4-byte aligning */
++	if (pitch & 3) {
++		if (pitch + 3 < pitch) {
++			SDL_SetError("A scanline is too wide");
++			return(0);
++		}
++		pitch = (pitch + 3) & ~3;
++	}
++	if (pitch > 0xFFFF) {
++		SDL_SetError("A scanline is too wide");
++		return(0);
++	}
++	return((Uint16)pitch);
+ }
+ /*
+  * Match an RGB value to a particular palette index
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/gapi/SDL_gapivideo.c
+--- a/src/video/gapi/SDL_gapivideo.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/gapi/SDL_gapivideo.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -733,6 +733,9 @@
+ 	video->w = gapi->w = width;
+ 	video->h = gapi->h = height;
+ 	video->pitch = SDL_CalculatePitch(video); 
++	if (!current->pitch) {
++		return(NULL);
++	}
+ 
+ 	/* Small fix for WinCE/Win32 - when activating window
+ 	   SDL_VideoSurface is equal to zero, so activating code
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/nanox/SDL_nxvideo.c
+--- a/src/video/nanox/SDL_nxvideo.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/nanox/SDL_nxvideo.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -378,6 +378,10 @@
+         current -> w = width ;
+         current -> h = height ;
+         current -> pitch = SDL_CalculatePitch (current) ;
++        if (!current->pitch) {
++            current = NULL;
++            goto done;
++        }
+         NX_ResizeImage (this, current, flags) ;
+     }
+ 
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/ps2gs/SDL_gsvideo.c
+--- a/src/video/ps2gs/SDL_gsvideo.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/ps2gs/SDL_gsvideo.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -479,6 +479,9 @@
+ 	current->w = width;
+ 	current->h = height;
+ 	current->pitch = SDL_CalculatePitch(current);
++	if (!current->pitch) {
++		return(NULL);
++	}
+ 
+ 	/* Memory map the DMA area for block memory transfer */
+ 	if ( ! mapped_mem ) {
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/ps3/SDL_ps3video.c
+--- a/src/video/ps3/SDL_ps3video.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/ps3/SDL_ps3video.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -339,6 +339,9 @@
+ 	current->w = width;
+ 	current->h = height;
+ 	current->pitch = SDL_CalculatePitch(current);
++	if (!current->pitch) {
++		return(NULL);
++	}
+ 
+ 	/* Alloc aligned mem for current->pixels */
+ 	s_pixels = memalign(16, current->h * current->pitch);
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/windib/SDL_dibvideo.c
+--- a/src/video/windib/SDL_dibvideo.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/windib/SDL_dibvideo.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -675,6 +675,9 @@
+ 	video->w = width;
+ 	video->h = height;
+ 	video->pitch = SDL_CalculatePitch(video);
++	if (!current->pitch) {
++		return(NULL);
++	}
+ 
+ 	/* Small fix for WinCE/Win32 - when activating window
+ 	   SDL_VideoSurface is equal to zero, so activating code
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/windx5/SDL_dx5video.c
+--- a/src/video/windx5/SDL_dx5video.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/windx5/SDL_dx5video.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -1127,6 +1127,9 @@
+ 		video->w = width;
+ 		video->h = height;
+ 		video->pitch = SDL_CalculatePitch(video);
++		if (!current->pitch) {
++			return(NULL);
++		}
+ 
+ #ifndef NO_CHANGEDISPLAYSETTINGS
+ 		/* Set fullscreen mode if appropriate.
+diff -r 4646533663ae -r 9b0e5c555c0f src/video/x11/SDL_x11video.c
+--- a/src/video/x11/SDL_x11video.c	Sat Mar 16 18:35:33 2019 -0700
++++ b/src/video/x11/SDL_x11video.c	Sat Mar 16 19:16:24 2019 -0700
+@@ -1225,6 +1225,10 @@
+ 		current->w = width;
+ 		current->h = height;
+ 		current->pitch = SDL_CalculatePitch(current);
++		if (!current->pitch) {
++			current = NULL;
++			goto done;
++		}
+ 		if (X11_ResizeImage(this, current, flags) < 0) {
+ 			current = NULL;
+ 			goto done;
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7638.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7638.patch
new file mode 100644
index 00000000..dab9aaeb
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7638.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1550504903 28800
+#      Mon Feb 18 07:48:23 2019 -0800
+# Branch SDL-1.2
+# Node ID 19d8c3b9c25143f71a34ff40ce1df91b4b3e3b78
+# Parent  8586f153eedec4c4e07066d6248ebdf67f10a229
+Fixed bug 4500 - Heap-Buffer Overflow in Map1toN pertaining to SDL_pixels.c
+
+Petr Pisar
+
+The reproducer has these data in BITMAPINFOHEADER:
+
+biSize = 40
+biBitCount = 8
+biClrUsed = 131075
+
+SDL_LoadBMP_RW() function passes biBitCount as a color depth to SDL_CreateRGBSurface(), thus 256-color pallete is allocated. But then biClrUsed colors are read from a file and stored into the palette. SDL_LoadBMP_RW should report an error if biClrUsed is greater than 2^biBitCount.
+
+CVE: CVE-2019-7638
+CVE: CVE-2019-7636
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff -r 8586f153eede -r 19d8c3b9c251 src/video/SDL_bmp.c
+--- a/src/video/SDL_bmp.c	Sun Jan 13 15:27:50 2019 +0100
++++ b/src/video/SDL_bmp.c	Mon Feb 18 07:48:23 2019 -0800
+@@ -233,6 +233,10 @@
+ 	if ( palette ) {
+ 		if ( biClrUsed == 0 ) {
+ 			biClrUsed = 1 << biBitCount;
++		} else if ( biClrUsed > (1 << biBitCount) ) {
++			SDL_SetError("BMP file has an invalid number of colors");
++			was_error = SDL_TRUE;
++			goto done;
+ 		}
+ 		if ( biSize == 12 ) {
+ 			for ( i = 0; i < (int)biClrUsed; ++i ) {
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
new file mode 100644
index 00000000..f98b9275
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
@@ -0,0 +1,19 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+Upstream-Status: Backport
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h	Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
new file mode 100644
index 00000000..913baa92
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
@@ -0,0 +1,187 @@
+Rather than code which doesn't even work properly when cross compiling,
+lets just use pkg-config instead. Its a little simpler.
+
+RP 2014/6/20
+
+Upstream-Status: Pending
+
+Index: SDL-1.2.15/sdl.m4
+===================================================================
+--- SDL-1.2.15.orig/sdl.m4
++++ SDL-1.2.15/sdl.m4
+@@ -12,174 +12,8 @@ dnl Test for SDL, and define SDL_CFLAGS
+ dnl
+ AC_DEFUN([AM_PATH_SDL],
+ [dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
+-    if test x${SDL_CONFIG+set} != xset ; then
+-      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-    fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
+-    if test x${SDL_CONFIG+set} != xset ; then
+-      SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-    fi
+-  fi
+-
+-  as_save_PATH="$PATH"
+-  if test "x$prefix" != xNONE; then
+-    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+-  fi
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+-  PATH="$as_save_PATH"
+   min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_CXXFLAGS="$CXXFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       CXXFLAGS="$ac_save_CXXFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          CXXFLAGS="$ac_save_CXXFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
++  PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version])
+   AC_SUBST(SDL_CFLAGS)
+   AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+ ])
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb
index 6deb352e..0a346bd9 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb
@@ -2,13 +2,13 @@ SUMMARY = "Simple DirectMedia Layer image library v2"
 SECTION = "libs"
 
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=a855a9eb5507fc556e672080c4b428ca"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=822edb694b20ff16ceef85b27f61c11f"
 
 DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
-SRC_URI[md5sum] = "c6baf6dfa80fa8a66853661a36a6034e"
-SRC_URI[sha256sum] = "3510c25da735ffcd8ce3b65073150ff4f7f9493b866e85b83738083b556d2368"
+SRC_URI[md5sum] = "f26f3a153360a8f09ed5220ef7b07aea"
+SRC_URI[sha256sum] = "bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0"
 
 S = "${WORKDIR}/SDL2_image-${PV}"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.2.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
index 718f3f5f..aa246f99 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.2.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
@@ -2,12 +2,12 @@ SUMMARY = "Simple DirectMedia Layer mixer library V2"
 SECTION = "libs"
 DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=95e0c3cf63f71b950911e698a54b7fc5"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "aaa0551393993c14a13f72b339c0ed6c"
-SRC_URI[sha256sum] = "4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb"
+SRC_URI[md5sum] = "a36e8410cac46b00a4d01752b32c3eb1"
+SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
 
 S = "${WORKDIR}/SDL2_mixer-${PV}"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch
deleted file mode 100644
index 1dfbec6e..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e6d2c0e130811c15b5f5cc10221fae182cb8609e Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Thu, 22 May 2014 10:59:33 +0100
-Subject: [PATCH] freetype-config was removed from oe-core in
-
-commit 5870bd272b0b077d0826fb900b251884c1c05061
-
-    binconfig-disabled: Add class and use
-
----
- configure.in | 38 +++++---------------------------------
- 1 file changed, 5 insertions(+), 33 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 9b36e15..f300cae 100644
---- a/configure.in
-+++ b/configure.in
-@@ -86,39 +86,11 @@ case "$host" in
- esac
- AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
- 
--dnl Check for the FreeType 2 library
--dnl
--dnl Get the cflags and libraries from the freetype-config script
--dnl
--AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is 
--installed (optional)],
--            freetype_prefix="$withval", freetype_prefix="")
--AC_ARG_WITH(freetype-exec-prefix,[  --with-freetype-exec-prefix=PFX Exec prefix 
--where FREETYPE is installed (optional)],
--            freetype_exec_prefix="$withval", freetype_exec_prefix="")
--
--if test x$freetype_exec_prefix != x ; then
--     freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
--     if test x${FREETYPE_CONFIG+set} != xset ; then
--        FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
--     fi
--fi
--if test x$freetype_prefix != x ; then
--     freetype_args="$freetype_args --prefix=$freetype_prefix"
--     if test x${FREETYPE_CONFIG+set} != xset ; then
--        FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
--     fi
--fi
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--no_freetype=""
--if test "$FREETYPE_CONFIG" = "no" ; then
--    AC_MSG_ERROR([
--*** Unable to find FreeType2 library (http://www.freetype.org/)
--])
--else
--    CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
--    LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
--fi
-+PKG_CHECK_MODULES(FREETYPE2, freetype2, 
-+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+    LIBS="$LIBS $FREETYPE2_LIBS",
-+    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
-+)
- 
- dnl Check for SDL
- SDL_VERSION=2.0.0
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb
index 4601593a..7d896cf0 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb
@@ -2,19 +2,18 @@ SUMMARY = "Simple DirectMedia Layer truetype font library"
 SECTION = "libs"
 DEPENDS = "virtual/libsdl2 freetype virtual/libgl"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=4bb27d550fdafcd8f8e4fb8cbb2775ef"
 
 SRC_URI = " \
     http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
-    file://use.pkg-config.for.freetype2.patch \
     file://automake_foreign.patch \
 "
-SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1"
-SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
+SRC_URI[md5sum] = "04fe06ff7623d7bdcb704e82f5f88391"
+SRC_URI[sha256sum] = "a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33"
 
 S = "${WORKDIR}/SDL2_ttf-${PV}"
 
-inherit autotools pkgconfig distro_features_check
+inherit autotools pkgconfig features_check
 
 # links to libGL.so
 REQUIRED_DISTRO_FEATURES += "x11 opengl"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
new file mode 100644
index 00000000..7a019083
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -0,0 +1,83 @@
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
+library designed to provide low level access to audio, keyboard, mouse, \
+joystick, 3D hardware via OpenGL, and 2D video framebuffer."
+HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
+SECTION = "libs"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
+
+PROVIDES = "virtual/libsdl"
+
+PR = "r3"
+
+SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+           file://libsdl-1.2.15-xdata32.patch \
+           file://pkgconfig.patch \
+           file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \
+           file://CVE-2019-7577.patch \
+           file://CVE-2019-7574.patch \
+           file://CVE-2019-7572.patch \
+           file://CVE-2019-7578.patch \
+           file://CVE-2019-7575.patch \
+           file://CVE-2019-7635.patch \
+           file://CVE-2019-7637.patch \
+           file://CVE-2019-7638.patch \
+           file://CVE-2019-7576.patch \
+          "
+
+UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
+
+S = "${WORKDIR}/SDL-${PV}"
+
+SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85"
+SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
+
+BINCONFIG = "${bindir}/sdl-config"
+
+inherit autotools lib_package binconfig-disabled pkgconfig
+
+CVE_PRODUCT = "simple_directmedia_layer sdl"
+
+EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
+                --enable-file --disable-oss --disable-esd --disable-arts \
+                --disable-diskaudio --disable-nas \
+                --disable-mintaudio --disable-nasm --disable-video-dga \
+                --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
+                --disable-xbios --disable-gem --disable-video-dummy \
+                --enable-input-events --enable-pthreads \
+                --disable-video-svga \
+                --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
+                --disable-rpath"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
+PACKAGECONFIG_class-native = "x11"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+
+PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib"
+PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib"
+PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb"
+PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu"
+PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender"
+
+# The following two options should only enabled with mingw support
+PACKAGECONFIG[stdio-redirect] = "--enable-stdio-redirect,--disable-stdio-redirect"
+PACKAGECONFIG[directx] = "--enable-directx,--disable-directx"
+
+EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
+
+do_configure_prepend() {
+        # Remove old libtool macros.
+        MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+        for i in ${MACROS}; do
+               rm -f ${S}/acinclude/$i
+        done
+        export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
deleted file mode 100644
index 38dac06e..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "library for easy implementation of a RDP/VNC server"
-HOMEPAGE = "https://libvnc.github.io"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
-
-DEPENDS += "zlib libsdl jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
-PACKAGECONFIG[systemd] = ",,systemd"
-
-RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
-
-inherit distro_features_check autotools binconfig pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz"
-SRC_URI[md5sum] = "7f06104d5c009813e95142932c4ddb06"
-SRC_URI[sha256sum] = "193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894"
-
-S = "${WORKDIR}/${BPN}-LibVNCServer-${PV}"
-
-TARGET_LDFLAGS += "-lgcrypt"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb
new file mode 100644
index 00000000..dfdf8245
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
+HOMEPAGE = "https://libvnc.github.io"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+PACKAGECONFIG ??= " \
+    24bpp \
+    filetransfer \
+    ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST','commercial','ffmpeg','',d)} \
+    gcrypt \
+    gnutls \
+    jpeg \
+    lzo \
+    png \
+    pthread \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \
+    sdl \
+    websockets \
+    zlib \
+"
+
+PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF,"
+PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF,"
+PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg"
+PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt"
+PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls"
+PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[ipv6] = "-DWITH_IPv6=ON,-DWITH_IPv6=OFF,"
+PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo"
+PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl"
+PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng"
+PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF,"
+PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
+PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl"
+PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2"
+PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,"
+PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
+
+PACKAGE_BEFORE_PN = "libvncclient"
+FILES_libvncclient = "${libdir}/libvncclient.*"
+
+inherit cmake
+
+SRC_URI = "git://github.com/LibVNC/libvncserver"
+SRCREV = "1354f7f1bb6962dab209eddb9d6aac1f03408110"
+PV .= "+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch
deleted file mode 100644
index 6d4bdc2a..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 5 Sep 2018 18:21:19 -0700
-Subject: [PATCH 1/2] Use override consistently
-
-Make clang++ happy
-error: 'setApplicationTitle' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-over ride]
-
-Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/NCApplication.h | 46 ++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/NCApplication.h b/src/NCApplication.h
-index e24c3eb..09e4708 100644
---- a/src/NCApplication.h
-+++ b/src/NCApplication.h
-@@ -60,7 +60,7 @@ public:
-      * Reimplemented from YApplication.
-      **/
-     virtual void setLanguage( const std::string & language,
--			      const std::string & encoding = std::string() );
-+			      const std::string & encoding = std::string() ) override;
- 
-     /**
-      * Open a directory selection box and prompt the user for an existing
-@@ -77,7 +77,7 @@ public:
-      * Implemented from YApplication.
-      **/
-     virtual std::string askForExistingDirectory( const std::string & startDir,
--					    const std::string & headline );
-+					    const std::string & headline ) override;
- 
-     /**
-      * Open a file selection box and prompt the user for an existing file.
-@@ -97,7 +97,7 @@ public:
-      **/
-     virtual std::string askForExistingFile( const std::string & startWith,
- 				       const std::string & filter,
--				       const std::string & headline );
-+				       const std::string & headline ) override;
- 
-     /**
-      * Open a file selection box and prompt the user for a file to save data
-@@ -119,28 +119,28 @@ public:
-      **/
-     virtual std::string askForSaveFileName( const std::string & startWith,
- 				       const std::string & filter,
--				       const std::string & headline );
-+				       const std::string & headline ) override;
- 
-     /**
-      * Beep.
-      *
-      * Reimplemented from YApplication.
-      **/
--    virtual void beep();
-+    virtual void beep() override;
- 
-     /**
-      * Redraw the screen.
-      *
-      * Reimplemented from YApplication.
-      **/
--    virtual void redrawScreen();
-+    virtual void redrawScreen() override;
- 
-     /**
-      * Initialize the (text) console keyboard.
-      *
-      * Reimplemented from YApplication.
-      **/
--    virtual void initConsoleKeyboard();
-+    virtual void initConsoleKeyboard() override;
- 
-     /**
-      * Set the (text) console font according to the current encoding etc.
-@@ -152,7 +152,7 @@ public:
- 				 const std::string & font,
- 				 const std::string & screen_map,
- 				 const std::string & unicode_map,
--				 const std::string & language );
-+				 const std::string & language ) override;
- 
-     /**
-      * Run a shell command (typically an interactive program using NCurses)
-@@ -165,7 +165,7 @@ public:
-      *
-      * Reimplemented from YApplication.
-      **/
--    virtual int runInTerminal( const std::string & command );
-+    virtual int runInTerminal( const std::string & command ) override;
- 
- 
-     /// @{
-@@ -183,33 +183,33 @@ public:
-     //
-     // All implemented from YApplication.
- 
--    virtual int	 displayWidth();
--    virtual int	 displayHeight();
--    virtual int	 displayDepth();
--    virtual long displayColors();
-+    virtual int	 displayWidth() override;
-+    virtual int	 displayHeight() override;
-+    virtual int	 displayDepth() override;
-+    virtual long displayColors() override;
- 
--    virtual int	 defaultWidth();
--    virtual int	 defaultHeight();
-+    virtual int	 defaultWidth() override;
-+    virtual int	 defaultHeight() override;
- 
--    virtual bool isTextMode()			{ return true; }
-+    virtual bool isTextMode() override			{ return true; }
- 
--    virtual bool hasImageSupport()		{ return false; }
-+    virtual bool hasImageSupport() override 		{ return false; }
- 
--    virtual bool hasIconSupport()		{ return false; }
-+    virtual bool hasIconSupport() override		{ return false; }
- 
--    virtual bool hasAnimationSupport()		{ return false; }
-+    virtual bool hasAnimationSupport()	override	{ return false; }
- 
--    virtual bool hasFullUtf8Support();
--    virtual bool richTextSupportsTable()	{ return false; }
-+    virtual bool hasFullUtf8Support() override;
-+    virtual bool richTextSupportsTable() override	{ return false; }
- 
--    virtual bool leftHandedMouse()		{ return false; }
-+    virtual bool leftHandedMouse() override		{ return false; }
-     
-     /**
-      * Set the application title
-      *
-      * Reimplemented from YApplication.
-      **/
--    virtual void setApplicationTitle(const std::string& title);
-+    virtual void setApplicationTitle(const std::string& title) override;
- };
- 
- 
--- 
-2.18.0
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch
deleted file mode 100644
index f65cbe66..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 162a0899f1dacd83007c4e82b9034f55610d8c20 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 5 Sep 2018 19:01:51 -0700
-Subject: [PATCH 2/2] Define own resize in NCPad and fix param type of
- SetLabel()
-
-Explicitly override resize() to avoid conflicts from NCursesWindow
-definition since there is another resize definition as well
-
-Fixes
-src/NCPad.h:164:18: error: 'NCPad::resize' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
-
-NCTablePad.h:132:18: error: 'NCTableTag::SetLabel' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
-
-Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/NCPad.h      | 1 +
- src/NCTablePad.h | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/NCPad.h b/src/NCPad.h
-index 328c4aa..d8fb324 100644
---- a/src/NCPad.h
-+++ b/src/NCPad.h
-@@ -162,6 +162,7 @@ public:
-     virtual void Destwin( NCursesWindow * dwin );
- 
-     virtual void resize( wsze nsze );
-+    virtual int resize( int lines, int columns ) { return NCursesWindow::resize(lines, columns );}
-     virtual void wRecoded();
-     virtual void setDirty() { dirty = true; }
- 
-diff --git a/src/NCTablePad.h b/src/NCTablePad.h
-index c450529..3756796 100644
---- a/src/NCTablePad.h
-+++ b/src/NCTablePad.h
-@@ -129,7 +129,7 @@ public:
- 
-     virtual ~NCTableTag() {}
- 
--    virtual void SetLabel( const NCstring & ) { /*NOOP*/; }
-+    virtual void SetLabel( const NClabel & ) { /*NOOP*/; }
- 
-     virtual void DrawAt( NCursesWindow & w, const wrect at,
- 			 NCTableStyle & tableStyle,
--- 
-2.18.0
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
index 18ea2e82..1a376a46 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
@@ -5,15 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 SRC_URI = "git://github.com/libyui/libyui-ncurses.git \
-           file://0001-Use-override-consistently.patch \
-           file://0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch \
            file://0003-Simplify-ncurses-finding-module.patch \
           "
 
 SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
 
-PV = "2.48.3+git${SRCPV}"
-SRCREV = "c941b32246e8b2952fce4fd5743f8e318222ab98"
+SRCREV = "d5b64b6291b6f292871ad5c6df25c4f6896f7d50"
 
 S = "${WORKDIR}/git"
 
@@ -28,8 +25,10 @@ do_configure_prepend () {
     git checkout bootstrap.sh
     sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh
     ./bootstrap.sh
-    mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
-    cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
+    if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then
+        mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
+        cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
+    fi
     cd -
     sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt
     sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch
index 42690181..b03723ac 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch
@@ -65,8 +65,6 @@ Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123]
  src/YWizard.h             | 2 +-
  47 files changed, 48 insertions(+), 48 deletions(-)
 
-diff --git a/src/YAlignment.h b/src/YAlignment.h
-index d716c77..7276944 100644
 --- a/src/YAlignment.h
 +++ b/src/YAlignment.h
 @@ -28,7 +28,7 @@
@@ -78,8 +76,6 @@ index d716c77..7276944 100644
  
  /**
   * Implementation of all the alignment widgets:
-diff --git a/src/YBarGraph.h b/src/YBarGraph.h
-index 29f7f26..d7eaad2 100644
 --- a/src/YBarGraph.h
 +++ b/src/YBarGraph.h
 @@ -29,7 +29,7 @@
@@ -91,8 +87,6 @@ index 29f7f26..d7eaad2 100644
  class YBarGraphSegment;
  
  /**
-diff --git a/src/YBusyIndicator.h b/src/YBusyIndicator.h
-index 9530fa5..75297d8 100644
 --- a/src/YBusyIndicator.h
 +++ b/src/YBusyIndicator.h
 @@ -27,7 +27,7 @@
@@ -104,8 +98,6 @@ index 9530fa5..75297d8 100644
  
  
  /**
-diff --git a/src/YButtonBox.h b/src/YButtonBox.h
-index 84f8dbb..ca51f57 100644
 --- a/src/YButtonBox.h
 +++ b/src/YButtonBox.h
 @@ -30,7 +30,7 @@
@@ -126,8 +118,6 @@ index 84f8dbb..ca51f57 100644
  
  protected:
      /**
-diff --git a/src/YCheckBox.h b/src/YCheckBox.h
-index 793cc77..03f3faa 100644
 --- a/src/YCheckBox.h
 +++ b/src/YCheckBox.h
 @@ -30,7 +30,7 @@
@@ -139,8 +129,6 @@ index 793cc77..03f3faa 100644
  
  enum YCheckBoxState
  {
-diff --git a/src/YCheckBoxFrame.h b/src/YCheckBoxFrame.h
-index 243f1a0..7017110 100644
 --- a/src/YCheckBoxFrame.h
 +++ b/src/YCheckBoxFrame.h
 @@ -29,7 +29,7 @@
@@ -152,8 +140,6 @@ index 243f1a0..7017110 100644
  
  
  /**
-diff --git a/src/YComboBox.h b/src/YComboBox.h
-index 416359a..ad0e550 100644
 --- a/src/YComboBox.h
 +++ b/src/YComboBox.h
 @@ -27,7 +27,7 @@
@@ -165,8 +151,6 @@ index 416359a..ad0e550 100644
  
  
  /**
-diff --git a/src/YCommandLine.h b/src/YCommandLine.h
-index 70cb4fe..f344a3b 100644
 --- a/src/YCommandLine.h
 +++ b/src/YCommandLine.h
 @@ -28,7 +28,7 @@
@@ -178,8 +162,6 @@ index 70cb4fe..f344a3b 100644
  
  
  /**
-diff --git a/src/YContextMenu.h b/src/YContextMenu.h
-index a4acb1c..1253002 100644
 --- a/src/YContextMenu.h
 +++ b/src/YContextMenu.h
 @@ -29,7 +29,7 @@
@@ -191,8 +173,6 @@ index a4acb1c..1253002 100644
  
  
  /**
-diff --git a/src/YDateField.h b/src/YDateField.h
-index e5a468d..6164fba 100644
 --- a/src/YDateField.h
 +++ b/src/YDateField.h
 @@ -27,7 +27,7 @@
@@ -204,8 +184,6 @@ index e5a468d..6164fba 100644
  
  /**
   * Input field for entering a date.
-diff --git a/src/YDialog.h b/src/YDialog.h
-index 66c25c0..371209b 100644
 --- a/src/YDialog.h
 +++ b/src/YDialog.h
 @@ -32,7 +32,7 @@
@@ -217,8 +195,6 @@ index 66c25c0..371209b 100644
  class YEvent;
  class YEventFilter;
  
-diff --git a/src/YDownloadProgress.h b/src/YDownloadProgress.h
-index c47ec4f..fe09a9d 100644
 --- a/src/YDownloadProgress.h
 +++ b/src/YDownloadProgress.h
 @@ -28,7 +28,7 @@
@@ -230,8 +206,6 @@ index c47ec4f..fe09a9d 100644
  
  /**
   * DownloadProgress: A progress bar that monitors downloading a file by
-diff --git a/src/YDumbTab.h b/src/YDumbTab.h
-index aec17a3..f8fb250 100644
 --- a/src/YDumbTab.h
 +++ b/src/YDumbTab.h
 @@ -27,7 +27,7 @@
@@ -243,8 +217,6 @@ index aec17a3..f8fb250 100644
  
  /**
   * DumbTab: A very simple tab widget that can display and switch between a
-diff --git a/src/YEmpty.h b/src/YEmpty.h
-index 9a3cb36..9b88fbc 100644
 --- a/src/YEmpty.h
 +++ b/src/YEmpty.h
 @@ -29,7 +29,7 @@
@@ -256,8 +228,6 @@ index 9a3cb36..9b88fbc 100644
  
  /**
   * A widget with zero size, useful as a placeholder.
-diff --git a/src/YEventFilter.h b/src/YEventFilter.h
-index 3dc1803..74aa62d 100644
 --- a/src/YEventFilter.h
 +++ b/src/YEventFilter.h
 @@ -32,7 +32,7 @@
@@ -269,8 +239,6 @@ index 3dc1803..74aa62d 100644
  
  
  /**
-diff --git a/src/YFrame.h b/src/YFrame.h
-index 111e8ec..4f8c61e 100644
 --- a/src/YFrame.h
 +++ b/src/YFrame.h
 @@ -29,7 +29,7 @@
@@ -282,8 +250,6 @@ index 111e8ec..4f8c61e 100644
  
  
  /**
-diff --git a/src/YGraph.h b/src/YGraph.h
-index d90d1ae..287d800 100644
 --- a/src/YGraph.h
 +++ b/src/YGraph.h
 @@ -37,7 +37,7 @@
@@ -295,8 +261,6 @@ index d90d1ae..287d800 100644
  
  /**
   * A graph with nodes and edges, rendered with Graphviz.
-diff --git a/src/YImage.h b/src/YImage.h
-index 17bea21..84eb674 100644
 --- a/src/YImage.h
 +++ b/src/YImage.h
 @@ -29,7 +29,7 @@
@@ -308,8 +272,6 @@ index 17bea21..84eb674 100644
  
  /**
   * A picture, possibly animated, loaded from a file.
-diff --git a/src/YInputField.h b/src/YInputField.h
-index 70641ce..fa29b42 100644
 --- a/src/YInputField.h
 +++ b/src/YInputField.h
 @@ -28,7 +28,7 @@
@@ -321,8 +283,6 @@ index 70641ce..fa29b42 100644
  
  
  
-diff --git a/src/YIntField.h b/src/YIntField.h
-index 9da0537..8ad2949 100644
 --- a/src/YIntField.h
 +++ b/src/YIntField.h
 @@ -27,7 +27,7 @@
@@ -334,8 +294,6 @@ index 9da0537..8ad2949 100644
  
  
  
-diff --git a/src/YLabel.h b/src/YLabel.h
-index d2fff61..bf06d8b 100644
 --- a/src/YLabel.h
 +++ b/src/YLabel.h
 @@ -30,7 +30,7 @@
@@ -347,8 +305,6 @@ index d2fff61..bf06d8b 100644
  
  /**
   * Implementation of the Label, Heading and OutputField widgets
-diff --git a/src/YLayoutBox.h b/src/YLayoutBox.h
-index e652a45..070eaff 100644
 --- a/src/YLayoutBox.h
 +++ b/src/YLayoutBox.h
 @@ -29,7 +29,7 @@
@@ -360,8 +316,6 @@ index e652a45..070eaff 100644
  
  /**
   * A vertical or horizontal stacking of widgets, implementing HBox and VBox.
-diff --git a/src/YLogView.h b/src/YLogView.h
-index 53fb9ee..5b44229 100644
 --- a/src/YLogView.h
 +++ b/src/YLogView.h
 @@ -27,7 +27,7 @@
@@ -373,8 +327,6 @@ index 53fb9ee..5b44229 100644
  
  
  /**
-diff --git a/src/YMenuButton.h b/src/YMenuButton.h
-index 205e730..5df7efb 100644
 --- a/src/YMenuButton.h
 +++ b/src/YMenuButton.h
 @@ -29,7 +29,7 @@
@@ -386,8 +338,6 @@ index 205e730..5df7efb 100644
  
  
  /**
-diff --git a/src/YMultiLineEdit.h b/src/YMultiLineEdit.h
-index c52a6ae..1f792f8 100644
 --- a/src/YMultiLineEdit.h
 +++ b/src/YMultiLineEdit.h
 @@ -27,7 +27,7 @@
@@ -399,8 +349,6 @@ index c52a6ae..1f792f8 100644
  
  /**
   * A multi-line plain-text area
-diff --git a/src/YMultiProgressMeter.h b/src/YMultiProgressMeter.h
-index 57c758d..f6bec91 100644
 --- a/src/YMultiProgressMeter.h
 +++ b/src/YMultiProgressMeter.h
 @@ -28,7 +28,7 @@
@@ -412,8 +360,6 @@ index 57c758d..f6bec91 100644
  
  
  /**
-diff --git a/src/YMultiSelectionBox.h b/src/YMultiSelectionBox.h
-index bbe5a20..f3a2947 100644
 --- a/src/YMultiSelectionBox.h
 +++ b/src/YMultiSelectionBox.h
 @@ -27,7 +27,7 @@
@@ -425,8 +371,6 @@ index bbe5a20..f3a2947 100644
  
  
  /**
-diff --git a/src/YPartitionSplitter.h b/src/YPartitionSplitter.h
-index 2839bbc..9de1174 100644
 --- a/src/YPartitionSplitter.h
 +++ b/src/YPartitionSplitter.h
 @@ -28,7 +28,7 @@
@@ -438,8 +382,6 @@ index 2839bbc..9de1174 100644
  
  
  /**
-diff --git a/src/YProgressBar.h b/src/YProgressBar.h
-index 718352f..baab662 100644
 --- a/src/YProgressBar.h
 +++ b/src/YProgressBar.h
 @@ -27,7 +27,7 @@
@@ -451,8 +393,6 @@ index 718352f..baab662 100644
  
  
  /**
-diff --git a/src/YPushButton.h b/src/YPushButton.h
-index 5b65c98..e288252 100644
 --- a/src/YPushButton.h
 +++ b/src/YPushButton.h
 @@ -27,7 +27,7 @@
@@ -464,8 +404,6 @@ index 5b65c98..e288252 100644
  
  
  
-diff --git a/src/YRadioButton.h b/src/YRadioButton.h
-index 9dc62de..5a7c0dd 100644
 --- a/src/YRadioButton.h
 +++ b/src/YRadioButton.h
 @@ -28,7 +28,7 @@
@@ -477,8 +415,6 @@ index 9dc62de..5a7c0dd 100644
  
  
  /**
-diff --git a/src/YRadioButtonGroup.h b/src/YRadioButtonGroup.h
-index 063a52e..671a257 100644
 --- a/src/YRadioButtonGroup.h
 +++ b/src/YRadioButtonGroup.h
 @@ -28,7 +28,7 @@
@@ -490,8 +426,6 @@ index 063a52e..671a257 100644
  
  typedef std::list<YRadioButton *> 		YRadioButtonList;
  typedef YRadioButtonList::iterator		YRadioButtonListIterator;
-diff --git a/src/YRichText.h b/src/YRichText.h
-index 149bfb3..86b3f80 100644
 --- a/src/YRichText.h
 +++ b/src/YRichText.h
 @@ -30,7 +30,7 @@
@@ -503,8 +437,6 @@ index 149bfb3..86b3f80 100644
  
  
  /**
-diff --git a/src/YSelectionBox.h b/src/YSelectionBox.h
-index 7fc4fb8..9bbf9f3 100644
 --- a/src/YSelectionBox.h
 +++ b/src/YSelectionBox.h
 @@ -27,7 +27,7 @@
@@ -516,8 +448,6 @@ index 7fc4fb8..9bbf9f3 100644
  
  
  /**
-diff --git a/src/YSelectionWidget.h b/src/YSelectionWidget.h
-index abbdfb4..cf05afd 100644
 --- a/src/YSelectionWidget.h
 +++ b/src/YSelectionWidget.h
 @@ -29,7 +29,7 @@
@@ -529,8 +459,6 @@ index abbdfb4..cf05afd 100644
  
  /**
   * Base class for various kinds of multi-value widgets.
-diff --git a/src/YSimpleInputField.h b/src/YSimpleInputField.h
-index 6d926d4..b93fe6b 100644
 --- a/src/YSimpleInputField.h
 +++ b/src/YSimpleInputField.h
 @@ -27,7 +27,7 @@
@@ -542,8 +470,6 @@ index 6d926d4..b93fe6b 100644
  
  
  /**
-diff --git a/src/YSlider.h b/src/YSlider.h
-index d29f6b8..4bcd7d3 100644
 --- a/src/YSlider.h
 +++ b/src/YSlider.h
 @@ -27,7 +27,7 @@
@@ -555,8 +481,6 @@ index d29f6b8..4bcd7d3 100644
  
  
  /**
-diff --git a/src/YSpacing.h b/src/YSpacing.h
-index e8aafd3..066cd68 100644
 --- a/src/YSpacing.h
 +++ b/src/YSpacing.h
 @@ -28,7 +28,7 @@
@@ -568,8 +492,6 @@ index e8aafd3..066cd68 100644
  
  
  /**
-diff --git a/src/YSquash.h b/src/YSquash.h
-index 4bd0fb6..3804cc4 100644
 --- a/src/YSquash.h
 +++ b/src/YSquash.h
 @@ -29,7 +29,7 @@
@@ -581,8 +503,6 @@ index 4bd0fb6..3804cc4 100644
  
  /**
   * HSquash, VSquash HVSquash: reduce child to its preferred size.
-diff --git a/src/YTable.h b/src/YTable.h
-index 6694f10..469b8ca 100644
 --- a/src/YTable.h
 +++ b/src/YTable.h
 @@ -30,7 +30,7 @@
@@ -594,8 +514,6 @@ index 6694f10..469b8ca 100644
  
  
  
-diff --git a/src/YTableHeader.h b/src/YTableHeader.h
-index 70166c2..4ae99b4 100644
 --- a/src/YTableHeader.h
 +++ b/src/YTableHeader.h
 @@ -31,7 +31,7 @@
@@ -607,8 +525,6 @@ index 70166c2..4ae99b4 100644
  
  /**
   * Helper class for YTable for table column properties:
-diff --git a/src/YTimeField.h b/src/YTimeField.h
-index ab2f9a3..f3a7b94 100644
 --- a/src/YTimeField.h
 +++ b/src/YTimeField.h
 @@ -27,7 +27,7 @@
@@ -620,8 +536,6 @@ index ab2f9a3..f3a7b94 100644
  
  
  /**
-diff --git a/src/YTimezoneSelector.cc b/src/YTimezoneSelector.cc
-index 9259b64..e2f9b6f 100644
 --- a/src/YTimezoneSelector.cc
 +++ b/src/YTimezoneSelector.cc
 @@ -32,7 +32,7 @@
@@ -633,8 +547,6 @@ index 9259b64..e2f9b6f 100644
  };
  
  
-diff --git a/src/YTree.h b/src/YTree.h
-index 14fa279..70e1364 100644
 --- a/src/YTree.h
 +++ b/src/YTree.h
 @@ -28,7 +28,7 @@
@@ -646,8 +558,6 @@ index 14fa279..70e1364 100644
  
  
  /**
-diff --git a/src/YUILog.h b/src/YUILog.h
-index 0890bc5..4a927a7 100644
 --- a/src/YUILog.h
 +++ b/src/YUILog.h
 @@ -64,7 +64,7 @@
@@ -659,11 +569,9 @@ index 0890bc5..4a927a7 100644
  
  enum YUILogLevel_t
  {
-diff --git a/src/YWidget.h b/src/YWidget.h
-index 5b285d0..636a41b 100644
 --- a/src/YWidget.h
 +++ b/src/YWidget.h
-@@ -45,7 +45,7 @@ typedef YChildrenManager<YWidget>	YWidgetChildrenManager;
+@@ -45,7 +45,7 @@ typedef YChildrenManager<YWidget>	YWidge
  typedef YSingleChildManager<YWidget>	YSingleWidgetChildManager;
  typedef YChildrenRejector<YWidget>	YWidgetChildrenRejector;
  
@@ -672,8 +580,6 @@ index 5b285d0..636a41b 100644
  
  
  /**
-diff --git a/src/YWizard.h b/src/YWizard.h
-index 7671cbf..975b597 100644
 --- a/src/YWizard.h
 +++ b/src/YWizard.h
 @@ -28,7 +28,7 @@
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch
deleted file mode 100644
index dbe24170..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 5 Sep 2018 17:48:09 -0700
-Subject: [PATCH] Use curly braces for MAKE variable
-
-Fixes errors with ninja
-| ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$)
-
-Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- buildtools/LibyuiCommon.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake
-index cb93307..e6fbefd 100644
---- a/buildtools/LibyuiCommon.cmake
-+++ b/buildtools/LibyuiCommon.cmake
-@@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS )	# setup compiler-flags depending on CMAKE_BUILD_TYPE
-     ENABLE_TESTING()
-     # add a wrapper "tests" target, the builtin "test" cannot be extended :-(
-     ADD_CUSTOM_TARGET(tests
--      $(MAKE)
--      COMMAND $(MAKE) test
-+      ${MAKE}
-+      COMMAND ${MAKE} test
-     )
-   ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE)
- 
--- 
-2.18.0
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
index d313fb02..7c6f4c13 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
@@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "git://github.com/libyui/libyui.git \
            file://0001-Fix-build-with-clang.patch \
-           file://0001-Use-curly-braces-for-MAKE-variable.patch \
            file://0001-Use-relative-install-paths-for-CMake.patch \
            "
 
-PV = "3.3.3+git"
-SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c"
+SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5"
 SRCREV_FORMAT = "default"
 S = "${WORKDIR}/git"
 
@@ -20,6 +18,8 @@ inherit cmake gettext pkgconfig
 
 DEPENDS += "boost"
 
+EXTRA_OECMAKE += "-DENABLE_WERROR=OFF"
+
 BBCLASSEXTEND = "native nativesdk"
 
 do_configure_prepend () {
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
index 701266bc..db4767bb 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
@@ -22,7 +22,7 @@ DEPENDS_append_libc-musl = " libexecinfo"
 # combine oe-core way with angstrom DISTRO_TYPE
 DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-inherit autotools pkgconfig gettext systemd distro_features_check
+inherit autotools pkgconfig gettext systemd features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb b/external/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
index 08d7f5b5..ac2634d8 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/numlockx/numlockx-${PV}.tar.g
 SRC_URI[md5sum] = "be9109370447eae23f6f3f8527bb1a67"
 SRC_URI[sha256sum] = "e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4"
 
-inherit autotools distro_features_check
+inherit autotools features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch b/external/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch
new file mode 100644
index 00000000..5ebeb016
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch
@@ -0,0 +1,138 @@
+From b7de9cff2a9578dd92d191241c28437cd6bbb595 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sun, 2 Feb 2020 14:39:21 +0000
+Subject: [PATCH] openbox-xdg-autostart: convert to python3
+
+Upstream-Status: Pending
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ data/autostart/openbox-xdg-autostart | 72 ++++++++++++++--------------
+ 1 file changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart
+index 04a17a1..52d763f 100755
+--- a/data/autostart/openbox-xdg-autostart
++++ b/data/autostart/openbox-xdg-autostart
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # openbox-xdg-autostart runs things based on the XDG autostart specification
+ # Copyright (C) 2008       Dana Jansens
+@@ -28,9 +28,9 @@ try:
+     from xdg.DesktopEntry import DesktopEntry
+     from xdg.Exceptions import ParsingError
+ except ImportError:
+-    print
+-    print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed"
+-    print
++    print()
++    print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr)
++    print()
+     sys.exit(1)
+ 
+ def main(argv=sys.argv):
+@@ -51,7 +51,7 @@ def main(argv=sys.argv):
+             try:
+                 autofile = AutostartFile(path)
+             except ParsingError:
+-                print "Invalid .desktop file: " + path
++                print("Invalid .desktop file: " + path)
+             else:
+                 if not autofile in files:
+                     files.append(autofile)
+@@ -99,9 +99,9 @@ class AutostartFile:
+ 
+     def _alert(self, str, info=False):
+         if info:
+-            print "\t ", str
++            print("\t ", str)
+         else:
+-            print "\t*", str
++            print("\t*", str)
+ 
+     def _showInEnvironment(self, envs, verbose=False):
+         default = not self.de.getOnlyShowIn()
+@@ -146,14 +146,14 @@ class AutostartFile:
+ 
+     def display(self, envs):
+         if self._shouldRun(envs):
+-            print "[*] " + self.de.getName()
++            print("[*] " + self.de.getName())
+         else:
+-            print "[ ] " + self.de.getName()
++            print("[ ] " + self.de.getName())
+         self._alert("File: " + self.path, info=True)
+         if self.de.getExec():
+             self._alert("Executes: " + self.de.getExec(), info=True)
+         self._shouldRun(envs, True)
+-        print
++        print()
+ 
+     def run(self, envs):
+         here = os.getcwd()
+@@ -165,34 +165,34 @@ class AutostartFile:
+         os.chdir(here)
+ 
+ def show_help():
+-    print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..."
+-    print
+-    print "This tool will run xdg autostart .desktop files"
+-    print
+-    print "OPTIONS"
+-    print "  --list        Show a list of the files which would be run"
+-    print "                Files which would be run are marked with an asterix"
+-    print "                symbol [*].  For files which would not be run,"
+-    print "                information is given for why they are excluded"
+-    print "  --help        Show this help and exit"
+-    print "  --version     Show version and copyright information"
+-    print
+-    print "ENVIRONMENT specifies a list of environments for which to run autostart"
+-    print "applications.  If none are specified, only applications which do not "
+-    print "limit themselves to certain environments will be run."
+-    print
+-    print "ENVIRONMENT can be one or more of:"
+-    print "  GNOME         Gnome Desktop"
+-    print "  KDE           KDE Desktop"
+-    print "  ROX           ROX Desktop"
+-    print "  XFCE          XFCE Desktop"
+-    print "  Old           Legacy systems"
+-    print
++    print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...")
++    print()
++    print("This tool will run xdg autostart .desktop files")
++    print()
++    print("OPTIONS")
++    print("  --list        Show a list of the files which would be run")
++    print("                Files which would be run are marked with an asterix")
++    print("                symbol [*].  For files which would not be run,")
++    print("                information is given for why they are excluded")
++    print("  --help        Show this help and exit")
++    print("  --version     Show version and copyright information")
++    print()
++    print("ENVIRONMENT specifies a list of environments for which to run autostart")
++    print("applications.  If none are specified, only applications which do not ")
++    print("limit themselves to certain environments will be run.")
++    print()
++    print("ENVIRONMENT can be one or more of:")
++    print("  GNOME         Gnome Desktop")
++    print("  KDE           KDE Desktop")
++    print("  ROX           ROX Desktop")
++    print("  XFCE          XFCE Desktop")
++    print("  Old           Legacy systems")
++    print()
+ 
+ def show_version():
+-    print ME, VERSION
+-    print "Copyright (c) 2008        Dana Jansens"
+-    print
++    print(ME, VERSION)
++    print("Copyright (c) 2008        Dana Jansens")
++    print()
+ 
+ if __name__ == "__main__":
+         sys.exit(main())
+-- 
+2.20.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
index f4d21b8f..e269a264 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
@@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = " \
     http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \
     file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \
+    file://0001-openbox-xdg-autostart-convert-to-python3.patch \
 "
 
 SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204"
 SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7"
 
-inherit autotools gettext update-alternatives pkgconfig distro_features_check
+inherit autotools gettext update-alternatives pkgconfig features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -54,4 +55,4 @@ FILES_${PN}-gnome += " \
 
 FILES_${PN}-config += "${sysconfdir}"
 
-RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python pyxdg"
+RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python3 python3-shell pyxdg"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
deleted file mode 100644
index 5c5fe64f..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 27 Sep 2018 23:45:04 +0200
-Subject: [PATCH] Ensure cmake files are installed at common location
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* Otherwise recent poppler is not able to find them
-* Include path needs adjustment with this change
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt                | 2 +-
- cmake/OpenJPEGConfig.cmake.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ff70a06f..23d2fac4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-   # We could install *.cmake files in share/ however those files contains
-   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
-   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
- endif()
- 
- if (APPLE)
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index b20294ca..6a2f4baf 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
--  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
-+  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
-   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
- 
- else()
--- 
-2.14.4
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
new file mode 100644
index 00000000..9f2fc901
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
@@ -0,0 +1,32 @@
+From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 11 Jan 2020 01:51:19 +0100
+Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
+ coordinates are beyond INT_MAX (fixes #1228)
+
+---
+ src/lib/openjp2/j2k.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
+index 14f6ff41..922550eb 100644
+--- a/src/lib/openjp2/j2k.c
++++ b/src/lib/openjp2/j2k.c
+@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
+     l_img_comp = p_image->comps;
+     for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
+         OPJ_INT32 l_h, l_w;
++        if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
++                p_image->y0 > (OPJ_UINT32)INT_MAX ||
++                p_image->x1 > (OPJ_UINT32)INT_MAX ||
++                p_image->y1 > (OPJ_UINT32)INT_MAX) {
++            opj_event_msg(p_manager, EVT_ERROR,
++                          "Image coordinates above INT_MAX are not supported\n");
++            return OPJ_FALSE;
++        }
+ 
+         l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
+                          (OPJ_INT32)l_img_comp->dx);
+-- 
+2.17.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch
new file mode 100644
index 00000000..cb250530
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch
@@ -0,0 +1,46 @@
+From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 30 Jan 2020 00:59:57 +0100
+Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
+
+That could lead to later assertion failures.
+
+Fixes #1231 / CVE-2020-8112
+---
+ src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
+index deecc4df..aa419030 100644
+--- a/src/lib/openjp2/tcd.c
++++ b/src/lib/openjp2/tcd.c
+@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
+             /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+             l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
+             l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
+-            l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
+-            l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
++            {
++                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
++                                  (OPJ_INT32)l_pdx)) << l_pdx;
++                if (tmp > (OPJ_UINT32)INT_MAX) {
++                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
++                    return OPJ_FALSE;
++                }
++                l_br_prc_x_end = (OPJ_INT32)tmp;
++            }
++            {
++                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
++                                  (OPJ_INT32)l_pdy)) << l_pdy;
++                if (tmp > (OPJ_UINT32)INT_MAX) {
++                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
++                    return OPJ_FALSE;
++                }
++                l_br_prc_y_end = (OPJ_INT32)tmp;
++            }
+             /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
+ 
+             l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
+-- 
+2.20.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
index d30ff482..42011efa 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
@@ -1,19 +1,22 @@
 DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec"
 HOMEPAGE = "http://www.openjpeg.org"
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
 
 DEPENDS = "libpng tiff lcms zlib"
 
 SRC_URI = " \
     git://github.com/uclouvain/openjpeg.git \
-    file://0001-Ensure-cmake-files-are-installed-at-common-location.patch \
     file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+    file://CVE-2020-6851.patch \
+    file://CVE-2020-8112.patch \
 "
-SRCREV = "081de4b15f54cb4482035b7bf5e3fb443e4bc84b"
+SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
 S = "${WORKDIR}/git"
 
 inherit cmake
 
 # for multilib
 EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}"
+
+FILES_${PN} += "${libdir}/openjpeg*"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb
index e0f72cd5..57d9ff98 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb
@@ -9,10 +9,10 @@ DEPENDS = "mm-common cairomm glibmm pango"
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz"
-SRC_URI[md5sum] = "874eadd9434613dbacf0272c82c3ac23"
-SRC_URI[sha256sum] = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"
+SRC_URI[md5sum] = "339c48dd92ebd3a9911b231708f7a819"
+SRC_URI[sha256sum] = "14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f"
 
-inherit distro_features_check autotools pkgconfig
+inherit features_check autotools pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb
index f5397750..108c339b 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "http://fukuchi.org/works/qrencode/"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
-PV = "4.0.0+git${SRCPV}"
+PV = "4.0.1+git${SRCPV}"
 
-SRCREV = "07f3c5d4bf9136711422cc7dbf28aff469da220a"
+SRCREV = "7c83deb8f562ae6013fea4c3e65278df93f98fb7"
 SRC_URI = "git://github.com/fukuchi/libqrencode.git"
 
 S = "${WORKDIR}/git"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch b/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch
new file mode 100644
index 00000000..6ba1e426
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch
@@ -0,0 +1,31 @@
+From 49dd914109fd1ee9e1e917890bf18f85dd95ff31 Mon Sep 17 00:00:00 2001
+From: Reid Kleckner <rnk@google.com>
+Date: Sun, 29 Dec 2019 23:17:16 -0800
+Subject: [PATCH] Remove glslang::pool_allocator::setAllocator
+
+TPoolAllocator is not copy assignable, so this setter could never have
+been used. After a recent change (878a24ee2), new versions of Clang
+reject this code outright.
+
+Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/0de87ee9a5bf5d094a3faa1a71fd9080e80b6be0]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h
+index 0e237a6a2..b8eccb883 100644
+--- a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h
++++ b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,6 @@ public:
+     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
+     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
+ 
+-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
+     TPoolAllocator& getAllocator() const { return allocator; }
+ 
+ protected:
+-- 
+2.24.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
new file mode 100644
index 00000000..e96dedfc
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
@@ -0,0 +1,57 @@
+From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Tue, 24 Sep 2019 16:07:18 +0300
+Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
+
+Renderdoc's attempt to cross compile an xxd replacement by directly
+calling a host cross-compiler breaks under OE's recipe specific
+sysroots protection because this is not a native recipe, so we just
+use xxd-native instead.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+---
+ renderdoc/CMakeLists.txt | 23 +----------------------
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 5cb7440a4..453a034ba 100644
+--- a/renderdoc/CMakeLists.txt
++++ b/renderdoc/CMakeLists.txt
+@@ -370,26 +370,6 @@ set(data
+ set(data_objects)
+ 
+ if(UNIX)
+-    # If we're cross-compiling, include-bin will get built for the target and we
+-    # then can't execute it. Instead, we force calling c++ (which we can safely
+-    # assume is present) directly to build the binary
+-
+-    if(CMAKE_CROSSCOMPILING)
+-        set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++")
+-
+-        add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+-            COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-            DEPENDS 3rdparty/include-bin/main.cpp)
+-        set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-        set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-    else()
+-        add_executable(include-bin 3rdparty/include-bin/main.cpp)
+-        set(INCLUDE_BIN_EXE $<TARGET_FILE:include-bin>)
+-        set(INCLUDE_BIN_DEP include-bin)
+-    endif()
+-
+     foreach(res ${data})
+         set(in ${res})
+         set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -399,8 +379,7 @@ if(UNIX)
+         add_custom_command(OUTPUT ${out_src}
+             WORKING_DIRECTORY ${working_dir}
+             COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
+-            COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
+-            DEPENDS ${INCLUDE_BIN_DEP}
++            COMMAND xxd -i ${in} ${out_src}
+             DEPENDS ${res})
+ 
+         list(APPEND data_objects ${out_src})
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb b/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
new file mode 100644
index 00000000..6ea632d0
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
@@ -0,0 +1,38 @@
+SUMMARY = "RenderDoc recipe providing renderdoccmd"
+DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger"
+HOMEPAGE = "https://github.com/baldurk/renderdoc"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772"
+
+SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2"
+SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
+	   file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
+	   file://0001-Remove-glslang-pool_allocator-setAllocator.patch \
+"
+S = "${WORKDIR}/git"
+
+DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native"
+
+RDEPENDS_${PN} = "libxcb xcb-util-keysyms"
+
+inherit cmake python3native features_check
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+python __anonymous () {
+    # only works on glibc systems
+    if d.getVar('TCLIBC') != "glibc":
+        raise bb.parse.SkipRecipe("incompatible with %s C library" % d.getVar('TCLIBC'))
+}
+
+COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux"
+
+EXTRA_OECMAKE += "\
+    -DENABLE_QRENDERDOC=OFF \
+    -DENABLE_PYRENDERDOC=OFF \
+    -DENABLE_RENDERDOCCMD=ON \
+    -DCMAKE_BUILD_TYPE=Release \
+"
+
+FILES_${PN} += "${libdir}"
+FILES_${PN}-dev = "${includedir}"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch b/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch
new file mode 100644
index 00000000..78598ea1
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch
@@ -0,0 +1,31 @@
+From 8d9870b66c3cfcf12ce7e8e013946e2a215bb722 Mon Sep 17 00:00:00 2001
+From: Ankit Navik <ankit.tarot@gmail.com>
+Date: Sat, 22 Dec 2018 19:16:02 +0530
+Subject: [PATCH] Add install PHONY target in Makefile
+
+---
+ Makefile | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 0564b65..0993372 100644
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,13 @@ $(STATIC_LIB): $(OBJECTS)
+ %.o: %.cpp
+ 	$(CXX) -c -o $@ $< $(CXXFLAGS) -MMD
+ 
++install:
++	mkdir -p $(TARGET_DIR_BIN)
++	mkdir -p $(TARGET_DIR_LIB)
++	cp $(TARGET) $(TARGET_DIR_BIN)/
++	cp $(STATIC_LIB) $(TARGET_DIR_LIB)/
++
+ clean:
+ 	rm -f $(TARGET) $(OBJECTS) $(CLI_OBJECTS) $(STATIC_LIB) $(DEPS)
+ 
+-.PHONY: clean
++.PHONY: all install clean
+-- 
+2.7.4
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch b/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch
new file mode 100644
index 00000000..9b48cdcd
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch
@@ -0,0 +1,50 @@
+From 4fffcd275b50d08b54b0411679ead98970651bad Mon Sep 17 00:00:00 2001
+From: David Neto <dneto@google.com>
+Date: Fri, 27 Dec 2019 12:05:58 -0500
+Subject: [PATCH] Avoid pessimizing std::move (#3124)
+
+Should fix a warning
+
+Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/commit/8aa423930db37e37086665efcc55944d577c06e5]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ test/opt/pass_fixture.h | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/test/opt/pass_fixture.h b/test/opt/pass_fixture.h
+index 53fb206f..64c089d8 100644
+--- a/test/opt/pass_fixture.h
++++ b/test/opt/pass_fixture.h
+@@ -60,8 +60,7 @@ class PassTest : public TestT {
+   // from pass Process() function.
+   std::tuple<std::vector<uint32_t>, Pass::Status> OptimizeToBinary(
+       Pass* pass, const std::string& original, bool skip_nop) {
+-    context_ =
+-        std::move(BuildModule(env_, consumer_, original, assemble_options_));
++    context_ = BuildModule(env_, consumer_, original, assemble_options_);
+     EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n"
+                                   << original << std::endl;
+     if (!context()) {
+@@ -197,8 +196,7 @@ class PassTest : public TestT {
+   // messages.
+   template <typename PassT, typename... Args>
+   void SinglePassRunAndFail(const std::string& original, Args&&... args) {
+-    context_ =
+-        std::move(BuildModule(env_, consumer_, original, assemble_options_));
++    context_ = BuildModule(env_, consumer_, original, assemble_options_);
+     EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n"
+                                   << original << std::endl;
+     std::ostringstream errs;
+@@ -235,8 +233,7 @@ class PassTest : public TestT {
+   void RunAndCheck(const std::string& original, const std::string& expected) {
+     assert(manager_->NumPasses());
+ 
+-    context_ =
+-        std::move(BuildModule(env_, nullptr, original, assemble_options_));
++    context_ = BuildModule(env_, nullptr, original, assemble_options_);
+     ASSERT_NE(nullptr, context());
+ 
+     context()->set_preserve_bindings(OptimizerOptions()->preserve_bindings_);
+-- 
+2.24.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch b/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
new file mode 100644
index 00000000..5d37da8f
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
@@ -0,0 +1,35 @@
+From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Dec 2019 07:02:24 -0800
+Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
+
+Upstream-Status: Submitted [https://github.com/google/effcee/pull/36]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt        | 1 +
+ effcee/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/external/effcee/CMakeLists.txt
++++ b/external/effcee/CMakeLists.txt
+@@ -27,6 +27,7 @@ endif()
+ 
+ include(cmake/setup_build.cmake)
+ include(cmake/utils.cmake)
++include(GNUInstallDirs)
+ 
+ add_subdirectory(third_party)
+ add_subdirectory(effcee)
+--- a/external/effcee/effcee/CMakeLists.txt
++++ b/external/effcee/effcee/CMakeLists.txt
+@@ -14,8 +14,8 @@ install(
+   DESTINATION
+     include/effcee)
+ install(TARGETS effcee
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib)
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if(EFFCEE_BUILD_TESTING)
+   add_executable(effcee-test
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
new file mode 100644
index 00000000..b787972d
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
@@ -0,0 +1,22 @@
+SUMMARY  = "SPIRV-Cross is a tool designed for parsing and converting SPIR-V \
+to other shader languages"
+LICENSE  = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+SECTION = "graphics"
+
+S = "${WORKDIR}/git"
+SRCREV = "ed16b3e69985feaf565efbecea70a1cc2fca2a58"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git \
+	file://0001-Add-install-PHONY-target-in-Makefile.patch \
+"
+
+EXTRA_OEMAKE += 'TARGET_DIR_LIB="${D}${libdir}"' 
+EXTRA_OEMAKE += 'TARGET_DIR_BIN="${D}${bindir}"'
+
+do_compile () {
+	cd ${S} && oe_runmake
+}
+
+do_install () {
+	cd ${S} && oe_runmake install
+}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb
new file mode 100644
index 00000000..8e8388e8
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb
@@ -0,0 +1,35 @@
+SUMMARY  = "The SPIR-V Tools project provides an API and commands for \
+processing SPIR-V modules"
+DESCRIPTION = "The project includes an assembler, binary module parser, \
+disassembler, validator, and optimizer for SPIR-V."
+LICENSE  = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+SECTION = "graphics"
+
+S = "${WORKDIR}/git"
+DEST_DIR = "${S}/external" 
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \
+	git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \
+	git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \
+	git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \
+	git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \
+        file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \
+        file://0001-Avoid-pessimizing-std-move-3124.patch \
+"
+SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a"
+SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563"
+SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d"
+SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb"
+SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528"
+
+inherit cmake python3native
+
+EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF"
+
+do_install_append() {
+	install -d ${D}/${includedir}/spirv
+	install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv	
+}
+
+FILES_SOLIBSDEV = ""
+FILES_${PN} += "${libdir}/*.so"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb
new file mode 100644
index 00000000..7db70ec9
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Stand-alone system tray"
+DESCRIPTION = "Stalonetray is a stand-alone freedesktop.org and KDE system tray"
+SECTION = "x11/graphics"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "virtual/libx11"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef"
+SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c"
+
+inherit autotools features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/external/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch
new file mode 100644
index 00000000..fb90432e
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch
@@ -0,0 +1,41 @@
+From e97bb73851f5bbd94260da553a222526485cdfb1 Mon Sep 17 00:00:00 2001
+From: Leon Anavi <leon.anavi@konsulko.com>
+Date: Fri, 15 Nov 2019 18:24:42 +0000
+Subject: [PATCH] config.mk: Fix compiler and linker
+
+Do not set explicitly compiler and linker.
+
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+ config.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index df6e812..5deb991 100644
+--- a/config.mk
++++ b/config.mk
+@@ -15,17 +15,17 @@ GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0`
+ GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0`
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = ${GTKINC}
++LIBS = -lc -lX11 ${GTKLIB} -lgthread-2.0
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
+ CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -s ${LIBS}
++LDFLAGS = ${LIBS}
+ 
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++CC ?= cc
+-- 
+2.7.4
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb b/external/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb
new file mode 100644
index 00000000..98973018
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Simple web browser"
+DESCRIPTION = "Simple open source web browser based on WebKit2/GTK"
+HOMEPAGE = "https://surf.suckless.org/"
+SECTION = "x11/graphics"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b57e7f7720307a02d5a6598b00fe3afa"
+
+DEPENDS = "webkitgtk gtk+3 glib-2.0"
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \
+           file://0001-config.mk-Fix-compiler-and-linker.patch \
+"
+SRCREV = "b814567e2bf8bda07cea8de1c7a062f4aa437b65"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig features_check
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install () {
+	install -D -m 0755 ${S}/surf ${D}${bindir}/surf
+}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb
index ac36a91a..75c2bc00 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb
@@ -3,16 +3,16 @@ SUMMARY = "tesseract-ocr language files"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9648bd7af63bd3cc4f5ac046d12c49e4"
 
-PV = "3.04.00+git${SRCPV}"
-SRCREV = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"
+SRCREV = "590567f20dc044f6948a8e2c61afc714c360ad0e"
 SRC_URI = "git://github.com/tesseract-ocr/tessdata.git"
+
 S = "${WORKDIR}/git"
 
 inherit allarch
 
 do_install() {
     install -d ${D}${datadir}/tessdata
-    cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata ${S}/*.cube.* ${S}/*.tesseract_cube.* ${D}${datadir}/tessdata
+    cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata ${D}${datadir}/tessdata
 }
 
 python populate_packages_prepend () {
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb b/external/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb
index f3dc8997..f97c2b2d 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb
@@ -3,22 +3,21 @@ HOMEPAGE = "http://www.tigervnc.com/"
 LICENSE = "GPLv2+"
 SECTION = "x11/utils"
 DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk"
-RDEPENDS_${PN} = "chkconfig coreutils hicolor-icon-theme"
+RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl"
 
 LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
 
 S = "${WORKDIR}/git"
 
-inherit distro_features_check
+inherit features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
 inherit autotools cmake
 B = "${S}"
 
-SRCREV = "6f2301d08e64a965ad36b401ec8dc2b24bc47075"
+SRCREV = "4739493b635372bd40a34640a719f79fa90e4dba"
 
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \
-           file://0001-tigervnc-remove-includedir.patch \
+SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.10-branch \
            file://0002-do-not-build-tests-sub-directory.patch \
            file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
            file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
@@ -26,11 +25,11 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \
 
 # Keep sync with xorg-server in oe-core
 XORG_PN ?= "xorg-server"
-XORG_PV ?= "1.19.6"
+XORG_PV ?= "1.20.6"
 SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
 XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
-SRC_URI[xorg.md5sum] = "3e47777ff034a331aed2322b078694a8"
-SRC_URI[xorg.sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
+SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
+SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
 
 # It is the directory containing the Xorg source for the
 # machine on which you are building TigerVNC.
@@ -58,7 +57,7 @@ do_patch_xserver () {
     xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
 
     cd ${XSERVER_SOURCE_DIR}
-    xserverpatch="${S}/unix/xserver119.patch"
+    xserverpatch="${S}/unix/xserver120.patch"
     echo "Apply $xserverpatch"
     patch -p1 -b --suffix .vnc < $xserverpatch
 }
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch b/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
new file mode 100644
index 00000000..ea8a9e56
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
@@ -0,0 +1,30 @@
+From 050bf24c16e95f63a76e13156346a072035d45b4 Mon Sep 17 00:00:00 2001
+From: Evan Harvey <evanwork1234@gmail.com>
+Date: Thu, 19 Mar 2020 01:32:03 -0700
+Subject: [PATCH] Fix build error with input_event_sec for old kernel
+
+Upstream-Status: Backport [https://github.com/libts/tslib/commit/050bf24c16e95f63a76e13156346a072035d45b4]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tools/ts_uinput.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c
+index 1832a07..9c40bb3 100644
+--- a/tools/ts_uinput.c
++++ b/tools/ts_uinput.c
+@@ -51,6 +51,11 @@
+ #include <linux/fb.h>
+ #endif
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #define RESET   "\033[0m"
+ #define RED     "\033[31m"
+ #define GREEN   "\033[32m"
+-- 
+2.26.2
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000..59bd97a0
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,389 @@
+From 5455055660700be18eb8800e56e2423031ed4c76 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 19:59:29 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Submitted [https://github.com/libts/tslib/pull/162]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plugins/input-raw.c | 59 +++++++++++++++++++++++++++-------------
+ tools/ts_uinput.c   | 66 ++++++++++++++++++++++++++++++---------------
+ 2 files changed, 85 insertions(+), 40 deletions(-)
+
+diff --git a/plugins/input-raw.c b/plugins/input-raw.c
+index 64f0156..f030836 100644
+--- a/plugins/input-raw.c
++++ b/plugins/input-raw.c
+@@ -40,6 +40,11 @@
+ # include <linux/input.h>
+ #endif
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #ifndef EV_SYN /* 2.4 kernel headers */
+ # define EV_SYN 0x00
+ #endif
+@@ -384,7 +389,8 @@ static int ts_input_read(struct tslib_module_info *inf,
+ 						samp->y = i->current_y;
+ 						samp->pressure = i->current_p;
+ 					}
+-					samp->tv = ev.time;
++					samp->tv.tv_sec = ev.input_event_sec;
++					samp->tv.tv_usec = ev.input_event_usec;
+ 			#ifdef DEBUG
+ 				fprintf(stderr,
+ 					"RAW---------------------> %d %d %d %ld.%ld\n",
+@@ -519,7 +525,8 @@ static int ts_input_read(struct tslib_module_info *inf,
+ 					samp->pressure = i->current_p = ev.value;
+ 					break;
+ 				}
+-				samp->tv = ev.time;
++				samp->tv.tv_sec = ev.input_event_sec;
++				samp->tv.tv_usec = ev.input_event_usec;
+ 	#ifdef DEBUG
+ 				fprintf(stderr,
+ 					"RAW---------------------------> %d %d %d\n",
+@@ -536,7 +543,8 @@ static int ts_input_read(struct tslib_module_info *inf,
+ 						samp->x = 0;
+ 						samp->y = 0;
+ 						samp->pressure = 0;
+-						samp->tv = ev.time;
++						samp->tv.tv_sec = ev.input_event_sec;
++						samp->tv.tv_usec = ev.input_event_usec;
+ 						samp++;
+ 						total++;
+ 					}
+@@ -651,7 +659,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 				switch (i->ev[it].code) {
+ 				case BTN_TOUCH:
+ 					i->buf[total][i->slot].pen_down = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					if (i->ev[it].value == 0)
+ 						pen_up = 1;
+@@ -751,7 +760,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					// fall through
+ 				case ABS_MT_POSITION_X:
+ 					i->buf[total][i->slot].x = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_Y:
+@@ -760,7 +770,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					// fall through
+ 				case ABS_MT_POSITION_Y:
+ 					i->buf[total][i->slot].y = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_PRESSURE:
+@@ -769,12 +780,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					// fall through
+ 				case ABS_MT_PRESSURE:
+ 					i->buf[total][i->slot].pressure = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_MT_TOOL_X:
+ 					i->buf[total][i->slot].tool_x = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					/* for future use
+ 					 * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL;
+@@ -782,7 +795,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					break;
+ 				case ABS_MT_TOOL_Y:
+ 					i->buf[total][i->slot].tool_y = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					/* for future use
+ 					 * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL;
+@@ -790,7 +804,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					break;
+ 				case ABS_MT_TOOL_TYPE:
+ 					i->buf[total][i->slot].tool_type = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					/* for future use
+ 					 * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL;
+@@ -798,12 +813,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					break;
+ 				case ABS_MT_ORIENTATION:
+ 					i->buf[total][i->slot].orientation = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_MT_DISTANCE:
+ 					i->buf[total][i->slot].distance = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 
+ 					if (i->special_device == EGALAX_VERSION_210) {
+@@ -816,34 +833,40 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
+ 					break;
+ 				case ABS_MT_BLOB_ID:
+ 					i->buf[total][i->slot].blob_id = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_MT_TOUCH_MAJOR:
+ 					i->buf[total][i->slot].touch_major = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					if (i->ev[it].value == 0)
+ 						i->buf[total][i->slot].pressure = 0;
+ 					break;
+ 				case ABS_MT_WIDTH_MAJOR:
+ 					i->buf[total][i->slot].width_major = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_MT_TOUCH_MINOR:
+ 					i->buf[total][i->slot].touch_minor = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_MT_WIDTH_MINOR:
+ 					i->buf[total][i->slot].width_minor = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					break;
+ 				case ABS_MT_TRACKING_ID:
+ 					i->buf[total][i->slot].tracking_id = i->ev[it].value;
+-					i->buf[total][i->slot].tv = i->ev[it].time;
++					i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
++					i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
+ 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+ 					if (i->ev[it].value == -1)
+ 						i->buf[total][i->slot].pressure = 0;
+diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c
+index 6ca4c3d..1832a07 100644
+--- a/tools/ts_uinput.c
++++ b/tools/ts_uinput.c
+@@ -170,14 +170,16 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
+ 				continue;
+ 
+ 			if (s[j][i].pen_down == 1) {
+-				data->ev[c].time = s[j][i].tv;
++				data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++				data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 				data->ev[c].type = EV_KEY;
+ 				data->ev[c].code = BTN_TOUCH;
+ 				data->ev[c].value = s[j][i].pen_down;
+ 				c++;
+ 			}
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_SLOT;
+ 			data->ev[c].value = s[j][i].slot;
+@@ -190,111 +192,129 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
+ 			 * we should use slot 1 and so on.
+ 			 */
+ 			if (i == 0) {
+-				data->ev[c].time = s[j][i].tv;
++				data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++				data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 				data->ev[c].type = EV_ABS;
+ 				data->ev[c].code = ABS_X;
+ 				data->ev[c].value = s[j][i].x;
+ 				c++;
+ 
+-				data->ev[c].time = s[j][i].tv;
++				data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++				data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 				data->ev[c].type = EV_ABS;
+ 				data->ev[c].code = ABS_Y;
+ 				data->ev[c].value = s[j][i].y;
+ 				c++;
+ 
+-				data->ev[c].time = s[j][i].tv;
++				data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++				data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 				data->ev[c].type = EV_ABS;
+ 				data->ev[c].code = ABS_PRESSURE;
+ 				data->ev[c].value = s[j][i].pressure;
+ 				c++;
+ 			}
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_POSITION_X;
+ 			data->ev[c].value = s[j][i].x;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_POSITION_Y;
+ 			data->ev[c].value = s[j][i].y;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_PRESSURE;
+ 			data->ev[c].value = s[j][i].pressure;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_TOUCH_MAJOR;
+ 			data->ev[c].value = s[j][i].touch_major;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_WIDTH_MAJOR;
+ 			data->ev[c].value = s[j][i].width_major;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_TOUCH_MINOR;
+ 			data->ev[c].value = s[j][i].touch_minor;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_WIDTH_MINOR;
+ 			data->ev[c].value = s[j][i].width_minor;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_TOOL_TYPE;
+ 			data->ev[c].value = s[j][i].tool_type;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_TOOL_X;
+ 			data->ev[c].value = s[j][i].tool_x;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_TOOL_Y;
+ 			data->ev[c].value = s[j][i].tool_y;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_ORIENTATION;
+ 			data->ev[c].value = s[j][i].orientation;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_DISTANCE;
+ 			data->ev[c].value = s[j][i].distance;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_BLOB_ID;
+ 			data->ev[c].value = s[j][i].blob_id;
+ 			c++;
+ 
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_ABS;
+ 			data->ev[c].code = ABS_MT_TRACKING_ID;
+ 			data->ev[c].value = s[j][i].tracking_id;
+ 			c++;
+ 
+ 			if (data->mt_type_a == 1) {
+-				data->ev[c].time = s[j][i].tv;
++				data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++				data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 				data->ev[c].type = EV_SYN;
+ 				data->ev[c].code = SYN_MT_REPORT;
+ 				data->ev[c].value = 0;
+@@ -302,7 +322,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
+ 			}
+ 
+ 			if (s[j][i].pen_down == 0) {
+-				data->ev[c].time = s[j][i].tv;
++				data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++				data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 				data->ev[c].type = EV_KEY;
+ 				data->ev[c].code = BTN_TOUCH;
+ 				data->ev[c].value = s[j][i].pen_down;
+@@ -312,7 +333,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
+ 		}
+ 
+ 		if (c > 0) {
+-			data->ev[c].time = s[j][i].tv;
++			data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
++			data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
+ 			data->ev[c].type = EV_SYN;
+ 			data->ev[c].code = SYN_REPORT;
+ 			data->ev[c].value = 0;
+-- 
+2.24.0
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb b/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
index 8d23bd5e..76c42314 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
@@ -14,11 +14,13 @@ LIC_FILES_CHKSUM = "\
 "
 
 SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \
+           file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+           file://0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch \
            file://ts.conf \
            file://tslib.sh \
 "
-SRC_URI[md5sum] = "254a022fc8aa89d164840fe8869c2441"
-SRC_URI[sha256sum] = "c9a54651337a701a66b074c603c313225579995a7910e519bbc7b1dcdab9a755"
+SRC_URI[md5sum] = "b2b20d3ed520128513f8d3135b42e142"
+SRC_URI[sha256sum] = "d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56"
 
 UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases"
 
@@ -79,4 +81,4 @@ FILES_tslib-calibrate += "${bindir}/ts_calibrate"
 FILES_tslib-uinput += "${bindir}/ts_uinput"
 
 FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \
-                     ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev"
+                     ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
index 522f0fb7..9de02b0f 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Unicode Mingti (printed) TrueType Font"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/CJKUnifonts"
 LICENSE = "Arphic-Public-License"
-LIC_FILES_CHKSUM = "file://README;md5=62be011094b7865ddc4d1a648444d31a"
+LIC_FILES_CHKSUM = "file://license/english/ARPHICPL.TXT;md5=4555ed88e9a72fc9562af379d07c3350"
 SRC_DISTRIBUTE_LICENSES += "${PN}"
 RPROVIDES_${PN} = "virtual-chinese-font"
 PR = "r6"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
index e62badf7..8dba7ee6 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
@@ -12,8 +12,12 @@ SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master"
 
 S = "${WORKDIR}/git/data/fonts"
 
-do_install_prepend() {
-    rm ${S}/Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf DroidSansFallbackLegacy.ttf # we're not packaging it
+do_install_append() {
+    for f in Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf \
+             Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf \
+             DroidSansFallbackLegacy.ttf; do
+        rm -f ${D}${datadir}/fonts/truetype/$f
+    done
 }
 
 PACKAGES = "ttf-droid-sans ttf-droid-sans-mono \
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
index 6a6258ad..e030bd19 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
@@ -2,7 +2,7 @@ require ttf.inc
 
 SUMMARY = "Gentium fonts - TTF Version"
 HOMEPAGE = "http://scripts.sil.org/gentium"
-LICENSE = "OFL"
+LICENSE = "OFL-1.0"
 LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL"
 LIC_FILES_CHKSUM = "file://OFL;md5=33a5bf7b98a9c0ae87430760ba762295 \
 "
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
index 5cd9935d..4df0c3af 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
@@ -2,8 +2,8 @@ require ttf.inc
 
 SUMMARY = "Hunky fonts - TTF Version"
 HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts"
-LICENSE = "LGPL"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=7fbc338309ac38fefcd64b04bb903e34"
+LICENSE = "LGPL-2.1+"
+LIC_FILES_CHKSUM = "file://../COPYRIGHT.TXT;md5=70d34478e38b1ad9995079f9921f9ef7"
 PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2"
@@ -16,5 +16,5 @@ FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif"
 FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf"
 FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf"
 
-SRC_URI[md5sum] = "36444795a356fb8a56c63b2840729bab"
-SRC_URI[sha256sum] = "e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829"
+SRC_URI[md5sum] = "b933312967842e5737b5415fa22d682a"
+SRC_URI[sha256sum] = "3fc528737ccd12ec3c09c4a91447d241d3c5bceeeb4d24b7f2c29b15c9735328"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
index 20041bb7..bf32fedc 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
@@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \
     ${datadir}/doc/ttf-inconsolata/*"
 
 do_configure() {
-    mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf
+    cp -fr ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf
 }
 
 do_install_append() {
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb
index f9679d60..0af0e91d 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
 FONT_PACKAGES = "${PN}"
 FILES_${PN} = "${datadir}"
 
-inherit pythonnative
+inherit python3native
 
 do_compile() {
     cd ${S}; make ttf;
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
index 9ad348d9..efcf1b61 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
@@ -2,7 +2,7 @@ require ttf.inc
 
 SUMMARY = "MPlus font - TTF Edition"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/"
-LICENSE = "${PN}"
+LICENSE = "${BPN}"
 LIC_FILES_CHKSUM = "file://LICENSE_E;md5=ac161e96eda00db9a3aec7870b5d9658 \
                     file://LICENSE_J;md5=a120ca8d7c8e4a475d5277c9aeb95221 \
 "
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb
new file mode 100644
index 00000000..e74f7a7f
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb
@@ -0,0 +1,19 @@
+require ttf.inc
+
+SUMMARY = "Google noto emoji font pack"
+HOMEPAGE = "https://github.com/googlefonts/noto-emoji"
+LICENSE = "OFL-1.1"
+LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097"
+
+SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https"
+SRCREV = "833a43d03246a9325e748a2d783006454d76ff66"
+
+PACKAGES = "${PN}-color ${PN}-regular"
+FONT_PACKAGES = "${PN}-color ${PN}-regular"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf"
+FILES_${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf"
+
+do_compile[noexec] = "1"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
new file mode 100644
index 00000000..521caff7
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
@@ -0,0 +1,14 @@
+require ttf.inc
+
+SUMMARY = "Roboto fonts"
+HOMEPAGE = "https://fonts.google.com/specimen/Roboto"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "https://github.com/google/roboto/releases/download/v${PV}/roboto-android.zip"
+SRC_URI[md5sum] = "3b43a5cb33196ec25e44d5fcb40219e1"
+SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf"
+
+S = "${WORKDIR}"
+
+FILES_${PN} = "${datadir}/fonts/truetype/*.ttf"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb
index 62f2bb28..e522810a 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb
@@ -4,7 +4,7 @@ SUMMARY = "Japanese TrueType fonts from Vine Linux"
 AUTHOR = "Contributor: noonov <noonov@gmail.com>"
 HOMEPAGE = "http://vlgothic.dicey.org/"
 
-LICENSE = "mplus & BSD"
+LICENSE = "ttf-mplus & BSD"
 LIC_FILES_CHKSUM = "file://LICENSE.en;md5=66ecd0fd7e4da6246fa30317c7b66755 \
                     file://LICENSE_E.mplus;md5=1c4767416f20215f1e61b970f2117db9 \
 "
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch b/external/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch
new file mode 100644
index 00000000..25771168
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch
@@ -0,0 +1,238 @@
+From 2a5cf5021b56bc92c9953d2c82e8c90502d22c97 Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Fri, 13 Sep 2019 10:20:53 +0200
+Subject: [PATCH] build: use autotools
+
+This removes the hand-crafted Makefile in favor of standardized autotools
+build configuration. This is done to allow for easy cross-compilation of
+this project.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+---
+ .gitignore          | 17 ++++++++++++
+ Makefile            | 66 ---------------------------------------------
+ Makefile.am         | 10 +++++++
+ configure.ac        | 36 +++++++++++++++++++++++++
+ include/Makefile.am |  9 +++++++
+ man/Makefile.am     |  7 +++++
+ obj/.gitkeep        |  0
+ src/Makefile.am     | 13 +++++++++
+ 8 files changed, 92 insertions(+), 66 deletions(-)
+ delete mode 100644 Makefile
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+ create mode 100644 include/Makefile.am
+ create mode 100644 man/Makefile.am
+ delete mode 100644 obj/.gitkeep
+ create mode 100644 src/Makefile.am
+
+diff --git a/.gitignore b/.gitignore
+index af88e94..4e7355a 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -3,3 +3,20 @@ obj/*.o
+ man/*.1
+ man/*.xml
+ test/GLOB*
++*.o
++
++# autotools stuff
++.deps/
++Makefile
++Makefile.in
++aclocal.m4
++autom4te.cache/
++autostuff/
++config.h
++config.h.in
++config.h.in~
++config.log
++config.status
++configure
++m4/
++stamp-h1
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index 6264da0..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,66 +0,0 @@
+-TARGET = unclutter
+-VERSION = 1.5
+-SDIR = src
+-IDIR = include
+-ODIR = obj
+-
+-INSTALL = install
+-PREFIX = /usr
+-
+-BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/share/man/man1
+-LICENSEDIR = $(PREFIX)/share/licenses/$(TARGET)
+-
+-CC = gcc
+-LD = $(CC)
+-PKG_CONFIG = pkg-config
+-
+-CPPFLAGS += -D'__VERSION="${VERSION}"' "-I$(IDIR)"
+-
+-CFLAGS += -std=gnu99
+-CFLAGS += -Wall -Wundef -Wshadow -Wformat-security
+-
+-LDFLAGS += $(shell $(PKG_CONFIG) --libs x11 xi xfixes)
+-# libev has no pkg-config support
+-LDFLAGS += -lev
+-
+-INCS = $(wildcard $(IDIR)/*.h)
+-SRCS = $(wildcard $(SDIR)/*.c)
+-OBJS = $(patsubst %,$(ODIR)/%,$(notdir $(SRCS:.c=.o)))
+-
+-MANS = man/unclutter-xfixes.1
+-
+-.NOTPARALLEL:
+-
+-.PHONY: all
+-all: clean $(TARGET) mans
+-
+-.PHONY: $(TARGET)
+-$(TARGET): $(OBJS)
+-	$(LD) $(OBJS) $(LDFLAGS) -o "$(TARGET)"
+-
+-$(ODIR)/%.o: $(SDIR)/%.c $(INCS)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<"
+-
+-.PHONY: install
+-install: $(TARGET) mans
+-	$(INSTALL) -Dm 0755 "$(TARGET)" "$(DESTDIR)$(BINDIR)/$(TARGET)"
+-	$(INSTALL) -Dm 0644 man/unclutter-xfixes.1 "$(DESTDIR)$(MANDIR)/unclutter.1"
+-	$(INSTALL) -Dm 0644 -t "$(DESTDIR)$(LICENSEDIR)/" LICENSE
+-
+-.PHONY: uninstall
+-uninstall:
+-	$(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)"
+-	$(RM) "$(DESTDIR)$(MANDIR)/unclutter.1"
+-	$(RM) "$(DESTDIR)$(LICENSEDIR)/LICENSE"
+-
+-.PHONY: mans
+-mans: $(MANS)
+-
+-$(MANS): %.1: %.man
+-	a2x --no-xmllint -f manpage "$<"
+-
+-.PHONY: clean
+-clean:
+-	$(RM) $(TARGET) $(OBJS)
+-	$(RM) man/*.1 man/*.xml
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..38ecaa1
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,10 @@
++ACLOCAL_AMFLAGS = -I m4
++AUTOMAKE_OPTIONS = foreign
++SUBDIRS = include src
++
++if HAS_A2X
++SUBDIRS += man
++endif
++
++licensedir = $(datadir)/licenses/unclutter
++license_DATA = LICENSE
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..1d59197
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,36 @@
++AC_PREREQ(2.61)
++
++AC_INIT([unclutter-xfixes], 1.6)
++AC_DEFINE_UNQUOTED([VERSION], ["$PACKAGE_VERSION"])
++
++AC_CONFIG_AUX_DIR([autostuff])
++AC_CONFIG_MACRO_DIRS([m4])
++AM_INIT_AUTOMAKE([foreign subdir-objects])
++
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++
++AC_CONFIG_SRCDIR([src])
++AC_CONFIG_HEADER([config.h])
++
++AM_PROG_AR
++AC_PROG_CC
++AC_PROG_INSTALL
++
++# libev has no pkg-config support
++AC_CHECK_HEADERS([ev.h], [], [AC_MSG_ERROR([ev.h not found - please install libev])])
++
++PKG_CHECK_MODULES([X11], [x11 xi xfixes])
++
++AC_CHECK_PROG([has_a2x], [a2x], [true], [false])
++AM_CONDITIONAL([HAS_A2X], [test "x$has_a2x" = xtrue])
++if test "x$has_a2x" = xfalse
++then
++	AC_MSG_NOTICE([a2x not found - needed to generate man pages])
++fi
++
++AC_CONFIG_FILES([Makefile
++		 include/Makefile
++		 src/Makefile
++		 man/Makefile])
++
++AC_OUTPUT
+diff --git a/include/Makefile.am b/include/Makefile.am
+new file mode 100644
+index 0000000..90d8bbc
+--- /dev/null
++++ b/include/Makefile.am
+@@ -0,0 +1,9 @@
++noinst_HEADERS = \
++	all.h \
++	cursor.h \
++	event.h \
++	extensions.h \
++	externals.h \
++	globals.h \
++	types.h \
++	util.h
+diff --git a/man/Makefile.am b/man/Makefile.am
+new file mode 100644
+index 0000000..7856e6a
+--- /dev/null
++++ b/man/Makefile.am
+@@ -0,0 +1,7 @@
++unclutter-xfixes.1:
++	a2x --no-xmllint -f manpage unclutter-xfixes.man
++
++dist_man1_MANS = unclutter-xfixes.1
++
++clean-local:
++	rm -f unclutter-xfixes.1
+diff --git a/obj/.gitkeep b/obj/.gitkeep
+deleted file mode 100644
+index e69de29..0000000
+diff --git a/src/Makefile.am b/src/Makefile.am
+new file mode 100644
+index 0000000..c7f0729
+--- /dev/null
++++ b/src/Makefile.am
+@@ -0,0 +1,13 @@
++AM_CFLAGS = -D'__VERSION="${VERSION}"' "-I$(top_srcdir)/include"
++AM_CFLAGS += -std=gnu99 -Wall -Wundef -Wshadow -Wformat-security
++AM_CFLAGS += $(X11_CFLAGS)
++AM_LDFLAGS = -lev $(X11_LIBS)
++
++bin_PROGRAMS = unclutter
++
++unclutter_SOURCES = \
++	cursor.c \
++	event.c \
++	extensions.c \
++	unclutter.c \
++	util.c
+-- 
+2.21.0
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb
new file mode 100644
index 00000000..7e22038f
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Remove idle cursor image from screen."
+DESCRIPTION = "This is a rewrite of the popular tool unclutter, but using the x11-xfixes extension."
+AUTHOR = "Ingo Bürk"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d"
+
+SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \
+           file://0001-build-use-autotools.patch"
+SRCREV = "10fd337bb77e4e93c3380f630a0555372778a948"
+
+inherit autotools pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+DEPENDS = "libev libx11 libxi libxfixes"
+
+S = "${WORKDIR}/git"
+
+do_install_append() {
+    # LICENSE is installed to /usr/share/licenses but we don't want it in the package
+    rm -rf ${D}${datadir}
+}
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb b/external/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb
index b79a562c..240949f5 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb
@@ -5,14 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58"
 
 DEPENDS = "virtual/libx11 libxext xorgproto"
 
-PV = "1.1.1+git${SRCPV}"
-
-SRCREV = "a21bf7aa438f5dd40d0a300a3167aa3d6f26dccc"
+SRCREV = "f57a9904c43ef5d726320c77baa91d0c38361ed4"
 SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau"
 
 S = "${WORKDIR}/git"
 
-inherit distro_features_check autotools pkgconfig
+inherit features_check meson
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000..d44445fa
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,111 @@
+From 8ab672ccc67b64058cffac2cd19a0d3b75d5aa25 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 11:43:32 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Submitted [https://github.com/LibVNC/x11vnc/pull/117]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/uinput.c | 28 ++++++++++++++++++++++++----
+ 1 file changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/src/uinput.c b/src/uinput.c
+index 28fbad3..343b7c5 100644
+--- a/src/uinput.c
++++ b/src/uinput.c
+@@ -54,6 +54,11 @@ so, delete this exception statement from your version.
+ #include <linux/input.h>
+ #include <linux/uinput.h>
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #if !defined(EV_SYN) || !defined(SYN_REPORT)
+ #undef UINPUT_OK
+ #endif
+@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) {
+ static void ptr_move(int dx, int dy) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
+ 
+ 	if (injectable && strchr(injectable, 'M') == NULL) {
+@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) {
+ 
+ 	if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
+ 
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_REL;
+ 	ev.code = REL_Y;
+ 	ev.value = dy;
+@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) {
+ static void ptr_abs(int x, int y, int p) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int x0, y0;
+ 	int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
+ 
+@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) {
+ 
+ 	if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
+ 
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_ABS;
+ 	ev.code = ABS_Y;
+ 	ev.value = y;
+@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;}
+ static void button_click(int down, int btn) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
+ 
+ 	if (injectable && strchr(injectable, 'B') == NULL) {
+@@ -959,7 +971,12 @@ static void button_click(int down, int btn) {
+ 	if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
+ 
+ 	memset(&ev, 0, sizeof(ev));
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_KEY;
+ 	ev.value = down;
+ 
+@@ -1230,6 +1247,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) {
+ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int scancode;
+ 	allowed_input_t input;
+ 	int d = direct_key_fd < 0 ? fd : direct_key_fd;
+@@ -1253,7 +1271,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ 	if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
+ 
+ 	memset(&ev, 0, sizeof(ev));
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_KEY;
+ 	ev.code = (unsigned char) scancode;
+ 	ev.value = down;
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch
new file mode 100644
index 00000000..a15f3fe5
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch
@@ -0,0 +1,37 @@
+From 686491573827b98ba031adaa5da373366079d3d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dagenais?= <jeff.dagenais@gmail.com>
+Date: Mon, 11 Feb 2019 11:42:59 -0500
+Subject: [PATCH] misc/Makefile.am: don't install Xdummy when configured
+ --without-x
+
+Upstream-status: submitted https://github.com/jeff-dagenais/x11vnc/pull/1
+
+Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
+---
+ misc/Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/misc/Makefile.am b/misc/Makefile.am
+index c0b98c8..e4a22c1 100644
+--- a/misc/Makefile.am
++++ b/misc/Makefile.am
+@@ -18,7 +18,10 @@ EXTRA_DIST = \
+ 	uinput.pl \
+ 	ultravnc_repeater.pl \
+ 	vcinject.pl \
+-	x11vnc_loop \
++	x11vnc_loop
++
++if HAVE_X11
++EXTRA_DIST += \
+ 	Xdummy.c \
+ 	Xdummy.in
+ 
+@@ -32,3 +35,4 @@ do_dummy_c_subst = $(SED) \
+ Xdummy: $(srcdir)/Xdummy.in $(srcdir)/Xdummy.c
+ 	$(do_dummy_c_subst) < $< > $@.tmp
+ 	mv -f $@.tmp $@
++endif
+-- 
+2.17.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
deleted file mode 100644
index f2a538bf..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN
-
-since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is
-automatically set for different arch, it is better to use WORDS_BIGENDIAN
-instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-Upstream-Status: Pending
-
-diff --git a/libvncserver/main.c b/libvncserver/main.c
-index b6bd930..8bbb7bf 100644
---- a/libvncserver/main.c
-+++ b/libvncserver/main.c
-@@ -47,7 +47,7 @@ static MUTEX(extMutex);
- 
- static int rfbEnableLogging=1;
- 
--#ifdef LIBVNCSERVER_WORDS_BIGENDIAN
-+#ifdef WORDS_BIGENDIAN
- char rfbEndianTest = (1==0);
- #else
- char rfbEndianTest = (1==1);
-
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch
new file mode 100644
index 00000000..a571ba28
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch
@@ -0,0 +1,30 @@
+From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Mon, 16 Mar 2020 20:04:06 +1100
+Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference
+
+xfc->width and xfc->height for the XFixes cursor image returned from
+XFixesGetCursorImage(dpy) are accessed without first checking that xfc
+is not NULL. This can result in the server sometimes crashing when
+moving a Google Chrome window.
+
+Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)")
+Upstream-Status: Accepted
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+---
+ src/cursor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cursor.c b/src/cursor.c
+index 39e73a6..74a08c6 100644
+--- a/src/cursor.c
++++ b/src/cursor.c
+@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) {
+ 
+ 		/* retrieve the cursor info + pixels from server: */
+ 		xfc = XFixesGetCursorImage(dpy);
+-		{
++		if (xfc) {
+ 			/* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems.
+ 			 * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but
+ 			 * the protocol spec says it's 32 bit per pixel
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
index f62e405d..060319c7 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
@@ -10,10 +10,10 @@ Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
 
 Upstream-Status: Inappropriate [configuration]
 
-Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
+Index: x11vnc-0.9.12/x11vnc.desktop
 ===================================================================
---- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop	2011-03-03 10:33:18.000000000 +0800
-+++ x11vnc-0.9.12/x11vnc/x11vnc.desktop	2011-03-03 10:35:20.000000000 +0800
+--- x11vnc-0.9.12.orig/x11vnc.desktop	2011-03-03 10:33:18.000000000 +0800
++++ x11vnc-0.9.12/x11vnc.desktop	2011-03-03 10:35:20.000000000 +0800
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  Name=X11VNC Server
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
deleted file mode 100644
index b047bc46..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "Exports your X session on-the-fly via VNC"
-HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
-
-SECTION = "x11/utils"
-AUTHOR = "Karl Runge"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
-                    file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
-           file://starting-fix.patch \
-           file://endian-fix.patch \
-           file://remove-redundant-RPATH.patch \
-"
-
-SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
-SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
-
-DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst libtasn1 p11-kit"
-
-inherit autotools-brokensep distro_features_check
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} libvncserver"
-PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
-PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
-PACKAGECONFIG[libvncserver] = "--with-system-libvncserver,--without-system-libvncserver,libvncserver"
-
-do_prepare_sources () {
-    # Remove old libtool macros from acinclude.m4
-    sed -i -e '/^# libtool.m4/q' ${S}/acinclude.m4
-}
-do_patch[postfuncs] += "do_prepare_sources"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
new file mode 100644
index 00000000..e3a1914f
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Exports your X session or FrameBuffer(fbdev) on-the-fly via VNC"
+HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
+
+SECTION = "x11/utils"
+AUTHOR = "Karl Runge"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314"
+
+SRCREV = "4ca006fed80410bd9b061a1519bd5d9366bb0bc8"
+SRC_URI = "git://github.com/LibVNC/x11vnc \
+           file://starting-fix.patch \
+           file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \
+           file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+           file://src-cursor-fix-xfc-NULL-pointer-dereference.patch \
+           "
+S = "${WORKDIR}/git"
+
+DEPENDS = "\
+	jpeg \
+	libtasn1 \
+	libvncserver \
+	openssl \
+	p11-kit \
+	zlib \
+"
+
+inherit pkgconfig autotools features_check
+
+ANY_OF_DISTRO_FEATURES = "x11 fbdev"
+
+PACKAGECONFIG ??= "\
+	${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+"
+
+PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
+PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
+PACKAGECONFIG[x11] = "--with-x,--without-x, libxdamage libxext libxfixes libxrandr libxtst virtual/libx11"
+
+RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'fbdev', 'kernel-module-uinput', '', d)}"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb
index a21dc42a..936d71b1 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd1fb9ee90eead85f7b171807b3ab4f2"
 DEPENDS = "libpng libxcursor"
 
 SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "09f56978a62854534deacc8aa8ff3031"
-SRC_URI[sha256sum] = "bc7171a0fa212da866fca2301241630e2009aea8c4ddb75f21b51a31c2e4c581"
+SRC_URI[md5sum] = "25cc7ca1ce5dcbb61c2b471c55e686b5"
+SRC_URI[sha256sum] = "35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d"
 
-inherit distro_features_check autotools pkgconfig
+inherit features_check autotools pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
index b68e994a..259c6405 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxtst"
 
 PR = "r1"
 
-inherit distro_features_check pkgconfig
+inherit features_check pkgconfig perlnative
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb
index d2afa78f..ad6bd17a 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb
@@ -4,8 +4,8 @@ SUMMARY = "a simple program for managing utmp/wtmp entries"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185"
 SRC_URI += "file://0001-Makefile.am-Error-Fix.patch"
-SRC_URI[md5sum] = "e475167a892b589da23edf8edf8c942d"
-SRC_URI[sha256sum] = "78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1"
+SRC_URI[md5sum] = "92be564d4be7d8aa7b5024057b715210"
+SRC_URI[sha256sum] = "dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33"
 
 CFLAGS_append_libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP "
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb
index 84027538..30fbd1b8 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb
@@ -15,5 +15,5 @@ DEPENDS += "libxkbfile"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "2c47a1b8e268df73963c4eb2316b1a89"
-SRC_URI[sha256sum] = "a9ddb3963f263ba13f0ea105d8c45a531832140530217cc559587bb94f02d3e1"
+SRC_URI[md5sum] = "93e736c98fb75856ee8227a0c49a128d"
+SRC_URI[sha256sum] = "8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.9.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb
index 41c804bb..45caaacf 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.9.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb
@@ -5,8 +5,9 @@ DEPENDS += " libxext libxt libxmu bison-native"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586"
 
-SRC_URI[md5sum] = "59a6f076cdacb5f6945dac809bcf4906"
-SRC_URI[sha256sum] = "c575167ac33edf3bd1592f1bedfe0559debb128ed5fb4873c1278e3be166310a"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "48e83210b39a7bfb492604ba0bcfb19e"
+SRC_URI[sha256sum] = "410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc"
 
 FILES_${PN} += "${datadir}/X11/twm/system.twmrc"
 ALTERNATIVE_NAME = "x-window-manager"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb
index cf970d5d..31c553ee 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb
@@ -6,6 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36"
 
 DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
 
-SRC_URI[md5sum] = "eaf124bbc9d13e1a12a29faaa2ed3612"
-SRC_URI[sha256sum] = "53a9169e24f3814fbfcfee3ca0b98637840a3156ed7c7e36ae03940fabae4c9a"
-
+SRC_URI[md5sum] = "437522a96f424f68fc64ed34ece9b211"
+SRC_URI[sha256sum] = "cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb
index c74b2919..e9260240 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb
@@ -9,5 +9,5 @@ DEPENDS += " libxaw"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4669d2703c60d585cc29ba7e9a69bcb3"
 
-SRC_URI[md5sum] = "a40302b88c599b63e3d3d412e02871e6"
-SRC_URI[sha256sum] = "170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf"
+SRC_URI[md5sum] = "13150ff98846bf6d9a14bee00697fa47"
+SRC_URI[sha256sum] = "25aa0b7c4262f5e99c07c2b96e00e4eb25b7e53f94fa803942af9d0e8da3001c"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb
index 26977bea..7b6ef968 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb
@@ -9,5 +9,5 @@ DEPENDS += "libxkbfile"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "3c25b40de530112c08bf7d229c5c6a28"
-SRC_URI[sha256sum] = "0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12"
+SRC_URI[md5sum] = "9c34da77363dc3d0f616980da87244bf"
+SRC_URI[sha256sum] = "5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.2.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb
index 723d4e21..288bcfc8 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.2.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b08d9e2e718ac83e6fe2b974d4b5fd8"
 DEPENDS += "libxmu"
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "5dcb6e6c4b28c8d7aeb45257f5a72a7d"
-SRC_URI[sha256sum] = "47e5dc7c3dbda6db2cf8c00cedac1722835c1550aa21cfdbc9ba83906694dea4"
+SRC_URI[md5sum] = "61671fee12535347db24ec3a715032a7"
+SRC_URI[sha256sum] = "57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb
index d5774218..ab74f5bd 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb
@@ -7,5 +7,5 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387"
 DEPENDS += " libxaw libxt"
 
-SRC_URI[md5sum] = "280b81cb09d1903aa868a058d90128ad"
-SRC_URI[sha256sum] = "4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6"
+SRC_URI[md5sum] = "8aaa41374935d697ee55d7dc9de70781"
+SRC_URI[sha256sum] = "87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb
index 9960706d..23cfb26c 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73c7f696a728de728d7446cbca814cc5"
 
 DEPENDS += "libxaw"
 
-SRC_URI[md5sum] = "2dd5ae46fa18abc9331bc26250a25005"
-SRC_URI[sha256sum] = "bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68"
+SRC_URI[md5sum] = "e50ffae17eeb3943079620cb78f5ce0b"
+SRC_URI[sha256sum] = "373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.0.bb
index e50c082d..c5e0e88e 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.0.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69"
 
 DEPENDS += "libxmu"
 
-SRC_URI[md5sum] = "96f9423eab4d0641c70848d665737d2e"
-SRC_URI[sha256sum] = "2d23ade7cdbb487996bf77cbb32cbe9bdb34d004748a53de7a4a97660d2217b7"
+SRC_URI[md5sum] = "34ae801ef994d192c70fcce2bdb2a1b2"
+SRC_URI[sha256sum] = "f23a65cfa1f7126040d68b6cf1e4567523edac10f8dc06f23d840d330c7c6946"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.6.bb
index a2a4941e..99dc3b5a 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.5.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.6.bb
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dad633bce9c3cd0e3abf72a16e0057cf"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "a896382bc53ef3e149eaf9b13bc81d42"
-SRC_URI[sha256sum] = "3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6"
+SRC_URI[md5sum] = "c56fa4adbeed1ee5173f464a4c4a61a6"
+SRC_URI[sha256sum] = "287dfb9bb7e8d780d07e672e3252150850869cb550958ed5f8401f0835cd6353"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb
index 2c79f27c..30a1e089 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ea29dbee22324787c061f039e0529de"
 DEPENDS += "xbitmaps libxcursor"
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "7211b31ec70631829ebae9460999aa0b"
-SRC_URI[sha256sum] = "ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9"
+SRC_URI[md5sum] = "5fe769c8777a6e873ed1305e4ce2c353"
+SRC_URI[sha256sum] = "10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb
index 99f70364..9d523bd7 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb
@@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b08d9e2e718ac83e6fe2b974d4b5fd8"
 DEPENDS += "libxmu"
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "eb5473acaef15a5db9b50df29c6a7f90"
-SRC_URI[sha256sum] = "f648e2b0cf16aa29856de998e2c7204be39dc1f8daeda9464d32288e0b580fc1"
+SRC_URI[md5sum] = "da67142c128d18386ff145882e0afc66"
+SRC_URI[sha256sum] = "06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
new file mode 100644
index 00000000..d3beea8b
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
@@ -0,0 +1,77 @@
+From 3730a38efad969fb6f8227df07eb4461a078f5a3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 13 Dec 2019 12:59:26 -0800
+Subject: [PATCH] Add configure time check for setsid
+
+Do not assume glibc == linux
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure    | 1 +
+ configure.in | 1 +
+ main.c       | 4 ++--
+ xtermcfg.hin | 1 +
+ 5 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 0aafefc..03e8df0 100755
+--- a/configure
++++ b/configure
+@@ -5411,6 +5411,7 @@ for ac_func in \
+ 	unsetenv \
+ 	sched_yield \
+ 	setpgid \
++	setsid \
+ 	strftime \
+ 	tcgetattr \
+ 	waitpid \
+diff --git a/configure.in b/configure.in
+index d2fee88..74d65df 100644
+--- a/configure.in
++++ b/configure.in
+@@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \
+ 	unsetenv \
+ 	sched_yield \
+ 	setpgid \
++	setsid \
+ 	strftime \
+ 	tcgetattr \
+ 	waitpid \
+diff --git a/main.c b/main.c
+index 5e60589..b81d2be 100644
+--- a/main.c
++++ b/main.c
+@@ -2868,7 +2868,7 @@ main(int argc, char *argv[]ENVP_ARG)
+     }
+ }
+ 
+-#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ #define USE_OPENPTY 1
+ static int opened_tty = -1;
+ #endif
+@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
+ 	    /*
+ 	     * now in child process
+ 	     */
+-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
++#if HAVE_SETSID
+ 	    int pgrp = setsid();	/* variable may not be used... */
+ #else
+ 	    int pgrp = getpid();
+diff --git a/xtermcfg.hin b/xtermcfg.hin
+index 1dbc3b8..4f3ff5b 100644
+--- a/xtermcfg.hin
++++ b/xtermcfg.hin
+@@ -96,6 +96,7 @@
+ #undef HAVE_PUTENV		/* AC_CHECK_FUNCS(putenv) */
+ #undef HAVE_SCHED_YIELD		/* AC_CHECK_FUNCS(sched_yield) */
+ #undef HAVE_SETPGID		/* AC_CHECK_FUNCS(setpgid) */
++#undef HAVE_SETSID		/* AC_CHECK_FUNCS(setsid) */
+ #undef HAVE_STDINT_H		/* AC_PROG_CC_STDC */
+ #undef HAVE_STDLIB_H		/* AC_CHECK_HEADERS(stdlib.h) */
+ #undef HAVE_STRFTIME		/* AC_CHECK_FUNCS(strftime) */
+-- 
+2.24.1
+
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
index c2feb810..6de704d0 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
@@ -2,12 +2,14 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
 SUMMARY = "xterm is the standard terminal emulator for the X Window System"
 DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses"
 
-LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=f02ab9ebda87b770ecf711dbb3784a33"
+LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e"
 
-SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz"
+SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
+           file://0001-Add-configure-time-check-for-setsid.patch \
+          "
 
-SRC_URI[md5sum] = "9a6db7974aa4ccbb50eabebf72618467"
-SRC_URI[sha256sum] = "7aeef9f29f6b95e09f481173c8c3053357bf5ffe162585647f690fd1707556df"
+SRC_URI[md5sum] = "247c30ebfa44623f3a2d100e0cae5c7f"
+SRC_URI[sha256sum] = "e521d3ee9def61f5d5c911afc74dd5c3a56ce147c7071c74023ea24cac9bb768"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
 
@@ -16,7 +18,9 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
                  FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \
                  --disable-imake \
                  --disable-rpath-hack \
-                 --disable-setuid"
+                 --disable-setuid \
+                 --with-app-defaults=${datadir}/X11/app-defaults \
+                 "
 
 B = "${S}"
 
@@ -26,8 +30,6 @@ do_configure() {
     oe_runconf
 }
 
-FILES_${PN} += "/usr/lib/X11"
-
 # busybox can supply resize too
 inherit update-alternatives
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.6.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.7.bb
index 694bf57a..1ad48b07 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.6.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.7.bb
@@ -7,5 +7,5 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c0cdb783e9a0198237371fdaa26a18bf"
 DEPENDS = "libxmu libxkbfile"
 
-SRC_URI[md5sum] = "6b5d48464c5f366e91efd08b62b12d94"
-SRC_URI[sha256sum] = "3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79"
+SRC_URI[md5sum] = "11794a8eba6d295a192a8975287fd947"
+SRC_URI[sha256sum] = "cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.2.bb
index 8647f038..4d26db66 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.2.bb
@@ -7,5 +7,5 @@ RDEPENDS_${PN}-dev = ""
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=dbd075aaffa4a60a8d00696f2e4b9a8f"
 
-SRC_URI[md5sum] = "7444bbbd999b53bec6a60608a5301f4c"
-SRC_URI[sha256sum] = "3671b034356bbc4d32d052808cf646c940ec8b2d1913adac51b1453e41aa1e9d"
+SRC_URI[md5sum] = "cedeef095918aca86da79a2934e03daf"
+SRC_URI[sha256sum] = "b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
index cb6b5ac7..958fecc1 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
@@ -7,6 +7,6 @@ XORG_PN = "${BPN}"
 SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit distro_features_check autotools pkgconfig
+inherit features_check autotools pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb
index 80f1f008..85687611 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb
@@ -6,7 +6,7 @@ DEPENDS += "util-macros"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449"
 
-SRC_URI[md5sum] = "2588efb3f49f7fc6ecf41ce42e0b2e5e"
-SRC_URI[sha256sum] = "84fd94e5c50556e6f77501485f8a48724cf3c95c6d58480bc280258ba14580c8"
+SRC_URI[md5sum] = "ee6dc0a8a693a908857af328b2462661"
+SRC_URI[sha256sum] = "e71ce1df82dcc51eb14be6f42171dcc6bdd11ef46c0c605d6da8af12bd73b74c"
 
 FILES_${PN} += " /usr/share/sgml/X11"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi
deleted file mode 100644
index 90604394..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.capabilities" contains="input.touchpad">
-      <merge key="input.x11_driver" type="string">tslib</merge>
-    </match>
-    <match key="info.capabilities" contains="input.touchscreen">
-      <merge key="input.x11_driver" type="string">tslib</merge>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch
deleted file mode 100644
index 07754731..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-xorg-server-1.7.3/hw/xfree86/common/xf86Helper.c contains this code
-causing a double free crash on chvt or exit:
-
-    /* This should *really* be handled in drv->UnInit(dev) call instead, but
-     * if the driver forgets about it make sure we free it or at least crash
-     * with flying colors */
-    if (pInp->private)
-	xfree(pInp->private);
-Index: xf86-input-tslib-0.0.6/src/tslib.c
-===================================================================
---- xf86-input-tslib-0.0.6.orig/src/tslib.c
-+++ xf86-input-tslib-0.0.6/src/tslib.c
-@@ -435,6 +435,7 @@ xf86TslibUninit(InputDriverPtr drv, Inpu
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
- 	xfree(pInfo->private);
-+	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
- 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
deleted file mode 100644
index d16b4a53..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fixes crash when a touchscreen event is received with xserver 1.12 and later:
-X: symbol lookup error: /usr/lib/xorg/modules/input/tslib_drv.so: undefined symbol: xf86XInputSetScreen
-
-Upstream-Status: Pending
-
-Taken from Gentoo:
-https://bugs.gentoo.org/show_bug.cgi?id=446432
-
-diff -ur xf86-input-tslib-0.0.6.orig/src/tslib.c xf86-input-tslib-0.0.6/src/tslib.c
---- xf86-input-tslib-0.0.6.orig/src/tslib.c	2012-12-05 01:12:16.286597071 +0100
-+++ xf86-input-tslib-0.0.6/src/tslib.c	2012-12-05 01:11:02.686598595 +0100
-@@ -75,6 +75,19 @@
- #define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 13
-+static void
-+xf86XInputSetScreen(InputInfoPtr	pInfo,
-+		    int			screen_number,
-+		    int			x,
-+		    int			y)
-+{
-+    if (miPointerGetScreen(pInfo->dev) !=
-+          screenInfo.screens[screen_number]) {
-+	miPointerSetScreen(pInfo->dev, screen_number, x, y);
-+    }
-+}
-+#endif
- 
- enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
- 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
deleted file mode 100644
index 6a6d5b92..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-Upstream-Status: Pending
-
-Taken from debian:
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627075
-
-Index: xf86-input-tslib-trunk/src/tslib.c
-===================================================================
---- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
-+++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
-@@ -69,6 +69,13 @@
- #define DEFAULT_HEIGHT		240
- #define DEFAULT_WIDTH		320
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
-+#else
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
-+#endif
-+
-+
- enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
- 
- enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
-@@ -106,7 +113,7 @@
- }
- 
- static Bool
--ConvertProc( LocalDevicePtr local,
-+ConvertProc( InputInfoPtr local,
- 			 int first,
- 			 int num,
- 			 int v0,
-@@ -135,7 +142,7 @@
-     return t;
- }
- 
--static void ReadInput (LocalDevicePtr local)
-+static void ReadInput (InputInfoPtr local)
- {
- 	struct ts_priv *priv = (struct ts_priv *) (local->private);
- 	struct ts_sample samp;
-@@ -382,7 +389,11 @@
- 					       axiswidth - 1,	/* max val */
- 					       axiswidth,	/* resolution */
- 					       0,		/* min_res */
--					       axiswidth);	/* max_res */
-+					       axiswidth	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		InitValuatorAxisStruct(device, 1,
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-@@ -392,7 +403,11 @@
- 					       axisheight - 1,	/* max val */
- 					       axisheight,	/* resolution */
- 					       0,		/* min_res */
--					       axisheight);	/* max_res */
-+					       axisheight	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		if (InitProximityClassDeviceStruct (device) == FALSE) {
- 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
-@@ -434,7 +449,7 @@
- 	ErrorF("%s\n", __FUNCTION__);
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
--	xfree(pInfo->private);
-+	free(pInfo->private);
- 	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
-@@ -444,47 +459,57 @@
-  *
-  * called when the module subsection is found in XF86Config
-  */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+static int 
-+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-+#else
- static InputInfoPtr
- xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
-+#endif
- {
- 	struct ts_priv *priv;
- 	char *s;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	InputInfoPtr pInfo;
-+#endif
- 
--	priv = xcalloc (1, sizeof (struct ts_priv));
-+	priv = calloc (1, sizeof (struct ts_priv));
-         if (!priv)
--                return NULL;
-+                return BadValue;
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
--		xfree(priv);
--		return NULL;
-+		free(priv);
-+		return BadValue;
- 	}
- 
- 	/* Initialise the InputInfoRec. */
- 	pInfo->name = dev->identifier;
--	pInfo->type_name = XI_TOUCHSCREEN;
- 	pInfo->flags =
- 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
- 	    XI86_SEND_DRAG_EVENTS;
--	pInfo->device_control = xf86TslibControlProc;
--	pInfo->read_input = ReadInput;
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- 	pInfo->motion_history_proc = xf86GetMotionEvents;
- 	pInfo->history_size = 0;
- #endif
--	pInfo->control_proc = NULL;
-+	pInfo->conf_idev = dev;
- 	pInfo->close_proc = NULL;
--	pInfo->switch_mode = NULL;
- 	pInfo->conversion_proc = ConvertProc;
- 	pInfo->reverse_conversion_proc = NULL;
--	pInfo->dev = NULL;
- 	pInfo->private_flags = 0;
- 	pInfo->always_core_feedback = 0;
--	pInfo->conf_idev = dev;
-+#endif
-+
-+	pInfo->type_name = XI_TOUCHSCREEN;
-+	pInfo->control_proc = NULL;
-+	pInfo->read_input = ReadInput;
-+	pInfo->device_control = xf86TslibControlProc;
-+	pInfo->switch_mode = NULL;
- 	pInfo->private = priv;
-+	pInfo->dev = NULL;
- 
- 	/* Collect the options, and process the common options. */
--	xf86CollectInputOptions(pInfo, NULL, NULL);
-+	COLLECT_INPUT_OPTIONS(pInfo, NULL);
- 	xf86ProcessCommonOptions(pInfo, pInfo->options);
- 
- 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
-@@ -510,23 +535,31 @@
- 		priv->rotate = TSLIB_ROTATE_NONE;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
-+#else
-+	s = xf86CheckStrOption(pInfo->options, "path", NULL);
-+#endif
-   	if (!s)
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
-+#else
-+		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
-+#endif
-  
- 	priv->ts = ts_open(s, 1);
--	xfree(s);
-+	free(s);
- 
- 	if (!priv->ts) {
- 		ErrorF("ts_open failed (device=%s)\n",s);
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	if (ts_config(priv->ts)) {
- 		ErrorF("ts_config failed\n");
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	pInfo->fd = ts_fd(priv->ts);
-@@ -536,11 +569,13 @@
- 		priv->state = BUTTON_EMULATION_OFF;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	/* Mark the device configured */
- 	pInfo->flags |= XI86_CONFIGURED;
-+#endif
- 
- 	/* Return the configured device */
--	return (pInfo);
-+	return Success;
- }
- 
- _X_EXPORT InputDriverRec TSLIB = {
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch
deleted file mode 100644
index a1f6ba8f..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From Grazvydas Ignotas
-
-At least xserver 1.7.4 crashes on XGetPointerControl request because of xf86-input-tslib:
-
-Program received signal SIGSEGV, Segmentation fault.
-#0  0x000355e0 in ProcGetPointerControl (client=0x4a2e58) at devices.c:2122
-#1  0x00062fa8 in Dispatch () at dispatch.c:439
-#2  0x00022444 in main (argc=4, argv=0xbeebedc4, envp=0xbeebedd8) at main.c:285
-
-This happens because ptrfeed field is not set in device structure from tslib.
-To fix this, call InitPtrFeedbackClassDeviceStruct() during DEVICE_INIT to get necessary setup done (as done in other input drivers).
-
----
-diff -ur xf86-input-tslib-0.0.6/src/tslib.c xf86-input-tslib-0.0.6_/src/tslib.c
---- xf86-input-tslib-0.0.6/src/tslib.c	2010-02-09 12:23:22.000000000 +0200
-+++ xf86-input-tslib-0.0.6_/src/tslib.c	2010-02-09 12:37:33.000000000 +0200
-@@ -103,8 +103,6 @@
- static void
- PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
- {
--	ErrorF("%s\n", __FUNCTION__);
--	return;
- }
- 
- static Bool
-@@ -406,6 +404,8 @@
- 		xf86MotionHistoryAllocate(pInfo);
- #endif
- 
-+		if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
-+			return !Success;
- 		break;
- 
- 	case DEVICE_ON:
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
deleted file mode 100644
index 6a3689a2..00000000
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require recipes-graphics/xorg-driver/xorg-driver-input.inc
-SUMMARY = "X.Org X server -- tslib input driver"
-DEPENDS += "tslib"
-RRECOMMENDS_${PN} += "tslib-calibrate"
-RSUGGESTS_${PN} += "hal"
-
-# derived from xf86-input-void, that's why I kept MIT-X, but it's not clear, see COPYING
-LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \
-                    file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
-
-PR = "${INC_PR}.1"
-
-SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \
-           file://double-free-crash.patch \
-           file://10-x11-input-tslib.fdi \
-           file://xserver-174-XGetPointerControl.patch \
-           file://99-xf86-input-tslib.rules \
-           file://xf86-input-tslib-port-ABI-12-r48.patch \
-           file://xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch \
-"
-
-SRC_URI[md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f"
-SRC_URI[sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105"
-
-do_configure_prepend() {
-    rm -rf ${S}/m4/ || true
-}
-do_install_append() {
-    install -d ${D}/${datadir}/hal/fdi/policy/20thirdparty
-    install -m 0644 ${WORKDIR}/10-x11-input-tslib.fdi ${D}/${datadir}/hal/fdi/policy/20thirdparty
-    install -d ${D}${nonarch_base_libdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/
-}
-
-FILES_${PN} += "${datadir}/hal ${nonarch_base_libdir}/udev"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb
new file mode 100644
index 00000000..1f63047c
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb
@@ -0,0 +1,20 @@
+require recipes-graphics/xorg-driver/xorg-driver-input.inc
+SUMMARY = "X.Org X server -- tslib input driver"
+DEPENDS += "tslib"
+RRECOMMENDS_${PN} += "tslib-calibrate"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=f1524518264f7776a9707c19c8affbbf"
+
+SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \
+           file://99-xf86-input-tslib.rules \
+"
+
+SRC_URI[md5sum] = "c5ffb03bccccfa1c4ba11079fef0036e"
+SRC_URI[sha256sum] = "1439a9efa50eb481e6a0ab5319ab0765d457732e7da64e3c15f3c0cd13b44297"
+
+do_install_append() {
+    install -d ${D}${nonarch_base_libdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/
+}
+
+FILES_${PN} += "${nonarch_base_libdir}/udev"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
index 969c1a0a..4042150b 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
@@ -9,13 +9,11 @@ DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics"
 DEPENDS += "virtual/libx11 libxvmc drm \
             virtual/libgl xorgproto libpciaccess"
 
-inherit distro_features_check
+inherit features_check
 REQUIRED_DISTRO_FEATURES += "opengl"
 
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-
-SRC_URI[md5sum] = "40e7c0a5a69aba3d84e0958f58705ea7"
-SRC_URI[sha256sum] = "72ea3b8127d4550b64f797457f5a7851a541fa4ee2cc3f345b6c1886b81714a0"
+SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6"
+SRC_URI[sha256sum] = "5cb6015d8664546ad1311bc9c363d7bc41ebf60e7046ceb44dd38e5b707961b0"
 
 EXTRA_OECONF += "--disable-glamor"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb
index 182e18fd..c113d51d 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb
@@ -12,8 +12,8 @@ DEPENDS += "virtual/libx11 libpciaccess"
 
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 
-SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118"
-SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422"
+SRC_URI[md5sum] = "b8fc99b4adea8bfe80156b13df4b6c9c"
+SRC_URI[sha256sum] = "268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb
index 2b1b87c4..5c9061a0 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb
@@ -10,11 +10,10 @@ DEPENDS += "virtual/libx11 libxvmc drm xorgproto \
             virtual/libgl libpciaccess"
 RDEPENDS_${PN} += "xserver-xorg-module-exa"
 
-inherit distro_features_check
+inherit features_check
 REQUIRED_DISTRO_FEATURES += "opengl"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-SRC_URI[md5sum] = "717203cb87029cddcbccf7398f9ad8c3"
-SRC_URI[sha256sum] = "aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c"
-
+SRC_URI[md5sum] = "ecd9be89d853301167e3d564c49f7a8e"
+SRC_URI[sha256sum] = "304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
index 29229bb5..d7dd1093 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
@@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util"
 RDEPENDS_${PN} = "encodings font-util"
 RDEPENDS_${PN}_class-native = "font-util-native"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
index 898850bb..5c00b4b6 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
@@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util"
 RDEPENDS_${PN} = "encodings font-util"
 RDEPENDS_${PN}_class-native = "font-util-native"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
index 4976e527..f9bdaf36 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
@@ -10,7 +10,7 @@ DEPENDS += "util-macros-native font-util-native bdftopcf-native font-util"
 RDEPENDS_${PN} = "encodings font-util"
 RDEPENDS_${PN}_class-native = "font-util-native"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
index 6e0b33ca..872ef4d0 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
@@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util"
 RDEPENDS_${PN} = "encodings font-util"
 RDEPENDS_${PN}_class-native = "font-util-native"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
index e8cfb615..a4ae91a3 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
@@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native"
 RDEPENDS_${PN} = "encodings font-util"
 RDEPENDS_${PN}_class-native = "font-util-native"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
index d425ce51..ee8cb360 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8b32ccac3ad25e75e68478deb7780265"
 DEPENDS = "util-macros-native font-util-native bdftopcf-native"
 RDEPENDS_${PN} = "encodings font-util"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
index e4cd90a7..355fb528 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=200c507f595ee97008c7c5c3e94ab9a8"
 DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util"
 RDEPENDS_${PN} = "encodings font-util"
 
-inherit distro_features_check
+inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
index 45e3f7b5..06778b3e 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Xorg 100 DPI font set"
-LICENSE = "Custom"
+LICENSE = "MIT"
 
-inherit packagegroup distro_features_check
+inherit packagegroup features_check
 # rdepends on font recipes with this restriction
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.3.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.3.bb
new file mode 100644
index 00000000..f935edd6
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.3.bb
@@ -0,0 +1,11 @@
+require recipes-graphics/xorg-lib/xcb-util.inc
+
+SUMMARY = "XCB port of libXcursor"
+
+DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974"
+
+SRC_URI[md5sum] = "6ac3b17cba51aaaa36ba035a53527214"
+SRC_URI[sha256sum] = "05a10a0706a1a789a078be297b5fb663f66a71fb7f7f1b99658264c35926394f"
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
index 3a88f12e..b8c1881d 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
@@ -1,6 +1,6 @@
 SUMMARY = "X screen saver and locker"
 
-LICENSE = "BSD"
+LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df"
 
 SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
@@ -15,9 +15,9 @@ SRC_URI += " \
 
 DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native"
 # These are only needed as part of the stopgap screensaver implementation:
-RDEPENDS_${PN} += "xserver-nodm-init liberation-fonts"
+RDEPENDS_${PN} += "liberation-fonts"
 
-inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check
+inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check
 
 EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/external/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
index a5ed21d4..2c09a485 100644
--- a/external/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 PR = "r9"
 
 # we are using a gpe-style Makefile
-inherit distro_features_check gpe
+inherit features_check gpe
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb b/external/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb
new file mode 100644
index 00000000..3760a37d
--- /dev/null
+++ b/external/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Yet Another Dialog"
+DESCRIPTION = "Program allowing you to display GTK+ dialog boxes from command line or shell scripts."
+AUTHOR = "Victor Ananjevsky"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "git://github.com/v1cont/yad.git"
+SRCREV = "a5b1a7a3867bc7dffbbc539f586f301687b6ec02"
+
+inherit autotools gsettings features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+DEPENDS = "gtk+3 glib-2.0-native intltool-native"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}/icons/"
author	takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>	2020-11-02 11:07:33 +0900
committer	takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>	2020-11-02 11:07:33 +0900
commit	1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch)
tree	cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-graphics
parent	4204309872da5cb401cbb2729d9e2d4869a87f42 (diff)