diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-05 23:27:58 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-05 23:27:58 +0300 |
| commit | ccd6cab15aedd223a42dfdb110ab2d71d8a87141 (patch) | |
| tree | 2050b16c5978dbf1268ea0f1a65d15026ec25831 /meta-openembedded | |
| parent | 6f65bb40d3e8b7fe978698488c2ea93f077bfcd6 (diff) | |
| parent | 6dbb316ab9052d4dbf158377e1ffe36f205d5477 (diff) | |
| download | openbmc-ccd6cab15aedd223a42dfdb110ab2d71d8a87141.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded')
900 files changed, 7087 insertions, 36107 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch new file mode 100644 index 000000000..e4d52a802 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch @@ -0,0 +1,25 @@ +From dfeadd4eb43e829aafb0d10f611fa22ae81bfca4 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Sun, 20 Oct 2019 17:00:45 +0900 +Subject: [PATCH] Add build rule for README. + +fix do_configure error: +Makefile.am: required file `./README' not found + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index e0c4ad6..0449321 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,3 +35,4 @@ rpmcvs: preparerpm + @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz + cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' + ++README: README.md +-- +2.7.4 + diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch deleted file mode 100644 index 0a990ac68..000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dd1af7541f18399bcdcb129a8b6618c18ebd9d63 Mon Sep 17 00:00:00 2001 -From: Tomasz Torcz <tomek@pipebreaker.pl> -Date: Sat, 17 Mar 2018 12:56:04 +0100 -Subject: [PATCH] include <sys/sysmacros.h> for major() - - Linux glibc ceased to include it in sys/types.h: -https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html - -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - module/owlib/src/include/ow.h | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 86751bf7..d625d3f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4]) - # Checks for header files. - AC_HEADER_DIRENT - AC_HEADER_STDC --AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) -+AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) - AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h]) - AC_CHECK_HEADERS(sys/event.h sys/inotify.h) - -diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h -index 9dbec5f3..0a310552 100644 ---- a/module/owlib/src/include/ow.h -+++ b/module/owlib/src/include/ow.h -@@ -188,8 +188,12 @@ - #include <netdb.h> /* for getaddrinfo */ - #endif /* HAVE_NETDB_H */ - -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> /* for major() */ -+#endif /* HAVE_SYS_SYSMACROS_H */ -+ - #ifdef HAVE_SYS_MKDEV_H --#include <sys/mkdev.h> /* for major() */ -+#include <sys/mkdev.h> /* for major() on Solaris */ - #endif /* HAVE_SYS_MKDEV_H */ - - #include <stddef.h> // for offsetof() diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index 857aaf216..414084449 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -4,16 +4,16 @@ HOMEPAGE = "http://www.owfs.org/" SECTION = "console/network" LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \ - file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42" +LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ + file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" DEPENDS = "fuse virtual/libusb0" -# v3.2p2 -SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa" +# v3.2p3 +SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" SRC_URI = "git://github.com/owfs/owfs \ + file://0001-Add-build-rule-for-README.patch \ file://owhttpd \ file://owserver \ - file://0001-include-sys-sysmacros.h-for-major.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb index f85977fd5..595b34900 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb @@ -7,7 +7,8 @@ DEPENDS = "fuse libmtp" inherit autotools pkgconfig +# 0.3.0 SRC_URI = "git://github.com/phatina/simple-mtpfs.git;protocol=https;branch=master" -SRCREV = "a7ab64c7e4d7aca155cbc7ce9412aaf68ef6e404" +SRCREV = "c9a691fc52fafaa55d26ac629856153c0514015a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index c72936c08..ddb2cc805 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -12,7 +12,7 @@ DEPENDS = "fuse samba" DEPENDS_append_libc-musl = " libexecinfo" # samba depends on libpam -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" inherit autotools gitpkgv pkgconfig diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb index b10c5c5ff..2515d07d4 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/libfuse/sshfs" -SRCREV = "695cd8916f0e78d28009de3ffe112b9d1a1c9e5e" +SRCREV = "a1e5f12c530ccf59434a7d59a34a049f160b3559" S = "${WORKDIR}/git" inherit meson diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.8.0.bb index e65eb08e2..b5bbe042a 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.8.0.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ " -SRC_URI[md5sum] = "1798945aa69434286723b9999a141c7a" -SRC_URI[sha256sum] = "f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281" +SRC_URI[md5sum] = "f184004cd3724f579cd602fa5232681b" +SRC_URI[sha256sum] = "4a464f6df782a1dca1f7e85bf64ff6ece9547b389557aae4160371cb1c898d61" S = "${WORKDIR}/fuse-${PV}" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch deleted file mode 100644 index cf844bf87..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3b3c6e6376babcd9a0b0db312b0e1e3bb3ab833e Mon Sep 17 00:00:00 2001 -From: Sven Ebenfeld <sven.ebenfeld@vaillant.de> -Date: Wed, 26 Nov 2014 10:36:44 +0100 -Subject: [PATCH] Remove AC_CHECK_FILE for cross compilation - ---- - configure.ac | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0111e72..8c286d4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,14 +20,9 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version, - [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), - [Minor version for f2fs-tools]) - --AC_CHECK_FILE(.git, -- AC_DEFINE([F2FS_TOOLS_DATE], -- "m4_bpatsubst(f2fs_tools_gitdate, -- [\([0-9-]*\)\(\w\|\W\)*], [\1])", -- [f2fs-tools date based on Git commits]), - AC_DEFINE([F2FS_TOOLS_DATE], - "f2fs_tools_date", -- [f2fs-tools date based on Source releases])) -+ [f2fs-tools date based on Source releases]) - - AC_CONFIG_SRCDIR([config.h.in]) - AC_CONFIG_HEADER([config.h]) --- -1.8.1.rc3 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb index 2240049d4..98bd478f3 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE = "http://sourceforge.net/projects/f2fs-tools/" +HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" @@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -# v1.11.0 -SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b" +# v1.13.0 +SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.3.bb index b26709e97..30224c202 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.3.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.gnu.org/software/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "ec79fd2736b8da76e7a870e27cadf6fa" -SRC_URI[sha256sum] = "0bd1e085015b28c24f57697d6def2fe84517967dc417554c0c3ccf1685ed0e56" +SRC_URI[md5sum] = "d6b16763a2ca23eec718cfac1761b40f" +SRC_URI[sha256sum] = "97a9c9831fa1b053f781f74a17b79327e7402c6163f5c7973453ba881616aeb4" PACKAGECONFIG ??= "acl attr zlib bzip2 readline" PACKAGECONFIG[acl] = "--enable-libacl,--disable-libacl,acl," @@ -17,7 +17,7 @@ PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," PACKAGECONFIG[bzip2] = "--enable-libbz2,--disable-libbz2,bzip2," PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline," -inherit autotools-brokensep pkgconfig distro_features_check +inherit autotools-brokensep pkgconfig features_check do_configure_prepend () { touch NEWS diff --git a/meta-openembedded/meta-gnome/classes/gnome-help.bbclass b/meta-openembedded/meta-gnome/classes/gnome-help.bbclass new file mode 100644 index 000000000..967091ba4 --- /dev/null +++ b/meta-openembedded/meta-gnome/classes/gnome-help.bbclass @@ -0,0 +1,69 @@ +# Class to pack gnome help files or delete them during install +# There are the following cases: +# +# if 'helpfiles' not in DISTRO_FEATURES +# delete all help contants during install +# else +# if PACKAGE_NO_HELP_SPLIT == 1 +# pack all help files to ${PN}-help +# else +# pack all help files to ${PN}-help-<lingua> + +FILES_${PN}-help = "${datadir}/*/translations" + +# Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1 +PACKAGES_append = " ${PN}-help" +FILES_${PN}-help = "${datadir}/help" +RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then + rm -rf ${D}${datadir}/help/* + fi +} + +python gnome_do_split_help() { + if bb.utils.contains('DISTRO_FEATURES', 'helpfiles', False, True, d): + return + + if (d.getVar('PACKAGE_NO_HELP_SPLIT') == '1'): + # all help files go to ${ + bb.debug(1, "package requested not splitting help-files") + return + + packages = (d.getVar('PACKAGES') or "").split() + datadir = d.getVar('datadir') + dvar = d.getVar('PKGD') + pn = d.getVar('PN') + + if pn + '-help' in packages: + packages.remove(pn + '-help') + + helpdir = os.path.join(dvar + datadir, 'help') + + if not cpath.isdir(helpdir): + bb.warn("No help files in this package - remove gnome-help from inherit?") + return + + helps = os.listdir(helpdir) + + summary = d.getVar('SUMMARY') or pn + description = d.getVar('DESCRIPTION') or "" + locale_section = d.getVar('LOCALE_SECTION') + mlprefix = d.getVar('MLPREFIX') or "" + for l in sorted(helps): + ln = legitimize_package_name(l) + pkg = pn + '-help-' + ln + packages.append(pkg) + d.setVar('FILES_' + pkg, os.path.join(datadir, 'help', l)) + d.setVar('RRECOMMENDS_' + pkg, '%syelp' % mlprefix) + d.setVar('SUMMARY_' + pkg, '%s - %s help' % (summary, l)) + d.setVar('DESCRIPTION_' + pkg, '%s This package contains language help files for the %s locale.' % (description, l)) + if locale_section: + d.setVar('SECTION_' + pkg, locale_section) + + d.setVar('PACKAGES', ' '.join(packages)) +} + +PACKAGESPLITFUNCS_prepend = "gnome_do_split_help " + diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index 862d622ee..d381fdf07 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -8,6 +8,9 @@ BBFILE_COLLECTIONS += "gnome-layer" BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_gnome-layer = "7" +# auto-pack gnome help files +IMAGE_LINGUAS_COMPLEMENTARY_append = " ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','*-help-%s','',d)}" + # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_gnome-layer = "1" diff --git a/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb index bf5178cf8..6b2688f3e 100644 --- a/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb +++ b/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ DEPENDS = "glib-2.0 gdk-pixbuf cogl-1.0 clutter-1.0 clutter-gst-3.0 librsvg" -inherit autotools gettext pkgconfig distro_features_check +inherit autotools gettext pkgconfig features_check # cogl requires opengl REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb deleted file mode 100644 index 37f512a73..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libnotify libsecret networkmanager \ - libgnome-keyring iso-codes nss \ - intltool-native \ -" - -GNOMEBASEBUILDCLASS = "autotools-brokensep" -inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f" -SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed" - -PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" -PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" -PACKAGECONFIG ??= "" - -EXTRA_OECONF = " \ - --without-selinux \ -" - -# gobject-introspection related -GI_DATA_ENABLED_libc-musl = "False" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs" -} - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnma/wifi.ui \ - ${datadir}/metainfo \ -" - -# musl builds generate gir files which otherwise go un-packaged -FILES_${PN}-dev += " \ - ${datadir}/gir-1.0 \ -" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb new file mode 100644 index 000000000..0853407ca --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb @@ -0,0 +1,29 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss" + +GNOMEBASEBUILDCLASS = "meson" +inherit features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050" +SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb index de143b9c8..aff994af7 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://gparted.org/index.php" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit distro_features_check autotools pkgconfig gtk-icon-cache +inherit features_check autotools pkgconfig gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb index 999ed041a..699511f7a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb @@ -8,8 +8,8 @@ DEPENDS = "dconf gtk+3" inherit gnomebase vala gettext gsettings bash-completion -SRC_URI[archive.md5sum] = "331a3603c0f8a9913e3a3c0f178b5310" -SRC_URI[archive.sha256sum] = "f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba" +SRC_URI[archive.md5sum] = "2907205ad1a0e2774c981932cb7ff25b" +SRC_URI[archive.sha256sum] = "cecc2a5cb44af68be80e970e83fb9e3e92e2a74df7c90b63324e6da19a929d5f" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch new file mode 100644 index 000000000..485c46509 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch @@ -0,0 +1,25 @@ +With meson 0.52 the build fails due to duplicate symbols. There is a fix +to meson but the dconf build also needs tweaking. + +https://gitlab.gnome.org/GNOME/dconf/issues/59 +https://github.com/mesonbuild/meson/pull/5936 + +Despite the comments there about this being incorrect, libdconf is unchanged +between 0.51 and 0.52 and this patch. + +Upstream-Status: Pending [under discussion, see above links] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: dconf-0.34.0/client/meson.build +=================================================================== +--- dconf-0.34.0.orig/client/meson.build ++++ dconf-0.34.0/client/meson.build +@@ -28,7 +28,7 @@ libdconf_client = static_library( + + libdconf_client_dep = declare_dependency( + dependencies: gio_dep, +- link_whole: libdconf_client, ++ link_with: libdconf_client, + ) + + libdconf = shared_library( diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb index a1996a1a3..3c3802f34 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb @@ -12,10 +12,16 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase bash-completion vala +SRC_URI += "file://fix-meson-0.52.patch" + # I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl EXTRA_OEMESON = "-Dman=false" +# no bash-completion for native +EXTRA_OEMESON_append_class-native = "-Dbash_completion=false" FILES_${PN} += " \ ${datadir}/dbus-1 \ ${libdir}/gio/modules/*.so \ " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb index 6ef8e8a62..69c23d562 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb @@ -14,7 +14,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "26eed0b5b4af5c7e13c551eceaeab832" SRC_URI[sha256sum] = "ecffc17c62b41e196b72340192a90c4223329df041f135e74c0990860595f828" -inherit distro_features_check pkgconfig gettext +inherit features_check pkgconfig gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch deleted file mode 100644 index 55ab5a7fc..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 95425206e7317e59b7ca06d7f838ad357cdd200c Mon Sep 17 00:00:00 2001 -From: Piotr Tworek <tworaz@tworaz.net> -Date: Wed, 14 Aug 2019 00:31:54 +0200 -Subject: [PATCH 5/7] Use LC_MESSAGES for address localization when LC_ADDRESS - is not available. - -Musl does not define LC_ADDRESS unfortunately. - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Piotr Tworek <tworaz@tworaz.net> ---- - src/addressbook/libebook-contacts/e-phone-number-private.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/addressbook/libebook-contacts/e-phone-number-private.cpp b/src/addressbook/libebook-contacts/e-phone-number-private.cpp -index 4c5aebb..9abcebd 100644 ---- a/src/addressbook/libebook-contacts/e-phone-number-private.cpp -+++ b/src/addressbook/libebook-contacts/e-phone-number-private.cpp -@@ -36,6 +36,10 @@ - #include <phonenumbers/logger.h> - #include <phonenumbers/phonenumberutil.h> - -+#ifndef LC_ADDRESS -+#define LC_ADDRESS LC_MESSAGES -+#endif -+ - using i18n::phonenumbers::PhoneNumber; - using i18n::phonenumbers::PhoneNumberUtil; - --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch deleted file mode 100644 index c0c1427fd..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fb9164bbca5b425f1cf1bb3cac51d06afe81938a Mon Sep 17 00:00:00 2001 -From: Piotr Tworek <tworaz@tworaz.net> -Date: Wed, 14 Aug 2019 00:47:59 +0200 -Subject: [PATCH 6/7] Dont add /usr/lib to LDFLAGS when linking libphonenumber. - -This will refer to host lib dir which is not what we want. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Piotr Tworek <tworaz@tworaz.net> ---- - cmake/modules/FindPhonenumber.cmake | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/cmake/modules/FindPhonenumber.cmake b/cmake/modules/FindPhonenumber.cmake -index 04d1056..70c0c41 100644 ---- a/cmake/modules/FindPhonenumber.cmake -+++ b/cmake/modules/FindPhonenumber.cmake -@@ -37,12 +37,10 @@ string(TOUPPER "${WITH_PHONENUMBER}" optupper) - if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) - set(WITH_PHONENUMBER "ON") - set(PHONENUMBER_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}") -- set(PHONENUMBER_LIB_DIRS ${LIB_INSTALL_DIR}) -- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) -+ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) - else(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) - set(PHONENUMBER_INCLUDE_DIRS "${WITH_PHONENUMBER}/include") -- set(PHONENUMBER_LIB_DIRS ${WITH_PHONENUMBER}/lib${LIB_SUFFIX}) -- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) -+ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) - endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) - - unset(bindirlen) --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch deleted file mode 100644 index c00082a2c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d84f4fd68441e934b37be2a6917abad52c5d1bda Mon Sep 17 00:00:00 2001 -From: Piotr Tworek <tworaz@tworaz.net> -Date: Fri, 16 Aug 2019 21:22:16 +0200 -Subject: [PATCH 7/7] Modify gobject-intrispection support to work with OE. - -1. Use tools provided by the recipe sysroot instread of host ones. -2. Make sure all the required dirs make it into g-ir-scanner via - LDFLAGS. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Piotr Tworek <tworaz@tworaz.net> ---- - cmake/modules/GObjectIntrospection.cmake | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake -index 5be5042..67c035a 100644 ---- a/cmake/modules/GObjectIntrospection.cmake -+++ b/cmake/modules/GObjectIntrospection.cmake -@@ -20,6 +20,9 @@ if(ENABLE_INTROSPECTION) - pkg_check_variable(G_IR_SCANNER gobject-introspection-1.0 g_ir_scanner) - pkg_check_variable(G_IR_COMPILER gobject-introspection-1.0 g_ir_compiler) - -+ string(CONCAT G_IR_SCANNER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_SCANNER}") -+ string(CONCAT G_IR_COMPILER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_COMPILER}") -+ - if(NOT G_IR_SCANNER) - message(FATAL_ERROR "g-ir-scanner not provided by gobject-introspection-1.0, you can disable GObject introspection by -DENABLE_INTROSPECTION=OFF") - endif(NOT G_IR_SCANNER) -@@ -116,7 +119,7 @@ macro(gir_add_introspection gir) - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") - - add_custom_command( -- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= -+ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=${INTROSPECTION_SCANNER_LDFLAGS} - ${INTROSPECTION_SCANNER_ENV} - ${G_IR_SCANNER} - ${INTROSPECTION_SCANNER_ARGS} -@@ -186,6 +189,7 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver - unset(INTROSPECTION_SCANNER_ARGS) - unset(INTROSPECTION_SCANNER_ENV) - unset(INTROSPECTION_COMPILER_ARGS) -+ unset(INTROSPECTION_SCANNER_LDFLAGS) - - set(${gir_vars_prefix} ${gir_library}) - set(${gir_vars_prefix}_SCANNERFLAGS "--warn-all") -@@ -223,12 +227,12 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver - --add-include-path=${CMAKE_CURRENT_SOURCE_DIR} - --library-path=${CMAKE_BINARY_DIR} - --library-path=${CMAKE_BINARY_DIR}/src -+ --library-path=${CMAKE_BINARY_DIR}/src/private - --library-path=${CMAKE_CURRENT_BINARY_DIR} - ${_gir_extra_libdirs} - ${_gir_identifies_prefixes} - ${_gir_deps} - --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0 -- --library-path=${LIB_INSTALL_DIR} - ${_extra_library_path} - --pkg-export ${pkg_export_prefix}-${gir_library_version} - --c-include=${c_include} -@@ -279,6 +283,10 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver - ) - endif(UNIX) - -+ _gir_list_prefix(_gir_scanner_ldflags ${gir_extra_libdirs_var} "-Wl,-rpath-link=") -+ string(REPLACE ";" " " _gir_scanner_ldflags "${_gir_scanner_ldflags}") -+ set(INTROSPECTION_SCANNER_LDFLAGS "${_gir_scanner_ldflags}") -+ - set(INTROSPECTION_SCANNER_ENV - ${_loader_library_path_var}="${_extra_loader_library_path_native}" - ) --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb deleted file mode 100644 index 429dd53d8..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb +++ /dev/null @@ -1,155 +0,0 @@ -SUMMARY = "Evolution database backend server" -HOMEPAGE = "http://www.gnome.org/projects/evolution/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ - file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ - file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \ - file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196" - -DEPENDS = " \ - intltool-native gperf-native glib-2.0-native \ - glib-2.0 gtk+3 libgnome-keyring libgdata libcanberra icu \ - dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ -" - -inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative upstream-version-is-even vala - -SRC_URI += "file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ - file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ - file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ - file://0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch \ - file://0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch \ - file://0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch \ - file://0007-Modify-gobject-intrispection-support-to-work-with-OE.patch \ - file://iconv-detect.h \ - " -SRC_URI[archive.md5sum] = "57820f3f88fc554e1a58665a52e12c05" -SRC_URI[archive.sha256sum] = "83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f" - -LKSTRFTIME = "HAVE_LKSTRFTIME=ON" -LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" - -EXTRA_OECMAKE = " \ - -D${LKSTRFTIME} \ - -DSYSCONF_INSTALL_DIR=${sysconfdir} \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -" - -PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection', '', d)}" -PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" -PACKAGECONFIG[oauth2] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,json-glib webkitgtk" -PACKAGECONFIG[mitkrb5] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" -PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" -PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather" -PACKAGECONFIG[phonenumber] = "-DWITH_PHONENUMBER=ON,-DWITH_PHONENUMBER=OFF,libphonenumber" -PACKAGECONFIG[introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF" -PACKAGECONFIG[vala] = "-DENABLE_VALA_BINDINGS=ON -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen,-DENABLE_VALA_BINDINGS=OFF" - -# -ldb needs this on some platforms -LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" - -do_configure_append () { - cp ${WORKDIR}/iconv-detect.h ${S}/src - - # fix native perl shebang - sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard -} - -do_compile_prepend() { - # CMake does not support building native binaries when cross compiling. As result - # it always cross compiles them for the target and then aborts when they fail to run. - # To work around this manually build required tools and patch cmake targets to use - # those native binaries we built here. - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} ${S}/src/camel/camel-gen-tables.c \ - -o ${B}/src/camel/camel-gen-tables-native - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} $(pkg-config-native --cflags glib-2.0) \ - ${S}/src/addressbook/libebook-contacts/gen-western-table.c \ - -o ${B}/src/addressbook/libebook-contacts/gen-western-table-native \ - $(pkg-config-native --libs glib-2.0) -} - - -PACKAGES =+ "libebook-contacts libebook-contacts-dev \ - libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ - libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ - libedataserver libedataserver-dev \ - libedataserverui libedataserverui-dev" - -FILES_${PN} =+ "${systemd_user_unitdir} \ - ${datadir}/dbus-1 \ - ${datadir}/evolution-data-server-*/ui/" -RDEPENDS_${PN} += "perl" - -FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" -FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \ - ${libdir}/evolution-data-server*/calendar-backends/.debug \ - ${libdir}/evolution-data-server*/addressbook-backends/.debug \ - ${libdir}/evolution-data-server*/extensions/.debug/" - -RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" - -FILES_libcamel = "${libdir}/libcamel-*.so.* \ - ${libdir}/libcamel-provider-*.so.* \ - ${libdir}/girepository-*/Camel-*.typelib \ - ${libdir}/evolution-data-server*/camel-providers/*.so \ - ${libdir}/evolution-data-server*/camel-providers/*.urls" -FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ - ${libdir}/pkgconfig/camel*pc \ - ${includedir}/evolution-data-server*/camel \ - ${datadir}/vala/vapi/camel-* \ - ${datadir}/gir-*/Camel-*.gir" - -FILES_libebook = "${libdir}/libebook-*.so.* \ - ${libdir}/girepository-*/EBook-*.typelib" -FILES_libebook-dev = "${libdir}/libebook-*.so \ - ${libdir}/pkgconfig/libebook-*.pc \ - ${datadir}/gir-*/EBook-*.gir \ - ${datadir}/vala/vapi/libebook-*.* \ - ${includedir}/evolution-data-server*/libebook/*.h" -RRECOMMENDS_libebook = "libedata-book" - -FILES_libebook-contacts = "${libdir}/libebook-contacts-*.so.* \ - ${libdir}/girepository-*/EBookContacts-*.typelib" -FILES_libebook-contacts-dev = "${libdir}/libebook-contacts-*.so \ - ${libdir}/pkgconfig/libebook-contacts-*.pc \ - ${datadir}/gir-*/EBookContacts-*.gir \ - ${datadir}/vala/vapi/libebook-contacts-* \ - ${includedir}/evolution-data-server*/libebook-contacts/*.h" - -FILES_libecal = "${libdir}/libecal-*.so.*" -FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ - ${includedir}/evolution-data-server*/libecal/*.h \ - ${includedir}/evolution-data-server*/libical/*.h" -RRECOMMENDS_libecal = "libedata-cal tzdata" - -FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ - ${datadir}/dbus-1/services/*.AddressBook.service \ - ${libdir}/libedata-book-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libebook*.so" -FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ - ${libdir}/pkgconfig/libedata-book-*.pc \ - ${includedir}/evolution-data-server-*/libedata-book" - -FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ - ${datadir}/dbus-1/services/*.Calendar.service \ - ${libdir}/libedata-cal-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libecal*.so" -FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ - ${libdir}/pkgconfig/libedata-cal-*.pc \ - ${includedir}/evolution-data-server-*/libedata-cal" - -FILES_libedataserver = "${libdir}/libedataserver-*.so.* \ - ${libdir}/girepository-*/EDataServer-*.typelib" -FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ - ${libdir}/pkgconfig/libedataserver-*.pc \ - ${datadir}/vala/vapi/libedataserver-* \ - ${includedir}/evolution-data-server-*/libedataserver/*.h" - -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*" -FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ - ${libdir}/pkgconfig/libedataserverui-*.pc \ - ${datadir}/gir-*/EDataServerUI-*.gir \ - ${datadir}/vala/vapi/libedataserverui-* \ - ${includedir}/evolution-data-server-*/libedataserverui/*.h" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch index de739c5b3..32ca073f9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch @@ -11,17 +11,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/cut-n-paste/synctex/synctex_parser_utils.c b/cut-n-paste/synctex/synctex_parser_utils.c -index f8a9f6f..9459b2d 100644 +index 08053f0..0519b38 100644 --- a/cut-n-paste/synctex/synctex_parser_utils.c +++ b/cut-n-paste/synctex/synctex_parser_utils.c -@@ -78,6 +78,7 @@ void *_synctex_malloc(size_t size) { - return (void *)ptr; +@@ -136,6 +136,7 @@ int _synctex_log(int level, const char * prompt, const char * reason,va_list arg + return result; } +__attribute__((__format__ (__printf__, 1, 0))) int _synctex_error(const char * reason,...) { - va_list arg; - int result; + va_list arg; + int result; -- -2.12.2 +2.20.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch deleted file mode 100644 index e87da90bc..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ef170dda7fbab53682c9bc287dec93fa86130bc9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Sep 2018 21:49:59 -0700 -Subject: [PATCH] add a formatting attribute check - -Tell Clang that parameter is a printf style format using the -attribute flag - -This helps in avoiding below warnings seen with clang - -unarr.c:106:22: error: format string is not a string literal -[-Werror,-Wformat-nonliteral] -| vfprintf(stderr, msg, args); -| ^~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - cut-n-paste/unarr/common/unarr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cut-n-paste/unarr/common/unarr.c b/cut-n-paste/unarr/common/unarr.c -index 97ec92a..9e6e3ad 100644 ---- a/cut-n-paste/unarr/common/unarr.c -+++ b/cut-n-paste/unarr/common/unarr.c -@@ -92,7 +92,7 @@ size_t ar_get_global_comment(ar_archive *ar, void *buffer, size_t count) - return ar->get_comment(ar, buffer, count); - } - --void ar_log(const char *prefix, const char *file, int line, const char *msg, ...) -+void __attribute__((__format__ (__printf__, 4, 0))) ar_log(const char *prefix, const char *file, int line, const char *msg, ...) - { - va_list args; - va_start(args, msg); diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch deleted file mode 100644 index 592f46606..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 40921037d8e7205a3889d529fb4e06f79e1e88b0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 19 Feb 2016 16:52:18 +0200 -Subject: [PATCH] help: remove YELP macro - -Upstream-Status: Inappropriate [embedded-specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - help/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/help/Makefile.am b/help/Makefile.am -index 7835810..37c88ce 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am -@@ -1,5 +1,3 @@ --@YELP_HELP_RULES@ -- - SUBDIRS = reference - - HELP_ID = evince --- -2.7.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch deleted file mode 100644 index dcc4a4e9c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com> -Date: Fri, 7 Sep 2018 22:34:29 +0200 -Subject: [PATCH] libview: Remove EvDocumentModel get type function declaration - -The EvDocumentModel class declares the `ev_document_model_get_type` -function as part of the `GObject` boilerplate code. - -However, this declaration is not necessary and also causes a warning -when introspection data file, `EvinceView-3.0.gir`, is generated. - -Upstream-Status: Applied [1] - - ---- - libview/ev-document-model.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h -index 784e27d6..6a99e43a 100644 ---- a/libview/ev-document-model.h -+++ b/libview/ev-document-model.h -@@ -54,7 +54,6 @@ typedef enum { - EV_PAGE_LAYOUT_AUTOMATIC - } EvPageLayout; - --GType ev_document_model_get_type (void) G_GNUC_CONST; - EvDocumentModel *ev_document_model_new (void); - EvDocumentModel *ev_document_model_new_with_document (EvDocument *document); - --- -2.20.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch new file mode 100644 index 000000000..c374fc943 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch @@ -0,0 +1,122 @@ +From ef170dda7fbab53682c9bc287dec93fa86130bc9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 9 Sep 2018 21:49:59 -0700 +Subject: [PATCH] add a formatting attribute check + +Tell Clang that parameter is a printf style format using the +attribute flag + +This helps in avoiding below warnings seen with clang + +unarr.c:106:22: error: format string is not a string literal +[-Werror,-Wformat-nonliteral] +| vfprintf(stderr, msg, args); +| ^~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cut-n-paste/unarr/common/unarr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/cut-n-paste/unarr/common/unarr.c ++++ b/cut-n-paste/unarr/common/unarr.c +@@ -92,7 +92,7 @@ size_t ar_get_global_comment(ar_archive + return ar->get_comment(ar, buffer, count); + } + +-void ar_log(const char *prefix, const char *file, int line, const char *msg, ...) ++void __attribute__((__format__ (__printf__, 4, 5))) ar_log(const char *prefix, const char *file, int line, const char *msg, ...) + { + va_list args; + va_start(args, msg); +--- a/cut-n-paste/synctex/synctex_parser_utils.c ++++ b/cut-n-paste/synctex/synctex_parser_utils.c +@@ -87,11 +87,11 @@ void _synctex_free(void * ptr) { + # include <syslog.h> + #endif + +-int _synctex_error(const char * reason, ...) __attribute__((__format__ (__printf__, 1, 2))); +-int _synctex_log(int level, const char * prompt, const char * reason, va_list arg) __attribute__((__format__ (__printf__, 3, 0))); +- +-int _synctex_log(int level, const char * prompt, const char * reason,va_list arg) { ++static int _synctex_log(int level, const char * prompt, const char * reason, ...) SYNCTEX_PRINTF_FORMAT(3, 0); ++static int _synctex_log(int level, const char * prompt, const char * reason, ...) { ++ va_list arg; + int result; ++ va_start(arg, reason); + # ifdef SYNCTEX_RECENT_WINDOWS + {/* This code is contributed by William Blum. + As it does not work on some older computers, +@@ -133,10 +133,10 @@ int _synctex_log(int level, const char * + result += vfprintf(where, reason, arg); + result += fprintf(where,"\n"); + # endif ++ va_end(arg); + return result; + } + +-__attribute__((__format__ (__printf__, 1, 0))) + int _synctex_error(const char * reason,...) { + va_list arg; + int result; +@@ -355,6 +355,7 @@ char * _synctex_merge_strings(const char + size_t len = strlen(temp); + if(UINT_MAX-len<size) { + _synctex_error("! _synctex_merge_strings: Capacity exceeded."); ++ va_end(arg); + return NULL; + } + size+=len; +@@ -374,6 +375,7 @@ char * _synctex_merge_strings(const char + if(dest != strncpy(dest,temp,size)) { + _synctex_error("! _synctex_merge_strings: Copy problem"); + free(result); ++ va_end(arg); + result = NULL; + return NULL; + } +--- a/cut-n-paste/synctex/synctex_parser.c ++++ b/cut-n-paste/synctex/synctex_parser.c +@@ -8411,6 +8411,7 @@ struct synctex_updater_t { + int length; /* the number of chars appended */ + }; + ++static int _synctex_updater_print(synctex_updater_p updater, const char * format, ...) SYNCTEX_PRINTF_FORMAT(2, 3); + static int _synctex_updater_print(synctex_updater_p updater, const char * format, ...) { + int result = 0; + if (updater) { +@@ -8447,6 +8448,7 @@ static int vasprintf(char **ret, + /** + * gzvprintf is not available until OSX 10.10 + */ ++static int _synctex_updater_print_gz(synctex_updater_p updater, const char * format, ...) SYNCTEX_PRINTF_FORMAT(2, 3); + static int _synctex_updater_print_gz(synctex_updater_p updater, const char * format, ...) { + int result = 0; + if (updater) { +--- a/cut-n-paste/synctex/synctex_parser_utils.h ++++ b/cut-n-paste/synctex/synctex_parser_utils.h +@@ -85,7 +85,11 @@ extern "C" { + # else + # define SYNCTEX_ARE_PATH_CHARACTERS_EQUAL(left,right) (toupper(left) != toupper(right)) + # endif +- ++# ifdef __GNUC__ ++# define SYNCTEX_PRINTF_FORMAT(si, ftc) __attribute__ ((format (printf, si, ftc))) ++# else ++# define SYNCTEX_PRINTF_FORMAT(si, ftc) ++# endif + /* This custom malloc functions initializes to 0 the newly allocated memory. + * There is no bzero function on windows. */ + void *_synctex_malloc(size_t size); +@@ -97,8 +101,8 @@ void _synctex_free(void * ptr); + /* This is used to log some informational message to the standard error stream. + * On Windows, the stderr stream is not exposed and another method is used. + * The return value is the number of characters printed. */ +- int _synctex_error(const char * reason,...); +- int _synctex_debug(const char * reason,...); ++ int _synctex_error(const char * reason,...) SYNCTEX_PRINTF_FORMAT(1, 2); ++ int _synctex_debug(const char * reason,...) SYNCTEX_PRINTF_FORMAT(1, 2); + + /* strip the last extension of the given string, this string is modified! + * This function depends on the OS because the path separator may differ. diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb deleted file mode 100644 index f45180e79..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" -SECTION = "x11/office" -DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native" - -inherit gnomebase pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd - -SRC_URI = " \ - ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-help-remove-YELP-macro.patch \ - file://0001-Add-format-attribute-to-_synctex_malloc.patch \ - file://0001-add-a-formatting-attribute-check.patch \ - file://0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch \ -" -SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3" -SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1" - -EXTRA_OECONF = "--enable-thumbnailer" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" -} - - -do_install_append() { - install -d ${D}${datadir}/pixmaps - install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/ - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)} - then - install -d ${D}${systemd_unitdir}/system - mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service - else - rm -rf ${D}${libdir}/systemd/user/evince.service - fi - rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir} - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir} -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus" -PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin," - -SYSTEMD_SERVICE_${PN} = "evince.service" - -RDEPENDS_${PN} += "glib-2.0-utils" -RRECOMMMENDS_${PN} = "adwaita-icon-theme" - -PACKAGES =+ "${PN}-nautilus-extension" -PACKAGES =+ "${PN}-browser-plugin" - -FILES_${PN} += "${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ - ${systemd_unitdir}/systemd/user/evince.service \ - " -FILES_${PN}-dbg += "${libdir}/*/*/.debug \ - ${libdir}/*/*/*/.debug" -FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \ - ${libdir}/evince/*/backends/*.la" -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \ - ${libdir}/evince/*/backends/*.a" -FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" -FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb new file mode 100644 index 000000000..e30162c06 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" +SECTION = "x11/office" +DEPENDS = " \ + gnome-common-native \ + yelp-tools-native \ + appstream-glib \ + gtk+3 \ + gspell \ + libsecret \ + poppler \ + gstreamer1.0-plugins-base \ + orc \ + adwaita-icon-theme \ + ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ +" + +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext features_check + +SRC_URI[archive.md5sum] = "77b38b625008f5940e9bd4b3d38e8cf8" +SRC_URI[archive.sha256sum] = "85e407cde396147b249120d816c7715fb6df191ca561cf65ff3554a5d67626df" +SRC_URI += " \ + file://0001-Add-format-attribute-to-_synctex_malloc.patch \ + file://0002-add-a-formatting-attribute-check.patch \ +" + +EXTRA_OECONF = " \ + --enable-thumbnailer \ + --without-systemduserunitdir \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus" +PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin," + +RDEPENDS_${PN} += "glib-2.0-utils" +RRECOMMMENDS_${PN} = "adwaita-icon-theme" + +PACKAGES =+ "${PN}-nautilus-extension" +PACKAGES =+ "${PN}-browser-plugin" + +FILES_${PN} += "${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" +FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" +FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb new file mode 100644 index 000000000..681a61c33 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb @@ -0,0 +1,23 @@ +require ${BPN}.inc + +inherit native + +DEPENDS = "glib-2.0-native" + +# build native helpers +do_compile() { + cd ${S}/src/camel + sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c + ${CC} -o ${B}/camel-gen-tables camel-gen-tables.c ${CFLAGS} ${LDFLAGS} + + LDFLAGS_glib=`pkg-config glib-2.0 --libs` + CFLAGS_glib=`pkg-config glib-2.0 --cflags` + cd ${S}/src/addressbook/libebook-contacts + sed -i 's:#include "evolution-data-server-config.h"::g' gen-western-table.c + ${CC} -o ${B}/gen-western-table gen-western-table.c ${CFLAGS} ${CFLAGS_glib} ${LDFLAGS} ${LDFLAGS_glib} +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/* ${D}${bindir} +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb new file mode 100644 index 000000000..08bd778d0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -0,0 +1,70 @@ +require ${BPN}.inc + +DEPENDS = " \ + ${BPN}-native intltool-native gperf-native \ + glib-2.0 gtk+3 libgdata \ + dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ +" + +inherit gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative pythonnative + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " \ + file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ + file://0004-call-native-helpers.patch \ + file://iconv-detect.h \ +" + +LKSTRFTIME = "HAVE_LKSTRFTIME=ON" +LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" + +# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now +GI_DATA_ENABLED="False" + +EXTRA_OECMAKE = " \ + -DSYSCONF_INSTALL_DIR=${sysconfdir} \ + -DWITH_KRB5=OFF \ + -DENABLE_GOA=OFF \ + -DENABLE_UOA=OFF \ + -DENABLE_GOOGLE_AUTH=OFF \ + -DENABLE_WEATHER=OFF \ + -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \ + -D${LKSTRFTIME} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" + +PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" +PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib" + +# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when +# searching for openldap-libs +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" + +# -ldb needs this on some platforms +LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" + +do_configure_append () { + cp ${WORKDIR}/iconv-detect.h ${S}/src + + # fix native perl shebang + sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard + + # fix abs path for g-ir-scanner-wrapper + sed -i ${B}/build.ninja \ + -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g' +} + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" +} + +FILES_${PN} =+ " \ + ${datadir}/dbus-1 \ + ${datadir}/evolution-data-server-*/ui/ \ + ${systemd_user_unitdir} \ +" + +RDEPENDS_${PN} += "perl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc new file mode 100644 index 000000000..0893f8e92 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -0,0 +1,15 @@ +SUMMARY = "Evolution database backend server" +HOMEPAGE = "http://www.gnome.org/projects/evolution/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2 & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ + file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ + file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" + +inherit gnomebase upstream-version-is-even + +SRC_URI[archive.md5sum] = "d1701875bbac80d6d62e9acfc6c43bea" +SRC_URI[archive.sha256sum] = "6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe" +PV = "3.34.1" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch index cc9dca4ea..e8c6d6a76 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch @@ -1,7 +1,7 @@ -From e32075119803f9fffbba01a31083e416cb213011 Mon Sep 17 00:00:00 2001 +From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 19 Dec 2017 16:37:20 +0100 -Subject: [PATCH 1/7] CMakeLists.txt: Remove TRY_RUN for iconv +Date: Sun, 31 Mar 2019 18:11:55 +0200 +Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,22 +13,24 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9d72db..ed99904 100644 +index 1672daf..0b3e4e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -526,15 +526,9 @@ endif(NOT HAVE_ICONV) +@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV) + message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") + endif(NOT HAVE_ICONV) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS}) - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator) +-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS}) +-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator) -CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\" - #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) - unset(_binary_dir_with_separator) - unset(CMAKE_REQUIRED_LIBRARIES) - +-unset(_binary_dir_with_separator) +-unset(CMAKE_REQUIRED_LIBRARIES) +- -if(NOT _correct_iconv) - message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") -endif(NOT _correct_iconv) @@ -37,5 +39,5 @@ index f9d72db..ed99904 100644 # Backtraces for debugging # ****************************** -- -2.21.0 +2.20.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch index 23c3a96d4..23c3a96d4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch index c9e6f96f5..c9e6f96f5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch index 67023df2c..e320f6342 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch @@ -1,26 +1,21 @@ -From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001 -From: Piotr Tworek <tworaz@tworaz.net> -Date: Mon, 12 Aug 2019 14:13:52 +0200 -Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during - build process. +From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 31 Mar 2019 19:11:31 +0200 +Subject: [PATCH] call native helpers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -CMake can't build tools for the host system when cross compiling. As -result eds currently fails to build in OE due to some programs being -cross compiled for the target and run on the host. To work around this -limitation modify existing targets using build time generated binaries -to invoke binaries suffixed with -native. We can inject such binaries -into expected locations prior to invoking ninja in do_compile. +Upstream-Status: Inappropriate[oe-specific] -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Piotr Tworek <tworaz@tworaz.net> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- src/addressbook/libebook-contacts/CMakeLists.txt | 2 +- src/camel/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt -index e9e3259..2ae72a8 100644 +index e9e3259..e749d1b 100644 --- a/src/addressbook/libebook-contacts/CMakeLists.txt +++ b/src/addressbook/libebook-contacts/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(gen-western-table @@ -28,12 +23,12 @@ index e9e3259..2ae72a8 100644 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h -+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table-native "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h ++ COMMAND gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h DEPENDS gen-western-table e-name-western-tables.h.in ) diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt -index be626a8..9226b2b 100644 +index be626a8..14ac8b8 100644 --- a/src/camel/CMakeLists.txt +++ b/src/camel/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC @@ -41,10 +36,10 @@ index be626a8..9226b2b 100644 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c -+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c ++ COMMAND camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c DEPENDS camel-gen-tables ) -- -2.21.0 +2.20.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h index 46f476d5b..46f476d5b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb new file mode 100644 index 000000000..7dcf3e9ec --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "An archive manager utility for the GNOME Environment" +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + nautilus \ + libarchive \ + libnotify \ +" + +inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even + +SRC_URI[archive.md5sum] = "e79715bb2400df83c0f67cc0cce2b655" +SRC_URI[archive.sha256sum] = "c60a79e0baf74cb1c09a1c8f5ffe0d6e311227ca14ecc5b1156beb3715341a71" + +PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${libdir}/nautilus \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch deleted file mode 100644 index 4ad57effe..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 17 May 2016 14:14:03 +0300 -Subject: [PATCH] Remove help directory from build - -It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e57b203..a88152d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx - --if !OS_OSX --SUBDIRS += help --endif - - distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper - --- -2.8.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch deleted file mode 100644 index 4885c4511..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 623ffac1f6e7725041b386e0f2933fe36809b5a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 09:04:30 -0700 -Subject: [PATCH] gedit-utils: qualify handle_builder_error() with format - string parameters - -gedit-utils.c:1063:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] - msg_plain = g_strdup_vprintf (message, args); - ^~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gedit/gedit-utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c -index 41a5afd..c800828 100644 ---- a/gedit/gedit-utils.c -+++ b/gedit/gedit-utils.c -@@ -1051,7 +1051,7 @@ gedit_utils_is_valid_uri (const gchar *uri) - return TRUE; - } - --static GtkWidget * -+static G_GNUC_PRINTF(1, 2) GtkWidget * - handle_builder_error (const gchar *message, ...) - { - GtkWidget *label; --- -2.14.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch deleted file mode 100644 index 11afe75ce..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 06:53:35 -0700 -Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined - already - -Helps compile with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/document-saver.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/document-saver.c b/tests/document-saver.c -index 9f44d5a..811ade6 100644 ---- a/tests/document-saver.c -+++ b/tests/document-saver.c -@@ -41,6 +41,10 @@ - #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt" - #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt" - -+#if !defined(ACCESSPERMS) -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+ - static gboolean test_completed; - static gboolean mount_completed; - static gboolean mount_success; --- -2.13.2 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch deleted file mode 100644 index a28808b8d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sat, 9 Mar 2013 12:47:06 +0100 -Subject: [PATCH] workaround void pointer arithmetic -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes errors like: -error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gedit/gedit-document-input-stream.c | 4 ++-- - gedit/gedit-smart-charset-converter.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c -index 5a1f961..38316e7 100644 ---- a/gedit/gedit-document-input-stream.c -+++ b/gedit/gedit-document-input-stream.c -@@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream *stream, - - do - { -- n = read_line (dstream, buffer + read, space_left); -+ n = read_line (dstream, ((char*)buffer) + read, space_left); - read += n; - space_left -= n; - } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0); -@@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream *stream, - - newline = get_new_line (dstream); - -- memcpy (buffer + read, newline, newline_size); -+ memcpy (((char*)buffer) + read, newline, newline_size); - - read += newline_size; - dstream->priv->newline_added = TRUE; -diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c -index e32b0b1..6745ce3 100644 ---- a/gedit/gedit-smart-charset-converter.c -+++ b/gedit/gedit-smart-charset-converter.c -@@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter, - do - { - res = g_converter_convert (G_CONVERTER (converter), -- inbuf + nread, -+ ((const char*)inbuf) + nread, - inbuf_size - nread, - out + nwritten, - out_size - nwritten, --- -1.7.4.4 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch deleted file mode 100644 index a5d231012..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 29 Jul 2016 23:19:40 +0200 -Subject: [PATCH] suppress string format literal warning to fix build with gcc6 -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> ---- - plugins/time/gedit-time-plugin.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c -index d2ffdb9..441d9f9 100644 ---- a/plugins/time/gedit-time-plugin.c -+++ b/plugins/time/gedit-time-plugin.c -@@ -473,12 +473,15 @@ get_time (const gchar* format) - clock = time (NULL); - now = localtime (&clock); - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - do - { - out_length += 255; - out = g_realloc (out, out_length); - } - while (strftime (out, out_length, locale_format, now) == 0); -+#pragma GCC diagnostic pop - - g_free (locale_format); - --- -2.5.5 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb deleted file mode 100644 index 6e0720888..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPLv2+" -PR = "r2" - -DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \ - gtksourceview2 iso-codes intltool-native gnome-common-native \ - libice python3-six-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit distro_features_check gnomebase gconf gettext python3native - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-workaround-void-pointer-arithmetic.patch \ - file://0001-Remove-help-directory-from-build.patch \ - file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ - file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \ - file://0001-gedit-utils-qualify-handle_builder_error-with-format.patch \ - " -SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" -SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = "--disable-scrollkeeper \ - --enable-gvfs-metadata" - -LDFLAGS += "-lgmodule-2.0 -lICE" - -FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" -FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb new file mode 100644 index 000000000..e9cdd8a6e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + yelp-tools-native \ + libxml2-native \ + gdk-pixbuf-native \ + iso-codes \ + gtk+3 \ + gsettings-desktop-schemas \ + gtksourceview4 \ + libpeas \ + libsoup-2.4 \ + gspell \ + gtksourceview4 \ +" + +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "ec6632fa73d9ea6c817e74a98d16eab6" +SRC_URI[archive.sha256sum] = "3e95e51d3ccb495a9ac95aa3ed7fe8fe37ccde7c678f37fa3cea684bc71d507e" + +GTKDOC_MESON_OPTION = "documentation" + +PACKAGECONFIG ??= "gvfs" +PACKAGECONFIG[gvfs] = "-Denable-gvfs-metadata=yes,-Denable-gvfs-metadata=no,,gvfs" + +PACKAGES += "${PN}-python" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES_${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb new file mode 100644 index 000000000..dc218f3a3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "A convenience library for the geocoding" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_OPTION = "enable-introspection" +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even + +DEPENDS = " \ + json-glib \ + libsoup-2.4 \ +" + +SRC_URI[archive.md5sum] = "21094494e66c86368add6a55bf480049" +SRC_URI[archive.sha256sum] = "5baa6ab76a76c9fc567e4c32c3af2cd1d1784934c255bc5a62c512e6af6bde1c" + +EXTRA_OEMESON = "-Denable-installed-tests=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb new file mode 100644 index 000000000..458eaeaa1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A GObject-based Exiv2 wrapper" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "exiv2" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.md5sum] = "0a618c5b053106d1801d89cc77385419" +SRC_URI[archive.sha256sum] = "58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a" + +EXTRA_OEMESON = " \ + -Dvapi=false \ + -Dpython2_girdir=no \ + -Dpython3_girdir=no \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb new file mode 100644 index 000000000..16a9213cb --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "GNOME archive library" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + gnome-common-native \ + gtk+3 \ + libarchive \ +" + +inherit gnomebase gobject-introspection gtk-doc vala + +SRC_URI[archive.md5sum] = "39b13fb2fc7752fa3b80616244dc4ef8" +SRC_URI[archive.sha256sum] = "5de9db0db028cd6cab7c2fec46ba90965474ecf9cd68cfd681a6488cf1fb240a" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb index 3c4438e7e..ae6587be1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb @@ -16,7 +16,7 @@ inherit gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version- # gtk-icon-cache bbclass will take care of this for us. EXTRA_OEMESON = "-Dicon_update=false" -SRC_URI[archive.md5sum] = "5b3d66f564a5067ea154750cdb6d850d" -SRC_URI[archive.sha256sum] = "6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa" +SRC_URI[archive.md5sum] = "0c567e124a52e8ddc31c8bed0c3e57a1" +SRC_URI[archive.sha256sum] = "e867e67423e1dc78c56c2ea11dec066ce0254238d559e4777c80fa2935eb6baf" RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb index 77aa3fb61..a2f73590f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb @@ -8,23 +8,23 @@ BPN = "gnome-desktop" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -SRC_URI[archive.md5sum] = "3149bbd12eaf6f4420b1a999131ec470" -SRC_URI[archive.sha256sum] = "8d331ee655c1d56b2b97562a07c7a7598ff6706a11ff1cdce97423ebc6b62426" +SRC_URI[archive.md5sum] = "357b4e63960830c1399d3341d05746ea" +SRC_URI[archive.sha256sum] = "c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ " -DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" +DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" -inherit distro_features_check gtk-doc +inherit features_check gtk-doc REQUIRED_DISTRO_FEATURES += "x11" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb new file mode 100644 index 000000000..5be8d5037 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk+3 \ + gnome-desktop3 \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gtk-icon-cache gettext features_check upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "76004a8986ea622b09c408b01a6f42e5" +SRC_URI[archive.sha256sum] = "aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb index 8dc11c85d..a84c218e6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -inherit distro_features_check gnomebase remove-libtool gettext upstream-version-is-even +inherit features_check gnomebase remove-libtool gettext upstream-version-is-even DEPENDS = " \ intltool-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb deleted file mode 100644 index 647ae914f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "GNOME menus" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native gnome-common-native" - -inherit distro_features_check gnomebase pkgconfig python-dir pythonnative gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -BPN = "gnome-menus" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" -SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71" - -FILES_${PN} += "${datadir}/desktop-directories/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb new file mode 100644 index 000000000..3f441d915 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "GNOME menus" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = "python libxml2 popt gtk+3 gnome-common-native" + +inherit features_check gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +BPN = "gnome-menus" + +SRC_URI[archive.md5sum] = "4262208c13f266d9ada7d356aada9e1b" +SRC_URI[archive.sha256sum] = "c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74" + +FILES_${PN} += "${datadir}/desktop-directories/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb new file mode 100644 index 000000000..65f669349 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "Window navigation construction toolkit" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even + +SRC_URI[archive.md5sum] = "528b0b7cc2dd22c6026a9c8739c71fa7" +SRC_URI[archive.sha256sum] = "7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337" + +DEPENDS = " \ + colord \ + geocode-glib \ + gcr \ + gnome-desktop3 \ + libgweather \ + lcms \ + libcanberra \ + geoclue \ + libnotify \ + upower \ + libwacom \ + virtual/libx11 \ +" + +# all these are mandatory +REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +SRC_URI[archive.md5sum] = "cdd0d0c8664056deb78aa40c88ec24d1" +SRC_URI[archive.sha256sum] = "9981a20babf8da7744b7fbe175b9e36078bf08f3bf65fe5aedeb82cfe27ac11f" + +# allow cross build mixed with build of native tools +do_write_config_append() { + cat >${WORKDIR}/meson.native <<EOF +[binaries] +pkgconfig = 'pkg-config-native' +EOF +} +EXTRA_OEMESON = "--native-file ${WORKDIR}/meson.native" + +PACKAGECONFIG ??= " \ + cups nm \ + alsa gudev \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ +" +PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" +PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" +PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" +PACKAGECONFIG[nm] = "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager" +PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" + +FILES_${PN} += " \ + ${systemd_user_unitdir} \ + ${libdir}/gnome-settings-daemon-3.0/libgsd.so \ +" + +RDEPEND_${PN} += "gdbus" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch deleted file mode 100644 index f2e720e9e..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 24 Mar 2019 02:46:07 +0100 -Subject: [PATCH] Do not build help - we do not have yelp yet -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> ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index d60ced7..6a0ab4b 100644 ---- a/meson.build -+++ b/meson.build -@@ -183,7 +183,6 @@ subdir('data') - subdir('po') - subdir('scripts') - subdir('src') --subdir('help') - - - message('\n'.join(['', --- -2.20.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb index 8930e1222..a3583d1de 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb @@ -3,7 +3,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = " \ - itstool-native \ gnome-common-native \ libxml2-native \ glib-2.0-native \ @@ -15,13 +14,12 @@ DEPENDS = " \ GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gconf gtk-icon-cache distro_features_check gettext +inherit gnomebase gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11 polkit" -SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd" -SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3" -SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch" +SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a" +SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch new file mode 100644 index 000000000..a69390eb2 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -0,0 +1,35 @@ +From f231cecc151930fd5b6309da317a8c5bc6001f38 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 17 Nov 2019 15:55:54 +0100 +Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems +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@gmail.com> +--- + src/terminal.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/terminal.c b/src/terminal.c +index d06ce35..6284e4c 100644 +--- a/src/terminal.c ++++ b/src/terminal.c +@@ -47,6 +47,12 @@ + GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) + #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) + ++/* fix for musl */ ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++ ++ + /* Wait-for-exit helper */ + + typedef struct { +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb new file mode 100644 index 000000000..ba9a79d89 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNOME terminal" +LICENSE = "GPLv3 & GFDL-1.3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ +" + +inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even + +DEPENDS = " \ + glib-2.0-native \ + intltool-native \ + yelp-tools-native \ + desktop-file-utils-native \ + gtk+3 \ + gsettings-desktop-schemas \ + vte \ + dconf \ + libpcre2 \ +" + +SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16" +SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d" +SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" + +EXTRA_OECONF += " \ + --disable-search-provider \ + --without-nautilus-extension \ +" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ + ${systemd_user_unitdir} \ +" + +RRECOMMENDS_${PN} += "vte-prompt gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb index 9de298c41..128a89f5d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb @@ -1,4 +1,4 @@ -SUMMARY = "spell adds spell-checking to a GTK+ applications" +SUMMARY = "gspell adds spell-checking to a GTK+ applications" HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" @@ -7,5 +7,5 @@ DEPENDS = "gtk+3 iso-codes enchant2" inherit gnomebase gettext gobject-introspection -SRC_URI[archive.md5sum] = "8269918ea5ff798e49943e7daf6a32b9" -SRC_URI[archive.sha256sum] = "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5" +SRC_URI[archive.md5sum] = "4f857382bc9d8d4afe1e67e5b5b9dbff" +SRC_URI[archive.sha256sum] = "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb index 7dabd1e39..bcc3106d9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb @@ -9,8 +9,6 @@ SRC_URI = "file://classic-light.xml" S = "${WORKDIR}" do_install() { - install -d ${D}${datadir}/gtksourceview-2.0/styles - install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-2.0/styles/ install -d ${D}${datadir}/gtksourceview-3.0/styles install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/ install -d ${D}${datadir}/gtksourceview-4/styles @@ -18,7 +16,6 @@ do_install() { } FILES_${PN} = " \ - ${datadir}/gtksourceview-2.0/styles \ ${datadir}/gtksourceview-3.0/styles \ ${datadir}/gtksourceview-4/styles \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb deleted file mode 100644 index 012f8e3bc..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Portable C library for multiline text editing" -HOMEPAGE = "http://projects.gnome.org/gtksourceview/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "gtk+ libxml2 intltool-native gnome-common-native glib-2.0-native" - -PNAME = "gtksourceview" - -S = "${WORKDIR}/${PNAME}-${PV}" - -inherit gnomebase lib_package gettext distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -# overrule SRC_URI from gnome.conf -SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive \ - file://gtk-doc.make \ - file://suppress-string-format-literal-warning.patch \ - file://0001-test-widget.c-fix-non-literal-format-string-issues.patch \ - " -SRC_URI[archive.md5sum] = "1219ad1694df136f126507466aeb41aa" -SRC_URI[archive.sha256sum] = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e" - -do_configure_prepend() { - cp ${WORKDIR}/gtk-doc.make ${S}/ - sed -i -e s:docs::g ${S}/Makefile.am - echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make -} - -FILES_${PN} += " ${datadir}/gtksourceview-2.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index f7884930c..13f81b4c9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -10,7 +10,7 @@ PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" -inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection upstream-version-is-even +inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb index 10deaffb8..bb49550c5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb @@ -10,12 +10,17 @@ PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" -inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.2/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "c9e6913c2fd30ca2fcdd71482faf8b99" -SRC_URI[sha256sum] = "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675" +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.4/${PNAME}-${PV}.tar.xz" +SRC_URI[md5sum] = "5c47e314517692f2622a0b724c65e628" +SRC_URI[sha256sum] = "9ddb914aef70a29a66acd93b4f762d5681202e44094d2d6370e51c9e389e689a" + +GIR_MESON_OPTION = 'gir' +GTKDOC_MESON_OPTION = "gtk_doc" FILES_${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb index d9f643106..d3b3bde43 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb @@ -6,7 +6,7 @@ SECTION = "x11/gnome/libs" DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" -inherit distro_features_check gnomebase gobject-introspection gettext +inherit features_check gnomebase gobject-introspection gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb index a7c8a6fce..a990bfcfd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.0+" LIC_FILES_CHKSUM = "file://tap.c;beginline=1;endline=20;md5=71756eeb144e9eeb177c69aa672b1635" PR = "r4" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index b594198a4..f0c9cdb0e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even # depends on libxau -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb new file mode 100644 index 000000000..d72b6ce24 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "A library to access weather information from online services" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even + +SRC_URI[archive.md5sum] = "52c3b1e27887fc88f862c92c42d930c1" +SRC_URI[archive.sha256sum] = "02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +GTKDOC_MESON_OPTION = "gtk_doc" + +DEPENDS = " \ + gtk+3 \ + json-glib \ + libsoup-2.4 \ + geocode-glib \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb index 7f52c42cd..a0874521e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb @@ -12,7 +12,7 @@ DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native" B = "${S}" -inherit distro_features_check autotools pkgconfig gobject-introspection +inherit features_check autotools pkgconfig gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb index e4829ea8c..d88161a3d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb @@ -15,7 +15,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -inherit gnomebase gobject-introspection gtk-doc gettext distro_features_check +inherit gnomebase gobject-introspection gtk-doc gettext features_check SRC_URI[archive.md5sum] = "89dbe5a1843fd3745b8b64b34a2ef55d" SRC_URI[archive.sha256sum] = "9595835cf28d0fc6af5526a18f77f2fcf3ca8c09e36741bb33915b6e69b8e3ca" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index f50b9ceb9..9eb041c27 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -8,7 +8,7 @@ DEPENDS = "intltool-native gnome-common-native gtk+ gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -inherit gnomebase gobject-introspection distro_features_check +inherit gnomebase gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index 501a44972..3cef0d2e5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" -inherit autotools pkgconfig gettext gobject-introspection distro_features_check +inherit autotools pkgconfig gettext gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb index ef6ea7946..8f15c5774 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb @@ -10,7 +10,7 @@ DEPENDS = "gsettings-desktop-schemas startup-notification \ gnome-doc-utils gdk-pixbuf-native \ gtk+3 glib-2.0 libcanberra libgtop intltool-native" -inherit autotools gettext gnomebase distro_features_check +inherit autotools gettext gnomebase features_check # depends on startup-notification which depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch deleted file mode 100644 index f19eb4979..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a4ed38e95cbe07f02028249b8b315565a5ac1e43 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 5 May 2018 22:32:45 -0700 -Subject: [PATCH] nautilus: drop gnome-desktop thumbnail API with new - gdk-pixbuf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If gdk-pixbuf >= 2.36.5 is available, its scaling API can do what we -want, so we don’t need to use the deprecated gnome-desktop one. - -Also fixes compile errors seen on master -nautilus-properties-window.c:5101: undefined reference to `gnome_desktop_thumbnail_scale_down_pixbuf' - -Upstream-Status: Backport - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/nautilus-properties-window.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c -index dea8b0f..fad9bd1 100644 ---- a/src/nautilus-properties-window.c -+++ b/src/nautilus-properties-window.c -@@ -5098,10 +5098,11 @@ update_preview_callback (GtkFileChooser *icon_chooser, - scale = (double)gdk_pixbuf_get_height (pixbuf) / - gdk_pixbuf_get_width (pixbuf); - -- scaled_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf -+ scaled_pixbuf = gdk_pixbuf_scale_simple - (pixbuf, - PREVIEW_IMAGE_WIDTH, -- scale * PREVIEW_IMAGE_WIDTH); -+ scale * PREVIEW_IMAGE_WIDTH, -+ GDK_INTERP_HYPER); - g_object_unref (pixbuf); - pixbuf = scaled_pixbuf; - } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb deleted file mode 100644 index bdb2f3c88..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=36cf660aea2b8beffba7945f44a7e748 \ - file://COPYING.EXTENSIONS;md5=7579d6678402a1868631bf82c93ff0d4 \ - file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" - -inherit distro_features_check autotools pkgconfig gobject-introspection - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/${MAJ_VER}/nautilus-${PV}.tar.xz \ - file://0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch \ - " - -SRC_URI[md5sum] = "0f578bda5655c0ce204befafca5803d7" -SRC_URI[sha256sum] = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15" - -DEPENDS = "gtk+3 gnome-desktop3 gsettings-desktop-schemas glib-2.0-native intltool-native pango" - -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = " \ - --disable-gtk-doc \ - --disable-update-mimedb \ - --disable-nst-extension \ - --enable-tracker=no \ - --disable-schemas-compile \ - --enable-xmp=no \ - --enable-libexif=no \ -" - -FILES_${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb new file mode 100644 index 000000000..789a11dfd --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + fontconfig \ + gtk+3 \ + gnome-desktop3 \ + gsettings-desktop-schemas \ + gnome-autoar \ + tracker \ +" + +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even + +SRC_URI[archive.md5sum] = "19e4f1d89fb9d0ff135d5b1974ce43b5" +SRC_URI[archive.sha256sum] = "37ce2c16a610c589dcc7660f9092446465568e38e29bce6ed8c24f2e8e0077f3" + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG = "extensions" +PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb new file mode 100644 index 000000000..590d7bdaf --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Tracker is a file search engine" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + libxml2-native \ + dbus-native \ + glib-2.0 \ + sqlite3 \ + libarchive \ + dbus \ + icu \ + json-glib \ + libsoup-2.4 \ + libstemmer \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check + +SRC_URI[archive.md5sum] = "5e75b611b190c4cebf53e3de15266429" +SRC_URI[archive.sha256sum] = "b6748726e465ad2f4d991560634b1fd0df8841f3d981b3b837c4162abedf08a1" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG ??= "fts" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" +# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set +PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false" + +# set required cross property sqlite3_has_fts5 +do_write_config[vardeps] += "PACKAGECONFIG" +do_write_config_append() { + echo "[properties]" > ${WORKDIR}/meson-tracker.cross + echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross +} + +EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/tracker-2.0 \ + ${systemd_user_unitdir} \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb new file mode 100644 index 000000000..af2bab380 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Collection of scripts and build utilities for documentation" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ +" + +inherit gnomebase itstool + +DEPENDS += " \ + libxslt-native \ + libxml2-native \ + yelp-xsl \ +" + +SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e" +SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9" + +RDEPENDS_${PN} += "yelp-xsl" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb new file mode 100644 index 000000000..20052cf16 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "XSL stylesheets for the yelp help browser" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +inherit gnomebase gettext itstool + +DEPENDS += "libxml2" + +SRC_URI[archive.md5sum] = "f8c4e777aee8b055251c333ef48a0cd0" +SRC_URI[archive.sha256sum] = "e8063aee67d1df634f3d062f1c28130b2dabb3c0c66396b1af90388f34e14ee2" + +RDEPENDS_${PN}_append_class-target = " libxml2 itstool" + +# ensure our native consumers are forced to inherit itstool +RDEPENDS_${PN}_append_class-native = " libxml2" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb new file mode 100644 index 000000000..f6311965e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Help browser for the GNOME desktop" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ +" + +inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc + +SRC_URI[archive.md5sum] = "776e29bd16424c8712cbf340cfe6429b" +SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045" + +DEPENDS += " \ + libxml2-native \ + glib-2.0-native \ + gtk+3 \ + appstream-glib \ + libxslt \ + sqlite3 \ + webkitgtk \ + yelp-xsl \ +" + +do_configure_prepend() { + export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool +} + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/yelp-xsl \ +" + +RDEPENDS_${PN} += "yelp-xsl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch deleted file mode 100644 index 488548667..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 38eeb345fdfca0298b11427aa942b68e627ba10e Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski <bgolaszewski@baylibre.com> -Date: Thu, 12 Sep 2019 13:14:55 +0200 -Subject: [PATCH] build: don't generate manual - -We don't have yelp in yocto and even if we did it would pull in -webkitgtk just to generate help. Just remove the manual generation -altogether. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> ---- - Makefile.am | 3 +-- - configure.ac | 5 ----- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 81ae6a7..bd073dd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,8 +4,7 @@ AM_CPPFLAGS = src - SUBDIRS = \ - src \ - po \ -- data \ -- help -+ data - - EXTRA_DIST = \ - autogen.sh \ -diff --git a/configure.ac b/configure.ac -index 5dccdb0..f88b2c0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,11 +115,6 @@ GETTEXT_PACKAGE=zenity - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) - --# ******************************* --# User manual --# ******************************* --YELP_HELP_INIT -- - # ******************************* - - AC_SUBST([AM_CPPFLAGS]) --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb index 295288bfb..c6883ae44 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb @@ -4,19 +4,17 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -inherit distro_features_check gnomebase gettext +inherit gnomebase itstool gnome-help features_check gettext -DEPENDS = "gtk+3" +DEPENDS = " \ + yelp-tools-native \ + gtk+3 \ +" REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-build-don-t-generate-manual.patch \ -" - SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a" SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95" -GNOME_COMPRESS_TYPE="xz" do_install_append() { # Remove gdialog compatibility helper - we don't want to pull in perl diff --git a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb new file mode 100644 index 000000000..ec3e4a3d3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb @@ -0,0 +1,37 @@ +SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" +HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + gperf-native \ + glib-2.0 \ + gtk+3 \ + libyaml \ + libarchive \ + libsoup-2.4 \ + json-glib \ + gdk-pixbuf \ + freetype \ + fontconfig \ + libstemmer \ +" + +inherit meson gobject-introspection gettext bash-completion + +SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" +SRC_URI[md5sum] = "78306049412396a72746186452abdf66" +SRC_URI[sha256sum] = "04f290d73bc865071112076b8a3345df2730783a16af976fe3becfd2f50d5992" + +EXTRA_OEMESON = " \ + -Drpm=false \ +" + +FILES_${PN} += "${libdir}/asb-plugins-5" + +FILES_${PN}-dev += " \ + ${datadir}/installed-tests \ + ${datadir}/gettext \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb new file mode 100644 index 000000000..8f6cd0431 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit meson gobject-introspection gettext gtk-doc features_check + +DEPENDS = " \ + gtk+3 \ + colord \ +" + +SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" +SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" + +EXTRA_OEMESON = "-Dman=false" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb new file mode 100644 index 000000000..ca65114c4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb @@ -0,0 +1,34 @@ +require ${BPN}.inc + +inherit native + +DEPENDS += " \ + glib-2.0-native \ + dbus-native \ + iso-codes \ +" + +PACKAGECONFIG = "" + +# for allarch iso-codes +EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig" +# for allarch unicode-ucd - just to make configure happy +EXTRA_OECONF += "--with-ucd-dir=${RECIPE_SYSROOT}${datadir_native}/unicode/ucd" + +do_compile() { + cd src + # seems by moving to src we break dependency tracking so build what's + # necessary step by step + oe_runmake ibusenumtypes.h + oe_runmake ibusmarshalers.h + oe_runmake ibusenumtypes.c + oe_runmake unicode-parser +} + +do_install() { + install -d ${D}/${libdir} + install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir} + + install -d ${D}/${bindir} + install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir} +} diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb new file mode 100644 index 000000000..caec455b6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb @@ -0,0 +1,37 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0-native \ + glib-2.0 \ + dbus \ + iso-codes \ +" + +inherit gtk-icon-cache bash-completion + +# for unicode-ucd +EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" + +PACKAGECONFIG ??= " \ + dconf vala \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ +" + +do_configure_prepend() { + # run native unicode-parser + sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/GConf \ + ${datadir}/glib-2.0 \ + ${libdir}/gtk-3.0 \ +" + +FILES_${PN}-dev += " \ + ${datadir}/gettext \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc new file mode 100644 index 000000000..0f4ae7d04 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -0,0 +1,36 @@ +SUMMARY = "Intelligent Input Bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala + +PV = "1.5.21" + +DEPENDS = "unicode-ucd" + +SRC_URI = " \ + git://github.com/ibus/ibus.git \ + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ +" +SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d" +S = "${WORKDIR}/git" + +PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" +PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" +PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" +PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" + +EXTRA_OECONF = " \ + --disable-tests \ + --disable-emoji-dict \ + --disable-python2 \ +" + +do_configure_prepend() { + touch ${S}/ChangeLog + touch ${S}/ABOUT-NLS +} diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch new file mode 100644 index 000000000..3701d19f5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -0,0 +1,39 @@ +From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 10 May 2019 14:30:08 +0200 +Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch +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@gmail.com> +--- + data/dconf/make-dconf-override-db.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh +index 9c650e97..02fbf059 100755 +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -46,5 +42,3 @@ for schema in $schemas; do + done + + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID +-- +2.20.1 + diff --git a/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb index 0a0a3e6b4..d567d00d3 100644 --- a/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb +++ b/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0 \ RDEPENDS_${PN} = "gtk+" -inherit distro_features_check autotools gtk-doc gobject-introspection +inherit features_check autotools gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend() { diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch new file mode 100644 index 000000000..73ebeb484 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -0,0 +1,63 @@ +From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 9 May 2019 22:06:48 +0200 +Subject: [PATCH] Build so-lib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] https://aur.archlinux.org/cgit/aur.git/commit/dynamiclib.patch?h=snowball-git&id=a9cbf4f42f3661e4b8f791cd4374233821716ea1 + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 7 +++++-- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 libstemmer/symbol.map + +diff --git a/GNUmakefile b/GNUmakefile +index cbd6ff7..a85230b 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations + CPPFLAGS=-Iinclude + +-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + clean: + rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ +@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) + libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(AR) -cru $@ $^ + ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ ++ + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o + $(CC) $(CFLAGS) -o $@ $^ + +diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map +new file mode 100644 +index 0000000..7a3d423 +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; +-- +2.20.1 + diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch new file mode 100644 index 000000000..69c1d670e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch @@ -0,0 +1,46 @@ +From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 6 Oct 2019 13:05:08 +0200 +Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build + environment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if +their LDFLAGS are ignored. + +Upstream-Status: Submitted [1] + +[1] https://github.com/snowballstem/snowball/pull/120 + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 76f6ae9..47c6077 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -179,7 +179,7 @@ clean: + -rmdir $(js_output_dir) + + snowball: $(COMPILER_OBJECTS) +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + $(COMPILER_OBJECTS): $(COMPILER_HEADERS) + +@@ -204,7 +204,7 @@ libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ + + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) + $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb new file mode 100644 index 000000000..96dd880b6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "Snowball compiler and stemming algorithms" +HOMEPAGE = "https://snowballstem.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e" + +DEPENDS_class-target = "${BPN}-native" + +SRC_URI = "\ + git://github.com/snowballstem/snowball.git \ + file://0001-Build-so-lib.patch \ + file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \ +" +SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74" +S = "${WORKDIR}/git" +PV = "2.0.0" +LIBVER = "0.0.0" + +inherit lib_package + +BBCLASSEXTEND = "native" + +do_compile_prepend_class-target() { + # use native tools + sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/snowball ${D}${bindir} + install -m 755 ${S}/stemwords ${D}${bindir} + + install -d ${D}${libdir} + install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/ + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0 + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so + + install -d ${D}${includedir} + install -m 644 ${S}/include/*.h ${D}${includedir} +} diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb index 74053e451..2c580f872 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3c DEPENDS = "popt libpam glib-2.0 python3" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" inherit autotools gettext python3native python3-dir pkgconfig gtk-doc diff --git a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb new file mode 100644 index 000000000..6fb3b82ef --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb @@ -0,0 +1,14 @@ +SUMMARY = "A tablet description library" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/linuxwacom/libwacom.git" +SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index 4e49becc4..03fd0517b 100644 --- a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -10,7 +10,7 @@ SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" -inherit distro_features_check setuptools3 pkgconfig gtk-icon-cache gsettings +inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb index 052783626..a94440c93 100644 --- a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb @@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit distro_features_check autotools gettext pkgconfig +inherit features_check autotools gettext pkgconfig EXTRA_OEMAKE += "INSTALL='install -p'" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch deleted file mode 100644 index 4bedef805..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 36360b16833400de7818151be5588b16ac4fd5bc Mon Sep 17 00:00:00 2001 -From: Barret Rhoden <brho@google.com> -Date: Thu, 14 Mar 2019 17:30:38 -0400 -Subject: [PATCH] Fix missing include in sys/mman.h - -Linux commit 746c9398f5ac ("arch: move common mmap flags to -linux/mman.h") moved a few mmap flags, particularly MAP_PRIVATE, from -asm/mman.h to linux/mman.h. This broke klibc's build, which uses -MAP_PRIVATE. - -linux/mman.h includes asm/mman.h, so this commit merely includes -linux/mman.h instead of asm/mman.h. - -Signed-off-by: Barret Rhoden <brho@google.com> -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- -Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=d4853d030639cf3542ae39129c18b654d8d4f020] - usr/include/sys/mman.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usr/include/sys/mman.h b/usr/include/sys/mman.h -index 56f0b65c..3fd626e7 100644 ---- a/usr/include/sys/mman.h -+++ b/usr/include/sys/mman.h -@@ -7,7 +7,7 @@ - - #include <klibc/extern.h> - #include <sys/types.h> --#include <asm/mman.h> -+#include <linux/mman.h> - - #define MAP_FAILED ((void *)-1) - --- -2.23.0 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klibc-config-eabi.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klibc-config-eabi.patch deleted file mode 100644 index a6998f86d..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klibc-config-eabi.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1118cc971917abe19ddb029aa80417f6fd6bb343 Mon Sep 17 00:00:00 2001 -From: Thomas Kunze <thommycheck@gmx.de> -Date: Sat, 6 Aug 2011 05:30:14 +0000 -Subject: [PATCH] klibc: initial commit of version 1.5.24 - -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 -Signed-off-by: Thomas Kunze <thommycheck@gmx.de> - ---- - defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/defconfig -+++ b/defconfig -@@ -6,5 +6,5 @@ CONFIG_KLIBC_ZLIB=y - CONFIG_REGPARM=y - # ARM options - # CONFIG_KLIBC_THUMB is not set --# CONFIG_AEABI is not set -+CONFIG_AEABI=y - # CONFIG_DEBUG_INFO is not set diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.6.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.7.bb index 4011aa231..4011aa231 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.6.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.7.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.6.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.7.bb index c835fd647..c835fd647 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.6.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.7.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.6.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.7.bb index 06e71cb7b..06e71cb7b 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.6.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.7.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 26689f87e..e1afe7f33 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -5,9 +5,8 @@ SECTION = "libs" LICENSE = "BSD-3-Clause & GPL-2.0 & MIT & Zlib" LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b" DEPENDS = "linux-libc-headers perl-native" -SRCREV = "22b36d1ae34416bc48869619cbb0cccb2070f48f" -SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ +SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ ${ARMPATCHES} \ file://klcc-consider-sysroot.patch \ file://klcc-cross-accept-clang-options.patch \ @@ -23,16 +22,18 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ file://0001-klibc-add-getrandom-syscall.patch \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch \ - file://0001-Fix-missing-include-in-sys-mman.h.patch \ " ARMPATCHES ?= "" -ARMPATCHES_arm = "file://klibc-config-eabi.patch \ +ARMPATCHES_arm = " \ file://armv4-fix-v4bx.patch \ " -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "712f8bc1a069e03d92584b7f5380c521" +SRC_URI[sha256sum] = "abef2637ca823485d9c90ce9512e2b08a65047ec4da204635eeaef95a41a9122" + +S = "${WORKDIR}/klibc-${PV}" OPTFLAGS = "${TUNE_CCARGS} -Os" OPTFLAGS_append_toolchain-clang = " -fno-builtin-bcmp" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.6.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.7.bb index 7df0b0a3d..7df0b0a3d 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.6.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.7.bb diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb index 3ddb818df..7a6b872f1 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb @@ -8,6 +8,6 @@ RRECOMMENDS_${PN} = "adwaita-icon-theme" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "212d85ebce89b32468b59e1164050d40" SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" -inherit distro_features_check autotools pkgconfig gettext +inherit features_check autotools pkgconfig gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch new file mode 100644 index 000000000..59bd4ef08 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch @@ -0,0 +1,176 @@ +From 81f29b028473a3d8ac0aaeb126fc0336a98bb077 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Nov 2019 11:03:16 -0800 +Subject: [PATCH] adjust for 64bit time_t + +Break assumption about time_t being of certain size, and use intmax_t to +print it where needed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cron.c | 4 ++-- + src/epggrab/module/psip.c | 2 +- + src/epggrab/otamux.c | 2 +- + src/parsers/parser_teletext.c | 2 +- + src/tvheadend.h | 6 +----- + src/webui/webui.c | 4 ++-- + 6 files changed, 8 insertions(+), 12 deletions(-) + +--- a/src/cron.c ++++ b/src/cron.c +@@ -329,9 +329,9 @@ cron_next ( cron_t *c, const time_t now, + *ret = mktime(&tmp); + if (*ret <= now) { + #ifndef CRON_TEST +- tvherror(LS_CRON, "invalid time, now %"PRItime_t", result %"PRItime_t, now, *ret); ++ tvherror(LS_CRON, "invalid time, now %"PRItime_t", result %"PRItime_t, (intmax_t)now, (intmax_t)*ret); + #else +- printf("ERROR: invalid time, now %"PRItime_t", result %"PRItime_t"\n", now, *ret); ++ printf("ERROR: invalid time, now %"PRItime_t", result %"PRItime_t"\n", (intmax_t)now, (intmax_t)*ret); + #endif + *ret = now + 600; + } +--- a/src/epggrab/module/psip.c ++++ b/src/epggrab/module/psip.c +@@ -383,14 +383,14 @@ _psip_eit_callback_channel + + tvhtrace(LS_PSIP, " %03d: [%s] eventid 0x%04x at %"PRItime_t", duration %d, title: '%s' (%d bytes)", + i, ch ? channel_get_name(ch, channel_blank_name) : "(null)", +- eventid, start, length, ++ eventid, (intmax_t)start, length, + lang_str_get(title, NULL), titlelen); + + save2 = changes2 = 0; + + ebc = epg_broadcast_find_by_time(ch, mod, start, stop, 1, &save2, &changes2); + tvhtrace(LS_PSIP, " eid=%5d, start=%"PRItime_t", stop=%"PRItime_t", ebc=%p", +- eventid, start, stop, ebc); ++ eventid, (intmax_t)start, (intmax_t)stop, ebc); + if (!ebc) goto next; + + save2 |= epg_broadcast_set_dvb_eid(ebc, eventid, &changes2); +--- a/src/epggrab/otamux.c ++++ b/src/epggrab/otamux.c +@@ -719,7 +719,7 @@ epggrab_ota_start_cb ( void *p ); + static void + epggrab_ota_next_arm( time_t next ) + { +- tvhtrace(LS_EPGGRAB, "next ota start event in %li seconds", next - time(NULL)); ++ tvhtrace(LS_EPGGRAB, "next ota start event in %jd seconds", (intmax_t)(next - time(NULL))); + gtimer_arm_absn(&epggrab_ota_start_timer, epggrab_ota_start_cb, NULL, next); + dbus_emit_signal_s64("/epggrab/ota", "next", next); + } +--- a/src/parsers/parser_teletext.c ++++ b/src/parsers/parser_teletext.c +@@ -625,7 +625,7 @@ tt_construct_unix_time(uint8_t *buf) + r[2] = mktime(&tm); + + for(i = 0; i < 3; i++) +- v[i] = labs(r[i] - t); ++ v[i] = (time_t)llabs((long long)(r[i] - t)); + + if(v[0] < v[1] && v[0] < v[2]) + return r[0]; +--- a/src/tvheadend.h ++++ b/src/tvheadend.h +@@ -332,11 +332,7 @@ void tvh_qsort_r(void *base, size_t nmem + # endif /* ULONG_MAX */ + #endif /* __WORDSIZE */ + +-#if __WORDSIZE == 32 && defined(PLATFORM_FREEBSD) +-#define PRItime_t "d" +-#else +-#define PRItime_t "ld" +-#endif ++#define PRItime_t "jd" + + /* transcoding */ + #define TVH_NAME_LEN 32 +--- a/src/webui/webui.c ++++ b/src/webui/webui.c +@@ -886,9 +886,9 @@ http_dvr_list_playlist(http_connection_t + bandwidth = ((8*fsize) / (durration*1024.0)); + strftime(buf, sizeof(buf), "%FT%T%z", localtime_r(&(de->de_start), &tm)); + +- htsbuf_qprintf(hq, "#EXTINF:%"PRItime_t",%s\n", durration, lang_str_get(de->de_title, NULL)); ++ htsbuf_qprintf(hq, "#EXTINF:%"PRItime_t",%s\n", (intmax_t)durration, lang_str_get(de->de_title, NULL)); + +- htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRItime_t"\n", durration); ++ htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRItime_t"\n", (intmax_t)durration); + uuid = idnode_uuid_as_str(&de->de_id, ubuf); + htsbuf_qprintf(hq, "#EXT-X-STREAM-INF:PROGRAM-ID=%s,BANDWIDTH=%d\n", uuid, bandwidth); + htsbuf_qprintf(hq, "#EXT-X-PROGRAM-DATE-TIME:%s\n", buf); +@@ -944,9 +944,9 @@ http_dvr_playlist(http_connection_t *hc, + strftime(buf, sizeof(buf), "%FT%T%z", localtime_r(&(de->de_start), &tm)); + + htsbuf_append_str(hq, "#EXTM3U\n"); +- htsbuf_qprintf(hq, "#EXTINF:%"PRItime_t",%s\n", durration, lang_str_get(de->de_title, NULL)); ++ htsbuf_qprintf(hq, "#EXTINF:%"PRItime_t",%s\n", (intmax_t)durration, lang_str_get(de->de_title, NULL)); + +- htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRItime_t"\n", durration); ++ htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRItime_t"\n", (intmax_t)durration); + uuid = idnode_uuid_as_str(&de->de_id, ubuf); + htsbuf_qprintf(hq, "#EXT-X-STREAM-INF:PROGRAM-ID=%s,BANDWIDTH=%d\n", uuid, bandwidth); + htsbuf_qprintf(hq, "#EXT-X-PROGRAM-DATE-TIME:%s\n", buf); +--- a/src/dvr/dvr_rec.c ++++ b/src/dvr/dvr_rec.c +@@ -723,7 +723,7 @@ static const char * + dvr_sub_start(const char *id, const char *fmt, const void *aux, char *tmp, size_t tmplen) + { + char buf[16]; +- snprintf(buf, sizeof(buf), "%"PRItime_t, (time_t)dvr_entry_get_start_time((dvr_entry_t *)aux, 0)); ++ snprintf(buf, sizeof(buf), "%"PRItime_t, (intmax_t)dvr_entry_get_start_time((dvr_entry_t *)aux, 0)); + return dvr_do_prefix(id, fmt, buf, tmp, tmplen); + } + +@@ -747,7 +747,7 @@ static const char * + dvr_sub_stop(const char *id, const char *fmt, const void *aux, char *tmp, size_t tmplen) + { + char buf[16]; +- snprintf(buf, sizeof(buf), "%"PRItime_t, (time_t)dvr_entry_get_stop_time((dvr_entry_t *)aux)); ++ snprintf(buf, sizeof(buf), "%"PRItime_t, (intmax_t)dvr_entry_get_stop_time((dvr_entry_t *)aux)); + return dvr_do_prefix(id, fmt, buf, tmp, tmplen); + } + +--- a/src/epggrab/module.c ++++ b/src/epggrab/module.c +@@ -582,7 +582,7 @@ static void _epggrab_socket_handler ( ep + + /* Process */ + if ( data ) { +- tvhinfo(mod->subsys, "%s: grab took %"PRItime_t" seconds", mod->id, tm2 - tm1); ++ tvhinfo(mod->subsys, "%s: grab took %"PRItime_t" seconds", mod->id, (intmax_t)(tm2 - tm1)); + epggrab_module_parse(mod, data); + + /* Failed */ +--- a/src/epggrab/module/opentv.c ++++ b/src/epggrab/module/opentv.c +@@ -486,7 +486,7 @@ opentv_parse_event_section_one + 1, &save, &changes); + tvhdebug(LS_OPENTV, "find by time start %"PRItime_t " stop " + "%"PRItime_t " eid %d = %p", +- ev.start, ev.stop, ev.eid, ebc); ++ (intmax_t)ev.start, (intmax_t)ev.stop, ev.eid, ebc); + save |= epg_broadcast_set_dvb_eid(ebc, ev.eid, &changes); + } else { + ebc = epg_broadcast_find_by_eid(ch, ev.eid); +--- a/src/webui/simpleui.c ++++ b/src/webui/simpleui.c +@@ -556,12 +556,12 @@ page_status(http_connection_t *hc, + "<title>%s</title>\n", + a.tm_year + 1900, a.tm_mon + 1, a.tm_mday, + a.tm_hour, a.tm_min, +- de->de_start, +- (time_t)dvr_entry_get_extra_time_pre(de), ++ (intmax_t)de->de_start, ++ (intmax_t)dvr_entry_get_extra_time_pre(de), + b.tm_year+1900, b.tm_mon + 1, b.tm_mday, + b.tm_hour, b.tm_min, +- de->de_stop, +- (time_t)dvr_entry_get_extra_time_post(de), ++ (intmax_t)de->de_stop, ++ (intmax_t)dvr_entry_get_extra_time_post(de), + buf); + + rstatus = val2str(de->de_sched_state, recstatustxt); diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index dc6cd46b0..e31fc6bb8 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -8,9 +8,11 @@ DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl uriparser zlib LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db" -SRC_URI = "git://github.com/tvheadend/tvheadend.git" +SRC_URI = "git://github.com/tvheadend/tvheadend.git \ + file://0001-adjust-for-64bit-time_t.patch \ + " -SRCREV = "bdc2ae9e19520a10cdf0bec0fcc0050b32bc75ff" +SRCREV = "fda89e85e0b6ae796d8a09e178d3937aa7869270" PV = "4.3+git${SRCPV}" PKGV = "4.3+git${GITPKGV}" @@ -21,3 +23,6 @@ EXTRA_OECONF += "--arch=${TARGET_ARCH} \ --disable-ffmpeg_static \ --disable-libav \ " + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index c4c623ad9..764ed375e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -4,9 +4,9 @@ SECTION = "libs/multimedia" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "62b38b1c66aec606f83b322bb03bd84810bbda41" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.0.x" +SRCREV = "c2f4683bf57f61451d14d219fdb25cf9f29cb7fe" S = "${WORKDIR}/git" -PV = "2.0.7" +PV = "2.0.9" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service deleted file mode 100644 index 1b5a3ad3e..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Start Gerbera, an UPnP media server -After=multi-user.target network-online.target -Wants=network-online.target - -[Service] -ExecStart=/usr/bin/gerbera -Environment='HOME=/root' -Type=simple -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target
\ No newline at end of file diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb index 9c78da0d2..c96e4c52e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb @@ -4,12 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \ - file://gerbera.service \ " -PV = "1.3.0+git${SRCPV}" -# v1.3.0 -SRCREV = "c7a81fb41e446ee67b3eac90e2caecd6de651a16" +PV = "1.3.2" +SRCREV = "42b035ea9098c02af503d6391a0ed56d973aaf23" S = "${WORKDIR}/git" @@ -26,8 +24,6 @@ EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_ do_install_append() { install -d ${D}/root/.config/ - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/gerbera.service ${D}${systemd_system_unitdir}/ } FILES_${PN} += "/root/.config/" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb deleted file mode 100644 index 94f6b575b..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gstd.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb index 455d89684..828caa883 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb @@ -1,8 +1,9 @@ -DESCRIPTION = "Gstreamer Daemon 1.0" +DESCRIPTION = "Gstreamer Daemon" SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" SECTION = "multimedia" LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon" @@ -14,6 +15,9 @@ SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SR " S = "${WORKDIR}/git" +# Remove the +really when upstream version is > 1.0 +PV = "1.0+really0.6.3" + inherit autotools pkgconfig gettext gtk-doc do_configure_prepend() { diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch index 43994e0ca..245785c82 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch @@ -1,7 +1,7 @@ From 07fce2101d83b5334de78e661ba0361c2874ebdf Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 18 Mar 2019 16:30:45 -0700 -Subject: [PATCH 1/5] Remove python venv +Subject: [PATCH 1/7] Remove python venv Remove the python venv requirements and instead just use the native python and pip pacakges. diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch index dd2431fdf..637854fdf 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch @@ -1,7 +1,7 @@ From 88696037af52d6a7f57bc0fb82598de1a25365cc Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Fri, 29 Mar 2019 16:09:57 -0700 -Subject: [PATCH 2/5] dev_setup.sh: Remove the git dependency +Subject: [PATCH 2/7] dev_setup.sh: Remove the git dependency Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch index a4290d1cd..d803f526d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch @@ -1,9 +1,10 @@ From 5ef52cdea278a1dff966a912549cb6708f2cb699 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Tue, 17 Sep 2019 11:31:47 -0700 -Subject: [PATCH 3/5] dev_setup.sh: Remove the TERM dependency +Subject: [PATCH 3/7] dev_setup.sh: Remove the TERM dependency Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] --- dev_setup.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch new file mode 100644 index 000000000..d2dc179ca --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch @@ -0,0 +1,31 @@ +From e3b6ca995caca22e65d012a54bc2aeb08eb7e9d4 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 15 Oct 2019 17:09:06 -0700 +Subject: [PATCH 4/7] dev_setup.sh: Ignore missing package manager + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + dev_setup.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/dev_setup.sh b/dev_setup.sh +index 72f734f36bf..0c8e11b8170 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -317,12 +317,6 @@ Please review the following package changes carefully." + echo -e "${YELLOW}Could not find package manager + ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools python-venv pygobject libtool libffi libjpg openssl autoconf bison swig glib2.0 portaudio19 mpg123 flac curl fann g++ jq\n$RESET" + +- echo 'Warning: Failed to install all dependencies. Continue? y/N' +- read -n1 continue +- if [[ $continue != 'y' ]] ; then +- exit 1 +- fi +- + fi + } + +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-pip-requirements-Don-t-install-requirements-with-pip.patch index 3063e7f8d..7f63ea13d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-pip-requirements-Don-t-install-requirements-with-pip.patch @@ -1,7 +1,7 @@ -From ac749f2512e8d121e8a64a8d5e6f226f16735dda Mon Sep 17 00:00:00 2001 +From 04b14c4569309f1a433d955773aeb8a3607a1360 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Tue, 19 Mar 2019 13:32:54 -0700 -Subject: [PATCH 4/5] pip requirements: Don't install requirements with pip +Subject: [PATCH 5/7] pip requirements: Don't install requirements with pip Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] @@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [embedded specific] delete mode 100644 test-requirements.txt diff --git a/dev_setup.sh b/dev_setup.sh -index 72f734f36bf..b5ca6851631 100755 +index 0c8e11b8170..be4a19de0c3 100755 --- a/dev_setup.sh +++ b/dev_setup.sh -@@ -357,19 +357,6 @@ fi +@@ -351,19 +351,6 @@ fi PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") @@ -37,7 +37,7 @@ index 72f734f36bf..b5ca6851631 100755 SYSMEM=$(free | awk '/^Mem:/ { print $2 }') MAXCORES=$(($SYSMEM / 512000)) MINCORES=1 -@@ -426,4 +413,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then +@@ -420,4 +407,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then fi #Store a fingerprint of setup diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch index 189b686c9..6f1f6f78d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch @@ -1,7 +1,7 @@ -From 9a0bd09706da3949db17ea7272d6647a487bb6ad Mon Sep 17 00:00:00 2001 +From 86a1d18d96f827baa0c1029c85a53fc89d436e17 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Tue, 19 Mar 2019 13:38:44 -0700 -Subject: [PATCH 5/5] Use python3 and pip3 instead of python and pip +Subject: [PATCH 6/7] Use python3 and pip3 instead of python and pip Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] @@ -73,7 +73,7 @@ index d80f0e75b13..9448ea3400f 100755 -output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") +output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") diff --git a/dev_setup.sh b/dev_setup.sh -index b5ca6851631..fcd0834669f 100755 +index be4a19de0c3..2d9e17ddfd6 100755 --- a/dev_setup.sh +++ b/dev_setup.sh @@ -48,7 +48,7 @@ param='' @@ -94,7 +94,7 @@ index b5ca6851631..fcd0834669f 100755 fi done -@@ -355,7 +355,7 @@ else +@@ -349,7 +349,7 @@ else fi fi diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch new file mode 100644 index 000000000..574bda144 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch @@ -0,0 +1,30 @@ +From b48b3d240cb0fa5e76aa5daf578e51bb8126431d Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Wed, 16 Oct 2019 09:18:39 -0700 +Subject: [PATCH 7/7] mycroft.conf: Use pocketsphinx by default + +precise only works on certain architectures, to make Mycroft more +versitle use pocketsphinx as it is architecture independent. + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + mycroft/configuration/mycroft.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mycroft/configuration/mycroft.conf b/mycroft/configuration/mycroft.conf +index 1d0be0dcd2b..d2dc75dac44 100644 +--- a/mycroft/configuration/mycroft.conf ++++ b/mycroft/configuration/mycroft.conf +@@ -196,7 +196,7 @@ + // Hotword configurations + "hotwords": { + "hey mycroft": { +- "module": "precise", ++ "module": "pocketsphinx", + "phonemes": "HH EY . M AY K R AO F T", + "threshold": 1e-90, + "lang": "en-us" +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb index d4ac4096b..3c7bd8963 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb @@ -11,8 +11,10 @@ SRC_URI = "git://github.com/MycroftAI/mycroft-core.git;branch=master \ file://0001-Remove-python-venv.patch \ file://0002-dev_setup.sh-Remove-the-git-dependency.patch \ file://0003-dev_setup.sh-Remove-the-TERM-dependency.patch \ - file://0004-pip-requirements-Don-t-install-requirements-with-pip.patch \ - file://0005-Use-python3-and-pip3-instead-of-python-and-pip.patch \ + file://0004-dev_setup.sh-Ignore-missing-package-manager.patch \ + file://0005-pip-requirements-Don-t-install-requirements-with-pip.patch \ + file://0006-Use-python3-and-pip3-instead-of-python-and-pip.patch \ + file://0007-mycroft.conf-Use-pocketsphinx-by-default.patch \ file://dev_opts.json \ file://mycroft-setup.service \ file://mycroft.service \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb deleted file mode 100644 index fcd321cb0..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${BPN}.inc - -LDFLAGS_append_riscv64 = " -pthread" - -SRC_URI += " \ - file://0006-make-opencv-configurable.patch \ - file://0007-use-vorbisidec.patch \ - file://0008-fix-luaL-checkint.patch \ -" -SRC_URI[md5sum] = "4ff71d262e070fd19f86a1c3542c7b4e" -SRC_URI[sha256sum] = "18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb index 7308465b1..fa7174d32 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb @@ -16,9 +16,15 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" -SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz" +SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ + file://0006-make-opencv-configurable.patch \ + file://0007-use-vorbisidec.patch \ + file://0008-fix-luaL-checkint.patch \ +" +SRC_URI[md5sum] = "744442ec0c145453ea1d257914c8072e" +SRC_URI[sha256sum] = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6" -inherit autotools gettext pkgconfig distro_features_check +inherit autotools gettext pkgconfig features_check ARM_INSTRUCTION_SET = "arm" export BUILDCC = "${BUILD_CC}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch deleted file mode 100644 index 7668df35d..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4945dca11bc4ddec60bd858f45212dc8f39638e0 Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne <nicolas.dufresne@collabora.com> -Date: Tue, 5 Jul 2016 18:07:45 -0400 -Subject: [PATCH 1/6] build: Protect against unsupported CPU types - -Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> -Upstream-Status: Accepted [expected in 0.4] ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6f9553b..f5304b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,8 +70,9 @@ AS_CASE(["${host_cpu}"], - [ - HAVE_ARM=1 - ARCH_CFLAGS="-DWEBRTC_ARCH_ARM" -- ] -+ ], - # FIXME: Add MIPS support, see webrtc/BUILD.gn for defines -+ [AC_MSG_ERROR([Unsupported CPU type $host_cpu])] - ) - AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"]) - AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"]) --- -2.11.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch deleted file mode 100644 index 2e202b03c..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b5bda3431159b6505dcd069641c863018c4d4309 Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne <nicolas.dufresne@collabora.com> -Date: Wed, 6 Jul 2016 15:18:15 -0400 -Subject: [PATCH 2/6] build: Add ARM 64bit support - -Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> -Upstream-Status: Accepted [expected in 0.4] ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f5304b8..be20514 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,6 +71,11 @@ AS_CASE(["${host_cpu}"], - HAVE_ARM=1 - ARCH_CFLAGS="-DWEBRTC_ARCH_ARM" - ], -+ [aarch64*], -+ [ -+ HAVE_NEON=1 -+ ARCH_CFLAGS="-DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64" -+ ], - # FIXME: Add MIPS support, see webrtc/BUILD.gn for defines - [AC_MSG_ERROR([Unsupported CPU type $host_cpu])] - ) --- -2.11.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch deleted file mode 100644 index 82e270fac..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 7722fb8a3189fea0f6381f02a0e4f63c847f0393 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Sat, 6 Aug 2016 11:02:43 +0200 -Subject: [PATCH 3/6] build: fix architecture detection - -The current architecture detection, based on the "host_cpu" part of the -tuple does not work properly for a number of reason: - - - The code assumes that if host_cpu starts with "arm" then ARM - instructions are available, which is incorrect. Indeed, Cortex-M - platforms can run Linux, they are ARM platforms (so host_cpu = arm), - but they don't support ARM instructions: they support only the - Thumb-2 instruction set. - - - The armv7 case is also not very useful, as it is not standard at all - to pass armv7 as host_cpu even if the host system is actually ARMv7 - based. - - - For the same reason, the armv8 case is not very useful: ARMv8 is - AArch64, and there is already a separate case to handle this - architecture. - -So, this commit moves away from a host_cpu based logic, and instead -tests using AC_CHECK_DECLS() the built-in definitions of the compiler: - - - If we have __ARM_ARCH_ISA_ARM defined, then it's an ARM processor - that supports the ARM instruction set (this allows to exclude Thumb-2 - only processors). - - - If we have __ARM_ARCH_7A__, then we have an ARMv7-A processor, and - we can enable the corresponding optimizations - - - Same for __aarch64__, __i386__ and __x86_64__. - -In addition, we remove the AC_MSG_ERROR() that makes the build fail for -all architectures but the ones that are explicitly supported. Indeed, -webrtc-audio-processing builds just fine for other architectures (tested -on MIPS), it's just that none of the architecture-specific optimizations -will be used. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> -Upstream-Status: Accepted [expected in 0.4] ---- - configure.ac | 35 +++++++++++------------------------ - 1 file changed, 11 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index be20514..e898014 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,30 +55,17 @@ AS_CASE(["${host}"], - ) - AC_SUBST(PLATFORM_CFLAGS) - --AS_CASE(["${host_cpu}"], -- [i?86|x86_64], -- [ -- HAVE_X86=1 -- ], -- [armv7*|armv8*], -- [ -- HAVE_ARM=1 -- HAVE_ARMV7=1 -- ARCH_CFLAGS="-DWEBRTC_ARCH_ARM -DWEBRTC_ARCH_ARM_V7" -- ], -- [arm*], -- [ -- HAVE_ARM=1 -- ARCH_CFLAGS="-DWEBRTC_ARCH_ARM" -- ], -- [aarch64*], -- [ -- HAVE_NEON=1 -- ARCH_CFLAGS="-DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64" -- ], -- # FIXME: Add MIPS support, see webrtc/BUILD.gn for defines -- [AC_MSG_ERROR([Unsupported CPU type $host_cpu])] --) -+# Testing __ARM_ARCH_ISA_ARM since the code contains ARM instructions, -+# which don't work on Thumb-2 only platforms (ARMv7-M). -+AC_CHECK_DECLS([__ARM_ARCH_ISA_ARM], -+ [HAVE_ARM=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM"]) -+AC_CHECK_DECLS([__ARM_ARCH_7A__], -+ [HAVE_ARMV7=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM_V7"]) -+AC_CHECK_DECLS([__aarch64__], -+ [HAVE_NEON=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64"]) -+AC_CHECK_DECLS([__i386__], [HAVE_X86=1]) -+AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1]) -+ - AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"]) - AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"]) - AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"]) --- -2.11.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.1.bb index dbba2f488..b94dcf9f1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.1.bb @@ -9,21 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da08a38a32a340c5d91e13ee86a118f2 \ file://webrtc/common.h;beginline=1;endline=9;md5=41f7322d91deabaf0acbbd0b8d0bc548 \ " -# Note that patch 3 effectively reverts patches 1 and 2. The only reason -# why patches 1 and 2 are included is that otherwise patch 3 wouldn't -# apply cleanly. SRC_URI = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${BP}.tar.xz \ - file://0001-build-Protect-against-unsupported-CPU-types.patch \ - file://0002-build-Add-ARM-64bit-support.patch \ - file://0003-build-fix-architecture-detection.patch \ file://0004-typedefs.h-add-support-for-64-bit-and-big-endian-MIP.patch \ file://0005-typedefs.h-add-support-for-PowerPC.patch \ file://0006-common_audio-implement-endianness-conversion-in-wav-.patch \ file://riscv_support.patch \ " -SRC_URI[md5sum] = "336ae032f608e65808ac577cde0ab72c" -SRC_URI[sha256sum] = "756e291d4f557d88cd50c4fe3b8454ec238362d22cedb3e6173240d90f0a80fa" +SRC_URI[md5sum] = "6e10724ca34bcbc715a4c208273acb0c" +SRC_URI[sha256sum] = "a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf" LDFLAGS_append_libc-musl = " -lexecinfo" -inherit autotools +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch new file mode 100644 index 000000000..00115cfca --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch @@ -0,0 +1,81 @@ +Fix fail to enable bluetooth issue + +When launch blueman-manager while bluetooth is disable, it may fails +with error: + + Failed to enable bluetooth + +Because when get bluetooth status right after change its status, the +status may not be updated that plugin applet/KillSwitch.py sets the +bluetooth status via method of another dbus service which doesn't return +immediately. + +Provides a new dbus method for PowerManager which checks whether dbus +method SetBluetoothStatus() has finished. Then it makes sure to get +right bluetooth status. + +Upstream-Status: Inappropriate +Send to upstream but not accepted: +https://github.com/blueman-project/blueman/pull/1121 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + blueman/Functions.py | 12 +++++++++++- + blueman/plugins/applet/PowerManager.py | 4 ++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/blueman/Functions.py b/blueman/Functions.py +index 3b76271..c5eeb27 100644 +--- a/blueman/Functions.py ++++ b/blueman/Functions.py +@@ -17,7 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # +-from time import sleep ++from time import sleep, time + import re + import os + import signal +@@ -86,6 +86,16 @@ def check_bluetooth_status(message, exitfunc): + return + + applet.SetBluetoothStatus('(b)', True) ++ ++ timeout = time() + 10 ++ while applet.GetRequestStatus(): ++ sleep(0.1) ++ if time() > timeout: ++ # timeout 5s has been set in applet/PowerManager.py ++ # so it should NOT reach timeout here ++ logging.warning('Should NOT reach timeout.') ++ break ++ + if not applet.GetBluetoothStatus(): + print('Failed to enable bluetooth') + exitfunc() +diff --git a/blueman/plugins/applet/PowerManager.py b/blueman/plugins/applet/PowerManager.py +index 8ec9fc4..29a0fb0 100644 +--- a/blueman/plugins/applet/PowerManager.py ++++ b/blueman/plugins/applet/PowerManager.py +@@ -48,6 +48,7 @@ class PowerManager(AppletPlugin): + self._add_dbus_signal("BluetoothStatusChanged", "b") + self._add_dbus_method("SetBluetoothStatus", ("b",), "", self.request_power_state) + self._add_dbus_method("GetBluetoothStatus", (), "b", self.get_bluetooth_status) ++ self._add_dbus_method("GetRequestStatus", (), "b", self.get_request_status) + + def on_unload(self): + self.parent.Plugins.Menu.unregister(self) +@@ -182,6 +183,9 @@ class PowerManager(AppletPlugin): + def get_bluetooth_status(self): + return self.current_state + ++ def get_request_status(self): ++ return self.request_in_progress ++ + def on_adapter_property_changed(self, _path, key, value): + if key == "Powered": + if value and not self.current_state: +-- +2.20.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb index 36de2af1d..96c8bb26c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb @@ -9,6 +9,7 @@ inherit autotools systemd gsettings python3native gtk-icon-cache SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ + file://0002-fix-fail-to-enable-bluetooth.patch \ " SRC_URI[md5sum] = "9de89abb31be45bdbf11f7884764a2dc" SRC_URI[sha256sum] = "f1eab2334e5a1587defa80900901048d14c2e8ffa8c0cff7240bc9937a61dbc3" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb index 79d1dada0..a5aa584f5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb @@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0531457992a97ecebc6975914a874a9d" UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" -SRC_URI[md5sum] = "c0375a1f725f1c191b43af60e4f7175b" -SRC_URI[sha256sum] = "33a26ad561546cd2cfe1e6de6352a85df72b41c37def8c7eb00e90e57c627a5c" + file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ + file://0001-dhcpcd-Fix-build-error-with-musl.patch" + +SRC_URI[md5sum] = "dc4f29a62afc53cdac311e925cfd1bc7" +SRC_URI[sha256sum] = "485d308fe10febd36b6f936e4260e4ab34a146e4f00a9f7a5509c4377ad5ea82" inherit pkgconfig autotools-brokensep diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch new file mode 100644 index 000000000..b48b467b8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch @@ -0,0 +1,34 @@ +Subject: [PATCH] dhcpcd: Fix build error with musl. + +Re-organize the header includes in if-linux.c to fix error as follows: +In file included from if-linux.c:49: +path/usr/include/netinet/if_ether.h:112:8: error: redefinition of 'struct ethhdr' + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + src/if-linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/if-linux.c b/src/if-linux.c +index fd47278..bfa878b 100644 +--- a/src/if-linux.c ++++ b/src/if-linux.c +@@ -37,6 +37,7 @@ + #include <linux/if_addr.h> + #include <linux/if_link.h> + #include <linux/if_packet.h> ++#include <netinet/if_ether.h> + #include <linux/if_tun.h> + #include <linux/if_vlan.h> + #include <linux/filter.h> +@@ -46,7 +47,6 @@ + + #include <arpa/inet.h> + #include <net/if.h> +-#include <netinet/if_ether.h> + #include <netinet/in_systm.h> + #include <netinet/in.h> + #include <net/route.h> +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service index 8dae0df5b..2d766488e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service @@ -4,8 +4,8 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=@STATEDIR@/run/radiusd/radiusd.pid -ExecStartPre=-@BASE_BINDIR@/chown -R radiusd.radiusd @STATEDIR@/run/radiusd +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-@BASE_BINDIR@/chown -R radiusd.radiusd /run/radiusd ExecStartPre=@SBINDIR@/radiusd -C ExecStart=@SBINDIR@/radiusd -d @SYSCONFDIR@/raddb ExecReload=@SBINDIR@/radiusd -C diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb index 8c95bbae3..31e6978d6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb @@ -230,3 +230,5 @@ FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" RDEPENDS_${PN} += "perl" RDEPENDS_${PN}-utils = "${PN} perl" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 53ba25e23..5b6e45c7b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -1,7 +1,7 @@ SUMMARY = "dumb networking library" HOMEPAGE = "http://code.google.com/p/libdnet/" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb index b0bd942ee..79d0dbeae 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb @@ -23,8 +23,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=302d50a6369f5f22efdb674db908167a" SECTION = "libs" SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-apache.tgz" -SRC_URI[md5sum] = "37cdec398ae9ebdd4640df74af893c95" -SRC_URI[sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4" +SRC_URI[md5sum] = "90ce7c7a001d2514410280706b3ab1a7" +SRC_URI[sha256sum] = "ec1bee6d82090ed6ea2690784ea4b294ab576a65d428da9fe8750f932d2da661" inherit cmake diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch index cd4291d91..e33d8eac1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch @@ -3,17 +3,15 @@ From: Khem Raj <raj.khem@gmail.com> Date: Sat, 22 Dec 2018 18:47:45 -0800 Subject: [PATCH] Add OpenEmbedded cross compile case -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- genconfig.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/genconfig.sh b/genconfig.sh -index dc42462..59922e9 100755 --- a/genconfig.sh +++ b/genconfig.sh -@@ -98,6 +98,12 @@ if [ -f ../shared/tomato_version ]; then +@@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then OS_VERSION="Tomato $TOMATO_VER" fi @@ -26,14 +24,14 @@ index dc42462..59922e9 100755 ${RM} ${CONFIGFILE} echo "/* MiniUPnP Project" >> ${CONFIGFILE} -@@ -318,6 +324,11 @@ case $OS_NAME in +@@ -346,6 +352,11 @@ case $OS_NAME in echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} - FW=netfilter + FW=iptables ;; + OpenEmbedded) + OS_URL=http://www.openembedded.org/ + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} -+ FW=netfilter ++ FW=iptables + ;; AstLinux) OS_URL=http://www.astlinux.org/ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb index 6b8fdca4c..81bfe66a9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -15,8 +15,8 @@ SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;do file://miniupnpd.service \ file://0001-Add-OpenEmbedded-cross-compile-case.patch \ " -SRC_URI[md5sum] = "394e676f555d8047be69730d9c4d23a5" -SRC_URI[sha256sum] = "29f49fe6868597d041ee29f511fa7b65781b9e4e85ef2569a2381c2079e1743e" +SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8" +SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" @@ -26,6 +26,7 @@ do_configure_prepend() { do_compile() { cd ${S} + CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux config.h CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb index 085807c4c..27508c4d9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb @@ -141,8 +141,11 @@ do_install_append() { rm -rf ${D}/run ${D}${localstatedir}/run - # For read-only filesystem, do not create links during bootup if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # For read-only filesystem, do not create links during bootup ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules fi } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.10.bb index d824eacf9..1ad5d55ac 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.10.bb @@ -34,8 +34,8 @@ SRC_URI_append_libc-musl = " \ file://0001-samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "f3c722bbcd903479008fa1b529f56365" -SRC_URI[sha256sum] = "c41f05fb567f7359998b451543501c7690a2bf6551d658a76bd6916316a410f4" +SRC_URI[md5sum] = "dde27447f39d124efe18f719ccf956dd" +SRC_URI[sha256sum] = "700c734b51610e2feaa0d6744f9bec0c0d8917bca8cc78d5b63a4591f32866a5" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.10(\.\d+)+).tar.gz" @@ -45,7 +45,7 @@ RDEPENDS_${PN}_remove = "perl" DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam libtasn1 jansson" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" DEPENDS_append_libc-musl = " libtirpc" @@ -189,15 +189,17 @@ do_install_append() { sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode fi - chmod 0750 ${D}${sysconfdir}/sudoers.d + chmod 0750 ${D}${sysconfdir}/sudoers.d || true rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba-gpupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_upgradedns - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_spnupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_kcc - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_dnsupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do + if [ -f "${D}${sbindir}/$f" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/$f + fi + done + if [ -f "${D}${bindir}/samba-tool" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool + fi } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.14.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.15.bb index 892fe4d4c..fbec1950d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.14.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.15.bb @@ -16,8 +16,8 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://0001-chdeck-for-gettid-API-during-configure.patch \ " -SRC_URI[md5sum] = "009254a9797ec93321c5936b99dcd6c8" -SRC_URI[sha256sum] = "2472989da3aace000d1ea5931ece68f8e5cc0c511e272d65182113a2481e822d" +SRC_URI[md5sum] = "b56cadfa840f706ff67d4df0256c03eb" +SRC_URI[sha256sum] = "bfb437746446ef72a03c501db13cd6da5edd2b41f55c80c437ba288be6da7dba" UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb index 19cfe46b7..6ff103c77 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb @@ -20,7 +20,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" -inherit setuptools distro_features_check +inherit setuptools features_check RDEPENDS_${PN} = " \ iptables \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.1.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.2.0.bb index ae379383a..5d8bc9ba9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.2.0.bb @@ -13,7 +13,7 @@ PROVIDES += "cyassl" RPROVIDES_${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https" -SRCREV = "50fbdb961fd8c2d8123064e567ae8ec44167732d" +SRCREV = "cb7b4af9861ad627faffdc3d24a196c2d11930b8" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index f511d729e..9109b105f 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -42,6 +42,8 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ " +RDEPENDS_packagegroup-meta-networking-connectivity_remove_libc-musl = "rdist" + RDEPENDS_packagegroup-meta-networking-daemons = "\ ippool radvd autofs keepalived proftpd openhpi lldpd \ ptpd igmpproxy opensaf squid \ @@ -50,6 +52,8 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "networkd-dispatcher", "", d)} \ " +RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" + RDEPENDS_packagegroup-meta-networking-devtools = "\ python-ldap grpc \ " @@ -81,6 +85,9 @@ RDEPENDS_packagegroup-meta-networking-netkit = "\ netkit-ftp netkit-rpc \ " +RDEPENDS_packagegroup-meta-networking-netkit_remove_libc-musl = " \ + netkit-rsh-client netkit-rsh-server netkit-telnet" + RDEPENDS_packagegroup-meta-networking-protocols = "\ tsocks freediameter xl2tpd babeld mdns net-snmp \ quagga pptp-linux zeroconf nopoll openflow rp-pppoe \ @@ -88,6 +95,8 @@ RDEPENDS_packagegroup-meta-networking-protocols = "\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \ " +RDEPENDS_packagegroup-meta-networking-protocols_remove_libc-musl = "mdns" + RDEPENDS_packagegroup-meta-networking-support = "\ ncp ndisc6 mtr tinyproxy ssmping ntp \ wpan-tools bridge-utils ifenslave celt051 pimd \ @@ -99,7 +108,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ libmemcached smcroute libtevent ipcalc c-ares uftp \ - ntimed linux-atm ssmtp openvpn lowpan-tools rdma-core \ + ntimed linux-atm ssmtp openvpn rdma-core \ iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ arptables macchanger nghttp2 strongswan fping \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch new file mode 100644 index 000000000..2a583466e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch @@ -0,0 +1,30 @@ +From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> +Date: Tue, 29 Oct 2019 13:19:37 +0800 +Subject: [PATCH] Bug fix for pid_t not found on musl. + +When compiling version 5.1.6 on musl, the following error occurs: +log.h:49:8: error: unknown type name 'pid_t' + +Upstream-Status: Pending + +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> +--- + lib/defaults.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/defaults.c b/lib/defaults.c +index a6ea116..b3ecfa5 100644 +--- a/lib/defaults.c ++++ b/lib/defaults.c +@@ -21,6 +21,7 @@ + #include <string.h> + #include <sys/utsname.h> + #include <sys/stat.h> ++#include <sys/types.h> + #include <stdarg.h> + + #include "config.h" +-- +2.20.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch index 410827b33..b991acad3 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch @@ -9,7 +9,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -update patch to version 5.1.5 +update patch to version 5.1.6 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- configure.in | 2 +- @@ -20,7 +20,7 @@ index 493b9f1..268d06b 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl - AC_INIT(.autofs-5.1.5) + AC_INIT(.autofs-5.1.6) # for pkg-config macros -m4_include([/usr/share/aclocal/pkg.m4]) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb index 9e43549e8..54f0b9991 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb @@ -25,11 +25,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://pkgconfig-libnsl.patch \ file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ + file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ " -SRC_URI[md5sum] = "03b13168ec7bd66a6f2d5f6fea705eee" -SRC_URI[sha256sum] = "86a8e56ea9d72bb53ff8cdfeefb5cafe983592c6b0178fb99c4a731e59879181" +SRC_URI[md5sum] = "e6800e0afd6009ecdff148088c564050" +SRC_URI[sha256sum] = "82094cad44f4e5c4f93eff2789cd66b57d7ab3fa646b7722d97608571001e694" UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" @@ -46,13 +47,19 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \ --enable-ignore-busy --with-openldap=no \ + --with-confdir=${sysconfdir}/default \ + --with-fifodir=/run \ + --with-flagdir=/run \ --with-sasl=no --with-libtirpc \ + --with-mapdir=${sysconfdir} \ --with-path=${STAGING_BINDIR_NATIVE} \ --with-fifodir=${localstatedir}/run \ --with-flagdir=${localstatedir}/run \ " CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ + initdir=${INIT_D_DIR} \ + piddir=/run \ " do_configure_prepend () { @@ -72,6 +79,11 @@ do_install_append () { if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run fi + # On hybrid systemd/sysvinit builds, we need to install the sysvinit script by hand. + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d -m 755 ${D}${INIT_D_DIR} + install -m 755 ${S}/samples/rc.autofs ${D}${INIT_D_DIR}/autofs + fi } SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index 594e55da1..be7131d7d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -2,7 +2,7 @@ SUMMARY = "Generic client/server library for SASL authentication" SECTION = "libs" HOMEPAGE = "http://asg.web.cmu.edu/sasl/" DEPENDS = "openssl db groff-native" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396" SRCREV = "e41cfb986c1b1935770de554872247453fdbb079" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch deleted file mode 100644 index f945c636f..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 24ce8f62e042e69497e1299212504c356179e15b Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Tue, 6 Nov 2018 11:16:06 -0800 -Subject: [PATCH] Fix i586 build issues with string length overflow. - -Gcc7 warns of possible string print overflow, on i586, -when printing password length (via a macro), generating -errors like: - -[ 59s] ^~~~~~~~~~~~~~~~~~~~ -[ 59s] In file included from /usr/include/stdio.h:862:0, -[ 59s] from idbm.h:27, -[ 59s] from context.h:22, -[ 59s] from idbm.c:59: -[ 59s] /usr/include/bits/stdio2.h:64:10: note: -'__builtin___snprintf_chk' output between 2 and 11 bytes into a -destination of size 8 -[ 59s] return __builtin___snprintf_chk (__s, __n, -__USE_FORTIFY_LEVEL - 1, -[ 59s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -~~~~~~~~~~ -[ 59s] __bos (__s), __fmt, __va_arg_pack ()); -[ 59s] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -[ 59s] cc1: all warnings being treated as errors -[ 59s] make[1]: *** [<builtin>: idbm.o] Error 1 -[ 59s] make[1]: Leaving directory - -The fix is to limit the size of the string printed, so that no -overflow is possible. - -The print macros in usr/idbm.c were updated, as well, to match -the newer version in libopeniscsiusr/idbm.c, also to help the -i586 build. - -Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi/commit/24ce8f62e042e69497e1299212504c356179e15b] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - libopeniscsiusr/idbm.c | 2 +- - usr/idbm.c | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c -index 7724de2..055dd9a 100644 ---- a/libopeniscsiusr/idbm.c -+++ b/libopeniscsiusr/idbm.c -@@ -676,7 +676,7 @@ updated: - if (!passwd_done && !strcmp(#_param, name)) { \ - passwd_done = 1; \ - name = #_param "_length"; \ -- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ -+ snprintf(passwd_len, 8, "%.7d", (int)strlen(value) & 0xffff); \ - value = passwd_len; \ - goto setup_passwd_len; \ - } -diff --git a/usr/idbm.c b/usr/idbm.c -index a0207e2..89a6c27 100644 ---- a/usr/idbm.c -+++ b/usr/idbm.c -@@ -30,6 +30,7 @@ - #include <fcntl.h> - #include <sys/stat.h> - #include <sys/file.h> -+#include <inttypes.h> - - #include "idbm.h" - #include "idbm_fields.h" -@@ -65,7 +66,7 @@ static struct idbm *db; - #define __recinfo_int(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_INT; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIi32, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -76,7 +77,7 @@ static struct idbm *db; - #define __recinfo_uint8(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_UINT8; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu8, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -87,7 +88,7 @@ static struct idbm *db; - #define __recinfo_uint16(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_UINT16; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu16, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -98,7 +99,7 @@ static struct idbm *db; - #define __recinfo_uint32(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_UINT32; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu32, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -1041,7 +1042,7 @@ updated: - if (!passwd_done && !strcmp(#_param, name)) { \ - passwd_done = 1; \ - name = #_param "_length"; \ -- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ -+ snprintf(passwd_len, 8, "%.7" PRIi32, (int)strlen(value) & 0xffff); \ - value = passwd_len; \ - goto setup_passwd_len; \ - } --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch deleted file mode 100644 index 08248d358..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 365efb2fd3062065af4b6eb3dc1661b96557dae8 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 21 Aug 2019 16:37:53 +0800 -Subject: [PATCH] Make iscsid systemd usage optional - -Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi -/commit/f71581bd641dc26d330cb8b97e5ec272dd08f811] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile | 5 +++++ - usr/Makefile | 2 ++ - usr/iscsid.c | 6 ++++++ - 3 files changed, 13 insertions(+) - -diff --git a/Makefile b/Makefile -index c533e9d..1ef0921 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,6 +39,11 @@ ifneq (,$(CFLAGS)) - export CFLAGS - endif - -+# export systemd disablement if set -+ifneq ($(NO_SYSTEMD),) -+export NO_SYSTEMD -+endif -+ - # Random comments: - # using '$(MAKE)' instead of just 'make' allows make to run in parallel - # over multiple makefile. -diff --git a/usr/Makefile b/usr/Makefile -index f9445ad..0203127 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) - ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr - LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -+ifneq ($(NO_SYSTEMD),) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) -+endif - PROGRAMS = iscsid iscsiadm iscsistart - - # libc compat files -diff --git a/usr/iscsid.c b/usr/iscsid.c -index 0c98440..164325e 100644 ---- a/usr/iscsid.c -+++ b/usr/iscsid.c -@@ -34,7 +34,9 @@ - #include <sys/wait.h> - #include <sys/types.h> - #include <sys/stat.h> -+#ifndef NO_SYSTEMD - #include <systemd/sd-daemon.h> -+#endif - - #include "iscsid.h" - #include "mgmt_ipc.h" -@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file) - /* called right before we enter the event loop */ - static void set_state_to_ready(void) - { -+#ifndef NO_SYSTEMD - if (sessions_to_recover) - sd_notify(0, "READY=1\n" - "RELOADING=1\n" -@@ -346,14 +349,17 @@ static void set_state_to_ready(void) - else - sd_notify(0, "READY=1\n" - "STATUS=Ready to process requests\n"); -+#endif - } - - /* called when recovery process has been reaped */ - static void set_state_done_reloading(void) - { -+#ifndef NO_SYSTEMD - sessions_to_recover = 0; - sd_notifyf(0, "READY=1\n" - "STATUS=Ready to process requests\n"); -+#endif - } - - int main(int argc, char *argv[]) --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch deleted file mode 100644 index 37b764e85..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch +++ /dev/null @@ -1,92 +0,0 @@ -From e9b49664e969fd5cad1abef7b8b59e1fb8d02a47 Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Mon, 12 Nov 2018 13:10:04 -0800 -Subject: [PATCH] Use pkg-config in Makefiles for newer libraries. - -These two recently-added libraries can be in different -locations on different distros, so use pkg-config to -added the appropriate actions in the make files. - -Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi/commit/ -623a81123c494f5c69dc6616bd72e838862e2f1f#diff-c4bf6688222ad28c9719cfaf88c16329] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libopeniscsiusr/Makefile | 8 +++++++- - usr/Makefile | 11 ++++++++--- - 2 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile -index bf7c96c..a045a45 100644 ---- a/libopeniscsiusr/Makefile -+++ b/libopeniscsiusr/Makefile -@@ -23,6 +23,8 @@ endif - INCLUDE_DIR ?= $(prefix)/include - PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig - -+PKG_CONFIG = /usr/bin/pkg-config -+ - LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr - - LIBISCSI_USR_VERSION_MAJOR=0 -@@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o - - CFLAGS ?= -O2 -g - CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC -+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) -+ -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) - - LIBADD = - - all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc - - $(LIBS): $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) -+ @echo CFLAGS= $(CFLAGS) -+ $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) - ln -sf $@ $(DEVLIB) - - $(LIBS_MAJOR): $(LIBS) -diff --git a/usr/Makefile b/usr/Makefile -index f9445ad..f1c35aa 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o - endif - endif - -+PKG_CONFIG = /usr/bin/pkg-config -+ - CFLAGS ?= -O2 -g - WARNFLAGS ?= -Wall -Wstrict-prototypes - CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - -I$(TOPDIR)/libopeniscsiusr -+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) - ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) - PROGRAMS = iscsid iscsiadm iscsistart - - # libc compat files -@@ -60,14 +65,14 @@ all: $(PROGRAMS) - - iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ - iscsid.o session_mgmt.o discoveryd.o mntcheck.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) - - iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb index 3cef70f5e..b75e54b9c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb @@ -8,21 +8,19 @@ HOMEPAGE = "http://www.open-iscsi.com/" LICENSE = "GPLv2 & LGPLv2.1" SECTION = "net" DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "120ac127654c4644d46a74799fffe527ab1f4f42" +SRCREV ?= "288add22d6b61cc68ede358faeec9affb15019cd" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://0001-Fix-i586-build-issues-with-string-length-overflow.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch \ - file://0001-Make-iscsid-systemd-usage-optional.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build" @@ -36,6 +34,8 @@ EXTRA_OECONF = " \ --host=${BUILD_SYS} \ " +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd', d)}" + EXTRA_OEMAKE = ' \ OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" \ @@ -46,6 +46,7 @@ EXTRA_OEMAKE = ' \ NO_SYSTEMD=1 \ ' + do_configure () { cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} } diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.16.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.19.bb index 5257c5cfe..08182b1b2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.16.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.19.bb @@ -11,8 +11,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" -SRC_URI[md5sum] = "03f202eace2ad392c61ced15bb710e24" -SRC_URI[sha256sum] = "f0c7dc86147a286913c1c2c918f557735016285d25779d4d2fce5732fcb888df" +SRC_URI[md5sum] = "df670e0904d4e48e72ccc8409ad9c6de" +SRC_URI[sha256sum] = "0e2f8454765bc6a5fa26758bd9cec18aae42882843cdd24848aff0ae65ce4ca7" DEPENDS = "libnfnetlink openssl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index 9ea4a9ffb..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c6a283bfcbfefe9c89113e81b0f792c12c4eefb8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> -Date: Mon, 25 Mar 2019 18:43:03 +0100 -Subject: [PATCH] priv: include limits.h for PATH_MAX - -Upstream-Status: Backport - -Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> ---- - src/daemon/priv.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/daemon/priv.c b/src/daemon/priv.c -index f4d6bdf..ba5ae58 100644 ---- a/src/daemon/priv.c -+++ b/src/daemon/priv.c -@@ -27,6 +27,7 @@ - #include <unistd.h> - #include <signal.h> - #include <errno.h> -+#include <limits.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <sys/socket.h> --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb index e650b5795..8fdaf848f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb @@ -9,11 +9,10 @@ SRC_URI = "\ http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ file://lldpd.init.d \ file://lldpd.default \ - file://0001-priv-include-limits.h-for-PATH_MAX.patch \ " -SRC_URI[md5sum] = "04844328f053ee343344d892efb8a00c" -SRC_URI[sha256sum] = "39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360" +SRC_URI[md5sum] = "33e8d58623f99184e4e709cbbfe45db3" +SRC_URI[sha256sum] = "5319bc032fabf1008d5d91e280276aa7f1bbfbb70129d8526cd4526d7c22724f" inherit autotools update-rc.d useradd systemd pkgconfig bash-completion diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb index 8523ae8c0..6b73506c2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb @@ -7,7 +7,7 @@ AUTHOR = "Clayton Craft and others" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" -inherit distro_features_check systemd +inherit features_check systemd RDEPENDS_${PN} = "python3-pygobject python3-dbus" REQUIRED_DISTRO_FEATURES = "systemd" diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index b47d59e2d..e8d19a2c0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -17,7 +17,7 @@ servers, Blade Center, and machines which export data via sysfs. \ HOMEPAGE = "http://openhpi.sourceforge.net/Home" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e3c772a32386888ccb5ae1c0ba95f1a4" DEPENDS = "net-snmp libxml2 ncurses openssl glib-2.0 popt e2fsprogs \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc index 778100533..64c20d0f5 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc @@ -202,29 +202,19 @@ ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" -PACKAGE_WRITE_DEPS += "postfix-native" -pkg_postinst_${PN} () { - if [ "x$D" = "x" ]; then - touch /etc/aliases - newaliases - - # generate virtual_alias, default is hash - touch /etc/postfix/virtual_alias - postmap /etc/postfix/virtual_alias - else - touch $D/etc/aliases - # This can fail depending on host setup - if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then - $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} - else - touch $D/etc/postfix/virtual_alias - postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias - fi +pkg_postinst_ontarget_${PN}-cfg () { + touch /etc/aliases + newaliases - fi + # generate virtual_alias, default is hash + touch /etc/postfix/virtual_alias + postmap /etc/postfix/virtual_alias } +PACKAGES =+ "${PN}-cfg" +RDEPENDS_${PN}_class-target += "${PN}-cfg" # Exclude .debug directories from the main package -FILES_${PN} = "${sysconfdir} ${localstatedir} ${bindir}/* ${sbindir}/* \ +FILES_${PN} = "${localstatedir} ${bindir}/* ${sbindir}/* \ ${libexecdir}/* ${systemd_unitdir}/*" +FILES_${PN}-cfg = "${sysconfdir}" FILES_${PN}-dbg += "${libexecdir}/postfix/.debug" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.5.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.7.bb index 189baea5c..3699ee58d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.7.bb @@ -15,7 +15,7 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ file://0001-Fixed-build-failure-with-glibc-2.30-due-to-dropped-R.patch \ " -SRC_URI[md5sum] = "093109941095390562166de766d4720d" -SRC_URI[sha256sum] = "8b2ba54f9d2a049582a0ed3ee2dbe96ba57e278feea9cb4f80e1a61844e6319f" +SRC_URI[md5sum] = "b29ab85e8f6ef7fae132b004e777671b" +SRC_URI[sha256sum] = "fe3253121d3ba8836a23774225518560b35e40497951ad5bec154afa8205f967" UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index 58625c809..2bd642706 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -5,7 +5,7 @@ and PTP Version 2 implements IEEE-1588-2008. PTP was developed to provide very p time coordination of LAN connected computers." HOMEPAGE = "http://sourceforge.net/projects/ptpd" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://README;md5=0733e1b3788ab2ebbc63bf33a020da1d" DEPENDS = "libpcap" diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch index 16a611e3c..2606a3667 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch @@ -8,30 +8,39 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> +Update for 1.0.49. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + --- - configure.ac | 12 ------------ - 1 file changed, 12 deletions(-) + configure.ac | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/configure.ac b/configure.ac -index 3a4209b..695ce68 100644 +index 079e6f0..9a1ec06 100644 --- a/configure.ac +++ b/configure.ac -@@ -91,18 +91,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) +@@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-if test "x$cross_compiling" != "xyes"; then +- for path in \ +- /usr/kerberos \ +- /usr/local /opt /usr/local/opt \ +- /usr/openssl@1.1 /opt/openssl@1.1 /usr/local/opt/openssl@1.1 \ +- /usr/openssl /opt/openssl /usr/local/opt/openssl; do +- if test -d $path/include; then +- CPPFLAGS="$CPPFLAGS -I${path}/include" +- fi +- if test -d $path/lib; then +- LDFLAGS="$LDFLAGS -L${path}/lib" +- fi +- done -fi - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" dnl Checks for header files +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb index 43be44ea3..5a8e9c130 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb @@ -2,8 +2,8 @@ SUMMARY = "FTP Server with a strong focus on software security" DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=0595b4261a04bc2d27f30b9c90796c1f" +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e25e28bc568d70eb26c3a91387c86ccb" DEPENDS = "libcap virtual/crypt" @@ -11,11 +11,10 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ file://nostrip.patch \ " -SRC_URI[md5sum] = "f000e519918682ee6b65090352177d4a" -SRC_URI[sha256sum] = "4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad" +SRC_URI[md5sum] = "451879495ba61c1d7dcfca8dd231119f" +SRC_URI[sha256sum] = "767bf458c70b24f80c0bb7a1bbc89823399e75a0a7da141d30051a2b8cc892a5" inherit autotools -EXTRA_OECONF = "--with-minimal" PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.6.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.9.bb index ca4927dda..6f202cf40 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.9.bb @@ -28,8 +28,8 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" -SRC_URI[md5sum] = "6fb9f2be772b9bcaf2b3322d9e16ee1e" -SRC_URI[sha256sum] = "73c1970467618db194057f6c43c80019a4dc47847579fc404796ff2dcd215f05" +SRC_URI[md5sum] = "b315d0dce37627dfe61eec7f5304baaf" +SRC_URI[sha256sum] = "0f5829d878002147e7c4d9b8901c2c3c051693465e82e45cef9ab0e226e3e729" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=19cc4dd146f397e72f3ff6f9f58fbfbe \ diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb index 5cfa3aa82..24072c083 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb @@ -6,12 +6,12 @@ SECTION = "libs" LICENSE = "Apache-2" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl" +DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2" DEPENDS_append_class-target = " googletest grpc-native " DEPENDS_append_class-nativesdk = " grpc-native " S = "${WORKDIR}/git" -SRCREV_grpc = "fe494ff4104b6f6a78117ab2da71d29c93053267" +SRCREV_grpc = "2de2e8dd8921e1f7d043e01faf7fe8a291fbb072" SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482" BRANCH = "v1.24.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ @@ -42,6 +42,10 @@ do_configure_prepend_mipsarch() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } +do_configure_prepend_toolchain-clang_x86() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + BBCLASSEXTEND = "native nativesdk" SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc" diff --git a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb index e2ab25b10..1f4a3e1c6 100644 --- a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb @@ -11,12 +11,12 @@ SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ file://corosync.conf \ " -SRC_URI[md5sum] = "69db29ff4bc035936946be44fc8be5cd" -SRC_URI[sha256sum] = "9bd4707bb271df16f8d543ec782eb4c35ec0330b7be696b797da4bd8f058a25d" +SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd" +SRC_URI[sha256sum] = "ab6eafdb8f43a23794fc15d4c5198bbd6759060cb13c8d2d1e78a6c8360aba5f" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" DEPENDS = "groff-native nss libqb" diff --git a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb index 876462d2f..4bf9944aa 100644 --- a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb +++ b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/dlm-dlm-${PV}" DEPENDS = "corosync systemd" -inherit pkgconfig systemd distro_features_check +inherit pkgconfig systemd features_check PACKAGECONFIG ??= "" @@ -36,6 +36,10 @@ export EXTRA_OEMAKE = "" DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" +do_compile_prepend_toolchain-clang() { + sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile +} + do_compile_prepend() { sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.5.bb index 75860073a..a3d4b7cc5 100644 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.5.bb @@ -8,7 +8,7 @@ DEPENDS = "openssl zlib icu" SRC_URI = "git://github.com/znc/znc.git;name=znc \ git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ " -SRCREV_znc = "e661cdf9a394e2afd1b97517efa21fa2fa757e22" +SRCREV_znc = "c7f72f8bc800115ac985e7e13eace78031cb1b50" SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" # This constructs a composite revision based on multiple SRCREV's. diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb index 394a69e62..65c20c072 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "netkit-ft includes the ftp client." SECTION = "net" HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://ftp/ftp.c;beginline=2;endline=3;md5=2d40a75a50d83b8f6317b3f53db72bfa" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb index ba1ad3f7f..c39faef8d 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb @@ -2,7 +2,7 @@ DESCRIPTION = "netkit-rusers includes rusers - Displays who is logged in to mach rusersd - Logged in users server" HOMEPAGE = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://rusers/rusers.c;beginline=2;endline=3;md5=f4fc634a4ce8c569911196b72b10770e" DEPENDS = " tcp-wrappers libtirpc rpcbind rpcsvc-proto rpcsvc-proto-native" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch index 717b4d73f..349a1351f 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch @@ -12,8 +12,6 @@ Upstream-Status: Pending rwhod/rwhod.c | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) -diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c -index 1d4f7b6..f1f043c 100644 --- a/ruptime/ruptime.c +++ b/ruptime/ruptime.c @@ -53,6 +53,7 @@ char ruptime_rcsid[] = @@ -24,11 +22,9 @@ index 1d4f7b6..f1f043c 100644 struct hs { char hs_hostname[MAXHOSTNAMELEN]; -diff --git a/rwho/rwho.c b/rwho/rwho.c -index 63919ac..71aec9e 100644 --- a/rwho/rwho.c +++ b/rwho/rwho.c -@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $"; +@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/0 #include <assert.h> #include <stdio.h> #include <time.h> @@ -36,8 +32,6 @@ index 63919ac..71aec9e 100644 #include <protocols/rwhod.h> #include "../version.h" -diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c -index 54498d0..40cabcf 100644 --- a/rwhod/rwhod.c +++ b/rwhod/rwhod.c @@ -76,6 +76,7 @@ char rcsid[] = @@ -66,6 +60,13 @@ index 54498d0..40cabcf 100644 /* * Taken from: * --- -2.14.1 - +--- a/include/protocols/rwhod.h ++++ b/include/protocols/rwhod.h +@@ -37,6 +37,7 @@ + #ifndef _RWHOD_H_ + #define _RWHOD_H_ + ++#include <stdint.h> + /* + * rwho protocol packet format. + */ diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb index 5685f03d6..60a8d95b0 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "netkit-rwho includes, ruptime rwho and rwhod (Daemon to maintain data for rwho/ruptime)" HOMEPAGE = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://rwho/rwho.c;beginline=2;endline=3;md5=5a85f13c0142d72fc378e00f15da5b9e" SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;name=archive \ diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index a8d98c940..cf9934138 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -2,7 +2,7 @@ DESCRIPTION = "netkit-telnet includes the telnet daemon and client." HOMEPAGE = "http://www.hcs.harvard.edu/~dholland/computers/netkit.html" SECTION = "net" DEPENDS = "ncurses" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://telnet/telnet.cc;beginline=2;endline=3;md5=780868e7b566313e70cb701560ca95ef" SRC_URI = "http://ftp.linux.org.uk/pub/linux/Networking/netkit/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.8.4.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb index 550e126f7..27e7b4307 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.8.4.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb @@ -13,7 +13,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" -SRCREV = "8627b6fcd4992f2e7992ecec97a4a4aa2d7ff099" +SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb b/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb index ffdab22cf..cfe71dd69 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb @@ -25,7 +25,7 @@ EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}" DEPENDS += "flex-native bison-native libpam" -inherit autotools-brokensep distro_features_check +inherit autotools-brokensep features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb index 8e928c989..385b8b373 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "ce05b4bf2a04cd2f472e77ba4b86fbfca690bfc83e51da8ce0e575804b S = "${WORKDIR}/${fd_pkgname}-${PV}" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=69bdc1d97648a2d35914563fcbbb361a" PTEST_PATH = "${libdir}/${fd_pkgname}/ptest" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch deleted file mode 100644 index 863866d18..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Feb 2018 21:54:11 -0800 -Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc - -Provide nss_status macro instead for non-glibc case -where nss.h is absent - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - mDNSPosix/nss_mdns.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c -index afadb3c..c469584 100755 ---- a/mDNSPosix/nss_mdns.c -+++ b/mDNSPosix/nss_mdns.c -@@ -378,8 +378,19 @@ init_config (); - - #define ENTNAME hostent - #define DATABASE "hosts" -- -+#ifdef __GLIBC__ - #include <nss.h> -+#else -+enum nss_status -+{ -+ NSS_STATUS_TRYAGAIN = -2, -+ NSS_STATUS_UNAVAIL, -+ NSS_STATUS_NOTFOUND, -+ NSS_STATUS_SUCCESS, -+ NSS_STATUS_RETURN -+}; -+#define NETDB_INTERNAL NULL -+#endif - // For nss_status - #include <netdb.h> - // For hostent --- -2.16.1 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb index 1bd17031a..017894531 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb @@ -4,15 +4,16 @@ HOMEPAGE = "http://developer.apple.com/networking/bonjour/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" +COMPATIBLE_HOST_libc-musl = 'null' + RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ - file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " -SRC_URI[md5sum] = "e773f290a7d29f1072247985d6add2ff" -SRC_URI[sha256sum] = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0" +SRC_URI[md5sum] = "aeb92d838a4aa2402ef128ed501484eb" +SRC_URI[sha256sum] = "3cc71582e8eee469c2de8ecae1d769e7f32b3468dfb7f2ca77f1dee1f30a7d1e" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb index 780423f0f..ea3775452 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb @@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/r/${BPN}/${BPN}_${PV}.orig.tar.gz \ SRC_URI[md5sum] = "6fb7d4d0aefafaee7385831ac46a8e9c" SRC_URI[sha256sum] = "282a9f1355f190efbb06c0d7c4e062eaa652caf342ed3ad361ac595f72f09f14" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause & BSD-2-Clause & HPND" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3e47566c9271b786693d8a08792dbf41" inherit autotools-brokensep diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch deleted file mode 100644 index b932ebbb4..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 748bc693cf24baf42e459e12f152349e392b6737 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 20 Dec 2016 21:32:11 -0800 -Subject: [PATCH] Use foreign switch for automake - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 64cc9994..19ccd4a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ dnl SUCH DAMAGE. - dnl - - AC_INIT([libusrsctp], [0.9.3.0]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_LIBTOOL --- -2.11.0 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 3ec746684..a5a5605da 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb @@ -2,9 +2,8 @@ DESCRIPTION = "This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ffcf846341f3856d79a483eafa18e2a5" -SRCREV = "dbfc1b8c4cf1a46a4d8987ba542d5ff06bdaf14c" +SRCREV = "a10cd498d964508c0e6ec6bd2be9dd4afcbb4d86" SRC_URI = "git://github.com/sctplab/usrsctp;protocol=https;branch=master \ - file://0001-Use-foreign-switch-for-automake.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb index 116800522..12b9124f7 100644 --- a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb @@ -9,7 +9,7 @@ with high quality. Unlike these formats CELT imposes very little delay \ on the signal, even less than is typical for speech centric formats \ like Speex, GSM, or G.729." -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=375f60ab360d17f0172737036ff155b2" PV = "0.5.1.3+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE deleted file mode 100644 index 54a28120e..000000000 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 1998-2008 Distributed Management Task Force, Inc. (DMTF). -// All rights reserved. -// DMTF is a not-for-profit association of industry members dedicated -// to promoting enterprise and systems management and interoperability. -// DMTF specifications and documents may be reproduced by -// members and non-members, provided that correct attribution is given. -// As DMTF specifications may be revised from time to time, -// the particular version and release date should always be noted. -// -// Implementation of certain elements of this standard or proposed -// standard may be subject to third party patent rights, including -// provisional patent rights (herein "patent rights"). DMTF makes -// no representations to users of the standard as to the existence -// of such rights, and is not responsible to recognize, disclose, or -// identify any or all such third party patent right, owners or -// claimants, nor for any incomplete or inaccurate identification or -// disclosure of such rights, owners or claimants. DMTF shall have no -// liability to any party, in any manner or circumstance, under any -// legal theory whatsoever, for failure to recognize, disclose, or -// identify any such third party patent rights, or for such party's -// reliance on the standard or incorporation thereof in its product, -// protocols or testing procedures. DMTF shall have no liability to -// any party implementing such standard, whether such implementation -// is foreseeable or not, nor to any patent owner or claimant, and shall -// have no liability or responsibility for costs or losses incurred if -// a standard is withdrawn or modified after publication, and shall be -// indemnified and held harmless by any party implementing the -// standard from any and all claims of infringement by a patent owner -// for such implementations. -// -// For information about patents held by third-parties which have -// notified the DMTF that, in their opinion, such patent may relate to -// or impact implementations of DMTF standards, visit -// http://www.dmtf.org/about/policies/disclosures.php. diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf index 9e5ab9f81..2897b9030 100755 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf @@ -2,7 +2,7 @@ # # Format is one option per line, legal options are the same # as the long options legal on the command line. See -# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. +# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. # Listen on this specific port instead of the standard DNS port # (53). Setting this to zero completely disables DNS function, diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb index be633e03b..239a25273 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb @@ -12,8 +12,8 @@ SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ file://0001-doveadm-Fix-parallel-build.patch \ " -SRC_URI[md5sum] = "80c1c271b1c4cbe26a793f4e3b09eb8e" -SRC_URI[sha256sum] = "992521305fa1d61f4726aac2619ccc65094a3cc2e5c80644455199764305863e" +SRC_URI[md5sum] = "66c4d71858b214afee5b390ee602dee2" +SRC_URI[sha256sum] = "777c61e264869e9b288b8d6603f4ed3ac3aac9ec573908067353f51269dce2fe" DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" CFLAGS += "-I${STAGING_INCDIR}/tirpc" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb index 0e14ae73f..286b0f606 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb @@ -12,9 +12,9 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -# v9.10.0 -SRCREV_drbd-utils = "859151b228d3b3aacefb09d06d515a2589c22e35" -SRCREV_drbd-headers = "0955b3423f08f8e11ff05092bc1b766609fd804b" +# v9.11.0 +SRCREV_drbd-utils = "63092751e76e1fba397e53df4be5c1161b83a223" +SRCREV_drbd-headers = "d100ee01bf5aa8d5220767e4e35c4224faa8d865" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.1.bb b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb index d4fd73e3d..d9d726861 100644 --- a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb @@ -22,8 +22,8 @@ SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.xz \ file://0001-Make-environment-variables-assignments-to-be-weak.patch \ file://0001-Replace-ntp_adjtime-with-adjtimex.patch \ " -SRC_URI[md5sum] = "cab01ddcb62bd84154670a37a7a0c31c" -SRC_URI[sha256sum] = "186c69509ba68178e2894cb8900e240bb688870ec25de2ac4676724e1e1d1cbf" +SRC_URI[md5sum] = "aad8c33933648532ac8716c809b15be1" +SRC_URI[sha256sum] = "5f1f959877852abb3153fa407e8532161a7abe916aa635796ef93f8e4119f955" do_configure () { : diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.5.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb index b19c964d8..cc24863c6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb @@ -33,11 +33,10 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "339a41ac9efaec680e6d1469dd9aa35b" -SRC_URI[sha256sum] = "199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68" +SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977" +SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b" -inherit waf-samba distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" +inherit waf-samba S = "${WORKDIR}/ldb-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc index e86f832f8..d9a821d10 100644 --- a/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc +++ b/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc @@ -1,7 +1,7 @@ DESCRIPTION = "open source C/C++ client library and tools for the memcached server" DEPENDS = "libevent util-linux" SECTION = "libdevel" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60" SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index b70c43f15..585968f83 100644 --- a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -35,3 +35,5 @@ FILES_${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${libdir}/python*" + +PNBLACKLIST[lowpan-tools] = "WARNING these tools are deprecated! Use wpan-tools instead" diff --git a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.92.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb index 2bc7d9787..dd150700a 100644 --- a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.92.bb +++ b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb @@ -6,11 +6,9 @@ DEPENDS = "ncurses" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ui/mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106" + file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" -PV .= "+git${SRCPV}" - -SRCREV = "6cddfc6e8f0e20af4af218b545f83d43b3f9a387" +SRCREV = "304349bad86229aedbc62c07d5e98a8292967991" SRC_URI = "git://github.com/traviscross/mtr" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.19.bb b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb index a6da18ea7..12a82c25b 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "162da84302abb5b9be06143c7943a642" -SRC_URI[sha256sum] = "b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690" +SRC_URI[md5sum] = "910fe6c152f8c30ad8608388e6a4ce89" +SRC_URI[sha256sum] = "e0e1b3538ab7ae5accf56180afd1a9887d415b98d21223b8ad42592b4af7d6cd" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch new file mode 100644 index 000000000..6226e2c03 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch @@ -0,0 +1,44 @@ +From 7f6a104a682d59f28f7df889129f4467cc45e912 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 6 Nov 2019 19:55:42 -0800 +Subject: [PATCH] Depend on haveuint128.h for umult64.c + +This fixes parallel build issue e.g. +mult/umult64.c:9:10: fatal error: 'haveuint128.h' file not found + ^~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + GNUmakefile | 1 + + Makefile | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 3f3193d..751ca60 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -126,6 +126,7 @@ $(CDB_OBJS): cdb.h uint32.h + $(CRITBIT_OBJS): critbit.h + + mult64.o: haveuint128.h ++umult64.o: haveuint128.h + + + iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h +diff --git a/Makefile b/Makefile +index 0d08da4..02df6c6 100644 +--- a/Makefile ++++ b/Makefile +@@ -430,7 +430,7 @@ range_str4inbuf.o: mult/range_str4inbuf.c rangecheck.h + range_strinbuf.o: mult/range_strinbuf.c rangecheck.h + umult16.o: mult/umult16.c uint16.h + umult32.o: mult/umult32.c uint32.h +-umult64.o: mult/umult64.c uint64.h ++umult64.o: mult/umult64.c uint64.h haveuint128.h + open_append.o: open/open_append.c open.h + open_excl.o: open/open_excl.c open.h + open_read.o: open/open_read.c open.h +-- +2.24.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb index 4b072f7e7..24f413555 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -6,9 +6,11 @@ HOMEPAGE = "http://www.fefe.de/libowfat" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "120798fab86cfd72dc6b12284d248dd0" -SRC_URI[sha256sum] = "d1e4ac1cfccbb7dc51d77d96398e6302d229ba7538158826c84cb4254c7e8a12" +SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ + file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \ + " +SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" +SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" EXTRA_OEMAKE = "\ DIET= \ @@ -19,7 +21,7 @@ EXTRA_OEMAKE = "\ do_install() { make install \ DESTDIR=${D} \ - INCLUDEDIR=${includedir}/${BPN} \ + INCLUDEDIR=${includedir} \ LIBDIR=${libdir} \ MAN3DIR=${mandir}/man3 } diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch new file mode 100644 index 000000000..e4db09638 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch @@ -0,0 +1,27 @@ +From 73ec79432fc557a8be4f1500982b1c0f5fdf12a9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 7 Nov 2019 09:58:52 +0000 +Subject: [PATCH] fetch-ocsp-response: use python3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: André Draszik <git@andred.net> +--- + script/fetch-ocsp-response | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/script/fetch-ocsp-response b/script/fetch-ocsp-response +index 0ff7461..185116b 100755 +--- a/script/fetch-ocsp-response ++++ b/script/fetch-ocsp-response +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + # nghttp2 - HTTP/2 C Library +-- +2.23.0.rc1 + diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb deleted file mode 100644 index 6077daf76..000000000 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "HTTP/2 C Library and tools" -HOMEPAGE = "https://nghttp2.org/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" - -+UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases" - -SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz" -SRC_URI[md5sum] = "02b015cb178c46f27dd87228e33db35f" -SRC_URI[sha256sum] = "679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448" - -DEPENDS = "libxml2 openssl zlib jansson cunit c-ares" - -inherit cmake pythonnative python-dir diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb new file mode 100644 index 000000000..c27afdb55 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "HTTP/2 C Library and tools" +HOMEPAGE = "https://nghttp2.org/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" +DEPENDS = "c-ares cunit jansson libev libevent libxml2 openssl zlib" + +UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases" + +SRC_URI = "\ + https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ + file://0001-fetch-ocsp-response-use-python3.patch \ +" +SRC_URI[md5sum] = "de52cd6b587b76486346745514972995" +SRC_URI[sha256sum] = "a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b" + +inherit cmake manpages pythonnative +PACKAGECONFIG[manpages] = "" + +# examples are never installed, and don't need to be built in the +# first place +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON" + +do_install_append() { + rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd +} + +PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server" + +RDEPENDS_${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}-proxy = "openssl python3-core python3-io python3-shell" + +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" +FILES_lib${PN} = "${libdir}/*${SOLIBS}" +FILES_${PN}-client = "${bindir}/h2load ${bindir}/nghttp" +FILES_${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" +FILES_${PN}-server = "${bindir}/nghttpd" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch index f8eb3ae67..8ca26b51b 100644 --- a/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch +++ b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch @@ -15,11 +15,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/ruli_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/ruli_addr.c b/src/ruli_addr.c -index 00d5d0d..f1eabae 100644 --- a/src/ruli_addr.c +++ b/src/ruli_addr.c -@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli_addr *addr, int family) +@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli { switch (family) { case PF_INET: @@ -28,6 +26,25 @@ index 00d5d0d..f1eabae 100644 case PF_INET6: return ruli_inet6_print(out, &addr->ipv6); --- -2.13.1 - +--- a/sample/getaddrinfo.c ++++ b/sample/getaddrinfo.c +@@ -174,7 +174,7 @@ static void solve(const char *fullname) + + for (ai = ai_res; ai; ai = ai->ai_next) { + +- printf(fullname); ++ printf("%s", fullname); + + switch (ai->ai_family) { + case PF_INET: +--- a/sample/ruli-getaddrinfo.c ++++ b/sample/ruli-getaddrinfo.c +@@ -176,7 +176,7 @@ static void solve(const char *fullname) + + for (ai = ai_res; ai; ai = ai->ai_next) { + +- printf(fullname); ++ printf("%s", fullname); + + switch (ai->ai_family) { + case PF_INET: diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch new file mode 100644 index 000000000..c3ca07a39 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch @@ -0,0 +1,95 @@ +From bb19a2c7e5b3142d70d3e13c2d8a92a63f2b840a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Nov 2019 22:12:52 -0800 +Subject: [PATCH] Make space for flags from environment + +Add force option to ln cmd, so do_install can be rerun in same directory + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sample/Makefile | 20 ++++++++++---------- + src/Makefile | 8 ++++---- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/sample/Makefile b/sample/Makefile +index 15cafd9..d83641f 100644 +--- a/sample/Makefile ++++ b/sample/Makefile +@@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS) + SOLARIS_LIBS = -lresolv -lnsl -lsocket + endif + +-CC = gcc +-CFLAGS = -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR) +-LDFLAGS = -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS) ++CC ?= gcc ++CFLAGS += -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR) ++LDFLAGS += -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS) + UNRULI_LINK = $(CC) $(ARCH) $(LDFLAGS) -o $@ $^ $(SOLARIS_LIBS) + LINK = $(UNRULI_LINK) -lruli -loop + +@@ -65,13 +65,13 @@ install: $(TARGETS) + mkdir -p $(INSTALL_BIN_DIR) $(INSTALL_MAN1_DIR) + cp $(TARGETS) $(INSTALL_BIN_DIR) + cp ../doc/man/*.1 $(INSTALL_MAN1_DIR) +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 smtpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 httpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_srvsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_smtpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_httpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 ruli-getaddrinfo.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 getaddrinfo.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 smtpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 httpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_srvsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_smtpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_httpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 ruli-getaddrinfo.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 getaddrinfo.1 + + %.o: %.c + $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $< +diff --git a/src/Makefile b/src/Makefile +index 9b56b5e..39a5ea1 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -45,7 +45,7 @@ endif + + WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ + -Wcast-align -Wwrite-strings -Wredundant-decls +-CC = gcc ++CC ?= gcc + + # gcc-specific options (not valid for g++) + ifeq ($(CC),gcc) +@@ -58,7 +58,7 @@ SHARED = -fPIC + FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \ + $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR) + SOFT_CFLAGS = $(WARN) $(FLAGS) +-CFLAGS = $(WARN) -Werror $(FLAGS) ++CFLAGS += $(WARN) -Werror $(FLAGS) + LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ + ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ + ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ +@@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ + ruli_getaddrinfo.o + SHAREDOBJ = $(LIBOBJ:%.o=%.os) + SONAME = libruli.so.4 +-LDFLAGS = -L$(OOP_LIB_DIR) ++LDFLAGS += -L$(OOP_LIB_DIR) + + COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c + SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c +@@ -95,7 +95,7 @@ install: ruli + cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) + cp *.h $(INSTALL_INCLUDE_DIR) + cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) +- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so ++ cd $(INSTALL_LIB_DIR) && ln -sf $(SONAME) libruli.so + @echo + @echo "REMINDER:" + @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" +-- +2.24.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch new file mode 100644 index 000000000..213006a67 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch @@ -0,0 +1,35 @@ +From 895ae26e36c4498677ad0b2695a6e5af05548a29 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Nov 2019 22:02:43 -0800 +Subject: [PATCH] ruli_srv: Mark prev_addr_list_size as unused + +This ensures that compiler does not trip on building it + +ruli_srv.c:157:20: error: variable 'prev_addr_list_size' set but not used [-Werror=unused-but-set-variable] +| int prev_addr_list_size; +| ^~~~~~~~~~~~~~~~~~~ +cc1: all warnings being treated as errors + +Upstream-Status: Inappropriate [Workaround] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ruli_srv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ruli_srv.c b/src/ruli_srv.c +index 45c70c7..ff82349 100644 +--- a/src/ruli_srv.c ++++ b/src/ruli_srv.c +@@ -154,7 +154,7 @@ static void *on_walk_answer(ruli_host_t *host_qry, void *qry_arg) + walk_t *walk_qry = (walk_t *) qry_arg; + ruli_srv_t *srv_qry = walk_qry->srv_query; + ruli_srv_entry_t *srv_entry; +- int prev_addr_list_size; ++ __attribute__((unused)) int prev_addr_list_size; + + assert(ruli_host_answer_code(host_qry) != RULI_SRV_CODE_VOID); + +-- +2.24.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch deleted file mode 100644 index 60789a3d5..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -Naur patch.org/ruli-0.36/Makefile patch.new/ruli-0.36/Makefile ---- ruli-0.36/Makefile 2015-09-10 15:14:13.952262350 -0400 -+++ ruli-0.36/Makefile 2015-09-10 15:14:38.628261620 -0400 -@@ -7,17 +7,17 @@ - .PHONY: default - default: - $(MAKE) -C src -- $(MAKE) -C sample -+# $(MAKE) -C sample - - .PHONY: clean - clean: - $(MAKE) -C src clean -- $(MAKE) -C sample clean -+# $(MAKE) -C sample clean - - .PHONY: install - install: - $(MAKE) -C src install -- $(MAKE) -C sample install -+# $(MAKE) -C sample install - - .PHONY: dpkg - dpkg: - -===================================================================== - -diff -Naur patch.org/git/src/Makefile patch.new/git/src/Makefile ---- ruli-0.36/src/Makefile 2005-06-13 12:34:53.000000000 -0400 -+++ ruli-0.36/src/Makefile 2015-09-11 09:46:06.290287347 -0400 -@@ -18,9 +18,9 @@ - # - # Debian packaging likes this: OOP_BASE_DIR = /usr - # --OOP_BASE_DIR = /usr/local/oop --OOP_INCLUDE_DIR = $(OOP_BASE_DIR)/include --OOP_LIB_DIR = $(OOP_BASE_DIR)/lib -+#OOP_BASE_DIR = /usr/local/oop -+OOP_INCLUDE_DIR = ${PKG_CONFIG_SYSROOT_DIR}/$(includedir)/ -+#OOP_LIB_DIR = $(OOP_BASE_DIR)/lib - - # - # INSTALL_BASE_DIR indicates where RULI -@@ -30,11 +30,11 @@ - # - # Debian packaging likes this: INSTALL_BASE_DIR = $(DESTDIR)/usr - # --INSTALL_BASE_DIR = ../install/ruli --INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include --INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib --INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man --INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3 -+#INSTALL_BASE_DIR = ../install/ruli -+#INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include -+#INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib -+#INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man -+#INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3 - - # SunOS, Linux - PLATFORM=$(shell uname) -@@ -45,7 +45,7 @@ - - WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ - -Wcast-align -Wwrite-strings -Wredundant-decls --CC = gcc -+#CC = gcc - - # gcc-specific options (not valid for g++) - ifeq ($(CC),gcc) -@@ -58,7 +58,7 @@ - FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \ - $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR) - SOFT_CFLAGS = $(WARN) $(FLAGS) --CFLAGS = $(WARN) -Werror $(FLAGS) -+CFLAGS = $(WARN) $(FLAGS) - LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ - ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ - ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ -@@ -66,7 +66,7 @@ - ruli_getaddrinfo.o - SHAREDOBJ = $(LIBOBJ:%.o=%.os) - SONAME = libruli.so.4 --LDFLAGS = -L$(OOP_LIB_DIR) -+#LDFLAGS = -L$(OOP_LIB_DIR) - - COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c - SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c -@@ -89,19 +89,19 @@ - strip: ruli - strip $(SONAME) libruli.a - --.PHONY: install --install: ruli -- mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR) -- cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) -- cp *.h $(INSTALL_INCLUDE_DIR) -- cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) -- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so -- @echo -- @echo "REMINDER:" -- @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" -- @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf" -- @echo "# ldconfig" -- @echo -+#.PHONY: install -+#install: ruli -+# mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR) -+# cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) -+# cp *.h $(INSTALL_INCLUDE_DIR) -+# cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) -+# cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so -+# @echo -+# @echo "REMINDER:" -+# @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" -+# @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf" -+# @echo "# ldconfig" -+# @echo - - .PHONY: ruli - ruli: $(SONAME) libruli.a - - diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb index 885796d2a..b82a3d08e 100644 --- a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -8,18 +8,27 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "liboop" SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz \ - file://Makefile.patch \ file://0001-Fix-build-with-format-string-checks.patch \ file://0001-src-ruli_addr.c-Add-missing-format-string.patch \ + file://0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch \ + file://0001-Make-space-for-flags-from-environment.patch \ " SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468" SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a3999dbfa" -do_install1() { - install -d ${D}${includedir}/ruli - install -d ${D}${libdir} - install -m 0644 ${S}/src/ruli*.h ${D}${includedir}/ruli - install -m 0644 ${S}/src/libruli.so ${D}${libdir} - install -m 0644 ${S}/src/libruli.so.4 ${D}${libdir} +B = "${S}" + +EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" INSTALL_BASE_DIR="${D}${exec_prefix}"' + +do_configure() { + touch configure-stamp +} + +do_install() { + oe_runmake install } + +PACKAGES =+ "${PN}-bin" + +FILES_${PN} =+ "${bindir}" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb index be9dba32f..966ca41c9 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb @@ -10,7 +10,7 @@ environment - not only on its computer-server machine, but also from \ anywhere on the Internet and using a wide variety of machine \ architectures." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95" PV = "0.14.0+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb index 3cd12aee7..05fc99bdc 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb @@ -1,7 +1,7 @@ SUMMARY = "A sophisticated network protocol analyzer" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" DEPENDS = "libpcap" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.2.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb index 0607c9d77..03eb2faec 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \ file://0001-contrib-add-yocto-compatible-startup-scripts.patch \ " -SRCREV="ee06aaaad99dc4d6b73f915d98f05c506885b98a" +SRCREV="b60c4a472c856f0a98120b7259e991b3a6507eb5" inherit autotools pkgconfig systemd update-rc.d diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb index a3c0b4998..ccaa0c94a 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb @@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[md5sum] = "e945d76a57db2c3e6cf776f95da2cf0e" -SRC_URI[sha256sum] = "af92729c781d870110885c31ebcbe4c4224ed51bb580d00c896fe9746994211c" +SRC_URI[md5sum] = "c6f8d12a3efe21cc7885f7cb0c4bd938" +SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e" PE = "1" diff --git a/meta-openembedded/meta-oe/classes/gitpkgv.bbclass b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass index 2d9680a35..ab591bd45 100644 --- a/meta-openembedded/meta-oe/classes/gitpkgv.bbclass +++ b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass @@ -7,8 +7,8 @@ # NN equals the total number of revs up to SRCREV # GITHASH is SRCREV's (full) hash # -# - GITPKGVTAG which is the output of 'git describe' allowing for -# automatic versioning +# - GITPKGVTAG which is the output of 'git describe --tags --exact-match' +# allowing for automatic versioning # # gitpkgv.bbclass assumes the git repository has been cloned, and # contains SRCREV. So ${GITPKGV} and ${GITPKGVTAG} should never be @@ -87,10 +87,8 @@ def get_git_pkgv(d, use_tags): if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0: commits = bb.fetch2.runfetchcmd( - "cd %(repodir)s && " - "git rev-list %(rev)s -- 2> /dev/null " - "| wc -l" % vars, - d, quiet=True).strip().lstrip('0') + "git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l" + % vars, d, quiet=True).strip().lstrip('0') if commits != "": oe.path.remove(rev_file, recurse=False) @@ -105,9 +103,8 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( - "cd %(repodir)s && " - "git describe %(rev)s 2>/dev/null" % vars, - d, quiet=True).strip() + "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null" + % vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: ver = "0.0-%s-g%s" % (commits, vars['rev'][:7]) diff --git a/meta-openembedded/meta-oe/classes/itstool.bbclass b/meta-openembedded/meta-oe/classes/itstool.bbclass new file mode 100644 index 000000000..45e3fb839 --- /dev/null +++ b/meta-openembedded/meta-oe/classes/itstool.bbclass @@ -0,0 +1,5 @@ +# helper class to prepare correct environment for native itstool + +inherit python3native + +DEPENDS_append = " itstool-native" diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 2a17eef30..bad87850e 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -71,6 +71,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-lklug->fontconfig \ ttf-lohit->fontconfig \ ttf-pt-sans->fontconfig \ + ttf-roboto->fontconfig \ ttf-mplus->fontconfig \ ttf-sazanami->fontconfig \ ttf-tlwg->fontconfig \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 605417634..d590b0501 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -19,7 +19,7 @@ SRCREV = "c17fd14505f30d9e4dbad276f7aa956fd21a637b" S = "${WORKDIR}/git" -inherit waf pkgconfig distro_features_check +inherit waf pkgconfig features_check REQUIRED_DISTRO_FEATURES += "opengl" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_487.bb index f218b87e9..42864bead 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_487.bb @@ -4,14 +4,14 @@ AUTHOR = "Don Capps <don.capps2@verizon.net>, William D. Norcott <wnorcott@us.or SECTION = "console/tests" LICENSE = "iozone3" LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ - file://iozone.c;beginline=269;endline=275;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ + file://iozone.c;beginline=276;endline=282;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ " SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://parallelism.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "aa6b88ab83793cb6809ca06949a6ab01" -SRC_URI[sha256sum] = "e816e6ae2f02003f2a6d19d47fcd9a50fdd8078da4f35fe3d4b9caf91c3d7216" +SRC_URI[md5sum] = "2dbe035caf99c5367625352e158bb866" +SRC_URI[sha256sum] = "2c488a7ccddd624fd557af16e71442c367b131d6178e1b4023bbd532bacdda59" UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb index d5296d733..98d2faabf 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://software.es.net/iperf/" SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9088fe7ffdccd042f7645f1012d7f70" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch index 53f35abb7..34a62207e 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch @@ -10,15 +10,17 @@ Upstream-Status: Submitted Signed-off-by: Ting Liu <b28495@freescale.com> +Update for 2.22. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- tests/run_tests.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/run_tests.py b/tests/run_tests.py -index 3c95a03..560df6b 100755 +index 018264d..0aabcd1 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py -@@ -234,9 +234,19 @@ def get_pagesizes(): +@@ -245,9 +245,19 @@ def get_pagesizes(): Use libhugetlbfs' hugeadm utility to get a list of page sizes that have active mount points and at least one huge page allocated to the pool. """ @@ -36,6 +38,9 @@ index 3c95a03..560df6b 100755 + return sizes + out = p.stdout.read().strip() + - if rc != 0 or out == "": return sizes + if rc != 0 or out == "": + return sizes - for size in out.split("\n"): sizes.add(int(size)) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch index 08174200d..e736cbc79 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch @@ -8,12 +8,14 @@ error: unknown type name 'ino_t'; did you mean 'int'? Signed-off-by: Khem Raj <raj.khem@gmail.com> +Update for 2.22. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- tests/hugetests.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/hugetests.h b/tests/hugetests.h -index 8b1d8d9..056042c 100644 +index bc4e16a..fbe4dc0 100644 --- a/tests/hugetests.h +++ b/tests/hugetests.h @@ -22,6 +22,7 @@ @@ -21,6 +23,9 @@ index 8b1d8d9..056042c 100644 #include <errno.h> #include <string.h> +#include <dirent.h> + #include <unistd.h> #include "libhugetlbfs_privutils.h" - #include "libhugetlbfs_testprobes.h" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 66fd8e21d..f25812279 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "sysfsutils" RDEPENDS_${PN} += "bash python python-io python-lang python-subprocess python-resource" -RDEPENDS_${PN}-tests += "bash" +RDEPENDS_${PN}-tests += "bash python3-core" -PV = "2.21" +PV = "2.22" PE = "1" -SRCREV = "73d06e69108f231696e9c5c44f4b42690fc5d752" +SRCREV = "e6499ff92b4a7dcffbd131d1f5d24933e48c3f20" SRC_URI = " \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.0.1.bb index c4df1a90b..89050e4f7 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.0.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "08fc81d25a1c24c7b091ac78ef145da6" -SRC_URI[sha256sum] = "d6feeeafb6d636667480b6fbfd2a6537e3b354b2c7c72305784d14d38ab4bcd0" +SRC_URI[md5sum] = "58023c8136a0206909552942660fe28a" +SRC_URI[sha256sum] = "a117a4350774e67989d90bf0b5e82a8072652f8caa60a62c3e5f64adc317ce14" S = "${WORKDIR}/phoronix-test-suite" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index 8c49b4674..d6852e29f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Small collection of benchmarks for storage I/O" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b529aaa6a0c50f15d29f89609b5c22f3" -SRCREV = "3b9eef2259a70f412ab02fbe6b3a4d313d09c38a" -PV = "3.5" +SRCREV = "f97f1ae321d1fb8111a2c638075702ed2512ff07" +PV = "3.6" SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master" S = "${WORKDIR}/git" @@ -19,6 +19,7 @@ do_install() { install -m0755 ${S}/def_config.sh ${D}/opt/S-suite install -m0755 ${S}/config_params.sh ${D}/opt/S-suite + install -m0755 ${S}/create_config.sh ${D}/opt/S-suite install -m0755 ${S}/process_config.sh ${D}/opt/S-suite } diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch deleted file mode 100644 index df8028627..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e5f68189ab3602b1042cc8423fd6a3a23abd5455 Mon Sep 17 00:00:00 2001 -From: Alex James <theracermaster@gmail.com> -Date: Sat, 14 Apr 2018 22:59:57 -0500 -Subject: [PATCH] ch341a_spi: Avoid deprecated libusb functions - -libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions -of libusb, use libusb_set_option instead. - -Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487 -Signed-off-by: Alex James <theracermaster@gmail.com> -Reviewed-on: https://review.coreboot.org/25681 -Tested-by: Nico Huber <nico.h@gmx.de> -Reviewed-by: David Hendricks <david.hendricks@gmail.com> ---- -Upstream-Status: Backport - ch341a_spi.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ch341a_spi.c b/ch341a_spi.c -index 6eb2804..d880510 100644 ---- a/ch341a_spi.c -+++ b/ch341a_spi.c -@@ -444,7 +444,12 @@ int ch341a_spi_init(void) - return -1; - } - -- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). -+ /* Enable information, warning, and error messages (only). */ -+#if LIBUSB_API_VERSION < 0x01000106 -+ libusb_set_debug(NULL, 3); -+#else -+ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); -+#endif - - uint16_t vid = devs_ch341a_spi[0].vendor_id; - uint16_t pid = devs_ch341a_spi[0].device_id; --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch deleted file mode 100644 index 7ba69a917..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2a28dcdbd1051d2f48320e2eda3393581fe0519 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Mar 2018 23:08:29 -0700 -Subject: [PATCH] platform: Add riscv to known platforms - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://review.coreboot.org/#/c/flashrom/+/25260/] - platform.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/platform.h b/platform.h -index b2fdcd0..2cadbb3 100644 ---- a/platform.h -+++ b/platform.h -@@ -69,6 +69,9 @@ - #elif defined (__m68k__) - #define __FLASHROM_ARCH__ "m68k" - #define IS_M68K 1 -+#elif defined (__riscv) -+ #define __FLASHROM_ARCH__ "riscv" -+ #define IS_RISCV 1 - #elif defined (__sh__) - #define __FLASHROM_ARCH__ "sh" - #define IS_SH 1 -@@ -77,7 +80,7 @@ - #define IS_S390 1 - #endif - --#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390) -+#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390) - #error Unknown architecture - #endif - --- -2.16.2 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch deleted file mode 100644 index 46a01529f..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch +++ /dev/null @@ -1,198 +0,0 @@ ---- flashrom-0.9.9.orig/chipdrivers.h -+++ flashrom-0.9.9/chipdrivers.h -@@ -103,6 +103,7 @@ - int spi_prettyprint_status_register_sst25(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash); -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash); - - /* sfdp.c */ - int probe_spi_sfdp(struct flashctx *flash); ---- flashrom-0.9.9.orig/flashchips.c -+++ flashrom-0.9.9/flashchips.c -@@ -12564,6 +12564,120 @@ - - { - .vendor = "SST", -+ .name = "SST26VF016B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF016B, -+ .total_size = 2048, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 512} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 30}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {2 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ { -+ .vendor = "SST", -+ .name = "SST26VF032B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF032B, -+ .total_size = 4096, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_UNTESTED, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 1024} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 62}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {4 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ -+ { -+ .vendor = "SST", -+ .name = "SST26VF064B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF064B, -+ .total_size = 8192, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 2048} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 126}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {8 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ { -+ .vendor = "SST", - .name = "SST25WF512", - .bustype = BUS_SPI, - .manufacture_id = SST_ID, ---- flashrom-0.9.9.orig/flashchips.h -+++ flashrom-0.9.9/flashchips.h -@@ -697,6 +697,8 @@ - #define SST_SST25VF064C 0x254B - #define SST_SST26VF016 0x2601 - #define SST_SST26VF032 0x2602 -+#define SST_SST26VF016B 0x2641 -+#define SST_SST26VF032B 0x2642 - #define SST_SST26VF064B 0x2643 - #define SST_SST27SF512 0xA4 - #define SST_SST27SF010 0xA5 ---- flashrom-0.9.9.orig/linux_spi.c -+++ flashrom-0.9.9/linux_spi.c -@@ -141,6 +141,16 @@ - return 0; - } - -+static void print_hex(const char *msg, const void *buf, size_t len) -+{ -+ size_t i; -+ msg_pspew("%s:\n", msg); -+ for (i = 0; i < len; i++) { -+ msg_pspew(" %02x", ((uint8_t *)buf)[i]); -+ } -+ msg_pspew("\n"); -+} -+ - static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, - unsigned int readcnt, - const unsigned char *txbuf, -@@ -172,10 +182,12 @@ - else - iocontrol_code = SPI_IOC_MESSAGE(2); - -+ print_hex("Write", txbuf, writecnt); - if (ioctl(fd, iocontrol_code, msg) == -1) { - msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); - return -1; - } -+ if (readcnt) print_hex("Got", rxbuf, readcnt); - return 0; - } - ---- flashrom-0.9.9.orig/spi25_statusreg.c -+++ flashrom-0.9.9/spi25_statusreg.c -@@ -196,6 +196,19 @@ - return spi_disable_blockprotect_generic(flash, 0x3C, 0, 0, 0xFF); - } - -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash) -+{ -+ int result = spi_write_enable(flash); -+ if (result) -+ return result; -+ -+ static const unsigned char cmd[] = { 0x98 }; /* ULBPR */ -+ result = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); -+ if (result) -+ msg_cerr("ULBPR failed\n"); -+ return result; -+} -+ - /* A common block protection disable that tries to unset the status register bits masked by 0x0C (BP0-1) and - * protected/locked by bit #7. Useful when bits 4-5 may be non-0). */ - int spi_disable_blockprotect_bp1_srwd(struct flashctx *flash) diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb deleted file mode 100644 index 1c1724668..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils libusb libusb-compat" - -SRC_URI = "https://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://sst26.patch \ - file://0001-platform-Add-riscv-to-known-platforms.patch \ - file://0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch \ - " -SRC_URI[md5sum] = "42d999990c735d88653627cefcc13b9a" -SRC_URI[sha256sum] = "3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64" - -inherit pkgconfig - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb new file mode 100644 index 000000000..074a1a5f6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +LICENSE = "GPLv2" +HOMEPAGE = "http://flashrom.org" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb libusb-compat" + +SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ + " +SRC_URI[md5sum] = "91bab6c072e38a493bb4eb673e4fe0d6" +SRC_URI[sha256sum] = "aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19" + +S = "${WORKDIR}/flashrom-v${PV}" + +inherit pkgconfig + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch new file mode 100644 index 000000000..09f4993a2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] Don't build with -Werror to fix compile error. + +| 550 | _dump_sgpio_amd(&amd_reg->amd); +| | ^~~~~~~~~~~~~ +| amd_sgpio.c: In function '_write_amd_register': +| amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member] + +Upstream-Status: Submitted +https://github.com/intel/ledmon/pull/48/commits + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7bc20f8..7e01bd5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1]) + AX_AM_CFLAGS_ADD([-Werror=shift-negative-value]) + AX_AM_CFLAGS_ADD([-Werror=alloca]) + AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers]) +-AX_AM_CFLAGS_ADD([-Werror]) + AX_AM_CFLAGS_ADD([-Werror=format-signedness]) + + AC_SUBST([AM_CFLAGS]) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb index 74ae56c67..f9ae9aad9 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -11,15 +11,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS = "sg3-utils udev" -inherit systemd +inherit autotools systemd SYSTEMD_SERVICE_${PN} = "ledmon.service" +# 0.93 SRC_URI = "git://github.com/intel/ledmon;branch=master \ file://0002-include-sys-select.h-and-sys-types.h.patch \ + file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \ " -SRCREV = "ad1304ca1363d727425a1f23703c523e21feae4f" +SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" COMPATIBLE_HOST_libc-musl = "null" @@ -27,8 +29,13 @@ COMPATIBLE_HOST_libc-musl = "null" S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" +# The ledmon sources include headers in ${S}/config to build but not in CFLAGS. +# We need to add this include path in CFLAGS. +CFLAGS += "-I${S}/config" + do_install_append() { - install -d ${D}/${systemd_unitdir}/system - oe_runmake DESTDIR=${D} install - oe_runmake DESTDIR=${D}${systemd_unitdir}/system install-systemd + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0755 ${S}/systemd/ledmon.service ${D}${systemd_unitdir}/system + fi } diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch deleted file mode 100644 index 337fb11dd..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 05a4d54e2adc4caed507baca529089ec01f48340 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Tue, 6 Sep 2016 14:04:29 +0800 -Subject: [PATCH 1/2] lmsensors: sensors-detect: print a special message when - there isn't enough cpu info - -When running sensors-detect, if there isn't enough information in -/proc/cpuinfo for this arch (e.g. ppc64), "Use of uninitialized value -in concatenation (.) or string at /usr/sbin/sensors-detect line 2867" -and incomplete "# Processor: (//)" will be printed. -Here print out a prompt for such a case. - -Upstream-Status: Pending - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - prog/detect/sensors-detect | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 0b3b0ff2..68594cd7 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -3119,7 +3119,12 @@ sub initialize_cpu_list - sub print_cpu_info - { - my $cpu = $cpu[0]; -- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) { -+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ } -+ else { -+ print "# Processor: There isn't enough cpu info for this arch!!!\n"; -+ } - } - - # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch deleted file mode 100644 index 68f51f5a6..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 26742544bc9f136093b6be78259f4a891870aa3c Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 21 Sep 2016 03:17:32 -0400 -Subject: [PATCH 2/2] lm-sensors: fix sensors-detect can't read the cpu - information on fsl-t4xxx - -This is because two reasons: - -1. The sensors-detect program in lm-sensors depends on the file '/proc/cpuinfo', - different arch write different infomation to it. That program supports x86 - and x86-64 well, but weak on ppc and arm. - -2. The sensors-detect program show the cpu information just design for intel's - cpu, when meets other arch, it can't output the correct information. - -So we need to add the ppc and arm support for this program: - -1. add the ppc cpu information field 'cpu' in initialize_cpu_list function. - -2. add the correspond case of ppc and arm when print cpu information in - print_cpu_info function. - -Upstream-Status: Pending - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - prog/detect/sensors-detect | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 68594cd7..efe2c1af 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -3088,6 +3088,7 @@ sub kernel_version_at_least - # model name and stepping, directly taken from /proc/cpuinfo. - use vars qw(@cpu); - -+# The added field 'cpu' is for support the ppc. - sub initialize_cpu_list - { - local $_; -@@ -3103,7 +3104,7 @@ sub initialize_cpu_list - }; - next; - } -- if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) { -+ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\s*:\s*(.+)$/) { - my $k = $1; - my $v = $2; - $v =~ s/\s+/ /g; # Merge multiple spaces -@@ -3116,12 +3117,20 @@ sub initialize_cpu_list - push @cpu, $entry if scalar keys(%{$entry}); # Last entry - } - -+# The field 'model name' is for ARM. -+# The field 'cpu' is for ppc. - sub print_cpu_info - { - my $cpu = $cpu[0]; - if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) { - print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; - } -+ elsif ( $cpu->{'model name'} ) { -+ print "# Processor: $cpu->{'model name'}\n"; -+ } -+ elsif ( $cpu->{'cpu'} && $cpu->{'revision'} ) { -+ print "# Processor: $cpu->{'cpu'} $cpu->{'revision'}\n"; -+ } - else { - print "# Processor: There isn't enough cpu info for this arch!!!\n"; - } --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index ffafd17f8..48490e8d8 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -14,10 +14,8 @@ DEPENDS = " \ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ file://fancontrol.init \ file://sensord.init \ - file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \ - file://0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch \ " -SRCREV = "e8afbda10fba571c816abddcb5c8180afc435bba" +SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" inherit update-rc.d systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb index e26a6ff86..982514f5d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9 S = "${WORKDIR}/hostapd-${PV}" B = "${WORKDIR}/hostapd-${PV}/hostapd" -inherit update-rc.d systemd pkgconfig distro_features_check +inherit update-rc.d systemd pkgconfig features_check CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch index 4bd40606b..35665bd3f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -9,13 +9,14 @@ Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> src/ethtool-local.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/ethtool-local.h b/src/ethtool-local.h -index 200476b..0edc7a9 100644 --- a/src/ethtool-local.h +++ b/src/ethtool-local.h -@@ -22,9 +22,9 @@ +@@ -20,11 +20,11 @@ + * along with ifplugd; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - +- ++#include <stdint.h> typedef unsigned long long u64; -typedef __uint32_t u32; -typedef __uint16_t u16; @@ -26,6 +27,3 @@ index 200476b..0edc7a9 100644 #include "ethtool-kernel.h" --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch new file mode 100644 index 000000000..93ef007f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch @@ -0,0 +1,40 @@ +From f2a2b9f445ab1e31fbb27a74744e9a2ededfce17 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 4 Nov 2019 16:38:04 -0800 +Subject: [PATCH] Makefile.am: Avoid redirection of input and output files + +Ensure that directory is created before its written to + +This can cause a build race in a highly parallelised build where a directory is not yet created but +output file is being written using redirection e.g. + +rst2man.py --strict --no-raw --no-generator --no-datestamp < ../git/monitor/iwmon.rst > monitor/iwmon.1 +/bin/sh: monitor/iwmon.1: No such file or directory +make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 823b7d02..1bd0005c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -626,8 +626,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + < $< > $@ + + if RUN_RST2MAN +-RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \ +- --no-datestamp < $< > $@ ++RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ ++ $(AM_V_GEN)$(RST2MAN) --strict --no-raw \ ++ --no-generator --no-datestamp $< $@ + else + RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ + { echo "Generated manual page $@ does not exist"; false; } +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb index 42205034c..d11e0d4ae 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb @@ -2,12 +2,14 @@ DESCRIPTION = "Wireless daemon for Linux" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd python3native -DEPENDS = "ell readline dbus" +DEPENDS = "ell readline dbus python3-docutils-native" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "00f0039232cc73bbcf7a1875f8f9aae464d90a8f" +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + " +SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db" S = "${WORKDIR}/git" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -26,7 +28,7 @@ do_install_append() { install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} } -FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d" +FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d ${systemd_unitdir}/network/" SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb index b72b7af4f..be4536b9c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb @@ -17,3 +17,5 @@ do_install_append() { # still basic so drop it for now. rm ${D}${includedir}/event.h } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb index c9913444d..785abf66d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb @@ -2,7 +2,7 @@ SUMMARY = "A packet dissection and creation library" # libnet at packetfactory.net is dead HOMEPAGE = "https://github.com/sam-github/libnet" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=3ec839e00408b484d33b472a86b7c266" DEPENDS = "libpcap" # There are major API changes beween libnet v1.0 and libnet v1.1 diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch deleted file mode 100644 index 4d0979710..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c9859a38a58996b8767a30e14febc03845f66f95 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 1 Jul 2017 13:10:53 -0700 -Subject: [PATCH] Define 64bit atomic helpers for ppc 32-bit - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/atomic64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/atomic64.c b/src/atomic64.c -index f841b39b..35c7c9d8 100644 ---- a/src/atomic64.c -+++ b/src/atomic64.c -@@ -18,10 +18,10 @@ - #include <stdbool.h> - - /* -- * only need these on MIPS, since it lacks hardware 64-bit atomics, -+ * only need these on MIPS & PPC32, since it lacks hardware 64-bit atomics, - * unlike x86 and ARM. - */ --#if defined(__mips__) || defined(__mipsel__) -+#if defined(__mips__) || defined(__mipsel__) || defined(__powerpc__) - - static void __spin_lock(volatile int *lock) { - while (__sync_lock_test_and_set(lock, 1)) --- -2.13.2 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch deleted file mode 100644 index 84e0772a7..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch +++ /dev/null @@ -1,263 +0,0 @@ -From d7b6df5808e7bef5930b61a82e880699a9f9e208 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Jun 2017 15:39:19 -0700 -Subject: [PATCH] implement 64bit atomic for mips - -GCC does not provide 64bit atomics for mips32 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/Makefile.am | 1 + - src/atomic64.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 229 insertions(+) - create mode 100644 src/atomic64.c - -diff --git a/src/Makefile.am b/src/Makefile.am -index 99aaace0..cbbbbee9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -27,6 +27,7 @@ libtorrent_la_LIBADD = \ - utils/libsub_utils.la - - libtorrent_la_SOURCES = \ -+ atomic64.c \ - globals.cc \ - globals.h \ - manager.cc \ -diff --git a/src/atomic64.c b/src/atomic64.c -new file mode 100644 -index 00000000..f841b39b ---- /dev/null -+++ b/src/atomic64.c -@@ -0,0 +1,228 @@ -+/*===----- atomic64.c - Support functions for 64-bit atomic operations.-----=== -+ * -+ * The LLVM Compiler Infrastructure -+ * -+ * This file is dual licensed under the MIT and the University of Illinois Open -+ * Source Licenses. See LICENSE.TXT for details. -+ * -+ *===-----------------------------------------------------------------------=== -+ * -+ * atomic64.c defines a set of functions for performing atomic accesses on -+ * 64-bit memory locations. It also implements spinlock synchronization -+ * operations. -+ * -+ *===-----------------------------------------------------------------------=== -+ */ -+ -+#include <stdint.h> -+#include <stdbool.h> -+ -+/* -+ * only need these on MIPS, since it lacks hardware 64-bit atomics, -+ * unlike x86 and ARM. -+ */ -+#if defined(__mips__) || defined(__mipsel__) -+ -+static void __spin_lock(volatile int *lock) { -+ while (__sync_lock_test_and_set(lock, 1)) -+ while (*lock) {} -+} -+ -+static void __spin_unlock(volatile int *lock) { -+ __sync_lock_release(lock); -+} -+ -+/* -+ * Make sure the lock is on its own cache line to prevent false sharing. -+ * Put it inside a struct that is aligned and padded to the typical MIPS -+ * cacheline which is 32 bytes. -+ */ -+static struct { -+ int lock; -+ char pad[32 - sizeof(int)]; -+} __attribute__((aligned (32))) lock = { 0 }; -+ -+ -+uint64_t __sync_fetch_and_add_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ *ptr = ret + val; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_fetch_and_sub_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ *ptr = ret - val; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_fetch_and_and_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ *ptr = ret & val; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_fetch_and_or_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ *ptr = ret | val; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_fetch_and_xor_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ *ptr = ret ^ val; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_add_and_fetch_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr + val; -+ *ptr = ret; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_sub_and_fetch_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr - val; -+ *ptr = ret; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_and_and_fetch_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr & val; -+ *ptr = ret; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_or_and_fetch_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr | val; -+ *ptr = ret; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_xor_and_fetch_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr ^ val; -+ *ptr = ret; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+bool __sync_bool_compare_and_swap_8(volatile uint64_t *ptr, -+ uint64_t oldval, uint64_t newval) { -+ bool ret = false; -+ -+ __spin_lock(&lock.lock); -+ -+ if (*ptr == oldval) { -+ *ptr = newval; -+ ret = true; -+ } -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_val_compare_and_swap_8(volatile uint64_t *ptr, -+ uint64_t oldval, uint64_t newval) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ if (ret == oldval) -+ *ptr = newval; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+uint64_t __sync_lock_test_and_set_8(volatile uint64_t *ptr, uint64_t val) { -+ uint64_t ret; -+ -+ __spin_lock(&lock.lock); -+ -+ ret = *ptr; -+ *ptr = val; -+ -+ __spin_unlock(&lock.lock); -+ -+ return ret; -+} -+ -+void __sync_lock_release_8(volatile uint64_t *ptr) { -+ __spin_lock(&lock.lock); -+ -+ *ptr = 0; -+ -+ __spin_unlock(&lock.lock); -+} -+ -+#endif --- -2.13.2 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index b2dffcdb9..3ee69554b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -8,15 +8,20 @@ DEPENDS = "zlib libsigc++-2.0 openssl cppunit" SRC_URI = "git://github.com/rakshasa/libtorrent \ file://don-t-run-code-while-configuring-package.patch \ - file://0001-implement-64bit-atomic-for-mips.patch \ - file://0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch \ " -SRCREV = "074f6ec51a2e4bc5c6140b4dad13c9bb56f3f0dc" +SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" -PV = "0.13.7+git${SRCPV}" +PV = "0.13.8" S = "${WORKDIR}/git" +PACKAGECONFIG ??= "instrumentation" + +PACKAGECONFIG_remove_mipsarch = "instrumentation" +PACKAGECONFIG_remove_powerpc = "instrumentation" + +PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," + inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb index c7fa3c10f..604568e62 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb @@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "697bea87b3a0b0e9b4e5ff86b39d1dedb70ee46d" +SRCREV = "07ad32138f4d2285ba2226b5e20462b27b091a59" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.8.bb index 92d4fe0f4..3cd21cc0d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.8.bb @@ -14,8 +14,8 @@ DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ " -SRC_URI[md5sum] = "7452a94f0d1ca361ae51ff1d287c53f5" -SRC_URI[sha256sum] = "3c2ca73782215664141042422759899ca9846440fc26d6223c7cf7ea4dd3c996" +SRC_URI[md5sum] = "c05ac4246c81cc15d617c4a129232988" +SRC_URI[sha256sum] = "cbe174078dbdf3f746a55f0004353d3c27da2a31da553036d90fc7dc34a0169a" S = "${WORKDIR}/ModemManager-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index c201c8651..876370935 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -10,7 +10,7 @@ SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz \ SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" SRC_URI[sha256sum] = "b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f" -inherit distro_features_check autotools-brokensep pkgconfig +inherit features_check autotools-brokensep pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.1.bb index f3086315d..fa249677e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.1.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" -SRCREV = "9f715d0862a8e16099b5837c4e53a1bf6a6a0675" +SRCREV = "d34c51214f4172f2e12bb17532c9f44f72a57dd4" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb index 3e644760c..5c19e65b0 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Radio enable/disable command line utility" HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill" SECTION = "base" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94" SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.bz2 \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch index 79d4f29fa..7d09f4382 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch @@ -1,19 +1,26 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. +Using AC_RUN_IFELSE prevent people from configuring package + for cross-compiling. Don't run code while configuring package. Upstream-Status: Pending Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> -Index: libtorrent-0.13.3/scripts/checks.m4 -=================================================================== ---- libtorrent-0.13.3.orig/scripts/checks.m4 2012-05-14 14:17:04.000000000 +0300 -+++ libtorrent-0.13.3/scripts/checks.m4 2013-02-10 15:28:37.414445524 +0200 -@@ -95,40 +95,6 @@ +Update for 0.9.8. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + scripts/checks.m4 | 34 ---------------------------------- + scripts/common.m4 | 28 ---------------------------- + 2 files changed, 62 deletions(-) +diff --git a/scripts/checks.m4 b/scripts/checks.m4 +index 83be846..1af80f5 100644 +--- a/scripts/checks.m4 ++++ b/scripts/checks.m4 +@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ + AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <fcntl.h> - #include <stdlib.h> - #include <unistd.h> @@ -47,18 +54,18 @@ Index: libtorrent-0.13.3/scripts/checks.m4 - AC_MSG_RESULT(no) - ]) ]) - + AC_DEFUN([TORRENT_WITH_KQUEUE], [ -Index: libtorrent-0.13.3/scripts/common.m4 -=================================================================== ---- libtorrent-0.13.3.orig/scripts/common.m4 2012-05-14 14:17:04.000000000 +0300 -+++ libtorrent-0.13.3/scripts/common.m4 2013-02-10 15:27:55.874446741 +0200 -@@ -222,38 +222,10 @@ - +diff --git a/scripts/common.m4 b/scripts/common.m4 +index aaf005e..42fb016 100644 +--- a/scripts/common.m4 ++++ b/scripts/common.m4 +@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. + AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], @@ -69,11 +76,11 @@ Index: libtorrent-0.13.3/scripts/common.m4 - AC_MSG_RESULT(no) - ]) ]) - + AC_DEFUN([TORRENT_CHECK_ALIGNED], [ AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <inttypes.h> - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; @@ -90,5 +97,8 @@ Index: libtorrent-0.13.3/scripts/common.m4 - AC_MSG_RESULT(required) - ]) ]) - + + +-- +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 9bb81c409..331f978f8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -8,10 +8,10 @@ DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" SRC_URI = "git://github.com/rakshasa/rtorrent \ file://don-t-run-code-while-configuring-package.patch \ " -# v0.9.7 -SRCREV = "327164f9d86aafcd2500a317d485374df32ea622" +# v0.9.8 +SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" -PV = "0.9.7+git${SRCPV}" +PV = "0.9.8" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.1.bb index 33c0a82b8..656ff0dd8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.1.bb @@ -28,8 +28,8 @@ SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stab file://zabbix-agent.service \ " -SRC_URI[md5sum] = "6cd55cd743d416d9ffbf2e6fdee680ee" -SRC_URI[sha256sum] = "646b1f29a768e3123a00a9afadf382b4d0dfd54e20fb31023f0d6da066da0864" +SRC_URI[md5sum] = "e9df94149790f86732f18d042b70155d" +SRC_URI[sha256sum] = "0bf74e597dd41a558305fe17a2b1ed6fe2d77044b87696a92e4227fbf315564a" inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd @@ -51,7 +51,6 @@ EXTRA_OECONF = " \ --enable-ipv6 \ --with-net-snmp \ --with-ldap=${STAGING_EXECPREFIXDIR} \ - --with-jabber \ --with-unixodbc \ --with-ssh2 \ --with-sqlite3 \ diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch new file mode 100644 index 000000000..ccc175bb8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch @@ -0,0 +1,48 @@ +From f42d5e38859c65a186acd0da94bbeeca12faf7a2 Mon Sep 17 00:00:00 2001 +From: David Rheinsberg <david.rheinsberg@gmail.com> +Date: Thu, 2 May 2019 17:33:34 +0200 +Subject: [PATCH] launch: improve error handling for opendir() + +This improves the error-handling of opendir() by always printing +diagnostics. Furthermore, it aligns the behavior with dbus-deamon and +ignores EACCES. + +Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com> +Upstream-Status: dbus-broker@f42d5e38859c65a186acd0da94bbeeca12faf7a2 +--- + src/launch/launcher.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/launch/launcher.c b/src/launch/launcher.c +index 31a5364..2ec4bda 100644 +--- a/src/launch/launcher.c ++++ b/src/launch/launcher.c +@@ -749,10 +749,23 @@ static int launcher_load_service_dir(Launcher *launcher, const char *dirpath, NS + + dir = opendir(dirpath); + if (!dir) { +- if (errno == ENOENT || errno == ENOTDIR) ++ if (errno == ENOENT || errno == ENOTDIR) { + return 0; +- else ++ } else if (errno == EACCES) { ++ log_append_here(&launcher->log, LOG_ERR, 0, NULL); ++ r = log_commitf(&launcher->log, "Access denied to service directory '%s'\n", dirpath); ++ if (r) ++ return error_fold(r); ++ ++ return 0; ++ } else { ++ log_append_here(&launcher->log, LOG_ERR, errno, NULL); ++ r = log_commitf(&launcher->log, "Unable to open service directory '%s': %m\n", dirpath); ++ if (r) ++ return error_fold(r); ++ + return error_origin(-errno); ++ } + } + + r = dirwatch_add(launcher->dirwatch, dirpath); +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch new file mode 100644 index 000000000..67a2dc46f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch @@ -0,0 +1,86 @@ +From 3570b3e9ba367f10718b56336ce32d5254f66575 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Thu, 9 May 2019 13:00:37 +0200 +Subject: [PATCH] metrics: change the constant used for invalid timestamps + +Use (uint64_t)-1 rather than 0 to indicate an invalid timestamp. It +should not be possible for the kernel to return 0 from +clock_gettime(), but we have received some reports of our asserts +triggering, so avoid the issue entirely by using -1 instead (which +really can never be returned). + +See https://retrace.fedoraproject.org/faf/reports/2539484/ + +Signed-off-by: Tom Gundersen <teg@jklm.no> +Upstream-Status: dbus-broker@3570b3e9ba367f10718b56336ce32d5254f66575 +--- + src/util/metrics.c | 8 ++++---- + src/util/metrics.h | 9 ++++++--- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/src/util/metrics.c b/src/util/metrics.c +index b5a7182..eef94eb 100644 +--- a/src/util/metrics.c ++++ b/src/util/metrics.c +@@ -26,7 +26,7 @@ void metrics_init(Metrics *metrics, clockid_t id) { + } + + void metrics_deinit(Metrics *metrics) { +- c_assert(!metrics->timestamp); ++ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); + metrics_init(metrics, metrics->id); + } + +@@ -82,7 +82,7 @@ void metrics_sample_add(Metrics *metrics, uint64_t timestamp) { + * a sample is not currently running. + */ + void metrics_sample_start(Metrics *metrics) { +- c_assert(!metrics->timestamp); ++ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); + metrics->timestamp = metrics_get_time(metrics); + } + +@@ -93,11 +93,11 @@ void metrics_sample_start(Metrics *metrics) { + * End a currently running sample, and update the internal state. + */ + void metrics_sample_end(Metrics *metrics) { +- c_assert(metrics->timestamp); ++ c_assert(metrics->timestamp != METRICS_TIMESTAMP_INVALID); + + metrics_sample_add(metrics, metrics->timestamp); + +- metrics->timestamp = 0; ++ metrics->timestamp = METRICS_TIMESTAMP_INVALID; + } + + /** +diff --git a/src/util/metrics.h b/src/util/metrics.h +index a8ee915..b00dee6 100644 +--- a/src/util/metrics.h ++++ b/src/util/metrics.h +@@ -8,6 +8,8 @@ + #include <stdlib.h> + #include <time.h> + ++#define METRICS_TIMESTAMP_INVALID ((uint64_t) -1) ++ + typedef struct Metrics Metrics; + + struct Metrics { +@@ -23,9 +25,10 @@ struct Metrics { + uint64_t sum_of_squares; + }; + +-#define METRICS_INIT(_id) { \ +- .minimum = (uint64_t) -1, \ +- .id = (_id), \ ++#define METRICS_INIT(_id) { \ ++ .minimum = (uint64_t) -1, \ ++ .id = (_id), \ ++ .timestamp = METRICS_TIMESTAMP_INVALID, \ + } + + void metrics_init(Metrics *metrics, clockid_t id); +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch new file mode 100644 index 000000000..53f9e71aa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch @@ -0,0 +1,83 @@ +From 520c47c53deeb893e03194fefaf3c5b9223ede27 Mon Sep 17 00:00:00 2001 +From: David Rheinsberg <david.rheinsberg@gmail.com> +Date: Fri, 10 May 2019 10:58:06 +0200 +Subject: [PATCH] dbus/socket: treat MSG_CTRUNC gracefully + +As it turns out, LSMs allow clients to trigger a MSG_CTRUNC on the +remote side of a unix socket. Whenever LSMs reject the transmission of +an FD, they will simply drop the FD and set MSG_CTRUNC, without any +other error notification. + +Therefore, we must assume any occurance of MSG_CTRUNC is trigger by a +client. This makes it impossible to consider MSG_CTRUNC for any other +error handling, and as such we are left to disconnecting the client and +ignoring the flag. + +Luckily, MSG_CTRUNC is expected for any other event, so we only used it +for diagnostics so far. + +Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com> +Upstream-Status: dbus-broker@520c47c53deeb893e03194fefaf3c5b9223ede27 +--- + src/dbus/socket.c | 44 +++++++++++++++++++++++++++++++++----------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +diff --git a/src/dbus/socket.c b/src/dbus/socket.c +index cacdff2..6e6ba10 100644 +--- a/src/dbus/socket.c ++++ b/src/dbus/socket.c +@@ -593,18 +593,40 @@ static int socket_recvmsg(Socket *socket, + + if (msg.msg_flags & MSG_CTRUNC) { + /* +- * This flag means the control-buffer was too small to retrieve +- * all data. If this can be triggered remotely, it means a peer +- * can cause us to miss FDs. Hence, we really must protect +- * against this. +- * We do provide suitably sized buffers to be prepared for any +- * possible scenario. So if this happens, something is fishy +- * and we better report it. +- * Note that this is also reported by the kernel if we exceeded +- * our NOFILE limit. Since this implies resource +- * misconfiguration as well, we treat it the same way. ++ * Our control-buffer-size is carefully calculated to be big ++ * enough for any possible ancillary data we expect. Therefore, ++ * the kernel should never be required to truncate it, and thus ++ * MSG_CTRUNC will never be set. This is also foward compatible ++ * to future extensions to the ancillary data, since these must ++ * be enabled explicitly before the kernel considers forwarding ++ * them. ++ * ++ * Unfortunately, the SCM_RIGHTS implementation might set this ++ * flag as well. In particular, if not all FDs can be returned ++ * to user-space, MSG_CTRUNC will be set (signalling that the ++ * FD-set is non-complete). No other error is returned or ++ * signalled, though. There are several reasons why the FD ++ * transmission can fail. Most importantly, if we exhaust our ++ * FD limit, further FDs will simply be discarded. We are ++ * protected against this by our accounting-quotas, but we ++ * would still like to catch this condition and warn loudly. ++ * However, FDs are also dropped if the security layer refused ++ * the transmission of the FD in question. This means, if an ++ * LSM refuses the D-Bus client to send us an FD, the FD is ++ * just dropped and MSG_CTRUNC will be set. This can be ++ * triggered by clients. ++ * ++ * To summarize: In an ideal world, we would expect this flag ++ * to never be set, and we would just use ++ * `error_origin(-ENOTRECOVERABLE)` to provide diagnostics. ++ * Unfortunately, the gross misuse of this flag for LSM ++ * security enforcements means we have to assume any occurence ++ * of MSG_CTRUNC means the client was refused to send a ++ * specific message. Our only possible way to deal with this is ++ * to disconnect the client. + */ +- r = error_origin(-ENOTRECOVERABLE); ++ socket_close(socket); ++ r = SOCKET_E_LOST_INTEREST; + goto error; + } + +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch new file mode 100644 index 000000000..0348d9722 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch @@ -0,0 +1,38 @@ +From fc1d26dd08c48c04fc9883b36a94c219aba2091c Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <luca.boccassi@microsoft.com> +Date: Mon, 28 Oct 2019 14:31:38 +0000 +Subject: [PATCH] launcher: fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +../src/launch/launcher.c: In function ‘launcher_fork’: +../src/launch/launcher.c:378:60: error: ‘WEXITED’ undeclared (first use in this function); did you mean ‘WIFEXITED’? + r = sd_event_add_child(launcher->event, NULL, pid, WEXITED, launcher_on_child_exit, launcher); + ^~~~~~~ + WIFEXITED + +Include sys/wait.h which defines it. + +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> +Suggested-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: pending https://github.com/bus1/dbus-broker/pull/214 +--- + src/launch/launcher.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/launch/launcher.c b/src/launch/launcher.c +index 2ec4bda..1f38fcf 100644 +--- a/src/launch/launcher.c ++++ b/src/launch/launcher.c +@@ -10,6 +10,7 @@ + #include <stdlib.h> + #include <sys/prctl.h> + #include <sys/un.h> ++#include <sys/wait.h> + #include <systemd/sd-bus.h> + #include <systemd/sd-daemon.h> + #include <systemd/sd-event.h> +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb deleted file mode 100644 index 82d8b8ba6..000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "dbus broker" -DESCRIPTION = "Drop-in replacement for dbus-daemon." - -SECTION = "base" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" - -SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "1648227f5a347d4f38d8a29bb9295a73a25c3feb4f3e79e3f04cc847343da3ed" - -inherit meson pkgconfig systemd distro_features_check - -DEPENDS = "expat systemd" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN} += "${systemd_user_unitdir}" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb new file mode 100644 index 000000000..98c50c4b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -0,0 +1,32 @@ +SUMMARY = "dbus broker" +DESCRIPTION = "Drop-in replacement for dbus-daemon." + +SECTION = "base" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" + +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI += " file://0001-launch-improve-error-handling-for-opendir.patch" +SRC_URI += " file://0002-metrics-change-the-constant-used-for-invalid-timesta.patch" +SRC_URI += " file://0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch" +SRC_URI += " file://0004-launcher-fix-build-with-musl-libc.patch" +SRC_URI[md5sum] = "a17886a92ab1e0bc2e4b1a274339e388" +SRC_URI[sha256sum] = "6fff9a831a514659e2c7d704e76867ce31ebcf43e8d7a62e080c6656f64cd39e" + +inherit meson pkgconfig systemd features_check + +DEPENDS = "expat systemd" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN} += "${systemd_user_unitdir}" +FILES_${PN} += "${libdir}/systemd/catalog" + +EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" +EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" diff --git a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb new file mode 100644 index 000000000..e3853a201 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "A multi-platform library for OpenGL, OpenGL ES, Vulkan, window and input" +HOMEPAGE = "https://www.glfw.org/" +DESCRIPTION = "GLFW is an Open Source, multi-platform library for OpenGL, \ +OpenGL ES and Vulkan application development. It provides a simple, \ +platform-independent API for creating windows, contexts and surfaces, reading \ +input, handling events, etc." +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=98d93d1ddc537f9b9ea6def64e046b5f" +SECTION = "lib" + +inherit pkgconfig cmake + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/glfw/glfw.git" +SRCREV = "d25248343e248337284dfbe5ecd1eddbd37ae66d" + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" +REQUIRED_DISTRO_FEATURES = "x11" + +COMPATIBLE_HOST_libc-musl = "null" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb index 7163212b5..75eea4e58 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb @@ -13,8 +13,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI += " \ file://remove-examples.patch \ " -SRC_URI[archive.md5sum] = "0f6180d185c067bdb2aa30d035f9b867" -SRC_URI[archive.sha256sum] = "a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc" +SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e" +SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe" do_install_append() { install -d ${D}${datadir}/glibmm-2.4 diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb new file mode 100644 index 000000000..3c0330f50 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A library for loose coupling of C++ method calls" +SECTION = "libs" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" + +DEPENDS = "mm-common" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz" +SRC_URI[md5sum] = "6ffe924f1d8624b5716468cde67dc03f" +SRC_URI[sha256sum] = "50a0855c1eb26e6044ffe888dbe061938ab4241f96d8f3754ea7ead38ab8ed06" + +S = "${WORKDIR}/libsigc++-${PV}" + +inherit autotools + +FILES_${PN}-dev += "${libdir}/sigc++-*/" +FILES_${PN}-doc += "${datadir}/devhelp" + +BBCLASSEXTEND = "native" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch new file mode 100644 index 000000000..6031eaa78 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -0,0 +1,41 @@ +From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 4 Nov 2019 19:19:47 +0100 +Subject: [PATCH] meson.build: do not ask for python installation / version +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Even by adding python3-setuptools-native the following error is not fixed so +just ask for python3 executable. + +| meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 3255328..7a6094c 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,12 +6,7 @@ project('mm-common', + license: 'GPLv2+' + ) + +-python3 = import('python').find_installation('python3') +-python_version = python3.language_version() +-python_version_req = '>= 3.5' +-if not python_version.version_compare(python_version_req) +- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) +-endif ++python3 = import('python3').find_python() + + # Use these instead of meson.source_root() and meson.build_root(). + # source_root() and build_root() are not useful, if this is a subproject. +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb deleted file mode 100644 index 4f91f31e4..000000000 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit gnomebase - -SRC_URI[archive.md5sum] = "be1c61587db989c7677375a729b94672" -SRC_URI[archive.sha256sum] = "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb new file mode 100644 index 000000000..c7d1f2b73 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718" +SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb index ae5988b57..479b9eb37 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "1654c8d2aa0dac51c8d1d755df61ae6c" -SRC_URI[sha256sum] = "94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61" +SRC_URI[md5sum] = "2b64ca9ea16e823df359eacf9c02414b" +SRC_URI[sha256sum] = "2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch new file mode 100644 index 000000000..e713665ab --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch @@ -0,0 +1,39 @@ +From 7b5dd67fee58f9f54c8a676abe2131776c0a3c52 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Nov 2019 13:41:39 -0800 +Subject: [PATCH] Use __builtin_bswap32 on Clang if supported + +clang pretends to be gcc 4.2.1 so GCC_VERSION macro will decide that +__builtin_bswap32 is not supported on clang, whereas in reality it might +so its better to add a check for enquiring clang if it supports +__builtin_bswap32 or not + +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/83] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/kcapi-kdf.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/kcapi-kdf.c b/lib/kcapi-kdf.c +index 9e53a0b..f32fbe9 100644 +--- a/lib/kcapi-kdf.c ++++ b/lib/kcapi-kdf.c +@@ -54,10 +54,14 @@ + #include "kcapi.h" + #include "internal.h" + ++#ifndef __has_builtin ++# define __has_builtin(x) 0 ++#endif ++ + #define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) +-#if GCC_VERSION >= 40400 ++#if GCC_VERSION >= 40400 || (defined(__clang__) && __has_builtin(__builtin_bswap32)) + # define __HAVE_BUILTIN_BSWAP32__ + #endif + +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch new file mode 100644 index 000000000..7ed9caf09 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch @@ -0,0 +1,73 @@ +From 8f961521add49278b48c9721fc53e05ee3543b74 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Nov 2019 23:03:51 -0800 +Subject: [PATCH] kcapi-kdf: Move code to fix + +Fixes clang build +unused function '_bswap32' [-Werror,-Wunused-function] + +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/83] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/kcapi-kdf.c | 37 +++++++++++++++++-------------------- + 1 file changed, 17 insertions(+), 20 deletions(-) + +diff --git a/lib/kcapi-kdf.c b/lib/kcapi-kdf.c +index ea39846..9e53a0b 100644 +--- a/lib/kcapi-kdf.c ++++ b/lib/kcapi-kdf.c +@@ -54,6 +54,20 @@ + #include "kcapi.h" + #include "internal.h" + ++#define GCC_VERSION (__GNUC__ * 10000 \ ++ + __GNUC_MINOR__ * 100 \ ++ + __GNUC_PATCHLEVEL__) ++#if GCC_VERSION >= 40400 ++# define __HAVE_BUILTIN_BSWAP32__ ++#endif ++ ++/* Endian dependent byte swap operations. */ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++# define be_bswap32(x) ((uint32_t)(x)) ++#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++# ifdef __HAVE_BUILTIN_BSWAP32__ ++# define be_bswap32(x) (uint32_t)__builtin_bswap32((uint32_t)(x)) ++# else + static inline uint32_t rol32(uint32_t x, int n) + { + return ( (x << (n&(32-1))) | (x >> ((32-n)&(32-1))) ); +@@ -68,27 +82,10 @@ static inline uint32_t _bswap32(uint32_t x) + { + return ((rol32(x, 8) & 0x00ff00ffL) | (ror32(x, 8) & 0xff00ff00L)); + } +- +-#define GCC_VERSION (__GNUC__ * 10000 \ +- + __GNUC_MINOR__ * 100 \ +- + __GNUC_PATCHLEVEL__) +-#if GCC_VERSION >= 40400 +-# define __HAVE_BUILTIN_BSWAP32__ +-#endif +- +-#ifdef __HAVE_BUILTIN_BSWAP32__ +-# define _swap32(x) (uint32_t)__builtin_bswap32((uint32_t)(x)) +-#else +-# define _swap32(x) _bswap32(x) +-#endif +- +-/* Endian dependent byte swap operations. */ +-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +-# define be_bswap32(x) ((uint32_t)(x)) +-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +-# define be_bswap32(x) _swap32(x) ++# define be_bswap32(x) _bswap32(x) ++# endif + #else +-#error "Endianess not defined" ++# error "endianess not defined" + #endif + + DSO_PUBLIC +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb index 799070972..4e217a351 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb @@ -10,6 +10,8 @@ SRCREV = "5649050d201856bf06c8738b5d2aa1710c86ac2f" PV = "1.1.5" SRC_URI = " \ git://github.com/smuellerDD/libkcapi.git \ + file://0001-kcapi-kdf-Move-code-to-fix.patch \ + file://0001-Use-__builtin_bswap32-on-Clang-if-supported.patch \ " inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb index e1a038dfa..e1a038dfa 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index f1c71feeb..ec5ac11ef 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,8 +19,8 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "11220d0b94c5c24caa2e1e9eaba38e31" -SRC_URI[sha256sum] = "39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b" +SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0" +SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -58,7 +58,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb" PACKAGECONFIG_class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" -PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" PACKAGECONFIG[krb5] = ", ,krb5" PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb index de24c920f..c0b53379d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb @@ -2,7 +2,7 @@ require mariadb.inc EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" -DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2" +DEPENDS += "mariadb-native bison-native openssl ncurses zlib libaio libedit libevent libxml2" PROVIDES += "mysql5 libmysqlclient" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index f14da06d9..84cd5c157 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -9,21 +9,25 @@ xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. Signed-off-by: Philip Balister <philip@balister.org> -upate to version 10.4 +update to version 10.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update for version 12.0 +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + configure.in | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in -index d9fe56e..3e2cd3a 100644 +index 6942f81..7fd3e78 100644 --- a/configure.in +++ b/configure.in -@@ -816,19 +816,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], +@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then - PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) +- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl - if test -n "$XML2_CONFIG"; then - for pgac_option in `$XML2_CONFIG --cflags`; do - case $pgac_option in diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index 0fe5d58e1..91d0275b3 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -18,7 +18,7 @@ DESCRIPTION = "\ this package if you're installing the postgresql-server package. \ " HOMEPAGE = "http://www.postgresql.com" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" DEPENDS = "libnsl2 zlib readline tzcode-native" ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb index fd4200a73..d5b1ebdb5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb @@ -8,5 +8,5 @@ SRC_URI += "\ file://0001-Improve-reproducibility.patch \ " -SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" -SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" +SRC_URI[md5sum] = "87545416ef021eee8621d31a93fcc899" +SRC_URI[sha256sum] = "cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch new file mode 100644 index 000000000..daf90ad44 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch @@ -0,0 +1,67 @@ +From a3eba0fcee5e96ef47a6d3fac7196a1074f0dc17 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <bunk@stusta.de> +Date: Wed, 30 Oct 2019 11:07:23 +0200 +Subject: Avoid use of "mips" which is reserved on mips + +Upstream-Status: Submitted [https://github.com/brasko/gdbwire/pull/9] + +Signed-off-by: Adrian Bunk <bunk@stusta.de> + +diff --git a/src/gdbwire_mi_parser.c b/src/gdbwire_mi_parser.c +index 3f6b563..24aa0cf 100644 +--- a/lib/tgdb/gdbwire.c ++++ b/lib/tgdb/gdbwire.c +@@ -40,7 +40,7 @@ struct gdbwire_mi_parser { + /* The GDB/MI lexer state */ + yyscan_t mils; + /* The GDB/MI push parser state */ +- gdbwire_mi_pstate *mips; ++ gdbwire_mi_pstate *mipst; + /* The client parser callbacks */ + struct gdbwire_mi_parser_callbacks callbacks; + }; +@@ -71,8 +71,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) + } + + /* Create a new push parser state instance */ +- parser->mips = gdbwire_mi_pstate_new(); +- if (!parser->mips) { ++ parser->mipst = gdbwire_mi_pstate_new(); ++ if (!parser->mipst) { + gdbwire_mi_lex_destroy(parser->mils); + gdbwire_string_destroy(parser->buffer); + free(parser); +@@ -81,7 +81,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) + + /* Ensure that the callbacks are non null */ + if (!callbacks.gdbwire_mi_output_callback) { +- gdbwire_mi_pstate_delete(parser->mips); ++ gdbwire_mi_pstate_delete(parser->mipst); + gdbwire_mi_lex_destroy(parser->mils); + gdbwire_string_destroy(parser->buffer); + free(parser); +@@ -109,9 +109,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser) + } + + /* Free the push parser instance */ +- if (parser->mips) { +- gdbwire_mi_pstate_delete(parser->mips); +- parser->mips = NULL; ++ if (parser->mipst) { ++ gdbwire_mi_pstate_delete(parser->mipst); ++ parser->mipst = NULL; + } + + free(parser); +@@ -162,7 +162,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser, + pattern = gdbwire_mi_lex(parser->mils); + if (pattern == 0) + break; +- mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL, ++ mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL, + parser->mils, &output); + } while (mi_status == YYPUSH_MORE); + +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch deleted file mode 100644 index 4358629b7..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch +++ /dev/null @@ -1,47 +0,0 @@ -Disable building manpages so that make install doesn't fail due to lack of help2man - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> ---- - configure.ac | 3 --- - doc/Makefile.am | 5 ----- - 2 files changed, 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee7eca0..1f0d924 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,9 +134,6 @@ dnl check that the required tools are available to generate documentation - if test "$HAS_MAKEINFO" != "yes" ; then - AC_MSG_ERROR([Please install makeinfo before installing]) - fi --if test "$HAS_HELP2MAN" != "yes" ; then -- AC_MSG_ERROR([Please install help2man]) --fi - - dnl Checking for log10 function in math - I would like to remove this - AC_CHECK_LIB(m, log10) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 60662f6..0ae0013 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,15 +1,10 @@ - info_TEXINFOS = cgdb.texi - cgdb_TEXINFOS = gpl.texi - --dist_man_MANS = cgdb.1 - EXTRA_DIST = cgdb.txt - - dist_pkgdata_DATA = cgdb.txt - --# generate the man page using help2man. --cgdb.1: -- help2man --output=$(top_srcdir)/doc/cgdb.1 $(top_builddir)/cgdb/cgdb$(EXEEXT) -- - cgdb.txt: cgdb.texi $(srcdir)/version.texi $(cgdb_TEXINFOS) - TEXTS = cgdb.txt - text-am: $(TEXTS) --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb index 74019fb62..57e364e1c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb @@ -10,11 +10,12 @@ DEPENDS = "flex-native readline ncurses" inherit autotools SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ - file://remove-help2man.patch" -SRC_URI[md5sum] = "7bd38c79bf4d794d239928fef401fca3" -SRC_URI[sha256sum] = "be203e29be295097439ab67efe3dc8261f742c55ff3647718d67d52891f4cf41" + file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \ +" +SRC_URI[md5sum] = "a104862ffd3145b076303992e9a3af26" +SRC_URI[sha256sum] = "bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198" -CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2" +CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ --with-ncurses=${STAGING_LIBDIR}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb b/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb index 8aa5947d0..199c31e15 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb @@ -11,7 +11,7 @@ DESCRIPTION = "Cscope is a developer's tool for browsing source code. \ HOMEPAGE = "http://cscope.sourceforge.net/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d4667b67b483823043fcffa489ea343b" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch deleted file mode 100644 index bbebc4dc7..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 81b213b98f51ec3eed5774f6f797c074ac35db3e Mon Sep 17 00:00:00 2001 -From: Ton van den Heuvel <tonvandenheuvel@gmail.com> -Date: Mon, 6 May 2019 15:17:28 +0200 -Subject: [PATCH] Fix #6906 - -Generate configvalues.h only as a dependency for the VHDL parser. Fixes -a problem in combination with Ninja v1.9.0 because of duplicate rules -for generating configvalues.h. - -Upstream-Status: Backport -Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> ---- - addon/doxyapp/CMakeLists.txt | 8 -------- - addon/doxyparse/CMakeLists.txt | 8 -------- - src/CMakeLists.txt | 4 ++++ - vhdlparser/CMakeLists.txt | 12 +++--------- - 4 files changed, 7 insertions(+), 25 deletions(-) - -diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt -index a7377112..0aaf4655 100644 ---- a/addon/doxyapp/CMakeLists.txt -+++ b/addon/doxyapp/CMakeLists.txt -@@ -1,11 +1,3 @@ --# configvalues.h --add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h -- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py -- OUTPUT ${GENERATED_SRC}/configvalues.h --) --set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -- - find_package(Iconv) - - include_directories( -diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt -index ff198fb4..1620c72e 100644 ---- a/addon/doxyparse/CMakeLists.txt -+++ b/addon/doxyparse/CMakeLists.txt -@@ -1,11 +1,3 @@ --# configvalues.h --add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h -- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py -- OUTPUT ${GENERATED_SRC}/configvalues.h --) --set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -- - find_package(Iconv) - - include_directories( -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 92a302ab..37a21ff6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -43,6 +43,10 @@ add_custom_command( - OUTPUT ${GENERATED_SRC}/configvalues.h - ) - set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -+add_custom_target( -+ generate_configvalues_header -+ DEPENDS ${GENERATED_SRC}/configvalues.h -+) - - # configvalues.cpp - add_custom_command( -diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt -index 71e97df5..f89008c5 100644 ---- a/vhdlparser/CMakeLists.txt -+++ b/vhdlparser/CMakeLists.txt -@@ -1,14 +1,5 @@ --# configvalues.h --add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h -- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py -- OUTPUT ${GENERATED_SRC}/configvalues.h --) --set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -- - include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) - add_library(vhdlparser STATIC --${GENERATED_SRC}/configvalues.h - CharStream.cc - ParseException.cc - Token.cc -@@ -17,3 +8,6 @@ VhdlParser.cc - VhdlParserTokenManager.cc - VhdlParserIF.cpp - ) -+add_dependencies(vhdlparser -+ generate_configvalues_header -+) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb index b49fbd4d0..4df994c75 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb @@ -8,9 +8,9 @@ DEPENDS = "flex-native bison-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ file://0001-build-don-t-look-for-Iconv.patch \ - file://0001-Fix-6906.patch" -SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3" -SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d" +" +SRC_URI[md5sum] = "3ec5f8bfda38a05845161fbbd5d8b439" +SRC_URI[sha256sum] = "ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82" inherit cmake python3native diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch new file mode 100644 index 000000000..f3e82101b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch @@ -0,0 +1,38 @@ +From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001 +From: Vladimir Glavnyy <31897320+vglavnyy@users.noreply.github.com> +Date: Fri, 10 May 2019 00:15:29 +0700 +Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337) + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Retrieved from: +https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066] +--- + CMakeLists.txt | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0640c37b5..30be238fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH) + message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}") + endif() + +-# Auto-detect locale-narrow 'strtod_l' function. ++# Auto-detect locale-narrow 'strtod_l' and 'strtoull_l' functions. + if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT) ++ set(FLATBUFFERS_LOCALE_INDEPENDENT 0) + if(MSVC) +- check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) ++ check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) ++ check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) + else() +- check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) ++ check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) ++ check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) ++ endif() ++ if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L) ++ set(FLATBUFFERS_LOCALE_INDEPENDENT 1) + endif() + endif() + add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$<BOOL:${FLATBUFFERS_LOCALE_INDEPENDENT}>) diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb index 452e1e65a..bd6dcef4e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb @@ -10,9 +10,11 @@ RDEPENDS_${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559" -SRCREV = "c0698cc33f1e534bb59c455909b88cc2726089af" +SRCREV = "9e7e8cbe9f675123dd41b7c62868acad39188cae" -SRC_URI = "git://github.com/google/flatbuffers.git" +SRC_URI = "git://github.com/google/flatbuffers.git \ + file://0001-Add-detection-of-strtoull_l-function.patch \ + " # Make sure C++11 is used, required for example for GCC 4.9 CXXFLAGS += "-std=c++11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb index 84adc7abe..c43d23b34 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb @@ -24,16 +24,16 @@ DEPENDS = " \ libgit2 \ " -inherit distro_features_check autotools pkgconfig gtk-icon-cache +inherit features_check autotools pkgconfig gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ - http://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ + https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ " -SRC_URI[md5sum] = "bf5fdd50727ad8bbbfe00027ccf2dac5" -SRC_URI[sha256sum] = "244417c681636e82a63cf6f9901b5b7f3889168f7d9b5ba9b45601767a589c3b" +SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33" +SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6" do_configure_prepend() { rm -f ${S}/build/cache/glib-gettext.m4 diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.34.1.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb index aab535d85..0d29b138a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.34.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" -inherit distro_features_check autotools pkgconfig perlnative pythonnative gettext +inherit features_check autotools pkgconfig perlnative pythonnative gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://download.geany.org/${BP}.tar.bz2" -SRC_URI[md5sum] = "87220f4a0e03623ab9d86820f6be7b5d" -SRC_URI[sha256sum] = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11" +SRC_URI = "https://download.geany.org/${BP}.tar.bz2" +SRC_URI[md5sum] = "53216a43345e2b6dbefa02ac24885753" +SRC_URI[sha256sum] = "9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e" FILES_${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb index bd4b586f1..cdd7057b3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb @@ -9,7 +9,7 @@ DEPENDS = "gtk+ gtk+3 glib-2.0 libxml2 intltool-native \ " -inherit distro_features_check autotools pkgconfig gnomebase gobject-introspection +inherit features_check autotools pkgconfig gnomebase gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb index 1a413452a..0057db661 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb @@ -6,12 +6,12 @@ AUTHOR = "Peace Lee <ipeace5@gmail.com>" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" -PV = "3.9.4+git${SRCPV}" +PV = "3.9.6+git${SRCPV}" PR = "r0" SRC_URI = "git://github.com/iipeace/${BPN}" #SRCREV = "${AUTOREV}" -SRCREV = "b433f3805674ef4588c1a161986c74eeac6a48e7" +SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" S = "${WORKDIR}/git" R = "${RECIPE_SYSROOT}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Bug-fix-for-data-type-length-judgment.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Bug-fix-for-data-type-length-judgment.patch new file mode 100644 index 000000000..98cc9ba90 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Bug-fix-for-data-type-length-judgment.patch @@ -0,0 +1,42 @@ +From 5226333bddb755dbefd780d31450e0238dd5d3bd Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> +Date: Wed, 16 Oct 2019 08:24:23 +0900 +Subject: [PATCH] Bug fix for data type length judgment. + +... +if (byte_size == sizeof(long)) { + + *type = is_signed ? ARGTYPE_LONG : ARGTYPE_ULONG; + + return true; + +} +... + +If ltrace's target command has a dbg package, ltrace will look for the debug file and analyze its contents. +Ltrace determines the type of analysis result variable. The type of the variable is longlong. +On 32-bit systems, longlong is 8 and long is 4 (same as in). +An error occurred because the ltrace code did not process a variable of length 8. + +Upstream-Status: Pending +Signed-off-by: Wang Mingyu <wangmy.fnst@cn.fujitsu.com> +--- + dwarf_prototypes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dwarf_prototypes.c b/dwarf_prototypes.c +index bfac177..9887d4b 100644 +--- a/dwarf_prototypes.c ++++ b/dwarf_prototypes.c +@@ -190,7 +190,7 @@ static bool get_integer_base_type(enum arg_type *type, int byte_size, + return true; + } + +- if (byte_size == sizeof(long)) { ++ if (byte_size == sizeof(long long)) { + *type = is_signed ? ARGTYPE_LONG : ARGTYPE_ULONG; + return true; + } +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index ead637cb7..bb21cbca8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -14,7 +14,6 @@ PV = "7.91+git${SRCPV}" SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" -RDEPENDS_${PN} = "elfutils" SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http \ file://configure-allow-to-disable-selinux-support.patch \ file://0001-replace-readdir_r-with-readdir.patch \ @@ -28,6 +27,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ file://include_unistd_nr.patch \ + file://0001-Bug-fix-for-data-type-length-judgment.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb index a7163a35a..b5ca49566 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb @@ -1,6 +1,6 @@ SUMMARY = "MCPP is a portable C/C++ preprocessor" HOMEPAGE = "http://mcpp.sourceforge.net/" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5ca370b75ec890321888a00cea9bc1d5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb index 65e49bc95..4399edaab 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb @@ -2,13 +2,13 @@ SUMMARY = "JSON for modern C++" HOMEPAGE = "https://nlohmann.github.io/json/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=9a8ae1c2d606c432a2aa2e2de15be22a" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" SRC_URI = "git://github.com/nlohmann/json.git" -PV = "3.3.0+git${SRCPV}" +PV = "3.7.0+git${SRCPV}" -SRCREV = "aafad2be1f3cd259a1e79d2f6fcf267d1ede9ec7" +SRCREV = "ea60d40f4a60a47d3be9560d8f7bc37c163fe47b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch deleted file mode 100644 index ed3bac39b..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001 -From: Anna Henningsen <anna@addaleax.net> -Date: Sat, 20 Oct 2018 05:24:54 +0200 -Subject: [PATCH] src: use more explicit return type in Sign::SignFinal() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Using the non-indexed variant of `std::get<>` broke Travis CI. -Also, this allows us to be a bit more concise when returning -from `SignFinal()` due to some error condition. - -Refs: https://github.com/nodejs/node/pull/23427 - -PR-URL: https://github.com/nodejs/node/pull/23779 -Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> -Reviewed-By: Tobias Nießen <tniessen@tnie.de> -Reviewed-By: Refael Ackermann <refack@gmail.com> -Reviewed-By: Colin Ihrig <cjihrig@gmail.com> ---- - src/node_crypto.cc | 23 +++++++++++------------ - src/node_crypto.h | 12 +++++++++++- - 2 files changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/node_crypto.cc b/src/node_crypto.cc -index bd8d9e032554..ec7d4f2bb5be 100644 ---- a/src/node_crypto.cc -+++ b/src/node_crypto.cc -@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx, - return MallocedBuffer<unsigned char>(); - } - --std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal( -+Sign::SignResult Sign::SignFinal( - const char* key_pem, - int key_pem_len, - const char* passphrase, - int padding, - int salt_len) { -- MallocedBuffer<unsigned char> buffer; -- - if (!mdctx_) -- return std::make_pair(kSignNotInitialised, std::move(buffer)); -+ return SignResult(kSignNotInitialised); - - EVPMDPointer mdctx = std::move(mdctx_); - - BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len)); - if (!bp) -- return std::make_pair(kSignPrivateKey, std::move(buffer)); -+ return SignResult(kSignPrivateKey); - - EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(), - nullptr, -@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal( - // without `pkey` being set to nullptr; - // cf. the test of `test_bad_rsa_privkey.pem` for an example. - if (!pkey || 0 != ERR_peek_error()) -- return std::make_pair(kSignPrivateKey, std::move(buffer)); -+ return SignResult(kSignPrivateKey); - - #ifdef NODE_FIPS_MODE - /* Validate DSA2 parameters from FIPS 186-4 */ -@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal( - } - #endif // NODE_FIPS_MODE - -- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len); -+ MallocedBuffer<unsigned char> buffer = -+ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len); - Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk; -- return std::make_pair(error, std::move(buffer)); -+ return SignResult(error, std::move(buffer)); - } - - -@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) { - - ClearErrorOnReturn clear_error_on_return; - -- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal( -+ SignResult ret = sign->SignFinal( - buf, - buf_len, - len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr, - padding, - salt_len); - -- if (std::get<Error>(ret) != kSignOk) -- return sign->CheckThrow(std::get<Error>(ret)); -+ if (ret.error != kSignOk) -+ return sign->CheckThrow(ret.error); - - MallocedBuffer<unsigned char> sig = -- std::move(std::get<MallocedBuffer<unsigned char>>(ret)); -+ std::move(ret.signature); - - Local<Object> rc = - Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size) -diff --git a/src/node_crypto.h b/src/node_crypto.h -index 6fcf737f6c43..0c26c1f6ff1d 100644 ---- a/src/node_crypto.h -+++ b/src/node_crypto.h -@@ -518,7 +518,17 @@ class Sign : public SignBase { - public: - static void Initialize(Environment* env, v8::Local<v8::Object> target); - -- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal( -+ struct SignResult { -+ Error error; -+ MallocedBuffer<unsigned char> signature; -+ -+ explicit SignResult( -+ Error err, -+ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>()) -+ : error(err), signature(std::move(sig)) {} -+ }; -+ -+ SignResult SignFinal( - const char* key_pem, - int key_pem_len, - const char* passphrase, diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch deleted file mode 100644 index f6569cd57..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -The target LDFLAGS have been ignored. Tools like torque -have been loaded from system libraries, even if a native -one was the target. -|$ ldd torque -| libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 -| libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 -| libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1 -| libicui18n.so.63 => not found -| libicuuc.so.63 => not found -... - -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi node-v10.15.1/deps/v8/gypfiles/toolchain.gypi ---- node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:01:39.000000000 +0100 -+++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:04:08.628361308 +0100 -@@ -1106,6 +1106,7 @@ - 'cflags': [ '-fno-strict-aliasing' ], - }], - ], # conditions -+ 'ldflags+': [ '$(LDFLAGS)' ], - }], - ['OS=="solaris"', { - 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch new file mode 100644 index 000000000..eb2cbfb8b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch @@ -0,0 +1,102 @@ +From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Sat, 9 Nov 2019 14:45:30 +0000 +Subject: [PATCH] v8: don't override ARM CFLAGS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This overrides yocto-provided build flags with its own, e.g we get + arm-poky-linux-musleabi-g++ -mthumb -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a7 \ + ... \ + -march=armv7-a -mfpu=neon -mfloat-abi=hard -marm + +Causing the latter to override the former, and compiler warnings: + cc1plus: warning: switch '-mcpu=cortex-a7' conflicts with '-march=armv7-a' switch + +Patch this out, so that yocto-provided flags take precedence. +Note that in reality the same should probably be done for all the other +supported architectures, too. + +Note that this also switches to Thumb(2) mode (in my case). No obvious +problems have been noted during compilation or runtime. + +Upstream-Status: Inappropriate [oe-specific] +Signed-off-by: André Draszik <git@andred.net> +--- + deps/v8/gypfiles/toolchain.gypi | 52 ++------------------------------- + 1 file changed, 2 insertions(+), 50 deletions(-) + +diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi +index 910a212..1390b15 100644 +--- a/deps/v8/gypfiles/toolchain.gypi ++++ b/deps/v8/gypfiles/toolchain.gypi +@@ -199,31 +199,7 @@ + 'target_conditions': [ + ['_toolset=="host"', { + 'conditions': [ +- ['v8_target_arch==host_arch', { +- # Host built with an Arm CXX compiler. +- 'conditions': [ +- [ 'arm_version==7', { +- 'cflags': ['-march=armv7-a',], +- }], +- [ 'arm_version==7 or arm_version=="default"', { +- 'conditions': [ +- [ 'arm_fpu!="default"', { +- 'cflags': ['-mfpu=<(arm_fpu)',], +- }], +- ], +- }], +- [ 'arm_float_abi!="default"', { +- 'cflags': ['-mfloat-abi=<(arm_float_abi)',], +- }], +- [ 'arm_thumb==1', { +- 'cflags': ['-mthumb',], +- }], +- [ 'arm_thumb==0', { +- 'cflags': ['-marm',], +- }], +- ], +- }, { +- # 'v8_target_arch!=host_arch' ++ ['v8_target_arch!=host_arch', { + # Host not built with an Arm CXX compiler (simulator build). + 'conditions': [ + [ 'arm_float_abi=="hard"', { +@@ -242,31 +218,7 @@ + }], # _toolset=="host" + ['_toolset=="target"', { + 'conditions': [ +- ['v8_target_arch==target_arch', { +- # Target built with an Arm CXX compiler. +- 'conditions': [ +- [ 'arm_version==7', { +- 'cflags': ['-march=armv7-a',], +- }], +- [ 'arm_version==7 or arm_version=="default"', { +- 'conditions': [ +- [ 'arm_fpu!="default"', { +- 'cflags': ['-mfpu=<(arm_fpu)',], +- }], +- ], +- }], +- [ 'arm_float_abi!="default"', { +- 'cflags': ['-mfloat-abi=<(arm_float_abi)',], +- }], +- [ 'arm_thumb==1', { +- 'cflags': ['-mthumb',], +- }], +- [ 'arm_thumb==0', { +- 'cflags': ['-marm',], +- }], +- ], +- }, { +- # 'v8_target_arch!=target_arch' ++ ['v8_target_arch!=target_arch', { + # Target not built with an Arm CXX compiler (simulator build). + 'conditions': [ + [ 'arm_float_abi=="hard"', { +-- +2.23.0.rc1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index a978eebe4..e36995c25 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" DEPENDS = "openssl" DEPENDS_append_class-target = " nodejs-native" -inherit pkgconfig +inherit pkgconfig pythonnative COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -17,17 +17,16 @@ COMPATIBLE_HOST_riscv32 = "null" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ - file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ - file://0006-Use-target-ldflags.patch \ + file://0007-v8-don-t-override-ARM-CFLAGS.patch \ " SRC_URI_append_class-target = " \ + file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ " -SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f" -SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd" +SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3" +SRC_URI[sha256sum] = "412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e" S = "${WORKDIR}/node-v${PV}" @@ -52,13 +51,48 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '- GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" -PACKAGECONFIG ??= "zlib icu" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" +PACKAGECONFIG ??= "ares icu libuv zlib" +PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" + +# We don't want to cross-compile during target compile, +# and we need to use the right flags during host compile, +# too. +EXTRA_OEMAKE = "\ + CC.host='${CC}' \ + CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ + CXX.host='${CXX}' \ + CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ + LDFLAGS.host='${LDFLAGS}' \ + AR.host='${AR}' \ + \ + builddir_name=./ \ +" + +python do_unpack() { + import shutil + + bb.build.exec_func('base_do_unpack', d) + + shutil.rmtree(d.getVar('S') + '/deps/openssl', True) + if 'ares' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/cares', True) + if 'gyp' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/tools/gyp', True) + if 'libuv' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/uv', True) + if 'nghttp2' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) + if 'zlib' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/zlib', True) +} # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { - rm -rf ${S}/deps/openssl export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch deleted file mode 100644 index c80d9f19f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 20 May 2019 23:24:26 -0700 -Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE - -PAGE_SIZE is defined in system includes on some systems, this would -avoid the unintended conflict - -Fixes -| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] -| #define PAGE_SIZE 4096 -| ^ -| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu -de/limits.h:89:9: note: previous definition is here -| #define PAGE_SIZE PAGESIZE - -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2] -Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/flash/nor/esirisc_flash.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c -index 4e33b942..3bed0658 100644 ---- a/src/flash/nor/esirisc_flash.c -+++ b/src/flash/nor/esirisc_flash.c -@@ -92,7 +92,7 @@ - #endif - - #define CONTROL_TIMEOUT 5000 /* 5s */ --#define PAGE_SIZE 4096 -+#define FLASH_PAGE_SIZE 4096 - #define PB_MAX 32 - - #define NUM_NS_PER_S 1000000000ULL -@@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last) - (void)esirisc_flash_disable_protect(bank); - - for (int page = first; page < last; ++page) { -- uint32_t address = page * PAGE_SIZE; -+ uint32_t address = page * FLASH_PAGE_SIZE; - - target_write_u32(target, esirisc_info->cfg + ADDRESS, address); - -@@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank) - if (target->state != TARGET_HALTED) - return ERROR_TARGET_NOT_HALTED; - -- bank->num_sectors = bank->size / PAGE_SIZE; -- bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors); -+ bank->num_sectors = bank->size / FLASH_PAGE_SIZE; -+ bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors); - - retval = esirisc_flash_init(bank); - if (retval != ERROR_OK) { --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 241b4baa3..9ec77fdc4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,22 +9,21 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \ file://0001-Do-not-include-syscrtl.h-with-glibc.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9" +SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" -SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" +SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98" +SRCREV_libjaylink = "cfccbc9d6763733f1d14dff3c2dc5b75aaef136b" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext -BBCLASSEXTEND += "nativesdk" +BBCLASSEXTEND += "native nativesdk" EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb index f5bdb2087..a96e3adc7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://README;md5=7911cdbb572d25c5f2e2ea17f669efc2" SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV}.tar.gz \ file://0001-CheckLib.pm-don-t-execute-the-binary.patch \ " -SRC_URI[md5sum] = "930216c5abc0f016df8a7539d48c891a" -SRC_URI[sha256sum] = "24adfd908705dfac4bb320711763f37126b75cf54b3566c2c27c7cdef9c429a8" +SRC_URI[md5sum] = "3519cbf9fe5ec3404449d5330ee5537f" +SRC_URI[sha256sum] = "f21c5e299ad3ce0fdc0cb0f41378dca85a70e8d6c9a7599f0e56a957200ec294" S = "${WORKDIR}/Devel-CheckLib-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch deleted file mode 100644 index 2258c4c7f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 03fecab78f9fa747ad8ab3484e7ca00c0148321d Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Sun, 28 Apr 2019 16:45:02 +0800 -Subject: [PATCH] From: Hugh McMaster <hugh.mcmaster@outlook.com> Date: Wed, 5 - Dec 2018 23:27:30 +1100 Subject: ext/intl: Use pkg-config to detect icu - -The developers of icu recommend using pkg-config to detect icu, -because icu-config is deprecated. - -Upstream-Status: Pending - -update to version 7.3.4 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - acinclude.m4 | 95 ++++++------------------------------------------------ - ext/intl/config.m4 | 16 ++++----- - 2 files changed, 15 insertions(+), 96 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 7d77c33..86b0ecc 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2158,92 +2158,15 @@ dnl - dnl Common setup macro for ICU - dnl - AC_DEFUN([PHP_SETUP_ICU],[ -- PHP_ARG_WITH(icu-dir,, -- [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) -- -- if test "$PHP_ICU_DIR" = "no"; then -- PHP_ICU_DIR=DEFAULT -- fi -- -- AC_MSG_CHECKING([for location of ICU headers and libraries]) -- found_icu=no -- -- dnl First try to find pkg-config -- if test -z "$PKG_CONFIG"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- fi -- -- dnl If pkg-config is found try using it -- if test "$PHP_ICU_DIR" = "DEFAULT" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then -- if $PKG_CONFIG --atleast-version=40 icu-uc; then -- found_icu=yes -- icu_version_full=`$PKG_CONFIG --modversion icu-uc` -- ac_IFS=$IFS -- IFS="." -- set $icu_version_full -- IFS=$ac_IFS -- icu_version=`expr [$]1 \* 1000 + [$]2` -- AC_MSG_RESULT([found $icu_version_full]) -- -- ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io icu-i18n` -- ICU_INCS=`$PKG_CONFIG --cflags-only-I icu-uc icu-io icu-i18n` -- ICU_CXXFLAGS="-DU_USING_ICU_NAMESPACE=1" -- -- AC_MSG_RESULT([found $ICU_VERSION]) -- -- PHP_EVAL_LIBLINE($ICU_LIBS, $1) -- PHP_EVAL_INCLINE($ICU_INCS) -- else -- AC_MSG_ERROR([ICU version 4.0 or later required.]) -- fi -- fi -- -- dnl If pkg-config fails for some reason, revert to the old method -- if test "$found_icu" = "no"; then -- if test "$PHP_ICU_DIR" = "DEFAULT"; then -- dnl Try to find icu-config -- AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) -- else -- ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" -- fi -- -- dnl Trust icu-config to know better what the install prefix is.. -- icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` -- if test "$?" != "0" || test -z "$icu_install_prefix"; then -- AC_MSG_RESULT([not found]) -- AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) -- else -- AC_MSG_RESULT([$icu_install_prefix]) -- -- dnl Check ICU version -- AC_MSG_CHECKING([for ICU 4.0 or greater]) -- icu_version_full=`$ICU_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $icu_version_full -- IFS=$ac_IFS -- icu_version=`expr [$]1 \* 1000 + [$]2` -- AC_MSG_RESULT([found $icu_version_full]) -- -- if test "$icu_version" -lt "4000"; then -- AC_MSG_ERROR([ICU version 4.0 or later is required]) -- fi -- -- ICU_VERSION=$icu_version -- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` -- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` -- PHP_EVAL_INCLINE($ICU_INCS) -- PHP_EVAL_LIBLINE($ICU_LIBS, $1) -- -- ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` -- if test "$icu_version" -ge "49000"; then -- ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" -- ICU_CFLAGS="-DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" -- fi -- if test "$icu_version" -ge "60000"; then -- ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" -- fi -- fi -+ PKG_CHECK_MODULES([ICU], [icu-io >= 50.1]) -+ PHP_EVAL_INCLINE($ICU_CFLAGS) -+ PHP_EVAL_LIBLINE($ICU_LIBS, $1) -+ -+ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" -+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" -+ -+ if $PKG_CONFIG icu-io --atleast-version=60; then -+ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" - fi - ]) - -diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 -index 4b9f469..fdae88a 100644 ---- a/ext/intl/config.m4 -+++ b/ext/intl/config.m4 -@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then - PHP_SETUP_ICU(INTL_SHARED_LIBADD) - PHP_SUBST(INTL_SHARED_LIBADD) - PHP_REQUIRE_CXX() -- INTL_COMMON_FLAGS="$ICU_INCS $ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" -- if test "$icu_version" -ge "4002"; then -- icu_spoof_src=" spoofchecker/spoofchecker_class.c \ -- spoofchecker/spoofchecker.c\ -- spoofchecker/spoofchecker_create.c\ -- spoofchecker/spoofchecker_main.c" -- else -- icu_spoof_src="" -- fi -+ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" - PHP_NEW_EXTENSION(intl, php_intl.c \ - intl_error.c \ - intl_convert.c \ -@@ -68,7 +60,11 @@ if test "$PHP_INTL" != "no"; then - transliterator/transliterator_methods.c \ - uchar/uchar.c \ - idn/idn.c \ -- $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx) -+ spoofchecker/spoofchecker_class.c \ -+ spoofchecker/spoofchecker.c\ -+ spoofchecker/spoofchecker_create.c\ -+ spoofchecker/spoofchecker_main.c \ -+ , $ext_shared,,$INTL_COMMON_FLAGS,cxx) - - PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \ - common/common_enum.cpp \ --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb index 3d537e5b6..e7fb847fa 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP-3.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" @@ -12,6 +13,11 @@ PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ + file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ + file://0048-Use-pkg-config-for-FreeType2-detection.patch \ + file://0001-Use-pkg-config-for-libxml2-detection.patch \ + file://debian-php-fixheader.patch \ + file://CVE-2019-6978.patch \ " SRC_URI_append_class-target = " \ @@ -22,8 +28,14 @@ SRC_URI_append_class-target = " \ file://php-fpm-apache.conf \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ file://php-fpm.service \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + file://xfail_two_bug_tests.patch \ " S = "${WORKDIR}/php-${PV}" +SRC_URI[md5sum] = "21b710b4126d4d54714de9693a6c7b0d" +SRC_URI[sha256sum] = "92d1ff4b13c7093635f1ec338a5e6891ca99b10e65fbcadd527e5bb84d11b5e7" inherit autotools pkgconfig pythonnative gettext diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb deleted file mode 100644 index a5c7b9b6b..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb +++ /dev/null @@ -1,20 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" - -SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ - file://0048-Use-pkg-config-for-FreeType2-detection.patch \ - file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ - file://debian-php-fixheader.patch \ - file://CVE-2019-6978.patch \ - " -SRC_URI_append_class-target = " \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - file://xfail_two_bug_tests.patch \ - " - -SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" -SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb index 928454117..58526f131 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "6d4e7fd7966c989e38024a8ea693db83758944f1" +SRCREV = "d09d649aea36f02c03f8396ba39a8d4db8a607e4" SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb index ad45f87ec..d48ad3751 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb @@ -7,11 +7,11 @@ data-driven tree queries." HOMPAGE = "https://pugixml.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=1d569c2ed59c94ddd9586051f8c67da6" +LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d5ee91fb74cbb64223b3693fd64eb169" SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "7286ee2ed11376b6b780ced19fae0b64" -SRC_URI[sha256sum] = "d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6" +SRC_URI[md5sum] = "f97237e9908201c6d8536210747b66af" +SRC_URI[sha256sum] = "55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.12.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb index af26e83d6..af26e83d6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc b/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc index 092531b32..d8e32a768 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc @@ -5,9 +5,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ - " -SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d" -SRC_URI[sha256sum] = "184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620" +" +SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" +SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" S = "${WORKDIR}/sip-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb index 010fa30fe..010fa30fe 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.16.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.19.bb index 3da15b842..3da15b842 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.16.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.19.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb index 459ae8253..3d7767074 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb @@ -35,7 +35,7 @@ S = "${WORKDIR}/${BPN}${PV}/unix" VER = "${@os.path.splitext(d.getVar('PV'))[0]}" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools distro_features_check +inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index b20d4c05c..dc4fbf7f5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -1,5 +1,5 @@ SUMMARY = "x86 (SSE) assembler supporting NASM and GAS-syntaxes" -LICENSE = "BSD" +LICENSE = "MIT" HOMEPAGE = "http://www.tortall.net/projects/yasm/" LIC_FILES_CHKSUM = "file://COPYING;md5=a12d8903508fb6bfd49d8d82c6170dd9" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb index e505bb4c5..d472d3269 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb @@ -37,7 +37,7 @@ SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://gtk-configure.patch \ " -inherit gettext autotools pkgconfig distro_features_check systemd +inherit gettext autotools pkgconfig features_check systemd REQUIRED_DISTRO_FEATURES += "opengl" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 3bc0db96e..c7830ed90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -10,16 +10,21 @@ Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +Update for 20190617. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + +Update for 20191103. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- aclocal.m4 | 1 - - configure | 140 ------------------------------------------------------------- - 2 files changed, 141 deletions(-) + configure | 259 ------------------------------------------------------------- + 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 0d14f26..0cefa08 100644 +index b90cfe6..413ea9c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1038,7 +1038,6 @@ CF_GCC_VERSION +@@ -1232,7 +1232,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -28,21 +33,140 @@ index 0d14f26..0cefa08 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index d27ae31..077c648 100755 +index ec77bba..234f271 100755 --- a/configure +++ b/configure -@@ -1946,146 +1946,6 @@ esac +@@ -2059,265 +2059,6 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} --echo "$as_me:1949: checking \$CC variable" >&5 +-echo "$as_me:2062: checking \$CFLAGS variable" >&5 +-echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 +-case "x$CFLAGS" in +-(*-[IUD]*) +- echo "$as_me:2066: result: broken" >&5 +-echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2068: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +-echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} +- cf_flags="$CFLAGS" +- CFLAGS= +- for cf_arg in $cf_flags +- do +- +-cf_fix_cppflags=no +-cf_new_cflags= +-cf_new_cppflags= +-cf_new_extra_cppflags= +- +-for cf_add_cflags in $cf_arg +-do +-case $cf_fix_cppflags in +-(no) +- case $cf_add_cflags in +- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) +- case $cf_add_cflags in +- (-D*) +- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- +- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=yes +- +- if test $cf_fix_cppflags = yes ; then +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- +- continue +- elif test "${cf_tst_cflags}" = "\"'" ; then +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- +- continue +- fi +- ;; +- esac +- case "$CPPFLAGS" in +- (*$cf_add_cflags) +- ;; +- (*) +- case $cf_add_cflags in +- (-D*) +- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` +- +-CPPFLAGS=`echo "$CPPFLAGS" | \ +- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +- +- ;; +- esac +- +- test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " +- cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +- +- ;; +- esac +- ;; +- (*) +- +- test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " +- cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +- +- ;; +- esac +- ;; +-(yes) +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- +- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +- +- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=no +- ;; +-esac +-done +- +-if test -n "$cf_new_cflags" ; then +- +- test -n "$CFLAGS" && CFLAGS="$CFLAGS " +- CFLAGS="${CFLAGS}$cf_new_cflags" +- +-fi +- +-if test -n "$cf_new_cppflags" ; then +- +- test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " +- CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +- +-fi +- +-if test -n "$cf_new_extra_cppflags" ; then +- +- test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " +- EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +- +-fi +- +- done +- ;; +-(*) +- echo "$as_me:2176: result: ok" >&5 +-echo "${ECHO_T}ok" >&6 +- ;; +-esac +- +-echo "$as_me:2181: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:1953: result: broken" >&5 +- echo "$as_me:2185: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 --echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} +- { echo "$as_me:2187: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +-echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` @@ -158,24 +282,24 @@ index d27ae31..077c648 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2072: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2304: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2076: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2308: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2080: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2312: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2084: result: ok" >&5 +- echo "$as_me:2316: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2089: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20180510.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb index f30c42640..eae4618e2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20180510.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb @@ -4,9 +4,9 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=8b2933503c0443e041d3168dc0c65640" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=3eb7c635434fafe23ef30fc263e63b2f" require byacc.inc -SRC_URI[md5sum] = "97fdc0745e0ff0cef5c09d57d0c6752d" -SRC_URI[sha256sum] = "d0940dbffbc7e9c9dd4985c25349c390beede84ae1d9fe86b71c0aa659a6d693" +SRC_URI[md5sum] = "84ffe59166f67bbe147a6f502c7af309" +SRC_URI[sha256sum] = "d291fb34816f45079067366b7f7300ffbf9f7e3f1aaf6d509b84442d065d11b9" diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 987c09fe5..251c5d0f5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Adapter to write and run CMPI-type CIM providers" DESCRIPTION = "CMPI-compliant provider interface for various languages via SWIG" HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native python3 sblim-cmpi-devel" diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb index d414bc683..a1acfcd00 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "e9d7f8b5e7b17183b0fb9297c0f57840" -SRC_URI[sha256sum] = "e5eb0eaaef9cae8c822887bd998e33c2c3b94ebadd37b4f6aba018c0194a2a87" +SRC_URI[md5sum] = "f48b597251a26c522002736652e0300c" +SRC_URI[sha256sum] = "886e12f2cf3df36cde65f32f6ae52bc598eb2599a611b1d8ce5dfdea599e47e2" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb index f9fd8ae88..898627bc1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb @@ -7,7 +7,7 @@ LICENSE = "gnuplot" LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" DEPENDS = "${BPN}-native virtual/libx11 gd readline" -inherit autotools distro_features_check +inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index 0189e19c0..e5b9bc947 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -22,7 +22,7 @@ EXTRA_OECONF = "\ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-init=service.redhat --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" +PACKAGECONFIG[systemd] = "--enable-init=service.fedora --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "haveged" @@ -35,6 +35,12 @@ do_install_append() { # The exit status is 143 when the service is stopped if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service + # Hybrid systemd-sysvinit distros must install the initscript manually + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${INIT_D_DIR} + sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged + chmod 755 ${D}${INIT_D_DIR}/haveged + fi fi } diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb index 7231484fe..2b0dfe4ea 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb @@ -4,7 +4,7 @@ DESCRIPTION = "The Portable Hardware Locality (hwloc) software package \ architectures." HOMEPAGE = "https://www.open-mpi.org/software/hwloc/" SECTION = "base" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb index 63fca1dd1..fe6de008f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb @@ -8,7 +8,7 @@ SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV} SRC_URI[md5sum] = "6eba94a7935a0531d2c14eeb1426aeef" SRC_URI[sha256sum] = "f1c1344b20a9e8635143f70ee27930b55f813c15ca61f84d77584d311b6ac027" -inherit autotools pkgconfig gettext perlnative distro_features_check qemu +inherit autotools pkgconfig gettext perlnative features_check qemu REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb index 3cc353ee7..f47fe5725 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb @@ -11,3 +11,4 @@ SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c70 inherit autotools pkgconfig +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch deleted file mode 100644 index f65d26aae..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -56,6 +56,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test - # Checks for programs. - AC_PROG_CC - AC_PROG_CC_C99 -+AM_PROG_AR - - # Enable automake silent build rules. - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 6c4f4a072..b7c1958ee 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -8,11 +8,10 @@ DEPENDS = "libusb1" inherit autotools pkgconfig -PV = "0.4.2+gitr${SRCPV}" +PV = "0.6.0" -SRCREV = "5f765f91430f16932d96b3777404420aa2dd4c7c" -SRC_URI = "git://git.libdivecomputer.org/libdivecomputer.git \ - file://fix-ar.patch \ +SRCREV = "1195abc2f4acc7b10175d570ec73549d0938c83e" +SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 7e4c330a1..8a2886b8c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -26,6 +26,6 @@ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = " --disable-static --disable-rebuilds --enable-compile-warnings=minimum" DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native" -inherit distro_features_check autotools pkgconfig gettext +inherit features_check autotools pkgconfig gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch index a6b297b59..a6b297b59 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb index de2c1e36d..10d88a3b5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb @@ -8,7 +8,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ file://configure.patch \ file://0001-Makefile.in-add-DESTDIR.patch \ - file://0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch \ + file://0001-Makefile.in-install-nfslock-libs.patch \ file://liblockfile-fix-install-so-to-man-dir.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb index bb5984519..5c1c15159 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb @@ -8,7 +8,7 @@ sophisticated "behind the scenes" with better support for multiple threads \ and flexibility for different log destinations (e.g. syslog and systemd \ journal)." SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=63fe03535d83726f5655072502bef1bc" SRC_URI = "http://download.rsyslog.com/${BPN}/${BPN}-${PV}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb index 3a0a87eea..c9d259b1a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb @@ -15,10 +15,9 @@ DEPENDS += "libtirpc libnsl2" PV = "1.3+git${SRCPV}" -SRCREV = "c6934373c7bac91499ff7bbe7d2439599325ca63" +SRCREV = "116219e215858f4af9370171d3ead63baca8fdb4" SRC_URI = "git://github.com/thkukuk/libnss_nisplus \ - file://0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch deleted file mode 100644 index cf380ddf4..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 184bda40e05053cd2df61c28bec0baa7353697bb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 28 Aug 2019 09:49:10 -0700 -Subject: [PATCH] nisplus-hosts: Remove use of RES_USE_INET6 - -Upstream glibc dropped it starting glibc 2.30 -see -https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe - -Upstream-Status: Submitted [https://github.com/thkukuk/libnss_nisplus/pull/2] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/Makefile.am | 3 +- - src/mapv4v6addr.h | 69 --------------------------------------------- - src/nisplus-hosts.c | 58 ++++++++----------------------------- - 3 files changed, 13 insertions(+), 117 deletions(-) - delete mode 100644 src/mapv4v6addr.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index e879d5c..37ef86c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -15,8 +15,7 @@ AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @LIBNSL_CFLAGS@ - - lib_LTLIBRARIES = libnss_nisplus.la - --noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h \ -- mapv4v6addr.h -+noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h - check_PROGRAMS = nss_loader-test - nss_loader_test_LDADD = -ldl - -diff --git a/src/mapv4v6addr.h b/src/mapv4v6addr.h -deleted file mode 100644 -index 7f85f7d..0000000 ---- a/src/mapv4v6addr.h -+++ /dev/null -@@ -1,69 +0,0 @@ --/* -- * ++Copyright++ 1985, 1988, 1993 -- * - -- * Copyright (c) 1985, 1988, 1993 -- * The Regents of the University of California. All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- * - -- * Portions Copyright (c) 1993 by Digital Equipment Corporation. -- * -- * Permission to use, copy, modify, and distribute this software for any -- * purpose with or without fee is hereby granted, provided that the above -- * copyright notice and this permission notice appear in all copies, and that -- * the name of Digital Equipment Corporation not be used in advertising or -- * publicity pertaining to distribution of the document or software without -- * specific, written prior permission. -- * -- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -- * SOFTWARE. -- * - -- * --Copyright-- -- */ -- --#include <string.h> --#include <arpa/nameser.h> -- --static void --map_v4v6_address (const char *src, char *dst) --{ -- u_char *p = (u_char *) dst; -- int i; -- -- /* Move the IPv4 part to the right position. */ -- memcpy (dst + 12, src, INADDRSZ); -- -- /* Mark this ipv6 addr as a mapped ipv4. */ -- for (i = 0; i < 10; i++) -- *p++ = 0x00; -- *p++ = 0xff; -- *p = 0xff; --} -diff --git a/src/nisplus-hosts.c b/src/nisplus-hosts.c -index cc00aa2..d37b209 100644 ---- a/src/nisplus-hosts.c -+++ b/src/nisplus-hosts.c -@@ -42,14 +42,9 @@ static u_long tablename_len; - #define NISENTRYLEN(idx, col, res) \ - (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len) - --/* Get implementation for some internal functions. */ --#include "mapv4v6addr.h" -- -- - static int - _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, -- char *buffer, size_t buflen, int *errnop, -- int flags) -+ char *buffer, size_t buflen, int *errnop) - { - unsigned int i; - char *first_unused = buffer; -@@ -66,8 +61,7 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, - - char *data = first_unused; - -- if (room_left < (af != AF_INET || (flags & AI_V4MAPPED) != 0 -- ? IN6ADDRSZ : INADDRSZ)) -+ if (room_left < INADDRSZ) - { - no_more_room: - *errnop = ERANGE; -@@ -78,18 +72,8 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, - if (af != AF_INET6 - && inet_pton (AF_INET, NISENTRYVAL (0, 2, result), data) > 0) - { -- assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC); -- if (flags & AI_V4MAPPED) -- { -- map_v4v6_address (data, data); -- host->h_addrtype = AF_INET6; -- host->h_length = IN6ADDRSZ; -- } -- else -- { -- host->h_addrtype = AF_INET; -- host->h_length = INADDRSZ; -- } -+ host->h_addrtype = AF_INET; -+ host->h_length = INADDRSZ; - } - else if (af != AF_INET - && inet_pton (AF_INET6, NISENTRYVAL (0, 2, result), data) > 0) -@@ -319,12 +303,8 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer, - } - } - -- if (_res.options & RES_USE_INET6) -- parse_res = _nss_nisplus_parse_hostent (result, AF_INET6, host, buffer, -- buflen, errnop, AI_V4MAPPED); -- else -- parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer, -- buflen, errnop, 0); -+ parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer, -+ buflen, errnop); - - if (parse_res == -1) - { -@@ -379,7 +359,7 @@ get_tablename (int *herrnop) - static enum nss_status - internal_gethostbyname2_r (const char *name, int af, struct hostent *host, - char *buffer, size_t buflen, int *errnop, -- int *herrnop, int flags) -+ int *herrnop) - { - if (tablename_val == NULL) - { -@@ -454,7 +434,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host, - } - - int parse_res = _nss_nisplus_parse_hostent (result, af, host, buffer, -- buflen, errnop, flags); -+ buflen, errnop); - - nis_freeresult (result); - -@@ -485,8 +465,7 @@ _nss_nisplus_gethostbyname2_r (const char *name, int af, struct hostent *host, - } - - return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop, -- herrnop, -- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0)); -+ herrnop); - } - - -@@ -495,19 +474,8 @@ _nss_nisplus_gethostbyname_r (const char *name, struct hostent *host, - char *buffer, size_t buflen, int *errnop, - int *h_errnop) - { -- if (_res.options & RES_USE_INET6) -- { -- enum nss_status status; -- -- status = internal_gethostbyname2_r (name, AF_INET6, host, buffer, -- buflen, errnop, h_errnop, -- AI_V4MAPPED); -- if (status == NSS_STATUS_SUCCESS) -- return status; -- } -- - return internal_gethostbyname2_r (name, AF_INET, host, buffer, -- buflen, errnop, h_errnop, 0); -+ buflen, errnop, h_errnop); - } - - -@@ -555,9 +523,7 @@ _nss_nisplus_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af, - } - - parse_res = _nss_nisplus_parse_hostent (result, af, host, -- buffer, buflen, errnop, -- ((_res.options & RES_USE_INET6) -- ? AI_V4MAPPED : 0)); -+ buffer, buflen, errnop); - nis_freeresult (result); - - if (parse_res > 0) -@@ -584,7 +550,7 @@ _nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, - - enum nss_status status = internal_gethostbyname2_r (name, AF_UNSPEC, &host, - buffer, buflen, -- errnop, herrnop, 0); -+ errnop, herrnop); - if (status == NSS_STATUS_SUCCESS) - { - if (*pat == NULL) --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index e50226e27..4276c4917 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -23,7 +23,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "systemd" inherit gettext autotools python3native pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 2c31a21c0..401c2c4da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -12,7 +12,7 @@ DEPENDS = "freetype libpng jpeg expat gtk+" BBCLASSEXTEND = "native" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 33142d6fe..41a79daf4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "f51039c997415fd0f13f8e01966b4a8ff80cbf90deb8b14c18827104a3 inherit autotools pkgconfig perlnative pythonnative -inherit distro_features_check +inherit features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" DEPENDS += "nspr zlib python-six-native python-pytoml-native \ diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 17ca26273..6d42c6771 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -22,6 +22,8 @@ DEPENDS += "json-c" EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON \ -DPYTHON3_PACKAGES_PATH:PATH=${baselib}/python${PYTHON_BASEVERSION}/site-packages \ + -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ + -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ " # Prepend mraa-utils to make sure bindir ends up in there diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index e5bb0765f..9d5a2307e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -12,11 +12,10 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -# v2.6.9 -SRCREV = "5efb1545dbac7e6d1e0a992f3e84ca12cea1c18e" +SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" SRC_URI = "git://github.com/Openwsman/openwsman.git \ file://libssl-is-required-if-eventint-supported.patch \ @@ -26,7 +25,7 @@ SRC_URI = "git://github.com/Openwsman/openwsman.git \ S = "${WORKDIR}/git" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" inherit systemd cmake pkgconfig python3native perlnative diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch deleted file mode 100644 index c9e1306af..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Wed, 4 Sep 2019 17:29:15 +0100 -Subject: [PATCH 1/2] Always enable trivial-httpd for tests - -When running tests we always need ostree-trivial-httpd, so enable it -unconditionally - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] ---- - Makefile.am | 1 + - ci/build.sh | 5 +++++ - ci/travis-build.sh | 1 + - 3 files changed, 7 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index cd04a055045a..673dbf88de55 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ - --enable-gtk-doc \ - --enable-man \ - --disable-maintainer-mode \ -+ --enable-trivial-httpd-cmdline \ - $(NULL) - - GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make -diff --git a/ci/build.sh b/ci/build.sh -index 0901507498f2..806af050b780 100755 ---- a/ci/build.sh -+++ b/ci/build.sh -@@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in - fi - ;; - esac -+# unless libsoup is disabled, enable trivial-httpd for the tests -+case "${CONFIGOPTS:-}" in -+ *--without-soup*) ;; -+ *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; -+esac - - # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 - # NB: this disables the default set of flags from configure.ac -diff --git a/ci/travis-build.sh b/ci/travis-build.sh -index 3fd969bdced6..7c85313a2d32 100755 ---- a/ci/travis-build.sh -+++ b/ci/travis-build.sh -@@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" - - ../configure \ - --enable-always-build-tests \ -+ --enable-trivial-httpd-cmdline \ - ${ci_configopts} - "$@" - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch new file mode 100644 index 000000000..d94b3ded9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch @@ -0,0 +1,43 @@ +From 114fe5067b58a2434b44855eee48f865186fe0fa Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Tue, 5 Nov 2019 22:26:23 +0000 +Subject: [PATCH] build: create tests directory for split builds + +When `--disable-dependency-tracking` is in effect with separate build +directory, the tests directory isn't created as a result of the +dependency generation, which leads to a build race for the tests +directory being created and failures: + + Making all in . + make[2]: Entering directory 'TOPDIR/build/tmp/work/riscv64-yoe-linux-musl/ostree/2019.5-r0/build' + (echo '[Test]' > tests/test-local-pull-depth.sh.test.tmp; \ + echo 'Type=session' >> tests/test-local-pull-depth.sh.test.tmp; \ + echo 'Exec=env G_TEST_SRCDIR=/usr/libexec/installed-tests/libostree G_TEST_BUILDDIR=/usr/libexec/installed-tests/libostree /usr/libexec/installed-tests/libostree/test-local-pull-depth.sh' >> tests/test-local-pull-depth.sh.test.tmp; \ + mv tests/test-local-pull-depth.sh.test.tmp tests/test-local-pull-depth.sh.test) + /bin/sh: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + /bin/sh: line 1: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + /bin/sh: line 2: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + mv: cannot stat 'tests/test-local-pull-depth.sh.test.tmp': No such file or directory + make[2]: *** [Makefile:9282: tests/test-local-pull-depth.sh.test] Error 1 + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Pending +--- + buildutil/glib-tap.mk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk +index 34b8f21ea26a..9a944a0acc88 100644 +--- a/buildutil/glib-tap.mk ++++ b/buildutil/glib-tap.mk +@@ -116,6 +116,7 @@ installed_testcases = $(test_programs) $(installed_test_programs) \ + installed_test_meta_DATA = $(installed_testcases:=.test) + + %.test: %$(EXEEXT) Makefile ++ @$(MKDIR_P) $(dir $@) + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<)' >> $@.tmp; \ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch new file mode 100644 index 000000000..fdb733ebe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch @@ -0,0 +1,51 @@ +From fb519f0361565cad0d340095263a1e8866ec4f89 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 31 Oct 2019 11:30:00 +0000 +Subject: [PATCH 1/3] tests: Handle EPIPE failures when head terminates + +When using musl, it appears that the default is line buffered output, so +when `head -1` reads from a pipe we have to handle the source end of the +pipe getting EPIPE. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/pull-test.sh | 2 +- + tests/test-pull-mirrorlist.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index 0a97a1195582..2cfd8e02f790 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh +@@ -177,7 +177,7 @@ if ! skip_one_without_user_xattrs; then + ${CMD_PREFIX} ostree --repo=cacherepo pull-local ostree-srv/gnomerepo main + rev=$(ostree --repo=cacherepo rev-parse main) + ${CMD_PREFIX} ostree --repo=cacherepo ls -R -C main > ls.txt +- regfile_hash=$(grep -E -e '^-0' ls.txt | head -1 | awk '{ print $5 }') ++ regfile_hash=$((grep -E -e '^-0' ls.txt || true) | head -1 | awk '{ print $5 }') + ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false corruptrepo $(cat httpd-address)/ostree/corruptrepo + # Make this a loop so in the future we can add more object types like commit etc. + for object in ${regfile_hash}.file; do +diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh +index 4e44852d3971..85ff66e99f8e 100755 +--- a/tests/test-pull-mirrorlist.sh ++++ b/tests/test-pull-mirrorlist.sh +@@ -47,12 +47,12 @@ setup_mirror content_mirror3 + + # Let's delete a file from 1 so that it falls back on 2 + cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo +-filez=$(find objects/ -name '*.filez' | head -n 1) ++filez=$((find objects/ -name '*.filez' || true) | head -n 1) + rm ${filez} + + # Let's delete a file from 1 and 2 so that it falls back on 3 + cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo +-filez=$(find objects/ -name '*.filez' | head -n 1) ++filez=$((find objects/ -name '*.filez' || true) | head -n 1) + rm ${filez} + cd ${test_tmpdir}/content_mirror2/ostree/gnomerepo + rm ${filez} +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch new file mode 100644 index 000000000..dcafb0995 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch @@ -0,0 +1,42 @@ +From 4d17cd917fe4fb67d2f9e4881b6693ac7289f423 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Wed, 30 Oct 2019 07:55:41 +0000 +Subject: [PATCH 1/4] tests/core: Fallback to en_US.UTF-8 locale + +A number of tests expect explicit left/right single quotes in their +messages, which will never happen in the C locale. Change so we pick a +likely UTF-8 locale, or fail if we can't find one. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest-core.sh | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index f6f94288fc61..bc191332c916 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -35,15 +35,11 @@ assert_not_reached () { + } + + # Some tests look for specific English strings. Use a UTF-8 version +-# of the C (POSIX) locale if we have one, or fall back to POSIX ++# of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) +-if locale -a | grep '^C.UTF-8$' >/dev/null; then +- export LC_ALL=C.UTF-8 +-elif locale -a | grep '^C.utf8$' >/dev/null; then +- export LC_ALL=C.utf8 +-else +- export LC_ALL=C +-fi ++export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) ++if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi ++ + # A GNU extension, used whenever LC_ALL is not C + unset LANGUAGE + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch deleted file mode 100644 index 362b2f36a..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Thu, 5 Sep 2019 13:22:15 +0100 -Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD - -When building without --enable-trivial-httpd-cmdline, don't build or install -the ostree-trivial-httpd binary. - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] ---- - Makefile-ostree.am | 3 ++- - configure.ac | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index 76f39cad4b74..7b53cb148960 100644 ---- a/Makefile-ostree.am -+++ b/Makefile-ostree.am -@@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c - endif - - if USE_LIBSOUP --# Eventually once we stop things from using this, we should support disabling this -+if BUILDOPT_TRIVIAL_HTTPD - ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c - pkglibexec_PROGRAMS += ostree-trivial-httpd - ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c - ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) - ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) -+endif - - if !USE_CURL - # This is necessary for the cookie jar bits -diff --git a/configure.ac b/configure.ac -index 069bab01752e..ffc67980d507 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -192,6 +192,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, - [Continue to support "ostree trivial-httpd" [default=no]])],, - enable_trivial_httpd_cmdline=no) - AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) -+AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [ -+ AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd]) -+]) - AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, - [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] - ) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch new file mode 100644 index 000000000..5ab9c8f6d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch @@ -0,0 +1,40 @@ +From 3d48021fb0892721fab8359b49470e521aaed493 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 31 Oct 2019 11:28:07 +0000 +Subject: [PATCH 2/3] tests/core: Assume C.UTF-8 if locale isn't found + +When building with musl there's no locale command, also its default +locale is C.UTF-8, so just get C.UTF-8 if we can't find locale. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest-core.sh | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index bc191332c916..46aafab03cc8 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -37,9 +37,15 @@ assert_not_reached () { + # Some tests look for specific English strings. Use a UTF-8 version + # of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) +-export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) +-if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi +- ++# ++# If we can't find the locale command assume we have support for C.UTF-8 ++# (e.g. musl based systems) ++if type -p locale >/dev/null; then ++ export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) ++ if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi ++else ++ export LC_ALL=C.UTF-8 ++fi + # A GNU extension, used whenever LC_ALL is not C + unset LANGUAGE + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch new file mode 100644 index 000000000..834617c12 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch @@ -0,0 +1,52 @@ +From abf1a7392b2fa1945286a39a35190d74fe141e52 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 31 Oct 2019 17:09:36 +0000 +Subject: [PATCH 3/3] tests: Avoid musl failure with `cp -a` + +When copying the tree, using musl and GNU coreutils, something gets confused +when setting the ownership of symlinks and the copy fails with: + + cp: failed to preserve ownership for osdata-devel/bin: Not supported + +Rework using tar to avoid the problem. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest.sh | 4 +++- + tests/test-admin-gpg.sh | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index ba00073a10a7..3f5fd931bc1e 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -440,7 +440,9 @@ EOF + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" + + cd ${test_tmpdir} +- cp -a osdata osdata-devel ++ rm -rf osdata-devel ++ mkdir osdata-devel ++ tar -C osdata -cf - . | tar -C osdata-devel -xf - + cd osdata-devel + mkdir -p usr/include + echo "a development header" > usr/include/foo.h +diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh +index 1f50c8a9a508..dc776743776c 100755 +--- a/tests/test-admin-gpg.sh ++++ b/tests/test-admin-gpg.sh +@@ -90,7 +90,9 @@ EOF + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" --gpg-sign=$keyid --gpg-homedir=${test_tmpdir}/gpghome + + cd ${test_tmpdir} +- cp -a osdata osdata-devel ++ rm -rf osdata-devel ++ mkdir osdata-devel ++ tar -C osdata -cf - . | tar -C osdata-devel -xf - + cd osdata-devel + mkdir -p usr/include + echo "a development header" > usr/include/foo.h +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest new file mode 100644 index 000000000..963d1f692 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libostree diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb index 505c9fccc..b3b34a15e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb @@ -25,18 +25,22 @@ PREMIRRORS = "" SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ - file://0001-Always-enable-trivial-httpd-for-tests.patch \ - file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ + file://run-ptest \ + file://0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch \ + file://0001-tests-Handle-EPIPE-failures-when-head-terminates.patch \ + file://0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch \ + file://0003-tests-Avoid-musl-failure-with-cp-a.patch \ + file://0001-build-create-tests-directory-for-split-builds.patch \ " -SRCREV = "9d39e7d91e8497987cad69a3fbed5c5fc91eebdc" +SRCREV = "980ca07b03b3aa7e0012729dd6c84b0878775d93" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" S = "${WORKDIR}/git" -inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig systemd +inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig ptest-gnome systemd -# package configuration - match ostree defaults, but without rofiles-fuse +# Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ @@ -107,6 +111,7 @@ PACKAGES += " \ ${PN}-grub \ ${PN}-mkinitcpio \ ${PN}-switchroot \ + ${PN}-trivial-httpd \ " FILES_${PN} = " \ @@ -118,7 +123,6 @@ FILES_${PN} = " \ ${libdir}/girepository-1.0 \ ${libdir}/lib*${SOLIBS} \ ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ - ${libexecdir}/libostree/ostree-trivial-httpd \ ${sysconfdir}/ostree/remotes.d \ ${systemd_unitdir}/system-generators/ostree-system-generator \ ${systemd_unitdir}/system/ostree-finalize-staged.path \ @@ -141,17 +145,48 @@ FILES_${PN}-switchroot = " \ ${libdir}/ostree/ostree-prepare-root \ ${systemd_unitdir}/system/ostree-prepare-root.service \ " +FILES_${PN}-trivial-httpd = " \ + ${libexecdir}/libostree/ostree-trivial-httpd \ +" +RDEPENDS_${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ +" RDEPENDS_${PN}-dracut = "bash" RDEPENDS_${PN}-mkinitcpio = "bash" RDEPENDS_${PN}_class-target = " \ gnupg \ ${PN}-switchroot \ " +RDEPENDS_${PN}-ptest += " \ + attr \ + bash \ + coreutils \ + cpio \ + diffutils \ + findutils \ + grep \ + python3-core \ + python3-multiprocessing \ + python3-pyyaml \ + ${PN}-trivial-httpd \ +" +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" RRECOMMENDS_${PN} += "kernel-module-overlay" +RRECOMMENDS_${PN}-ptest += "strace" SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" BBCLASSEXTEND = "native" + +python __anonymous() { + if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d): + if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d): + raise bb.parse.SkipRecipe('ptest requires meta-python to be present.') + elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d): + raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.') + elif not oe.utils.any_distro_features(d, "xattr"): + raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.') +} diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 95d879dc6..9838e75ef 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libpam openssl db" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 2fdadcbc9..6864cc317 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41ab94182d94be9bb35e2a8b933f1e7d" DEPENDS = "libpam openldap" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index ac7fa4bbf..41b4d0d30 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" # This gets us ssh-agent, which we are almost certain to want. diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch deleted file mode 100644 index 0c79c4c09..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 340110292b35d367205953a59e7eab28e1f4a0bb Mon Sep 17 00:00:00 2001 -From: Daniel Frey <d.frey@gmx.de> -Date: Sat, 7 Apr 2018 09:13:51 +0200 -Subject: [PATCH] Fix clang-warning about non-virtual dtor - -Upstream-Status: Backport [https://github.com/taocpp/PEGTL/commit/340110292b35d367205953a59e7eab28e1f4a0bb] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/example/pegtl/json_classes.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/example/pegtl/json_classes.hpp -+++ b/src/example/pegtl/json_classes.hpp -@@ -34,10 +34,7 @@ namespace examples - : type( in_type ) - { - } -- -- ~json_base() -- { -- } -+ virtual ~json_base() = default; - }; - - inline std::ostream& operator<<( std::ostream& o, const json_base& j ) diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb deleted file mode 100644 index 344a80524..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -LICENSE="MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=80cb066ab204c7fe022f1cfe0c2c6818" - -SRCREV = "776fa4a1e8bda860008524f6dd9473967c8375b1" -SRC_URI = "git://git@github.com/taocpp/PEGTL.git;protocol=https;branch=master \ - file://0001-Fix-clang-warning-about-non-virtual-dtor.patch \ - " - -inherit cmake - -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb new file mode 100644 index 000000000..7333363ec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +HOMEPAGE="https://github.com/taocpp/PEGTL" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae77b0d903a788cb48f4f0926ffc468b" + +SRCREV = "7aff80da2ca4fcb0b47f32ba684ff2e1cd48c579" +SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=2.x \ + " + +inherit cmake + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb index 96da266e6..f5066da0d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb @@ -2,7 +2,7 @@ SUMMARY = "Persistent Memory Development Kit" DESCRIPTION = "Persistent Memory Development Kit" HOMEPAGE = "http://pmem.io" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=7db1106255a1baa80391fd2e21eebab7" DEPENDS = "ndctl" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 8ced8abe5..e38e344c1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -1,7 +1,7 @@ # polkit must prepare polkitd group DEPENDS += "polkit" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "polkit" inherit useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb index 8754383ef..ad1973b13 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ DEPENDS = "expat glib-2.0 intltool-native mozjs" -inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection distro_features_check +inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 45ea29b70..7dc6f9711 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -2,7 +2,7 @@ SUMMARY = "Redis key-value store" DESCRIPTION = "Redis is an open source, advanced key-value store." HOMEPAGE = "http://redis.io" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" DEPENDS = "readline lua ncurses" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch deleted file mode 100644 index b494ca687..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b0894088b680666035a3418326e13bc99d4fed49 Mon Sep 17 00:00:00 2001 -From: Philippe Duveau <pduveau@users.noreply.github.com> -Date: Tue, 24 Sep 2019 20:45:25 +0200 -Subject: [PATCH] Out of bounds issue - -Add a new sanity check after determining the level len. ---- - contrib/pmdb2diag/pmdb2diag.c | 4 ++++ - 1 file changed, 4 insertions(+) - -Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/commit/b0894088b6] -CVE: CVE-2019-17040 -Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> -diff --git a/contrib/pmdb2diag/pmdb2diag.c b/contrib/pmdb2diag/pmdb2diag.c -index 2b5916301..5810eb4df 100644 ---- a/contrib/pmdb2diag/pmdb2diag.c -+++ b/contrib/pmdb2diag/pmdb2diag.c -@@ -134,6 +134,10 @@ CODESTARTparse2 - ABORT_FINALIZE(0); - } - -+ /* let recheck with the real level len */ -+ if(pMsg->iLenRawMsg - (int)pMsg->offAfterPRI < pInst->levelpos+lvl_len) -+ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); -+ - DBGPRINTF("db2parse Level %d\n", pMsg->iSeverity); - - end = (char*)pMsg->pszRawMsg + pMsg->iLenRawMsg ; --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch deleted file mode 100644 index 0b32766a5..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 10549ba915556c557b22b3dac7e4cb73ad22d3d8 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards <rgerhards@adiscon.com> -Date: Fri, 27 Sep 2019 13:36:02 +0200 -Subject: [PATCH] pmaixforwardedfrom bugfix: potential misadressing - ---- - contrib/pmaixforwardedfrom/pmaixforwardedfrom.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/pull/3884] -CVE: CVE-2019-17041 -Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> - -diff --git a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c -index 37157c7d4..ebf12ebbe 100644 ---- a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c -+++ b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c -@@ -109,6 +109,10 @@ CODESTARTparse - /* bump the message portion up by skipLen(23 or 5) characters to overwrite the "Message forwarded from - " or "From " with the hostname */ - lenMsg -=skipLen; -+ if(lenMsg < 2) { -+ dbgprintf("not a AIX message forwarded from message has nothing after header\n"); -+ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); -+ } - memmove(p2parse, p2parse + skipLen, lenMsg); - *(p2parse + lenMsg) = '\n'; - *(p2parse + lenMsg + 1) = '\0'; -@@ -120,6 +124,11 @@ really an AIX log, but has a similar preamble */ - --lenMsg; - ++p2parse; - } -+ if (lenMsg < 1) { -+ dbgprintf("not a AIX message forwarded from message has nothing after colon " -+ "or no colon at all\n"); -+ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); -+ } - if (lenMsg && *p2parse != ':') { - DBGPRINTF("not a AIX message forwarded from mangled log but similar enough that the preamble has " - "been removed\n"); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb index f9e44421d..8287d2b7f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb @@ -23,16 +23,14 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://rsyslog.logrotate \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ - file://0001-Out-of-bounds-issue.patch \ - file://0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch \ " SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "6e9aa4ef4cad8ae49affa0a786cc9e2f" -SRC_URI[sha256sum] = "f8c8e53b651e03a011667c60bd2d4dba7a7cb6ec04b247c8ea8514115527863b" +SRC_URI[md5sum] = "6d4d94359d083f449f089b8dbb93c423" +SRC_URI[sha256sum] = "0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -41,6 +39,7 @@ inherit autotools pkgconfig systemd update-rc.d ptest EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" EXTRA_OECONF += "--enable-imfile-tests" +EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes" # first line is default yes in configure PACKAGECONFIG ??= " \ diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch new file mode 100644 index 000000000..a0b721c46 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch @@ -0,0 +1,51 @@ +From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Nov 2019 13:47:42 -0800 +Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference + --preserve=mode, links" + +Using "cp -a" leaks UID of user running the builds + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile | 8 ++++---- + wdmd/Makefile | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 533dd79..2fc9ba5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -127,9 +127,9 @@ install: all + $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig + $(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig +- cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/wdmd/Makefile b/wdmd/Makefile +index 5849efc..4894517 100644 +--- a/wdmd/Makefile ++++ b/wdmd/Makefile +@@ -68,7 +68,7 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 + $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8 +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index 9f7ce9c57..bf7eaf411 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,13 +11,15 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + " SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" -inherit distutils +inherit distutils3 useradd do_configure[noexec] = "1" @@ -32,3 +34,11 @@ do_install_prepend () { oe_runmake -C src DESTDIR=${D} LIBDIR=${libdir} install cd ${S}/python } + +SANLOCKGROUP ?= "sanlock" +SANLOCKUSER ?= "sanlock" +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system ${SANLOCKGROUP}" +USERADD_PARAM_${PN} = "--system -g ${SANLOCKGROUP} -G disk \ + --home-dir /run/${SANLOCKUSER} --no-create-home \ + --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 91c50027d..a527f773a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -11,7 +11,7 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ diff --git a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index b922bb1f1..2b7571e23 100644 --- a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -5,7 +5,7 @@ DESCRIPTION = "scsirastools were designed to add to the Serviceability of \ maintenance or service functions. It handles SCSI, \ Linux SW RAID, SAS, SATA, and USB devices via SCSI emulation." HOMEPAGE = "http://scsirastools.sourceforge.net/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=687ea108478d26152ae46eb29d9d1545" DEPENDS += "groff-native" diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch new file mode 100644 index 000000000..c16b8dbc5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch @@ -0,0 +1,27 @@ +From 996d37fc0b7177ee57788399b9140032d5de2765 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 18 Nov 2019 15:50:02 -0800 +Subject: [PATCH] nmea_gps: Link with latomic + +clang/x86 ends up with missing symbols for atomics due to atomic<double> +with libstdc++, it works ok with libc++ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nmea_gps/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nmea_gps/CMakeLists.txt b/src/nmea_gps/CMakeLists.txt +index b3fb6591..5280bfed 100644 +--- a/src/nmea_gps/CMakeLists.txt ++++ b/src/nmea_gps/CMakeLists.txt +@@ -6,4 +6,4 @@ upm_mixed_module_init (NAME nmea_gps + CPP_SRC nmea_gps.cxx + FTI_SRC nmea_gps_fti.c + CPP_WRAPS_C +- REQUIRES mraa utilities-c ${CMAKE_THREAD_LIBS_INIT}) ++ REQUIRES mraa utilities-c atomic ${CMAKE_THREAD_LIBS_INIT}) +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index a6b379ec3..dbe97370d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -15,6 +15,8 @@ SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ file://0001-Use-stdint-types.patch \ " +SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch " + S = "${WORKDIR}/git" # Depends on mraa which only supports x86 and ARM for now @@ -36,7 +38,7 @@ BINDINGS_armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" -PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," +PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb deleted file mode 100644 index e97b4efb2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Zstandard - Fast real-time compression algorithm" -DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ -real-time compression scenarios at zlib-level and better compression ratios. \ -It's backed by a very fast entropy stage, provided by Huff0 and FSE library." -HOMEPAGE = "http://www.zstd.net/" -SECTION = "console/utils" - -LICENSE = "BSD-3-Clause & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ - file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" - -SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" - -SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" -PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" -PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" - -# See programs/README.md for how to use this -ZSTD_LEGACY_SUPPORT ??= "4" - -do_compile () { - oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -} - -do_install () { - oe_runmake install 'DESTDIR=${D}' -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb index e587e2a10..0e09c3a64 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ DEPENDS = "atk glibmm" -inherit distro_features_check gnomebase autotools pkgconfig +inherit features_check gnomebase autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/iconv-detect.h b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h index 714cb5aa9..714cb5aa9 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/iconv-detect.h +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/nodolt.patch b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch index 1f9bdd304..1f9bdd304 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/nodolt.patch +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb index bce89bec8..568083bf3 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb @@ -4,20 +4,13 @@ DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" SECTION = "libs" DEPENDS = "glib-2.0 zlib" -inherit gnomebase autotools gobject-introspection +inherit gnomebase gobject-introspection SRC_URI += "file://iconv-detect.h \ file://nodolt.patch" -SRC_URI[archive.md5sum] = "69ae21a0b1df966a7d39a9431856ac81" -SRC_URI[archive.sha256sum] = "6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311" - -EXTRA_OECONF_remove = "--disable-schemas-install" +SRC_URI[archive.md5sum] = "98970e3995e67ac3f23827ff52308f9e" +SRC_URI[archive.sha256sum] = "fb7556501f85c3bf3e65fdd82697cbc4fa4b55dccd33ad14239ce0197e78ba59" export ac_cv_have_iconv_detect_h="yes" do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" - -# we do not need GNOME 1 gnome-config support -do_install_append () { - rm -f ${D}${libdir}/gmimeConf.sh -} diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb index 53eb32be9..2fa754e79 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" # Upstream renamed this package to gnome-themes-extra at some point BPN = "gnome-themes-extra" -inherit gnomebase gettext gtk-icon-cache upstream-version-is-even distro_features_check +inherit gnomebase gettext gtk-icon-cache upstream-version-is-even features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc index d6d14a79d..ccbcfc8da 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" SECTION = "libs" -inherit distro_features_check +inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" # This picks stable releases in the 2.x series (but not 2.90 onwards, diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb index 6dd051337..adc38d8cf 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb @@ -10,12 +10,12 @@ DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" BPN = "gtkmm" -inherit gnomebase distro_features_check +inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "9524ed4e5c821d13eeda49ba2a78f024" -SRC_URI[archive.sha256sum] = "ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd" +SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b" +SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3" SRC_URI += "file://0001-do-not-build-demos.patch" EXTRA_OECONF = " --disable-documentation " diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb index b780d09bc..bb179447b 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "atkmm pangomm glibmm gtk+ cairomm" -inherit gnomebase distro_features_check +inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb deleted file mode 100644 index dd1b53e39..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "libpeas is a gobject-based plugins engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" - -DEPENDS = "gnome-common gtk+3 intltool-native" - -inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache distro_features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" - -SRC_URI[archive.md5sum] = "a20dc55c3f88ad06da9491cfd7de7558" -SRC_URI[archive.sha256sum] = "5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962" - -PACKAGECONFIG[python3] = "--enable-python3,--disable-python3,python3-pygobject" - -export GIR_EXTRA_LIBS_PATH = "${B}/libpeas/.libs" - -PACKAGES =+ "${PN}-demo ${PN}-python3" -FILES_${PN}-demo = " \ - ${bindir}/peas-demo \ - ${libdir}/peas-demo \ -" - -RDEPENDS_${PN}-python3 = "python3-pygobject" -FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb new file mode 100644 index 000000000..6c8e0e0bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "libpeas is a gobject-based plugins engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" + +DEPENDS = "gtk+3" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache + +SRC_URI[archive.md5sum] = "bbecf334a7333d0a5d4d655ba38be9b4" +SRC_URI[archive.sha256sum] = "9c3acf7a567cbb4f8bf62b096e013f12c3911cc850c3fa9900cbd5aa4f6ec284" + +PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" + +PACKAGES =+ "${PN}-demo ${PN}-python3" +FILES_${PN}-demo = " \ + ${bindir}/peas-demo \ + ${libdir}/peas-demo \ +" + +RDEPENDS_${PN}-python3 = "python3-pygobject" +FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc index d860d44e2..14d194004 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc +++ b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc @@ -8,7 +8,7 @@ RDEPENDS_libvte = "vte-termcap" GNOMEBN = "vte" S = "${WORKDIR}/vte-${PV}" -inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection +inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" EXTRA_OECONF = "--disable-python" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb index 25c2ce81f..99c108da1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gettext-native" DEPENDS_append_class-target = " libxi" -inherit autotools pkgconfig pythonnative distro_features_check gettext gtk-icon-cache mime +inherit autotools pkgconfig pythonnative features_check gettext gtk-icon-cache mime REQUIRED_DISTRO_FEATURES_append_class-target = " x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb index d54fafc8d..3b540bb78 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb @@ -7,7 +7,7 @@ SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${P SRC_URI[md5sum] = "90c3ca4dd9d51cf32276bc5344ec9754" SRC_URI[sha256sum] = "2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2" -inherit cmake distro_features_check +inherit cmake features_check # depends on virtual/libx11, virtual/libgl REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb index 343c983c3..65f72747c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://sourceforge.net/projects/ftgl/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb index e1c3158bb..b3cb01aaa 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb @@ -42,7 +42,7 @@ SRCREV = "dc6a396bfe5cd6c53eb1df103c3af505d0899f90" S = "${WORKDIR}/git" -inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check +inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb index 0053c0c68..0db0f793d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb @@ -5,7 +5,7 @@ DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual EXTRA_OECONF = "--disable-docs" -inherit distro_features_check gnomebase vala gobject-introspection +inherit features_check gnomebase vala gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb index 1d64910fd..024534508 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb @@ -25,7 +25,7 @@ DEPENDS = " \ " DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" -inherit distro_features_check gnomebase gtk-icon-cache gtk-doc +inherit features_check gnomebase gtk-icon-cache gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi deleted file mode 100644 index 3977064fe..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi deleted file mode 100644 index 00427e7d9..000000000 --- a/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&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&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 & 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 & 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 & 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 & 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 & 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/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb index 91c5ed211..623037bc3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb @@ -10,8 +10,6 @@ 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 \ " @@ -35,9 +33,6 @@ 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/ } @@ -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/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 4094513b2..6fe258271 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -16,7 +16,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/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb index 310c41067..cd3b6629e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb @@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" -SRC_URI[md5sum] = "eac3073ef381e0c09da33590296ca37f" -SRC_URI[sha256sum] = "efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6" +SRC_URI[md5sum] = "13da7d4235d4031fde52971830458850" +SRC_URI[sha256sum] = "80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7" inherit pkgconfig autotools gettext texinfo 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 distro_features_check +inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" +EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc" FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb index 5d3318590..999d53d4a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb @@ -14,7 +14,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar. SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" -inherit autotools distro_features_check +inherit autotools features_check REQUIRED_DISTRO_FEATURES = "opengl x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb index 4601593ad..6224ad3e7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62f 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/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 701266bcc..db4767bb3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb index 08d7f5b52..ac2634d8e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 9af3798aa..33f34e428 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -12,7 +12,7 @@ SRC_URI = " \ 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" diff --git a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb index 8a85db475..35e71ab42 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb @@ -12,7 +12,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${ SRC_URI[md5sum] = "6cffedf2225c4e72645a7d757fb5b832" SRC_URI[sha256sum] = "ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb index c7e872409..784f6fbb8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb @@ -14,9 +14,9 @@ DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" RDEPENDS_${PN} = "libxcb xcb-util-keysyms" -inherit cmake python3native distro_features_check +inherit cmake python3native features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 opengl" python __anonymous () { # only works on glibc systems diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch new file mode 100644 index 000000000..fb90432ea --- /dev/null +++ b/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/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb new file mode 100644 index 000000000..9932d0a1c --- /dev/null +++ b/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" + +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/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb index f3dc89972..d0ee2a50e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb @@ -9,7 +9,7 @@ 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 diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb index 8d23bd5eb..2bc40d939 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}. 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 +79,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/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb new file mode 100644 index 000000000..521caff74 --- /dev/null +++ b/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/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb index a566bc18a..7e22038f2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ file://0001-build-use-autotools.patch" SRCREV = "10fd337bb77e4e93c3380f630a0555372778a948" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb index d96b50186..240949f55 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb @@ -10,7 +10,7 @@ SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" S = "${WORKDIR}/git" -inherit distro_features_check meson +inherit features_check meson REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index e4a032135..d0c9f774f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -23,7 +23,7 @@ DEPENDS = "\ zlib \ " -inherit pkgconfig autotools distro_features_check +inherit pkgconfig autotools features_check ANY_OF_DISTRO_FEATURES = "x11 fbdev" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb index 3f4bfaaf1..936d71b10 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb @@ -7,7 +7,7 @@ SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.b 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/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb index b68e994ab..aeae071dc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ b/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 # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb index 26977bea5..7b6ef9682 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb index 137a1655e..d98ce4751 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=c7faceb872d90115e7 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz" -SRC_URI[md5sum] = "194012229738f74bc44e7c0f5f6bf0c8" -SRC_URI[sha256sum] = "39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f" +SRC_URI[md5sum] = "189b593841189da66bc1cea92df602a5" +SRC_URI[sha256sum] = "aefb59eefd310268080d1a90a447368fb97a9a6737bfecfc3800bf6cc304104d" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc index cb6b5ac77..958fecc11 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi deleted file mode 100644 index 906043947..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch deleted file mode 100644 index 07754731d..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch deleted file mode 100644 index d16b4a53c..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch deleted file mode 100644 index 6a6d5b92c..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch deleted file mode 100644 index a1f6ba8f9..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb deleted file mode 100644 index 6a3689a2e..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb new file mode 100644 index 000000000..1f63047c7 --- /dev/null +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb index 971de731a..4042150b1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb @@ -9,7 +9,7 @@ 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" SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb index 3966867ee..5c9061a05 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb @@ -10,7 +10,7 @@ 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' diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb index 29229bb51..d7dd10932 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb index 898850bbc..5c00b4b6a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb index 4976e527f..f9bdaf366 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb index 6e0b33ca3..872ef4d01 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb index e8cfb615a..a4ae91a38 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb index d425ce515..ee8cb360a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb index e4cd90a7a..355fb528f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb +++ b/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/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb index ae9704050..06778b3e8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb @@ -1,7 +1,7 @@ SUMMARY = "Xorg 100 DPI font set" 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/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb index 62f00563c..b8c1881d9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb @@ -17,7 +17,7 @@ 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} += "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/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index a5ed21d45..2c09a4853 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/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/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch index 5bfce4d90..70723f2d0 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch @@ -7,37 +7,77 @@ Subject: [PATCH 4/4] Remove clang unsupported compiler flags configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 4fcd48b..40302db 100644 --- a/configure.ac +++ b/configure.ac -@@ -140,20 +140,20 @@ then - case "$optimize" in - -O|"-O "*) - optimize="-O" +@@ -124,70 +124,7 @@ done + + if test "$GCC" = yes + then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" - optimize="$optimize -fforce-addr" -+ : #optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" - optimize="$optimize -fthread-jumps" - optimize="$optimize -fcse-follow-jumps" - optimize="$optimize -fcse-skip-blocks" -+ : #optimize="$optimize -fthread-jumps" -+ : #optimize="$optimize -fcse-follow-jumps" -+ : #optimize="$optimize -fcse-skip-blocks" - : #x optimize="$optimize -frerun-cse-after-loop" - : #x optimize="$optimize -frerun-loop-opt" - : #x optimize="$optimize -fgcse" - optimize="$optimize -fexpensive-optimizations" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" - optimize="$optimize -fregmove" -+ : #optimize="$optimize -fregmove" - : #* optimize="$optimize -fdelayed-branch" - : #x optimize="$optimize -fschedule-insns" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" - optimize="$optimize -fschedule-insns2" -+ : #optimize="$optimize -fschedule-insns2" - : #? optimize="$optimize -ffunction-sections" - : #? optimize="$optimize -fcaller-saves" - : #> optimize="$optimize -funroll-loops" --- -2.1.0 - +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac ++ optimize="-O2" + fi + + case "$host" in diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch index 01c7aa3c8..5bc91f355 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch @@ -11,15 +11,13 @@ Upstream-Status: Pending 2010/07/29 Nitin A Kamble <nitin.a.kamble@intel.com> -Index: libmad-0.15.1b/fixed.h -=================================================================== ---- libmad-0.15.1b.orig/fixed.h -+++ libmad-0.15.1b/fixed.h +--- a/fixed.h ++++ b/fixed.h @@ -297,6 +297,15 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t /* --- MIPS ---------------------------------------------------------------- */ -+# elif defined(FPM_MIPS) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++# elif defined(FPM_MIPS) && (defined(__clang__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + typedef unsigned int u64_di_t __attribute__ ((mode (DI))); +# define MAD_F_MLX(hi, lo, x, y) \ + do { \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb index 19ec12c88..29ef2fa44 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb @@ -5,7 +5,7 @@ designed by the IETF Codec Working Group and incorporates \ technology from Skype's SILK codec and Xiph.Org's CELT codec." HOMEPAGE = "http://www.opus-codec.org/" SECTION = "libs/multimedia" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc index cf4dc7f4f..e08d11b0c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc @@ -49,8 +49,8 @@ do_install() { install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ } -PACKAGES =+ " live555-openrtsp live555-playsip live555-mediaserver" -FILES_${PN} = "${bindir}/sapWatch ${bindir}/testMPEG1or2ProgramToTransportStream ${bindir}/testMPEG1or2Splitter ${bindir}/testMPEG1or2VideoReceiver ${bindir}/testMPEG2TransportStreamTrickPlay ${bindir}/testOnDemandRTSPServer ${bindir}/testRelay ${bindir}/testAMRAudioStreamer ${bindir}/testDVVideoStreamer ${bindir}/testMP3Receiver ${bindir}/testMP3Streamer ${bindir}/testMPEG1or2AudioVideoStreamer ${bindir}/testMPEG1or2VideoStreamer ${bindir}/testMPEG2TransportStreamer ${bindir}/testMPEG4VideoStreamer ${bindir}/testWAVAudioStreamer ${bindir}/vobStreamer ${bindir}/MPEG2TransportStreamIndexer" +PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" FILES_live555-openrtsp = "${bindir}/openRTSP" FILES_live555-playsip = "${bindir}/playSIP" FILES_live555-mediaserver = "${bindir}/live555MediaServer" +FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index d334956a8..1ba9f0f6c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -24,7 +24,7 @@ SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f2 S = "${WORKDIR}/git" -inherit waf pkgconfig pythonnative distro_features_check +inherit waf pkgconfig pythonnative features_check LUA ?= "lua" LUA_mips64 = "" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb index ff6311147..a84f2bf07 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb @@ -1,7 +1,7 @@ SUMMARY = "Opus Audio Tools" HOMEPAGE = "http://www.opus-codec.org/" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=843a066da9f1facfcc6ea6f616ffecb1" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch deleted file mode 100644 index 97ec37d4c..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch +++ /dev/null @@ -1,624 +0,0 @@ -From ccb3eb7b4ff65414a56e2294080885b8966da52b Mon Sep 17 00:00:00 2001 -From: Arun Raghavan <git@arunraghavan.net> -Date: Tue, 2 Feb 2016 17:01:47 +0530 -Subject: [PATCH 2/2] build-sys: Add m4 file for AX_CXX_COMPILE_STDCXX_11 - ---- - m4/ax_cxx_compile_stdcxx.m4 | 558 +++++++++++++++++++++++++++++++++++++++++ - m4/ax_cxx_compile_stdcxx_11.m4 | 39 +++ - 2 files changed, 597 insertions(+) - create mode 100644 m4/ax_cxx_compile_stdcxx.m4 - create mode 100644 m4/ax_cxx_compile_stdcxx_11.m4 - -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -new file mode 100644 -index 0000000..079e17d ---- /dev/null -+++ b/m4/ax_cxx_compile_stdcxx.m4 -@@ -0,0 +1,558 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the specified -+# version of the C++ standard. If necessary, add switches to CXXFLAGS to -+# enable support. VERSION may be '11' (for the C++11 standard) or '14' -+# (for the C++14 standard). -+# -+# The second argument, if specified, indicates whether you insist on an -+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -+# -std=c++11). If neither is specified, you get whatever works, with -+# preference for an extended mode. -+# -+# The third argument, if specified 'mandatory' or if left unspecified, -+# indicates that baseline support for the specified C++ standard is -+# required and that the macro should error out if no mode with that -+# support is found. If specified 'optional', then configuration proceeds -+# regardless, after defining HAVE_CXX${VERSION} if and only if a -+# supporting mode is found. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> -+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> -+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com> -+# Copyright (c) 2015 Paul Norman <penorman@mac.com> -+# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 1 -+ -+dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro -+dnl (serial version number 13). -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl -+ m4_if([$1], [11], [], -+ [$1], [14], [], -+ [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])], -+ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl -+ m4_if([$2], [], [], -+ [$2], [ext], [], -+ [$2], [noext], [], -+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl -+ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], -+ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], -+ [$3], [optional], [ax_cxx_compile_cxx$1_required=false], -+ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) -+ AC_LANG_PUSH([C++])dnl -+ ac_success=no -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, -+ ax_cv_cxx_compile_cxx$1, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [ax_cv_cxx_compile_cxx$1=yes], -+ [ax_cv_cxx_compile_cxx$1=no])]) -+ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then -+ ac_success=yes -+ fi -+ -+ m4_if([$2], [noext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=gnu++$1 -std=gnu++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ -+ m4_if([$2], [ext], [], [dnl -+ if test x$ac_success = xno; then -+ dnl HP's aCC needs +std=c++11 according to: -+ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf -+ dnl Cray's crayCC needs "-h std=c++11" -+ for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ AC_LANG_POP([C++]) -+ if test x$ax_cxx_compile_cxx$1_required = xtrue; then -+ if test x$ac_success = xno; then -+ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) -+ fi -+ else -+ if test x$ac_success = xno; then -+ HAVE_CXX$1=0 -+ AC_MSG_NOTICE([No compiler with C++$1 support was found]) -+ else -+ HAVE_CXX$1=1 -+ AC_DEFINE(HAVE_CXX$1,1, -+ [define if the compiler supports basic C++$1 syntax]) -+ fi -+ -+ AC_SUBST(HAVE_CXX$1) -+ fi -+]) -+ -+ -+dnl Test body for checking C++11 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+) -+ -+ -+dnl Test body for checking C++14 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 -+) -+ -+ -+dnl Tests for new features in C++11 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template <typename T> -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check<void> single_type; -+ typedef check<check<void>> double_type; -+ typedef check<check<check<void>>> triple_type; -+ typedef check<check<check<check<void>>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same<T, T> -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same<int, decltype(0)>::value == true, ""); -+ static_assert(is_same<int, decltype(c)>::value == false, ""); -+ static_assert(is_same<int, decltype(v)>::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same<int, decltype(ac)>::value == true, ""); -+ static_assert(is_same<int, decltype(av)>::value == true, ""); -+ static_assert(is_same<int, decltype(sumi)>::value == true, ""); -+ static_assert(is_same<int, decltype(sumf)>::value == false, ""); -+ static_assert(is_same<int, decltype(add(c, v))>::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template <int...> -+ struct sum; -+ -+ template <int N0, int... N1toN> -+ struct sum<N0, N1toN...> -+ { -+ static constexpr auto value = N0 + sum<N1toN...>::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template<typename T> -+ using member = typename T::member_type; -+ -+ template<typename T> -+ void func(...) {} -+ -+ template<typename T> -+ void func(member<T>*) {} -+ -+ void test(); -+ -+ void test() { func<foo>(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+]]) -+ -+ -+dnl Tests for new features in C++14 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_seperators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same<T, T> -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same<int, decltype(f(x))>::value, ""); -+ static_assert(is_same<int&, decltype(g(x))>::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+]]) -diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 -new file mode 100644 -index 0000000..09db383 ---- /dev/null -+++ b/m4/ax_cxx_compile_stdcxx_11.m4 -@@ -0,0 +1,39 @@ -+# ============================================================================ -+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -+# ============================================================================ -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++11 -+# standard; if necessary, add switches to CXXFLAGS to enable support. -+# -+# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX -+# macro with the version set to C++11. The two optional arguments are -+# forwarded literally as the second and third argument respectively. -+# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for -+# more information. If you want to use this macro, you also need to -+# download the ax_cxx_compile_stdcxx.m4 file. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> -+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> -+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com> -+# Copyright (c) 2015 Paul Norman <penorman@mac.com> -+# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 14 -+ -+include([ax_cxx_compile_stdcxx.m4]) -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) --- -2.12.1 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 421ea9d5c..51d7e2a2e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -1,10 +1,16 @@ DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server." -LICENSE = "GPLv2" +HOMEPAGE = "https://freedesktop.org/software/pulseaudio/pavucontrol/" +SECTION = "x11/multimedia" +LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "intltool-native gtk+3-native gtkmm3 libcanberra pulseaudio" +# glib-2.0-native is required for glib-gettextize, which is used by the +# AM_GLIB_GNU_GETTEXT macro in configure.ac. That macro is deprecated, so the +# glib-2.0-native dependency may go away at some point (something to keep in +# mind when doing version upgrades). +DEPENDS = "intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" -inherit gnomebase distro_features_check +inherit autotools features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb index cc5b84489..021496bd4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8" SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb index 70278ecca..006e73af4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and HOMEPAGE = "http://www.webmproject.org/code/" BUGTRACKER = "http://code.google.com/p/webm/issues/list" SECTION = "libs/multimedia" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb index 526659e45..b6aafdee1 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb @@ -9,7 +9,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${BPN}/${BPN}_${ file://auxdir.patch;striplevel=0" S = "${WORKDIR}/xpext-1.0" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb index c7a068df3..c611da48c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb @@ -7,7 +7,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${BPN}_${PV} file://xsp-fix-pc.patch" S = "${WORKDIR}/Xsp" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch new file mode 100644 index 000000000..9b3801580 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch @@ -0,0 +1,37 @@ +From 2a4b3bcde0d73a3a4a6644d5f944ac9d16023ba9 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <bunk@stusta.de> +Date: Mon, 21 Oct 2019 13:53:25 +0300 +Subject: gps_shm_close: Free privdata + +Previously every open/close cycle leaked privdata. + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Signed-off-by: Gary E. Miller <gem@rellim.com> + +Upstream-Status: Backport +--- + libgps_shm.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libgps_shm.c b/libgps_shm.c +index d93972bba..12bb3760b 100644 +--- a/libgps_shm.c ++++ b/libgps_shm.c +@@ -163,8 +163,12 @@ int gps_shm_read(struct gps_data_t *gpsdata) + + void gps_shm_close(struct gps_data_t *gpsdata) + { +- if (PRIVATE(gpsdata) && PRIVATE(gpsdata)->shmseg != NULL) +- (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg); ++ if (PRIVATE(gpsdata)) { ++ if (PRIVATE(gpsdata)->shmseg != NULL) ++ (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg); ++ free(PRIVATE(gpsdata)); ++ gpsdata->privdata = NULL; ++ } + } + + int gps_shm_mainloop(struct gps_data_t *gpsdata, int timeout, +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index a28d59dce..6834bd45a 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -2,13 +2,12 @@ SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" -DEPENDS = "dbus ncurses python python3 libusb1 chrpath-replacement-native pps-tools" +DEPENDS = "dbus ncurses python python3 libusb1 pps-tools" PROVIDES = "virtual/gpsd" -EXTRANATIVEPATH += "chrpath-native" - SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ + file://0001-gps_shm_close-Free-privdata.patch \ " SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b" SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39" @@ -32,7 +31,6 @@ EXTRA_OESCONS = " \ libQgpsmm='false' \ debug='false' \ nostrip='true' \ - chrpath='yes' \ systemd='${SYSTEMD_OESCONS}' \ libdir='${libdir}' \ manbuild='false' \ diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 010f65fb9..589fc5f7c 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" DEPENDS = "gtk+" -inherit distro_features_check autotools-brokensep pkgconfig +inherit features_check autotools-brokensep pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb index 8fc0b3591..504ac1537 100644 --- a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb @@ -21,10 +21,10 @@ SECTION = "System Environment/Base" DEPENDS += "libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -LICENSE = "BSD" +LICENSE = "BSD-1-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb new file mode 100644 index 000000000..3236cb9a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "PKCS#11 HSM/Token Emulator" +HOMEPAGE = "https://www.opendnssec.org/softhsm/" +LICENSE = "BSD-2-Clause & ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" +DEPENDS = "openssl" +PV = "2.5.0" + +SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master" +SRCREV = "369df0383d101bc8952692c2a368ac8bc887d1b4" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +# EdDSA requires OpenSSL >= 1.1.1 +EXTRA_OECONF = "--enable-eddsa --disable-gost" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index 30d41a16e..9362a5c11 100644 --- a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ " -inherit autotools pkgconfig python3native lib_package distro_features_check +inherit autotools pkgconfig python3native lib_package features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch new file mode 100644 index 000000000..586ff18c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -0,0 +1,22 @@ +Subject: [PATCH] Add build rule for README. + +fix do_configure error: +Makefile.am: required file `./README' not found + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 49574a3..a5a7c2a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,3 +26,4 @@ libtool: $(LIBTOOL_DEPS) + ChangeLog: + git log --stat --decorate=short > $@ + ++README: README.md +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb index 95a41d2f7..de07bfd23 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb @@ -8,10 +8,11 @@ RDEPENDS_${PN} = "pcsc-lite" SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://no-dep-on-libfl.patch \ + file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[md5sum] = "817abceef715e02cb47617621fe192e0" -SRC_URI[sha256sum] = "ac17087be08880a0cdf99a8a2799a4ef004dc6ffa08b4d9b0ad995f39a53ff7c" +SRC_URI[md5sum] = "e4690f3362f95adb2332fd47a2b08212" +SRC_URI[sha256sum] = "6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb new file mode 100644 index 000000000..845041cc4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb @@ -0,0 +1,64 @@ +require ${BPN}.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" + +inherit meson native + +DEPENDS += " \ + meson-native \ + glib-2.0-native \ + lcms-native \ +" + +SRC_URI += " \ + file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \ + file://Makefile;subdir=${BPN}-${PV} \ +" + +do_configure() { + # we expect meson to fail - but before it extracts project's version in log file + meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true + + # extract and split version + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'` + major=`echo $version | cut -d. -f1` + minor=`echo $version | cut -d. -f2` + micro=`echo $version | cut -d. -f3` + echo "Project version: $major.$minor.$micro" + + # extract project name + proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'` + + # create cd-version.h + mkdir -p ${B}/colord + sed ${S}/lib/colord/cd-version.h.in \ + -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \ + -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \ + -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \ + > ${B}/colord/cd-version.h + + # create config.h based on target build and add what's necessary only + localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'` + echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h + echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h + echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h + echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h +} + +do_compile() { + oe_runmake -C${S} DESTDIR=${B} +} + +do_install() { + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'` + major=`echo $version | cut -d. -f1` + + install -d ${D}${libdir} + install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so" + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major" + + install -d ${D}${bindir} + install -m 755 ${B}/cd_create_profile ${D}${bindir}/ + install -m 755 ${B}/cd_idt8 ${D}${bindir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch new file mode 100644 index 000000000..278b90e07 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -0,0 +1,166 @@ +From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 12 May 2019 21:58:02 +0200 +Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev + dependeny +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We do not have udev-native so it is a dependeny we cannot satisfy + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ + lib/colord/cd-icc.c | 62 ------------------------------------------- + 2 files changed, 63 insertions(+), 62 deletions(-) + +diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c +index a5e2328..dec509a 100644 +--- a/lib/colord/cd-edid.c ++++ b/lib/colord/cd-edid.c +@@ -687,3 +687,66 @@ cd_edid_new (void) + edid = g_object_new (CD_TYPE_EDID, NULL); + return CD_EDID (edid); + } ++ ++/** ++ * cd_icc_create_from_edid_data: ++ * @icc: A valid #CdIcc ++ * @edid: EDID data ++ * @error: A #GError, or %NULL ++ * ++ * Creates an ICC profile from EDID data. ++ * ++ * Return value: %TRUE for success ++ * ++ * Since: 1.1.2 ++ **/ ++gboolean ++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) ++{ ++ CdIccPrivate *priv = GET_PRIVATE (icc); ++ const gchar *data; ++ ++ /* not loaded */ ++ if (priv->lcms_profile != NULL) { ++ g_set_error_literal (error, ++ CD_ICC_ERROR, ++ CD_ICC_ERROR_FAILED_TO_CREATE, ++ "already loaded or generated"); ++ return FALSE; ++ } ++ ++ /* create from parsed object */ ++ if (!cd_icc_create_from_edid (icc, ++ cd_edid_get_gamma (edid), ++ cd_edid_get_red (edid), ++ cd_edid_get_green (edid), ++ cd_edid_get_blue (edid), ++ cd_edid_get_white (edid), ++ error)) { ++ return FALSE; ++ } ++ ++ /* set copyright */ ++ cd_icc_set_copyright (icc, NULL, ++ /* deliberately not translated */ ++ "This profile is free of known copyright restrictions."); ++ ++ /* set 'ICC meta Tag for Monitor Profiles' data */ ++ data = cd_edid_get_checksum (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data); ++ data = cd_edid_get_monitor_name (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data); ++ data = cd_edid_get_serial_number (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data); ++ data = cd_edid_get_pnp_id (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data); ++ data = cd_edid_get_vendor_name (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data); ++ return TRUE; ++} ++ +diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c +index f231814..2c8fe77 100644 +--- a/lib/colord/cd-icc.c ++++ b/lib/colord/cd-icc.c +@@ -3094,68 +3094,6 @@ out: + return ret; + } + +-/** +- * cd_icc_create_from_edid_data: +- * @icc: A valid #CdIcc +- * @edid: EDID data +- * @error: A #GError, or %NULL +- * +- * Creates an ICC profile from EDID data. +- * +- * Return value: %TRUE for success +- * +- * Since: 1.1.2 +- **/ +-gboolean +-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) +-{ +- CdIccPrivate *priv = GET_PRIVATE (icc); +- const gchar *data; +- +- /* not loaded */ +- if (priv->lcms_profile != NULL) { +- g_set_error_literal (error, +- CD_ICC_ERROR, +- CD_ICC_ERROR_FAILED_TO_CREATE, +- "already loaded or generated"); +- return FALSE; +- } +- +- /* create from parsed object */ +- if (!cd_icc_create_from_edid (icc, +- cd_edid_get_gamma (edid), +- cd_edid_get_red (edid), +- cd_edid_get_green (edid), +- cd_edid_get_blue (edid), +- cd_edid_get_white (edid), +- error)) { +- return FALSE; +- } +- +- /* set copyright */ +- cd_icc_set_copyright (icc, NULL, +- /* deliberately not translated */ +- "This profile is free of known copyright restrictions."); +- +- /* set 'ICC meta Tag for Monitor Profiles' data */ +- data = cd_edid_get_checksum (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data); +- data = cd_edid_get_monitor_name (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data); +- data = cd_edid_get_serial_number (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data); +- data = cd_edid_get_pnp_id (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data); +- data = cd_edid_get_vendor_name (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data); +- return TRUE; +-} +- + /** + * cd_icc_create_from_edid: + * @icc: A valid #CdIcc +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile new file mode 100644 index 000000000..1e29e4f67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile @@ -0,0 +1,48 @@ +# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so +# only. By reducing the library to what's necessary, we avoid dependencies on +# naitve udev and libgudev + +CFLAGS+=$(shell pkg-config-native --cflags gio-2.0) +CFLAGS+=$(shell pkg-config-native --cflags lcms2) +CFLAGS+=-std=c99 -I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION + +LDFLAGS+=$(shell pkg-config-native --libs gio-2.0) +LDFLAGS+=$(shell pkg-config-native --libs lcms2) +LDFLAGS+=-lm + +all: cd_idt8 cd_create_profile + +LIBSOURCES = \ + lib/colord/cd-it8.c \ + lib/colord/cd-color.c \ + lib/colord/cd-spectrum.c \ + lib/colord/cd-math.c \ + lib/colord/cd-interp-akima.c \ + lib/colord/cd-context-lcms.c \ + lib/colord/cd-interp.c \ + lib/colord/cd-interp-linear.c \ + lib/colord/cd-it8-utils.c \ + lib/colord/cd-enum.c \ + lib/colord/cd-icc.c \ + lib/colord/cd-icc-utils.c \ + lib/colord/cd-dom.c + +libcolord.so: $(LIBSOURCES) + $(CC) $(CFLAGS) -L$(DESTDIR) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@ $(LDFLAGS) + +cd_idt8.o: client/cd-it8.c + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@ + +cd_idt8: libcolord.so cd_idt8.o + $(CC) $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@ -L$(DESTDIR) -lcolord $(LDFLAGS) + +cd_create_profile.o: client/cd-create-profile.c + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@ + +cd_create_profile: libcolord.so cd_create_profile.o + $(CC) $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@ -L$(DESTDIR) -lcolord $(LDFLAGS) + +.PHONY: clean + +clean: + rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb new file mode 100644 index 000000000..df86708e2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -0,0 +1,45 @@ +require ${BPN}.inc + +inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd + +# polkit and gobject-introspection are mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0 \ + lcms \ + sqlite3 \ + libgusb \ + libgudev \ + polkit \ +" + +SRC_URI += " \ + file://0001-Run-native-cd_idt8-cd_create_profile.patch \ +" + +EXTRA_OEMESON = " \ + -Dman=false \ + -Ddocs=false \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +SYSTEMD_SERVICE_${PN} = "colord.service" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/glib-2.0 \ + ${datadir}/color \ + ${systemd_user_unitdir} \ + ${libdir}/tmpfiles.d \ + ${libdir}/colord-plugins \ + ${libdir}/colord-sensors \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.inc b/meta-openembedded/meta-oe/recipes-support/colord/colord.inc new file mode 100644 index 000000000..7497fed51 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.inc @@ -0,0 +1,13 @@ +SUMMARY = "Making color management just work" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ +" + +PV = "1.4.4" +SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" +SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" + diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch new file mode 100644 index 000000000..4b52aa337 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch @@ -0,0 +1,59 @@ +From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 12 May 2019 22:47:05 +0200 +Subject: [PATCH] Run native cd_idt8/cd_create_profile +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@gmail.com> +--- + data/cmf/meson.build | 2 +- + data/illuminant/meson.build | 2 +- + data/profiles/meson.build | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/cmf/meson.build b/data/cmf/meson.build +index a693cd7..1ae3613 100644 +--- a/data/cmf/meson.build ++++ b/data/cmf/meson.build +@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ] + custom_target(arg, + input: arg + '.csv', + output: arg + '.cmf', +- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], ++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], + install: true, + install_dir: join_paths(datadir, 'colord', 'cmf') + ) +diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build +index f8dfa07..ad7dced 100644 +--- a/data/illuminant/meson.build ++++ b/data/illuminant/meson.build +@@ -24,7 +24,7 @@ foreach arg: generated_spectra + custom_target(arg, + input: arg + '.csv', + output: arg + '.sp', +- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], ++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], + install: true, + install_dir: join_paths(datadir, 'colord', 'illuminant') + ) +diff --git a/data/profiles/meson.build b/data/profiles/meson.build +index 591b97d..2cef011 100644 +--- a/data/profiles/meson.build ++++ b/data/profiles/meson.build +@@ -59,7 +59,7 @@ foreach arg: icc_profiles + generated_icc = custom_target(arg + '.icc', + input: xml_i18n, + output: arg + '.icc', +- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ], ++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ], + install: true, + install_dir: join_paths(datadir, 'color', 'icc', 'colord'), + ) +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb index ec9e04bed..7ad4ac70a 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb @@ -2,7 +2,7 @@ require ${BPN}.inc DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -inherit distro_features_check binconfig lib_package gtk-icon-cache mime +inherit features_check binconfig lib_package gtk-icon-cache mime REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch" diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb index fdb82519b..731c83516 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb @@ -2,7 +2,6 @@ SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" HOMEPAGE = "https://github.com/gperftools/gperftools" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -DEPENDS += "libunwind" SRCREV = "9608fa3bcf8020d35f59fbf70cd3cbe4b015b972" SRC_URI = "git://github.com/gperftools/gperftools \ @@ -20,7 +19,7 @@ S = "${WORKDIR}/git" # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 # Segmentation fault (core dumped) -COMPATIBLE_HOST_mipsarch_libc-glibc = "null" +COMPATIBLE_HOST_mipsarch = "null" # Disable thumb1 # {standard input}: Assembler messages: # {standard input}:434: Error: lo register required -- `ldr pc,[sp]' @@ -28,9 +27,11 @@ COMPATIBLE_HOST_mipsarch_libc-glibc = "null" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_toolchain-clang_arm = "arm" -# Ensure static libs are always enabled, as they seem to be not produced by -# default at least on ARM. -EXTRA_OECONF_append += " --enable-static" +PACKAGECONFIG ?= "libunwind static" +PACKAGECONFIG_remove_arm_libc-musl = "libunwind" + +PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[static] = "--enable-static,--disable-static," PACKAGE_BEFORE_PN += "libtcmalloc-minimal" FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index e66102064..a8479466a 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.327" -SRCREV = "874f7831c64de7ea2203cfcd1b3fc336bc27e468" +PV = "0.329" +SRCREV = "3b93b226177b6a8d219fa5edee2a417758cf74db" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch new file mode 100644 index 000000000..19a858bd7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch @@ -0,0 +1,35 @@ +From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 27 Oct 2019 16:38:52 +0100 +Subject: [PATCH] Native: Don't use build time hardcoded python binary path. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is same patch as used for target build except that we do not use the +'-S' and '-s' option because '-S' is relatively young [1] and elder build-host +don't support it [2] + +[1] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30 +[2] https://errors.yoctoproject.org/Errors/Details/274743/ + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + itstool.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/itstool.in b/itstool.in +index e64cd34..05d264f 100755 +--- a/itstool.in ++++ b/itstool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ -s ++#!/usr/bin/env python3 + # + # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org> + # +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch index b91105330..b91105330 100644 --- a/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch +++ b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch diff --git a/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb b/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb index b4b37aa01..8290c5e58 100644 --- a/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb @@ -7,8 +7,10 @@ inherit autotools python3native DEPENDS = "libxml2-native" -SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Don-t-use-build-time-hardcoded-python-binary-path.patch" +SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" +SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" + SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1" SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" diff --git a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb index 4fc6eb090..c33c79111 100644 --- a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM= "\ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ " -DEPENDS = "libusb1" +DEPENDS = "libusb1 python3" SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2" @@ -17,11 +17,17 @@ SRC_URI[sha256sum] = "ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681c S = "${WORKDIR}/${BPN}1-${PV}" -inherit cmake binconfig pkgconfig +inherit cmake binconfig pkgconfig python3native PACKAGECONFIG ??= "" PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=off,boost" -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ + -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" BBCLASSEXTEND = "native nativesdk" + +PACKAGES += "${PN}-python" + +FILES_${PN}-python = "${libdir}/${PYTHON_DIR}/site-packages/" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc index 89679cb91..07ce35a7f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -8,11 +8,9 @@ SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" inherit autotools pkgconfig PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" -PACKAGECONFIG[tools] = "--enable-tools,--disable-tools," + +EXTRA_OECONF = "--enable-tools" PACKAGES =+ " ${PN}-tools" FILES_${PN}-tools = "${bindir}/*" - -RRECOMMENDS_TOOLS = "${@bb.utils.contains('PACKAGECONFIG', 'tools', '${PN}-tools', '',d)}" -RRECOMMENDS_${PN} += "${RRECOMMENDS_TOOLS}" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb index 3ecfffdd6..c4d2bddf4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb @@ -1,7 +1,6 @@ require libgpiod.inc -# enable tools -PACKAGECONFIG ?= "tools" +PACKAGECONFIG ?= "" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb index d55902898..0391deb86 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb @@ -5,8 +5,8 @@ DEPENDS += "autoconf-archive-native" SRC_URI[md5sum] = "585b4bb431f99c4ba9b3ee58b9d494c1" SRC_URI[sha256sum] = "21ae8fd1f8dafc2eb2ba50e652390cf533d21351419a7426255895cb52e21b1c" -# enable tools and cxx bindings -PACKAGECONFIG ?= "cxx tools" +# enable cxx bindings +PACKAGECONFIG ?= "cxx" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb new file mode 100644 index 000000000..e3c0bdd15 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb" + +inherit meson gobject-introspection gtk-doc gettext vala + +SRC_URI = "git://github.com/hughsie/libgusb.git" +SRCREV = "636efc0624aa2a88174220fcabc9764c13d7febf" +PV = "0.3.0+git${SRCPV}" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 4e57d5b77..b53ba4647 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -25,10 +25,13 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND" +PACKAGECONFIG ??= "usb_backend network_backend" -PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" -PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)} PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch deleted file mode 100644 index 61a7ac0a6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 -From: Christian Grothoff <christian@grothoff.org> -Date: Fri, 2 Aug 2019 15:43:44 +0200 -Subject: trying to fix #5806 - -Upstream-Status: Backport from 0.9.67 [https://git.gnunet.org/libmicrohttpd.git/commit/?id=b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f] - ---- - src/microhttpd/daemon.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c -index bf01ba9b..a8fc98c6 100644 ---- a/src/microhttpd/daemon.c -+++ b/src/microhttpd/daemon.c -@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon, - else - { - #ifdef HTTPS_SUPPORT -- gnutls_init_flags_t flags; -+#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) -+ gnutls_init_flags_t -+#else -+ unsigned int -+#endif -+ flags; - - flags = GNUTLS_SERVER; - #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) --- -cgit v1.2.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb index 6b5417004..c400462e0 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb @@ -7,10 +7,9 @@ SECTION = "net" DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ - file://fix-build-with-older-gnutls.patch \ " -SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" -SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" +SRC_URI[md5sum] = "e28e04e3d3eca62f5754efb844d17812" +SRC_URI[sha256sum] = "7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495" inherit autotools lib_package pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb index b40223e8a..655db4907 100644 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb @@ -24,3 +24,5 @@ do_install_append () { FILES_${PN} += "${libdir}/engines*/pkcs11.so" FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 6428958f9..25e0af3ff 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" -SRC_URI[md5sum] = "616efd99af3d9ef731a26bed6cee9593" -SRC_URI[sha256sum] = "088307d9f6b6c4b8c13f34602e8ff65d21c2dc4d55284dfe15d502c4ee190d67" +SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" +SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" inherit autotools pkgconfig @@ -21,7 +21,7 @@ EXTRA_OECONF += "\ # only one of openssl and gcrypt could be set PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-openssl --with-libssl-prefix=${STAGING_LIBDIR},--without-openssl,openssl" -PACKAGECONFIG[gcrypt] = "--with-libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR},--without-libgcrypt,libgcrypt" +PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_LIBDIR}, , openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb index f55a6fc7b..90fa20084 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb @@ -25,7 +25,7 @@ require links.inc DEPENDS += "virtual/libx11" RCONFLICTS_${PN} = "links" -inherit distro_features_check +inherit features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch deleted file mode 100644 index 07cb88ffb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001 -From: Marian Csontos <mcsontos@redhat.com> -Date: Mon, 19 Aug 2019 14:54:43 +0200 -Subject: [PATCH] configure: Fix setting of CLDFLAGS default - ---- - configure | 6 +++--- - configure.ac | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> - -diff --git a/configure b/configure -index ff3a59b6b..4c8476502 100755 ---- a/configure -+++ b/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - -diff --git a/configure.ac b/configure.ac -index 5da694631..830edb8da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([]) - AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -51,7 +51,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -64,7 +64,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb index be558ce1d..be558ce1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 41bf78a3f..01c9df45c 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,9 +15,8 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ - file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " -SRCREV = "60bd9e8406ac28a04aa5e8165149f7a5d4f3265a" +SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch deleted file mode 100644 index a864f1e21..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch +++ /dev/null @@ -1,82 +0,0 @@ -From f8466749dd73f5b0ccf4fc86c8a7585c4140b3f9 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Fri, 16 Aug 2019 23:49:59 +0200 -Subject: [PATCH 1/3] activation: add synchronization point - -Resuming of 'error' table entry followed with it's dirrect removal -is now troublesame with latest udev as it may skip processing of -udev rules for already 'dropped' device nodes. - -As we cannot 'synchronize' with udev while we know we have devices -in suspended state - rework 'cleanup' so it collects nodes -for removal into pending_delete list and process the list with -synchronization once we are without any suspended nodes. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - WHATS_NEW | 9 +++++++++ - lib/activate/dev_manager.c | 20 ++++++++++++-------- - 2 files changed, 21 insertions(+), 8 deletions(-) - -diff --git a/WHATS_NEW b/WHATS_NEW -index 3a58de5f9..0b48e032b 100644 ---- a/WHATS_NEW -+++ b/WHATS_NEW -@@ -1,3 +1,12 @@ -+Version 2.03.06 - -+================================ -+ Synchronize with udev when dropping snapshot. -+ Add missing device synchronization point before removing pvmove node. -+ Correctly set read_ahead for LVs when pvmove is finished. -+ Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. -+ Prevent creating VGs with PVs with different logical block sizes. -+ Fix metadata writes from corrupting with large physical block size. -+ - Version 2.03.05 - 15th June 2019 - ================================ - Fix command definition for pvchange -a. -diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c -index 981f4674a..7101ffa12 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -3558,13 +3558,6 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - const char *name, *uuid; - struct dm_str_list *dl; - -- /* Deactivate any tracked pending delete nodes */ -- dm_list_iterate_items(dl, &dm->pending_delete) { -- log_debug_activation("Deleting tracked UUID %s.", dl->str); -- if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) -- return_0; -- } -- - while ((child = dm_tree_next_child(&handle, root, 0))) { - if (!(name = dm_tree_node_get_name(child))) - continue; -@@ -3585,10 +3578,21 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - if (non_toplevel_tree_dlid && !strcmp(non_toplevel_tree_dlid, uuid)) - continue; - -- if (!dm_tree_deactivate_children(root, uuid, strlen(uuid))) -+ if (!str_list_add(dm->mem, &dm->pending_delete, uuid)) - return_0; - } - -+ /* Deactivate any tracked pending delete nodes */ -+ if (!dm_list_empty(&dm->pending_delete) && !dm_get_suspended_counter()) { -+ fs_unlock(); -+ dm_tree_set_cookie(root, fs_get_cookie()); -+ dm_list_iterate_items(dl, &dm->pending_delete) { -+ log_debug_activation("Deleting tracked UUID %s.", dl->str); -+ if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) -+ return_0; -+ } -+ } -+ - return 1; - } - --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch deleted file mode 100644 index 5a6db4b88..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e48f8328f9d35f23a24e5b27237e8ebf1dbfa269 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 10 Oct 2019 22:38:00 -0400 -Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule - -The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, -that is ~5 years ago. - -Since systemd/udev version 243, there's a new message printed if unsupported -OPTIONS value is used: - - Invalid value for OPTIONS key, ignoring: 'event_timeout=180' - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 - -Signed-off-by: Peter Rajnoha <prajnoha@redhat.com> - -Upstream-Status: Backport [https://github.com/lvmteam/lvm2/commit/125f27ac37bc9b93cc96f64052b9681b3d479ee1] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - udev/11-dm-lvm.rules.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in -index 91cb991..7c58994 100644 ---- a/udev/11-dm-lvm.rules.in -+++ b/udev/11-dm-lvm.rules.in -@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE - - ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" - --OPTIONS+="event_timeout=180" -- - # Do not create symlinks for inappropriate subdevices. - ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" - ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch deleted file mode 100644 index e30731593..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch +++ /dev/null @@ -1,124 +0,0 @@ -From d06ad77b47f4dfd25bc3da88c0621ac073ad8ce5 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Fri, 23 Aug 2019 13:08:34 +0200 -Subject: [PATCH 2/3] activation: extend handling of pending_delete - -With previous patch 30a98e4d6710a543692d40d11428ae4baea11b7b we -started to put devices one pending_delete list instead -of directly scheduling their removal. - -However we have operations like 'snapshot merge' where we are -resuming device tree in 2 subsequent activation calls - so -1st such call will still have suspened devices and no chance -to push 'remove' ioctl. - -Since we curently cannot easily solve this by doing just single -activation call (which would be preferred solution) - we introduce -a preservation of pending_delete via command structure and -then restore it on next activation call. - -This way we keep to remove devices later - although it might be -not the best moment - this may need futher tunning. - -Also we don't keep the list of operation in 1 trasaction -(unless we do verify udev symlinks) - this could probably -also make it more correct in terms of which 'remove' can -be combined we already running 'resume'. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - lib/activate/dev_manager.c | 24 +++++++++++------------- - lib/commands/toolcontext.c | 8 ++++++++ - lib/commands/toolcontext.h | 1 + - 3 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c -index 7101ffa12..7a7689291 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -3591,6 +3591,7 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) - return_0; - } -+ dm_list_init(&dm->pending_delete); - } - - return 1; -@@ -3717,25 +3718,22 @@ out_no_root: - int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv, - struct lv_activate_opts *laopts) - { -+ dm_list_splice(&dm->pending_delete, &lv->vg->cmd->pending_delete); -+ - if (!_tree_action(dm, lv, laopts, ACTIVATE)) - return_0; - -- /* -- * When lvm2 resumes a device and shortly after that it removes it, -- * udevd rule will try to blindly call 'dmsetup info' on already removed -- * device leaving the trace inside syslog about failing operation. -- * -- * TODO: It's not completely clear this call here is the best fix. -- * Maybe there can be a better sequence, but ATM we do usually resume -- * error device i.e. on cache deletion and remove it. -- * TODO2: there could be more similar cases! -- */ -- if (!dm_list_empty(&dm->pending_delete)) -- fs_unlock(); -- - if (!_tree_action(dm, lv, laopts, CLEAN)) - return_0; - -+ if (!dm_list_empty(&dm->pending_delete)) { -+ log_debug("Preserving %d device(s) for removal while being suspended.", -+ dm_list_size(&dm->pending_delete)); -+ if (!(str_list_dup(lv->vg->cmd->mem, &lv->vg->cmd->pending_delete, -+ &dm->pending_delete))) -+ return_0; -+ } -+ - return 1; - } - -diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c -index 1e03ea235..0a9355361 100644 ---- a/lib/commands/toolcontext.c -+++ b/lib/commands/toolcontext.c -@@ -1734,6 +1734,8 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, - cmd->current_settings = cmd->default_settings; - - cmd->initialized.config = 1; -+ -+ dm_list_init(&cmd->pending_delete); - out: - if (!cmd->initialized.config) { - destroy_toolcontext(cmd); -@@ -1922,6 +1924,12 @@ int refresh_toolcontext(struct cmd_context *cmd) - - cmd->initialized.config = 1; - -+ if (!dm_list_empty(&cmd->pending_delete)) { -+ log_debug(INTERNAL_ERROR "Unprocessed pending delete for %d devices.", -+ dm_list_size(&cmd->pending_delete)); -+ dm_list_init(&cmd->pending_delete); -+ } -+ - if (cmd->initialized.connections && !init_connections(cmd)) - return_0; - -diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h -index 6e4530c8a..54ddec320 100644 ---- a/lib/commands/toolcontext.h -+++ b/lib/commands/toolcontext.h -@@ -237,6 +237,7 @@ struct cmd_context { - const char *report_list_item_separator; - const char *time_format; - unsigned rand_seed; -+ struct dm_list pending_delete; /* list of LVs for removal */ - }; - - /* --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch deleted file mode 100644 index 953e4ad65..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9143445478871b47ba28b41f5e88d4c415f8205b Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Mon, 26 Aug 2019 15:13:55 +0200 -Subject: [PATCH 3/3] snapshot: always activate - -Drop the 'cluster-only' optimization so we do resume ALL device -before we try to wait on cookie before 'removal' operation. - -It's more correct order of operation - alhtough possibly slightly -less efficient - but until we have correct list of operations -'in-progress' we can't do anything better. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - lib/metadata/snapshot_manip.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c -index 5ccf251c7..65d8dbd13 100644 ---- a/lib/metadata/snapshot_manip.c -+++ b/lib/metadata/snapshot_manip.c -@@ -361,13 +361,7 @@ int vg_remove_snapshot(struct logical_volume *cow) - return 0; - } - -- /* -- * For merged snapshot and clustered VG activate cow LV so -- * the following call to deactivate_lv() can clean-up table -- * entries. For this clustered lock need to be held. -- */ -- if (vg_is_clustered(cow->vg) && -- merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { -+ if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { - log_error("Failed to activate %s.", cow->name); - return 0; - } --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb index b80f1fd4b..e2b551bbc 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -3,10 +3,6 @@ require lvm2.inc SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ - file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ - file://0001-activation-add-synchronization-point.patch \ - file://0002-activation-extend-handling-of-pending_delete.patch \ - file://0003-snapshot-always-activate.patch \ " DEPENDS += "autoconf-archive-native" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index 888c729b3..007b3944a 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ file://makefile-remove-ldflags.patch \ " -SRCREV = "74bffd8b0aa27051aeaa1983a7b23975ca8d8726" -PV = "20171030+git${SRCPV}" +SRCREV = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" +PV = "20190917+git${SRCPV}" RDEPENDS_${PN} = "mcelog mce-inject dialog bash" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_166.bb index af309d1c6..3b4ea1f67 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_166.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "e53631f84a181be371c08e0b961180bff77fd2ab" +SRCREV = "ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb index 06e78c78c..358f0cb60 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb @@ -47,7 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -SRCREV = "8a7e9b6648898f2c2d2bbd2d22871f79612e716e" +SRCREV = "6c3bd369b23e959700527e0e2e6d5b2a1bd36294" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch new file mode 100644 index 000000000..6cb5dfccc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch @@ -0,0 +1,94 @@ +From 6fb28085e867d7c3ef46577d9ff193a185693bcb Mon Sep 17 00:00:00 2001 +From: Oliver Kurth <okurth@vmware.com> +Date: Mon, 30 Sep 2019 16:24:27 -0700 +Subject: [PATCH] GitHub Issue #367. Remove references to deprecated G_INLINE_FUNC. + +G_INLINE_FUNC was a work-around for compilers that didn't support +static inline. Change uses of it to static inline. + +Upstream-Status: Backport +[https://github.com/vmware/open-vm-tools/commit/89c0d444567eb525e8d083fb564c46d68e96660c] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/lib/include/vmware/tools/plugin.h | 2 +- + open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++---- + open-vm-tools/lib/include/vmware/tools/utils.h | 9 --------- + 3 files changed, 5 insertions(+), 14 deletions(-) + +diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h +index f9acc6a2..deefd1f3 100644 +--- a/open-vm-tools/lib/include/vmware/tools/plugin.h ++++ b/open-vm-tools/lib/include/vmware/tools/plugin.h +@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx { + * + * @return TRUE if COM is initialized when the function returns. + */ +-G_INLINE_FUNC gboolean ++static inline gboolean + ToolsCore_InitializeCOM(ToolsAppCtx *ctx) + { + if (!ctx->comInitialized) { +diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h +index 3f2082b3..5880fbcf 100644 +--- a/open-vm-tools/lib/include/vmware/tools/threadPool.h ++++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h +@@ -91,7 +91,7 @@ typedef struct ToolsCorePool { + ******************************************************************************* + */ + +-G_INLINE_FUNC ToolsCorePool * ++static inline ToolsCorePool * + ToolsCorePool_GetPool(ToolsAppCtx *ctx) + { + ToolsCorePool *pool = NULL; +@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx) + ******************************************************************************* + */ + +-G_INLINE_FUNC guint ++static inline guint + ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, + ToolsCorePoolCb cb, + gpointer data, +@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, + ******************************************************************************* + */ + +-G_INLINE_FUNC void ++static inline void + ToolsCorePool_CancelTask(ToolsAppCtx *ctx, + guint taskId) + { +@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx, + ******************************************************************************* + */ + +-G_INLINE_FUNC gboolean ++static inline gboolean + ToolsCorePool_StartThread(ToolsAppCtx *ctx, + const gchar *threadName, + ToolsCorePoolCb cb, +diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h +index f6574590..a3292d5c 100644 +--- a/open-vm-tools/lib/include/vmware/tools/utils.h ++++ b/open-vm-tools/lib/include/vmware/tools/utils.h +@@ -51,15 +51,6 @@ + # include <sys/time.h> + #endif + +- +-/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */ +-#if defined(G_PLATFORM_WIN32) +-# if defined(G_INLINE_FUNC) +-# undef G_INLINE_FUNC +-# endif +-# define G_INLINE_FUNC static __inline +-#endif +- + #ifndef ABS + # define ABS(x) (((x) >= 0) ? (x) : -(x)) + #endif +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch new file mode 100644 index 000000000..61a681f17 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch @@ -0,0 +1,78 @@ +From caf80e220b055dbce259078be96e899dc78ec1d2 Mon Sep 17 00:00:00 2001 +From: Bartosz Brachaczek <b.brachaczek@gmail.com> +Date: Tue, 12 Nov 2019 14:31:08 +0100 +Subject: [PATCH] Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 + +I verified that this function behaves as expected on x86_64, i386 with +32-bit time_t, and i386 with 64-bit time_t for the following values of +ntTtime: + +UNIX_EPOCH-1, UNIX_EPOCH, UNIX_EPOCH+1, UNIX_S32_MAX-1, UNIX_S32_MAX, +UNIX_S32_MAX+1, UNIX_S32_MAX*2+1 + +I did not verify whether the use of Div643264 is optimal, performance +wise. + +Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/387] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/lib/hgfs/hgfsUtil.c | 34 +++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 15 deletions(-) + +diff --git a/open-vm-tools/lib/hgfs/hgfsUtil.c b/open-vm-tools/lib/hgfs/hgfsUtil.c +index cc580ab8..49b10040 100644 +--- a/open-vm-tools/lib/hgfs/hgfsUtil.c ++++ b/open-vm-tools/lib/hgfs/hgfsUtil.c +@@ -110,23 +110,21 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format + uint64 ntTime) // IN: Time in Windows NT format + { + #ifdef __i386__ +- uint32 sec; +- uint32 nsec; ++ uint64 sec64; ++ uint32 sec32, nsec; ++#endif + + ASSERT(unixTime); +- /* We assume that time_t is 32bit */ +- ASSERT_ON_COMPILE(sizeof (unixTime->tv_sec) == 4); + +- /* Cap NT time values that are outside of Unix time's range */ ++ if (sizeof (unixTime->tv_sec) == 4) { ++ /* Cap NT time values that are outside of Unix time's range */ + +- if (ntTime >= UNIX_S32_MAX) { +- unixTime->tv_sec = 0x7FFFFFFF; +- unixTime->tv_nsec = 0; +- return 1; ++ if (ntTime >= UNIX_S32_MAX) { ++ unixTime->tv_sec = 0x7FFFFFFF; ++ unixTime->tv_nsec = 0; ++ return 1; ++ } + } +-#else +- ASSERT(unixTime); +-#endif + + if (ntTime < UNIX_EPOCH) { + unixTime->tv_sec = 0; +@@ -135,9 +133,15 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format + } + + #ifdef __i386__ +- Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec); +- unixTime->tv_sec = sec; +- unixTime->tv_nsec = nsec * 100; ++ if (sizeof (unixTime->tv_sec) == 4) { ++ Div643232(ntTime - UNIX_EPOCH, 10000000, &sec32, &nsec); ++ unixTime->tv_sec = sec32; ++ unixTime->tv_nsec = nsec * 100; ++ } else { ++ Div643264(ntTime - UNIX_EPOCH, 10000000, &sec64, &nsec); ++ unixTime->tv_sec = sec64; ++ unixTime->tv_nsec = nsec * 100; ++ } + #else + unixTime->tv_sec = (ntTime - UNIX_EPOCH) / 10000000; + unixTime->tv_nsec = ((ntTime - UNIX_EPOCH) % 10000000) * 100; diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch index 0736572b3..a711f5e5d 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch @@ -14,11 +14,9 @@ Signed-off-by: Martin Kelly <mkelly@xevo.com> open-vm-tools/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 325a39f5..713ea683 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -949,7 +949,7 @@ if test "$with_dnet" = "yes"; then +@@ -937,7 +937,7 @@ if test "$with_dnet" = "yes"; then AC_VMW_CHECK_LIB([dnet], [DNET], [], @@ -27,11 +25,11 @@ index 325a39f5..713ea683 100644 [], [dnet.h], [intf_open], -@@ -959,7 +959,7 @@ if test "$with_dnet" = "yes"; then +@@ -947,7 +947,7 @@ if test "$with_dnet" = "yes"; then if test $have_dnet = "no"; then AC_MSG_ERROR( -- [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) +- [dnet-config was not found on your PATH. Please configure without dnet or install dnet - http://libdnet.sourceforge.net]) + [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) fi fi diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch new file mode 100644 index 000000000..0f64eabc9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch @@ -0,0 +1,41 @@ +From fe56b67a2915a8632ea30604c14241f335dd3c15 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Nov 2019 10:49:46 -0800 +Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../lib/hgfsServer/hgfsServerLinux.c | 19 +++++-------------- + 1 file changed, 5 insertions(+), 14 deletions(-) + +diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +index 03175623..554da67f 100644 +--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +@@ -2561,20 +2561,11 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information + LOG(4, ("%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, + attr->specialPerms, attr->ownerPerms, attr->groupPerms, + attr->otherPerms, attr->size)); +-#ifdef __FreeBSD__ +-# if !defined(VM_X86_64) && __FreeBSD_version >= 500043 +-# define FMTTIMET "" +-# else +-# define FMTTIMET "l" +-# endif +-#else +-# define FMTTIMET "l" +-#endif +- LOG(4, ("access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" +- "attr: %"FMTTIMET"d/%"FMT64"u\n", +- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime, +- stats->st_ctime, attr->attrChangeTime)); +-#undef FMTTIMET ++ LOG(4, ("access: %jd/%"FMT64"u \nwrite: %jd/%"FMT64"u \n" ++ "attr: %jd/%"FMT64"u\n", ++ (intmax_t)stats->st_atime, attr->accessTime, ++ (intmax_t)stats->st_mtime, attr->writeTime, ++ (intmax_t)stats->st_ctime, attr->attrChangeTime)); + + attr->userId = stats->st_uid; + attr->groupId = stats->st_gid; diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch index 5c1aa7c40..9cf54f6f4 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch @@ -19,8 +19,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 7 files changed, 7 insertions(+), 7 deletions(-) rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) -diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index b41aa29d..8691309d 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -86,7 +86,7 @@ @@ -32,8 +30,6 @@ index b41aa29d..8691309d 100644 #include "log.h" #include "err.h" #include "hostinfo.h" -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c -index 7ea3b7f4..740c4fed 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c @@ -48,7 +48,7 @@ @@ -45,8 +41,6 @@ index 7ea3b7f4..740c4fed 100644 #include "mutexRankLib.h" #include "vm_basic_asm.h" #include "unicodeOperations.h" -diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h -index ec9b45aa..dc91e738 100644 --- a/open-vm-tools/lib/include/asyncsocket.h +++ b/open-vm-tools/lib/include/asyncsocket.h @@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; @@ -58,8 +52,6 @@ index ec9b45aa..dc91e738 100644 struct IVmdbPoll; typedef struct AsyncSocketPollParams { int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ -diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h -index 46442e55..8bc66997 100644 --- a/open-vm-tools/lib/include/pollImpl.h +++ b/open-vm-tools/lib/include/pollImpl.h @@ -44,7 +44,7 @@ @@ -71,24 +63,672 @@ index 46442e55..8bc66997 100644 #include "vm_basic_asm.h" #if defined(__cplusplus) -diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h -similarity index 99% -rename from open-vm-tools/lib/include/poll.h -rename to open-vm-tools/lib/include/vm_poll.h -index 6acd4f35..fbc88494 100644 --- a/open-vm-tools/lib/include/poll.h -+++ b/open-vm-tools/lib/include/vm_poll.h -@@ -60,7 +60,7 @@ extern "C" { - #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 - #include <sys/kernel.h> - #endif ++++ /dev/null +@@ -1,330 +0,0 @@ +-/********************************************************* +- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. +- * +- * This program is free software; you can redistribute it and/or modify it +- * under the terms of the GNU Lesser General Public License as published +- * by the Free Software Foundation version 2.1 and no later version. +- * +- * This program is distributed in the hope that it will be useful, but +- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +- * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public +- * License for more details. +- * +- * You should have received a copy of the GNU Lesser General Public License +- * along with this program; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +- * +- *********************************************************/ +- +-/********************************************************* +- * The contents of this file are subject to the terms of the Common +- * Development and Distribution License (the "License") version 1.0 +- * and no later version. You may not use this file except in +- * compliance with the License. +- * +- * You can obtain a copy of the License at +- * http://www.opensource.org/licenses/cddl1.php +- * +- * See the License for the specific language governing permissions +- * and limitations under the License. +- * +- *********************************************************/ +- +- +-#ifndef _POLL_H_ +-#define _POLL_H_ +- +-#define INCLUDE_ALLOW_USERLEVEL +-#define INCLUDE_ALLOW_VMCORE +-#include "includeCheck.h" +- +-#include "vm_basic_types.h" +-#include "vm_basic_defs.h" +-#include "vmware.h" +-#include "userlock.h" +- +-#if defined(__cplusplus) +-extern "C" { +-#endif +- +-#ifdef _WIN32 +-#define HZ 100 +-#elif defined linux +-#include <asm/param.h> +-#elif __APPLE__ +-#include <TargetConditionals.h> +-/* +- * Old SDKs don't define TARGET_OS_IPHONE at all. +- * New ones define it to 0 on Mac OS X, 1 on iOS. +- */ +-#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 +-#include <sys/kernel.h> +-#endif -#include <sys/poll.h> +-#define HZ 100 +-#endif +-#ifdef __ANDROID__ +-/* +- * <poll.h> of android should be included, but its name is same +- * with this file. So its content is put here to avoid conflict. +- */ +-#include <asm/poll.h> +-#define HZ 100 +-typedef unsigned int nfds_t; +-int poll(struct pollfd *, nfds_t, long); +-#endif +- +- +-/* +- * Poll event types: each type has a different reason for firing, +- * or condition that must be met before firing. +- */ +- +-typedef enum { +- /* +- * Actual Poll queue types against which you can register callbacks. +- */ +- POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ +- POLL_VTIME = 0, +- POLL_REALTIME, +- POLL_DEVICE, +- POLL_MAIN_LOOP, +- POLL_NUM_QUEUES +-} PollEventType; +- +- +-/* +- * Classes of events +- * +- * These are the predefined classes. More can be declared +- * with Poll_AllocClass(). +- */ +- +-typedef enum PollClass { +- POLL_CLASS_MAIN, +- POLL_CLASS_PAUSE, +- POLL_CLASS_IPC, +- POLL_CLASS_CPT, +- POLL_CLASS_MKS, +- POLL_FIXED_CLASSES, +- POLL_DEFAULT_FIXED_CLASSES, +- /* Size enum to maximum */ +- POLL_MAX_CLASSES = 31, +-} PollClass; +- +-/* +- * Do not use; Special pseudo private poll class supported by +- * PollDefault only +- */ +-#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES +-#define POLL_DEFAULT_CS_NET PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET) +- +-/* +- * Each callback is registered in a set of classes +- */ +- +-typedef struct PollClassSet { +- uintptr_t bits; +-} PollClassSet; +- +-/* An empty PollClassSet. */ +-static INLINE PollClassSet +-PollClassSet_Empty(void) +-{ +- PollClassSet set = { 0 }; +- return set; +-} +- +-/* A PollClassSet with the single member. */ +-static INLINE PollClassSet +-PollClassSet_Singleton(PollClass c) +-{ +- PollClassSet s = PollClassSet_Empty(); +- +- ASSERT_ON_COMPILE(POLL_MAX_CLASSES < sizeof s.bits * 8); +- ASSERT(c < POLL_MAX_CLASSES); +- +- s.bits = CONST3264U(1) << c; +- return s; +-} +- +-/* Combine two PollClassSets. */ +-static INLINE PollClassSet +-PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) +-{ +- PollClassSet set; +- set.bits = lhs.bits | rhs.bits; +- return set; +-} +- +-/* Add single class to PollClassSet. */ +-static INLINE PollClassSet +-PollClassSet_Include(PollClassSet set, PollClass c) +-{ +- return PollClassSet_Union(set, PollClassSet_Singleton(c)); +-} +- +- +-#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) +-#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ +- PollClassSet_Singleton(POLL_CLASS_PAUSE)) +-#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ +- PollClassSet_Singleton(POLL_CLASS_CPT)) +-#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ +- PollClassSet_Singleton(POLL_CLASS_IPC)) +-#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ +-#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) +-/* +- * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. +- */ +-#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) +- +-/* +- * Poll class-set taxonomy: +- * POLL_CS_MAIN +- * - Unless you NEED another class, use POLL_CS_MAIN. +- * POLL_CS_PAUSE +- * - For callbacks that must occur even if the guest is paused. +- * Most VMDB or Foundry commands are in this category. +- * POLL_CS_CPT +- * - Only for callbacks which can trigger intermediate Checkpoint +- * transitions. +- * The ONLY such callback is Migrate. +- * POLL_CS_IPC +- * - Only for callbacks which can contain Msg_(Post|Hint|Question) +- * responses, and for signal handlers (why)? +- * Vigor, VMDB, and Foundry can contain Msg_* responses. +- * POLL_CS_MKS +- * - Callback runs in MKS thread. +- * POLL_CS_ALWAYS +- * - Only for events that must be processed immediately. +- * The ONLY such callback is OvhdMemVmxSizeCheck. +- */ +- +- +-/* +- * Poll_Callback flags +- */ +- +-#define POLL_FLAG_PERIODIC 0x01 // keep after firing +-#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory +-#define POLL_FLAG_READ 0x04 // device is ready for reading +-#define POLL_FLAG_WRITE 0x08 // device is ready for writing +-#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket +-#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking +-#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events +-#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. +-#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl +-#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop +- +- +-typedef void (*PollerFunction)(void *clientData); +-typedef void (*PollerFireWrapper)(PollerFunction func, +- void *funcData, +- void *wrapperData); +-typedef Bool (*PollerErrorFn)(const char *errorStr); +- +-/* +- * Initialisers: +- * +- * For the sake of convenience, we declare the initialisers +- * for custom implmentations here, even though the actual +- * implementations are distinct from the core poll code. +- */ +- +-typedef struct PollOptions { +- Bool locked; // Use internal MXUser for locking +- Bool allowFullQueue; // Don't assert when device event queue is full. +- VThreadID windowsMsgThread; // thread that processes Windows messages +- PollerFireWrapper fireWrapperFn; // optional; may be useful for stats +- void *fireWrapperData; // optional +- PollerErrorFn errorFn; // optional; called upon unrecoverable error +-} PollOptions; +- +- +-void Poll_InitDefault(void); +-void Poll_InitDefaultEx(const PollOptions *opts); +-void Poll_InitGtk(void); // On top of glib for Linux +-void Poll_InitCF(void); // On top of CoreFoundation for OSX +- +- +-/* +- * Functions +- */ +-int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); +-void Poll_Loop(Bool loop, Bool *exit, PollClass c); +-void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); +-Bool Poll_LockingEnabled(void); +-void Poll_Exit(void); +- +- +-/* +- * Poll_Callback adds a callback regardless of whether an identical one exists. +- * The exception to this rule is POLL_DEVICE callbacks: there is a maximum of +- * one read and one write callback per fd. +- * +- * Poll_CallbackRemove removes one callback. If there are multiple identical +- * callbacks, which one is removed is an implementation detail. Note that in +- * the case of POLL_DEVICE and POLL_REALTIME callbacks, the fd/delay used to +- * create the callback is not specified when removing, so all callbacks +- * of those types with the same flags, function, and clientData are considered +- * "identical" even if their fd/delay differed. +- */ +- +-VMwareStatus Poll_Callback(PollClassSet classSet, +- int flags, +- PollerFunction f, +- void *clientData, +- PollEventType type, +- PollDevHandle info, // fd/microsec delay +- MXUserRecLock *lck); +-Bool Poll_CallbackRemove(PollClassSet classSet, +- int flags, +- PollerFunction f, +- void *clientData, +- PollEventType type); +-Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, +- int flags, +- PollerFunction f, +- PollEventType type, +- void **clientData); +- +-void Poll_NotifyChange(PollClassSet classSet); +- +-/* +- * Wrappers for Poll_Callback and Poll_CallbackRemove that present +- * simpler subsets of those interfaces. +- */ +- +-VMwareStatus Poll_CB_Device(PollerFunction f, +- void *clientData, +- PollDevHandle device, +- Bool periodic); +- +-Bool Poll_CB_DeviceRemove(PollerFunction f, +- void *clientData, +- Bool periodic); +- +- +-VMwareStatus Poll_CB_RTime(PollerFunction f, +- void *clientData, +- int64 delay, // microseconds +- Bool periodic, +- MXUserRecLock *lock); +- +-Bool Poll_CB_RTimeRemove(PollerFunction f, +- void *clientData, +- Bool periodic); +- +- +-#ifdef _WIN32 +-void Poll_SetPumpsWindowsMessages(Bool pumps); +-void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); +-Bool Poll_FireWndCallback(void *lparam); +-#endif +- +-#if defined(__cplusplus) +-} // extern "C" +-#endif +- +-#endif // _POLL_H_ +--- /dev/null ++++ b/open-vm-tools/lib/include/vm_poll.h +@@ -0,0 +1,330 @@ ++/********************************************************* ++ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation version 2.1 and no later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public ++ * License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ *********************************************************/ ++ ++/********************************************************* ++ * The contents of this file are subject to the terms of the Common ++ * Development and Distribution License (the "License") version 1.0 ++ * and no later version. You may not use this file except in ++ * compliance with the License. ++ * ++ * You can obtain a copy of the License at ++ * http://www.opensource.org/licenses/cddl1.php ++ * ++ * See the License for the specific language governing permissions ++ * and limitations under the License. ++ * ++ *********************************************************/ ++ ++ ++#ifndef _POLL_H_ ++#define _POLL_H_ ++ ++#define INCLUDE_ALLOW_USERLEVEL ++#define INCLUDE_ALLOW_VMCORE ++#include "includeCheck.h" ++ ++#include "vm_basic_types.h" ++#include "vm_basic_defs.h" ++#include "vmware.h" ++#include "userlock.h" ++ ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ ++#ifdef _WIN32 ++#define HZ 100 ++#elif defined linux ++#include <asm/param.h> ++#elif __APPLE__ ++#include <TargetConditionals.h> ++/* ++ * Old SDKs don't define TARGET_OS_IPHONE at all. ++ * New ones define it to 0 on Mac OS X, 1 on iOS. ++ */ ++#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 ++#include <sys/kernel.h> ++#endif +#include <poll.h> - #define HZ 100 - #endif - #ifdef __ANDROID__ -diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c -index 8eea7d86..c48f5be2 100644 ++#define HZ 100 ++#endif ++#ifdef __ANDROID__ ++/* ++ * <poll.h> of android should be included, but its name is same ++ * with this file. So its content is put here to avoid conflict. ++ */ ++#include <asm/poll.h> ++#define HZ 100 ++typedef unsigned int nfds_t; ++int poll(struct pollfd *, nfds_t, long); ++#endif ++ ++ ++/* ++ * Poll event types: each type has a different reason for firing, ++ * or condition that must be met before firing. ++ */ ++ ++typedef enum { ++ /* ++ * Actual Poll queue types against which you can register callbacks. ++ */ ++ POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ ++ POLL_VTIME = 0, ++ POLL_REALTIME, ++ POLL_DEVICE, ++ POLL_MAIN_LOOP, ++ POLL_NUM_QUEUES ++} PollEventType; ++ ++ ++/* ++ * Classes of events ++ * ++ * These are the predefined classes. More can be declared ++ * with Poll_AllocClass(). ++ */ ++ ++typedef enum PollClass { ++ POLL_CLASS_MAIN, ++ POLL_CLASS_PAUSE, ++ POLL_CLASS_IPC, ++ POLL_CLASS_CPT, ++ POLL_CLASS_MKS, ++ POLL_FIXED_CLASSES, ++ POLL_DEFAULT_FIXED_CLASSES, ++ /* Size enum to maximum */ ++ POLL_MAX_CLASSES = 31, ++} PollClass; ++ ++/* ++ * Do not use; Special pseudo private poll class supported by ++ * PollDefault only ++ */ ++#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES ++#define POLL_DEFAULT_CS_NET PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET) ++ ++/* ++ * Each callback is registered in a set of classes ++ */ ++ ++typedef struct PollClassSet { ++ uintptr_t bits; ++} PollClassSet; ++ ++/* An empty PollClassSet. */ ++static INLINE PollClassSet ++PollClassSet_Empty(void) ++{ ++ PollClassSet set = { 0 }; ++ return set; ++} ++ ++/* A PollClassSet with the single member. */ ++static INLINE PollClassSet ++PollClassSet_Singleton(PollClass c) ++{ ++ PollClassSet s = PollClassSet_Empty(); ++ ++ ASSERT_ON_COMPILE(POLL_MAX_CLASSES < sizeof s.bits * 8); ++ ASSERT(c < POLL_MAX_CLASSES); ++ ++ s.bits = CONST3264U(1) << c; ++ return s; ++} ++ ++/* Combine two PollClassSets. */ ++static INLINE PollClassSet ++PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) ++{ ++ PollClassSet set; ++ set.bits = lhs.bits | rhs.bits; ++ return set; ++} ++ ++/* Add single class to PollClassSet. */ ++static INLINE PollClassSet ++PollClassSet_Include(PollClassSet set, PollClass c) ++{ ++ return PollClassSet_Union(set, PollClassSet_Singleton(c)); ++} ++ ++ ++#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) ++#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ ++ PollClassSet_Singleton(POLL_CLASS_PAUSE)) ++#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ ++ PollClassSet_Singleton(POLL_CLASS_CPT)) ++#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ ++ PollClassSet_Singleton(POLL_CLASS_IPC)) ++#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ ++#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) ++/* ++ * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. ++ */ ++#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) ++ ++/* ++ * Poll class-set taxonomy: ++ * POLL_CS_MAIN ++ * - Unless you NEED another class, use POLL_CS_MAIN. ++ * POLL_CS_PAUSE ++ * - For callbacks that must occur even if the guest is paused. ++ * Most VMDB or Foundry commands are in this category. ++ * POLL_CS_CPT ++ * - Only for callbacks which can trigger intermediate Checkpoint ++ * transitions. ++ * The ONLY such callback is Migrate. ++ * POLL_CS_IPC ++ * - Only for callbacks which can contain Msg_(Post|Hint|Question) ++ * responses, and for signal handlers (why)? ++ * Vigor, VMDB, and Foundry can contain Msg_* responses. ++ * POLL_CS_MKS ++ * - Callback runs in MKS thread. ++ * POLL_CS_ALWAYS ++ * - Only for events that must be processed immediately. ++ * The ONLY such callback is OvhdMemVmxSizeCheck. ++ */ ++ ++ ++/* ++ * Poll_Callback flags ++ */ ++ ++#define POLL_FLAG_PERIODIC 0x01 // keep after firing ++#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory ++#define POLL_FLAG_READ 0x04 // device is ready for reading ++#define POLL_FLAG_WRITE 0x08 // device is ready for writing ++#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket ++#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking ++#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events ++#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. ++#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl ++#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop ++ ++ ++typedef void (*PollerFunction)(void *clientData); ++typedef void (*PollerFireWrapper)(PollerFunction func, ++ void *funcData, ++ void *wrapperData); ++typedef Bool (*PollerErrorFn)(const char *errorStr); ++ ++/* ++ * Initialisers: ++ * ++ * For the sake of convenience, we declare the initialisers ++ * for custom implmentations here, even though the actual ++ * implementations are distinct from the core poll code. ++ */ ++ ++typedef struct PollOptions { ++ Bool locked; // Use internal MXUser for locking ++ Bool allowFullQueue; // Don't assert when device event queue is full. ++ VThreadID windowsMsgThread; // thread that processes Windows messages ++ PollerFireWrapper fireWrapperFn; // optional; may be useful for stats ++ void *fireWrapperData; // optional ++ PollerErrorFn errorFn; // optional; called upon unrecoverable error ++} PollOptions; ++ ++ ++void Poll_InitDefault(void); ++void Poll_InitDefaultEx(const PollOptions *opts); ++void Poll_InitGtk(void); // On top of glib for Linux ++void Poll_InitCF(void); // On top of CoreFoundation for OSX ++ ++ ++/* ++ * Functions ++ */ ++int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); ++void Poll_Loop(Bool loop, Bool *exit, PollClass c); ++void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); ++Bool Poll_LockingEnabled(void); ++void Poll_Exit(void); ++ ++ ++/* ++ * Poll_Callback adds a callback regardless of whether an identical one exists. ++ * The exception to this rule is POLL_DEVICE callbacks: there is a maximum of ++ * one read and one write callback per fd. ++ * ++ * Poll_CallbackRemove removes one callback. If there are multiple identical ++ * callbacks, which one is removed is an implementation detail. Note that in ++ * the case of POLL_DEVICE and POLL_REALTIME callbacks, the fd/delay used to ++ * create the callback is not specified when removing, so all callbacks ++ * of those types with the same flags, function, and clientData are considered ++ * "identical" even if their fd/delay differed. ++ */ ++ ++VMwareStatus Poll_Callback(PollClassSet classSet, ++ int flags, ++ PollerFunction f, ++ void *clientData, ++ PollEventType type, ++ PollDevHandle info, // fd/microsec delay ++ MXUserRecLock *lck); ++Bool Poll_CallbackRemove(PollClassSet classSet, ++ int flags, ++ PollerFunction f, ++ void *clientData, ++ PollEventType type); ++Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, ++ int flags, ++ PollerFunction f, ++ PollEventType type, ++ void **clientData); ++ ++void Poll_NotifyChange(PollClassSet classSet); ++ ++/* ++ * Wrappers for Poll_Callback and Poll_CallbackRemove that present ++ * simpler subsets of those interfaces. ++ */ ++ ++VMwareStatus Poll_CB_Device(PollerFunction f, ++ void *clientData, ++ PollDevHandle device, ++ Bool periodic); ++ ++Bool Poll_CB_DeviceRemove(PollerFunction f, ++ void *clientData, ++ Bool periodic); ++ ++ ++VMwareStatus Poll_CB_RTime(PollerFunction f, ++ void *clientData, ++ int64 delay, // microseconds ++ Bool periodic, ++ MXUserRecLock *lock); ++ ++Bool Poll_CB_RTimeRemove(PollerFunction f, ++ void *clientData, ++ Bool periodic); ++ ++ ++#ifdef _WIN32 ++void Poll_SetPumpsWindowsMessages(Bool pumps); ++void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); ++Bool Poll_FireWndCallback(void *lparam); ++#endif ++ ++#if defined(__cplusplus) ++} // extern "C" ++#endif ++ ++#endif // _POLL_H_ --- a/open-vm-tools/lib/rpcIn/rpcin.c +++ b/open-vm-tools/lib/rpcIn/rpcin.c @@ -57,7 +57,7 @@ @@ -100,16 +740,3 @@ index 8eea7d86..c48f5be2 100644 # include "asyncsocket.h" # include "vmci_defs.h" #include "dataMap.h" -diff --git a/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c b/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c -index 03700937..f0b49ad7 100644 ---- a/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c -+++ b/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c -@@ -48,7 +48,7 @@ - #include "rpcout.h" - #include "rabbitmqProxyConst.h" - #include "vm_basic_types.h" --#include "poll.h" -+#include "vm_poll.h" - #ifdef OPEN_VM_TOOLS - #include "vmci_sockets.h" - #include "sslDirect.h" diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch index 88f4f694c..3e4753b2a 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch @@ -14,18 +14,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> open-vm-tools/lib/misc/util_misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/open-vm-tools/lib/misc/util_misc.c b/open-vm-tools/lib/misc/util_misc.c -index 198c23d2..0ac0a335 100644 --- a/open-vm-tools/lib/misc/util_misc.c +++ b/open-vm-tools/lib/misc/util_misc.c -@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN file path to expand +@@ -719,7 +719,7 @@ Util_ExpandString(const char *fileName) ASSERT(!freeChunk[i]); chunks[i] = expand; if (chunks[i] == NULL) { -- Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n", -- __FUNCTION__, expand, fileName); +- Log("%s: Cannot allocate memory to expand $ in \"%s\".\n", + Log("%s: Cannot allocate memory to expand in \"%s\".\n", -+ __FUNCTION__, fileName); + __FUNCTION__, fileName); goto out; } - chunkSize[i] = strlen(expand); diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0014-Fix-new-warnings-from-gcc9.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0014-Fix-new-warnings-from-gcc9.patch deleted file mode 100644 index b5ccffd14..000000000 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0014-Fix-new-warnings-from-gcc9.patch +++ /dev/null @@ -1,1281 +0,0 @@ -From af9eca8689c97ea8e792902b458a31608286655e Mon Sep 17 00:00:00 2001 -From: Martin Jansa <martin.jansa@lge.com> -Date: Thu, 13 Jun 2019 16:01:03 +0000 -Subject: [PATCH] Fix new warnings from gcc9 - -Imported from Fedora: -https://src.fedoraproject.org/rpms/open-vm-tools/raw/master/f/gcc9-warnings.patch - -Upstream bug: -https://github.com/vmware/open-vm-tools/issues/330 - -Upstream-Status: Pending ---- - open-vm-tools/hgfsmounter/hgfsmounter.c | 14 +- - open-vm-tools/lib/hgfsServer/hgfsServer.c | 24 ++- - open-vm-tools/vmhgfs-fuse/dir.c | 175 ++++++++--------- - open-vm-tools/vmhgfs-fuse/file.c | 217 +++++++++++++--------- - open-vm-tools/vmhgfs-fuse/filesystem.c | 46 ++--- - open-vm-tools/vmhgfs-fuse/fsutil.c | 63 ++++--- - open-vm-tools/vmhgfs-fuse/link.c | 125 +++++++------ - 7 files changed, 367 insertions(+), 297 deletions(-) - -diff --git a/open-vm-tools/hgfsmounter/hgfsmounter.c b/open-vm-tools/hgfsmounter/hgfsmounter.c -index 0921b700..3f6798dc 100644 ---- a/open-vm-tools/hgfsmounter/hgfsmounter.c -+++ b/open-vm-tools/hgfsmounter/hgfsmounter.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2006-2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -514,11 +514,13 @@ ParseFmask(const char *option, // IN: option string along with value - HgfsMountInfo *mountInfo, // OUT: mount data - int *flags) // OUT: mount flags - { -+ unsigned short fmask = 0; - ASSERT(option); - ASSERT(mountInfo); - -- if (ParseMask(option, &mountInfo->fmask)) { -- LOG("Setting mount fmask to %o\n", mountInfo->fmask); -+ if (ParseMask(option, &fmask)) { -+ LOG("Setting mount fmask to %o\n", fmask); -+ mountInfo->fmask = fmask; - return TRUE; - } - -@@ -548,11 +550,13 @@ ParseDmask(const char *option, // IN: option string along with value - HgfsMountInfo *mountInfo, // OUT: mount data - int *flags) // OUT: mount flags - { -+ unsigned short dmask = 0; - ASSERT(option); - ASSERT(mountInfo); - -- if (ParseMask(option, &mountInfo->dmask)) { -- LOG("Setting mount dmask to %o\n", mountInfo->dmask); -+ if (ParseMask(option, &dmask)) { -+ LOG("Setting mount dmask to %o\n", dmask); -+ mountInfo->dmask = dmask; - return TRUE; - } - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c -index 740c4fed..422383cd 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServer.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -+ * Copyright (C) 1998-2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -159,7 +159,7 @@ struct HgfsTransportSessionInfo { - HgfsServerChannelData channelCapabilities; - }; - --/* The input request paramaters object. */ -+/* The input request parameters object. */ - typedef struct HgfsInputParam { - const void *request; /* Hgfs header followed by operation request */ - size_t requestSize; /* Size of Hgfs header and operation request */ -@@ -2682,8 +2682,8 @@ HgfsSearchHandle2Search(HgfsHandle handle, // IN: handle - * None - * - * Side effects: -- * If there isnt enough memory to accomodate the new names, those file nodes -- * that couldnt be updated are deleted. -+ * If there isn't enough memory to accommodate the new names, those file nodes -+ * that couldn't be updated are deleted. - * - *----------------------------------------------------------------------------- - */ -@@ -3399,7 +3399,7 @@ HgfsServerSessionReceive(HgfsPacket *packet, // IN: Hgfs Packet - - /* Send error if we fail to process the op. */ - if (HGFS_ERROR_SUCCESS != status) { -- LOG(4, ("Error %d occured parsing the packet\n", (uint32)status)); -+ LOG(4, ("Error %d occurred parsing the packet\n", (uint32)status)); - HgfsServerCompleteRequest(status, 0, input); - } - } -@@ -4131,7 +4131,7 @@ HgfsServerSetSessionCapability(HgfsOp op, // IN: operation code - result = TRUE; - } - } -- LOG(4, ("%s: Setting capabilitiy flags %x for op code %d %s\n", -+ LOG(4, ("%s: Setting capability flags %x for op code %d %s\n", - __FUNCTION__, flags, op, result ? "succeeded" : "failed")); - - return result; -@@ -4143,7 +4143,7 @@ HgfsServerSetSessionCapability(HgfsOp op, // IN: operation code - * - * HgfsServerResEnumInit -- - * -- * Initialize an enumeration of all exisitng resources. -+ * Initialize an enumeration of all existing resources. - * - * Results: - * The enumeration state object. -@@ -4239,7 +4239,7 @@ HgfsServerResEnumExit(void *enumState) // IN/OUT: enumeration state - * - * HgfsServerEnumerateSharedFolders -- - * -- * Enumerates all exisitng shared folders and registers shared folders with -+ * Enumerates all existing shared folders and registers shared folders with - * directory notification package. - * - * Results: -@@ -6536,11 +6536,13 @@ HgfsServerRead(HgfsInputParam *input) // IN: Input params - payload = &reply->payload[0]; - } - if (payload) { -+ uint32 actualSize = 0; - status = HgfsPlatformReadFile(readFd, input->session, offset, - requiredSize, payload, -- &reply->actualSize); -+ &actualSize); - if (HGFS_ERROR_SUCCESS == status) { - reply->reserved = 0; -+ reply->actualSize = actualSize; - replyPayloadSize = sizeof *reply; - - if (readUseDataBuffer) { -@@ -6556,11 +6558,13 @@ HgfsServerRead(HgfsInputParam *input) // IN: Input params - break; - } - case HGFS_OP_READ: { -+ uint32 actualSize = 0; - HgfsReplyRead *reply = replyRead; - - status = HgfsPlatformReadFile(readFd, input->session, offset, requiredSize, -- reply->payload, &reply->actualSize); -+ reply->payload, &actualSize); - if (HGFS_ERROR_SUCCESS == status) { -+ reply->actualSize = actualSize; - replyPayloadSize = sizeof *reply + reply->actualSize; - } else { - LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status)); -diff --git a/open-vm-tools/vmhgfs-fuse/dir.c b/open-vm-tools/vmhgfs-fuse/dir.c -index 6298a4ea..e71b7afd 100644 ---- a/open-vm-tools/vmhgfs-fuse/dir.c -+++ b/open-vm-tools/vmhgfs-fuse/dir.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2013 VMware, Inc. All rights reserved. -+ * Copyright (C) 2013,2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -54,38 +54,53 @@ HgfsPackDirOpenRequest(const char *path, // IN: Path of the dir to open - HgfsOp opUsed, // IN: Op to be used - HgfsReq *req) // IN/OUT: Packet to write into - { -- char *name; -- unsigned int *nameLength = NULL; - size_t reqSize; -- int result; - - ASSERT(path); - ASSERT(req); - LOG(4, ("Path = %s \n", path)); - switch (opUsed) { - case HGFS_OP_SEARCH_OPEN_V3: { -+ int result; - HgfsRequestSearchOpenV3 *requestV3 = HgfsGetRequestPayload(req); - -- /* We'll use these later. */ -- name = requestV3->dirName.name; -- nameLength = &requestV3->dirName.length; - requestV3->dirName.flags = 0; - requestV3->dirName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; - requestV3->dirName.fid = HGFS_INVALID_HANDLE; - requestV3->reserved = 0; - reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ requestV3->dirName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed\n")); -+ return -EINVAL; -+ } -+ LOG(4, ("After conversion = %s\n", requestV3->dirName.name)); -+ requestV3->dirName.length = result; -+ reqSize += result; - break; - } - - case HGFS_OP_SEARCH_OPEN: { -+ int result; - HgfsRequestSearchOpen *request; - - request = (HgfsRequestSearchOpen *)(HGFS_REQ_PAYLOAD(req)); - -- /* We'll use these later. */ -- name = request->dirName.name; -- nameLength = &request->dirName.length; - reqSize = sizeof *request; -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ request->dirName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed\n")); -+ return -EINVAL; -+ } -+ LOG(4, ("After conversion = %s\n", request->dirName.name)); -+ request->dirName.length = result; -+ reqSize += result; - break; - } - -@@ -94,21 +109,7 @@ HgfsPackDirOpenRequest(const char *path, // IN: Path of the dir to open - return -EPROTO; - } - -- /* Convert to CP name. */ -- -- LOG(4, ("After buildPath = %s\n", path)); -- result = CPName_ConvertTo(path, -- HGFS_LARGE_PACKET_MAX - (reqSize - 1), -- name); -- if (result < 0) { -- LOG(4, ("CP conversion failed\n")); -- return -EINVAL; -- } -- -- LOG(4, ("After conversion = %s\n", name)); -- -- *nameLength = (uint32) result; -- req->payloadSize = reqSize + result; -+ req->payloadSize = reqSize; - - /* Fill in header here as payloadSize needs to be there. */ - HgfsPackHeader(req, opUsed); -@@ -149,7 +150,6 @@ HgfsDirOpen(const char* path, // IN: Path of dir to open - int result; - HgfsOp opUsed; - HgfsStatus replyStatus; -- HgfsHandle *replySearch; - - ASSERT(path); - req = HgfsGetNewRequest(); -@@ -161,16 +161,6 @@ HgfsDirOpen(const char* path, // IN: Path of dir to open - - retry: - opUsed = hgfsVersionSearchOpen; -- if (opUsed == HGFS_OP_SEARCH_OPEN_V3) { -- HgfsReplySearchOpenV3 *requestV3 = HgfsGetReplyPayload(req); -- -- replySearch = &requestV3->search; -- -- } else { -- HgfsReplySearchOpen *request = (HgfsReplySearchOpen *)HGFS_REQ_PAYLOAD(req); -- -- replySearch = &request->search; -- } - - result = HgfsPackDirOpenRequest(path, opUsed, req); - if (result != 0) { -@@ -187,8 +177,14 @@ retry: - - switch (result) { - case 0: -- *handle = *replySearch; -- LOG(6, ("Set handle to %u\n", *replySearch)); -+ if (opUsed == HGFS_OP_SEARCH_OPEN_V3) { -+ HgfsReplySearchOpenV3 *requestV3 = HgfsGetReplyPayload(req); -+ *handle = requestV3->search; -+ } else { -+ HgfsReplySearchOpen *request = (HgfsReplySearchOpen *)HGFS_REQ_PAYLOAD(req); -+ *handle = request->search; -+ } -+ LOG(6, ("Set handle to %u\n", *handle)); - break; - case -EPROTO: - /* Retry with older version(s). Set globally. */ -@@ -626,25 +622,30 @@ HgfsPackCreateDirRequest(const char *path, - HgfsOp opUsed, // IN: Op to be used. - HgfsReq *req) // IN/OUT: Packet to write into - { -- char *fileName = NULL; -- uint32 *fileNameLength; - size_t reqSize; -- int result; -+ - - ASSERT(req); - - switch (opUsed) { - case HGFS_OP_CREATE_DIR_V3: { -+ int result; - HgfsRequestCreateDirV3 *requestV3 = HgfsGetRequestPayload(req); - - reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); -- /* We'll use these later. */ -- fileName = requestV3->fileName.name; -- fileNameLength = &requestV3->fileName.length; - requestV3->fileName.flags = 0; - requestV3->fileName.fid = HGFS_INVALID_HANDLE; - requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; -- -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ requestV3->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ requestV3->fileName.length = result; -+ reqSize += result; - requestV3->mask = HGFS_CREATE_DIR_MASK; - - /* Set permissions. */ -@@ -656,15 +657,23 @@ HgfsPackCreateDirRequest(const char *path, - break; - } - case HGFS_OP_CREATE_DIR_V2: { -+ int result; - HgfsRequestCreateDirV2 *requestV2; - - requestV2 = (HgfsRequestCreateDirV2 *)(HGFS_REQ_PAYLOAD(req)); - -- /* We'll use these later. */ -- fileName = requestV2->fileName.name; -- fileNameLength = &requestV2->fileName.length; - reqSize = sizeof *requestV2; - -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ requestV2->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ requestV2->fileName.length = result; -+ reqSize += result; - requestV2->mask = HGFS_CREATE_DIR_MASK; - - /* Set permissions. */ -@@ -675,15 +684,22 @@ HgfsPackCreateDirRequest(const char *path, - break; - } - case HGFS_OP_CREATE_DIR: { -+ int result; - HgfsRequestCreateDir *request; - - request = (HgfsRequestCreateDir *)(HGFS_REQ_PAYLOAD(req)); - -- /* We'll use these later. */ -- fileName = request->fileName.name; -- fileNameLength = &request->fileName.length; - reqSize = sizeof *request; -- -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ request->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ request->fileName.length = result; -+ reqSize += result; - /* Set permissions. */ - request->permissions = (permsMode & S_IRWXU) >> 6; - break; -@@ -693,18 +709,7 @@ HgfsPackCreateDirRequest(const char *path, - return -EPROTO; - } - -- -- /* Convert to CP name. */ -- result = CPName_ConvertTo(path, -- HGFS_LARGE_PACKET_MAX - (reqSize - 1), -- fileName); -- if (result < 0) { -- LOG(4, ("CP conversion failed.\n")); -- return -EINVAL; -- } -- -- *fileNameLength = result; -- req->payloadSize = reqSize + result; -+ req->payloadSize = reqSize; - - /* Fill in header here as payloadSize needs to be there. */ - HgfsPackHeader(req, opUsed); -@@ -827,8 +832,6 @@ HgfsDelete(const char* path, // IN: Path to file - HgfsReq *req = NULL; - int result = 0; - HgfsStatus replyStatus; -- char *fileName = NULL; -- uint32 *fileNameLength; - uint32 reqSize; - HgfsOp opUsed; - HgfsAttrInfo newAttr = {0}; -@@ -862,8 +865,17 @@ HgfsDelete(const char* path, // IN: Path to file - - reqSize = sizeof(*request) + HgfsGetRequestHeaderSize(); - request->hints = 0; -- fileName = request->fileName.name; -- fileNameLength = &request->fileName.length; -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize), -+ request->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ request->fileName.length = result; -+ reqSize += result; - request->fileName.fid = HGFS_INVALID_HANDLE; - request->fileName.flags = 0; - request->fileName.caseType = HGFS_FILE_NAME_DEFAULT_CASE; -@@ -874,24 +886,21 @@ HgfsDelete(const char* path, // IN: Path to file - - request = (HgfsRequestDelete *)(HGFS_REQ_PAYLOAD(req)); - /* Fill out the request packet. */ -- fileName = request->fileName.name; -- fileNameLength = &request->fileName.length; - reqSize = sizeof *request; -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize), -+ request->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ request->fileName.length = result; -+ reqSize += result; - } - -- -- /* Convert to CP name. */ -- result = CPName_ConvertTo(path, -- HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize), -- fileName); -- if (result < 0) { -- LOG(4, ("CP conversion failed.\n")); -- result = -EINVAL; -- goto out; -- } -- -- *fileNameLength = result; -- req->payloadSize = reqSize + result; -+ req->payloadSize = reqSize; - - /* Fill in header here as payloadSize needs to be there. */ - HgfsPackHeader(req, opUsed); -diff --git a/open-vm-tools/vmhgfs-fuse/file.c b/open-vm-tools/vmhgfs-fuse/file.c -index 389ebba8..0b6c48bc 100644 ---- a/open-vm-tools/vmhgfs-fuse/file.c -+++ b/open-vm-tools/vmhgfs-fuse/file.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2013,2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2013,2018-2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -66,10 +66,7 @@ HgfsPackOpenRequest(const char *path, // IN: Path to file - HgfsOp opUsed, // IN: Op to use - HgfsReq *req) // IN/OUT: Packet to write into - { -- char *name; -- uint32 *nameLength; - size_t reqSize; -- int result; - int openMode, openFlags; - - ASSERT(path); -@@ -88,14 +85,22 @@ HgfsPackOpenRequest(const char *path, // IN: Path to file - - switch (opUsed) { - case HGFS_OP_OPEN_V3: { -+ int result; - HgfsRequestOpenV3 *requestV3 = HgfsGetRequestPayload(req); - - reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); - -- /* We'll use these later. */ -- name = requestV3->fileName.name; -- nameLength = &requestV3->fileName.length; -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ requestV3->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } - -+ requestV3->fileName.length = result; -+ reqSize += result; - /* Linux clients need case-sensitive lookups. */ - requestV3->fileName.flags = 0; - requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; -@@ -122,15 +127,24 @@ HgfsPackOpenRequest(const char *path, // IN: Path to file - } - - case HGFS_OP_OPEN_V2: { -+ int result; - HgfsRequestOpenV2 *requestV2; - - requestV2 = (HgfsRequestOpenV2 *)(HGFS_REQ_PAYLOAD(req)); - -- /* We'll use these later. */ -- name = requestV2->fileName.name; -- nameLength = &requestV2->fileName.length; - reqSize = sizeof *requestV2; - -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ requestV2->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ -+ requestV2->fileName.length = result; -+ reqSize += result; - requestV2->mask = mask; - requestV2->mode = openMode; - requestV2->flags = openFlags; -@@ -148,14 +162,23 @@ HgfsPackOpenRequest(const char *path, // IN: Path to file - break; - } - case HGFS_OP_OPEN: { -+ int result; - HgfsRequestOpen *request; - - request = (HgfsRequestOpen *)(HGFS_REQ_PAYLOAD(req)); -- /* We'll use these later. */ -- name = request->fileName.name; -- nameLength = &request->fileName.length; - reqSize = sizeof *request; - -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (reqSize - 1), -+ request->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ -+ request->fileName.length = result; -+ reqSize += result; - request->mode = openMode; - request->flags = openFlags; - -@@ -168,18 +191,7 @@ HgfsPackOpenRequest(const char *path, // IN: Path to file - return -EPROTO; - } - -- -- /* Convert to CP name. */ -- result = CPName_ConvertTo(path, -- HGFS_LARGE_PACKET_MAX - (reqSize - 1), -- name); -- if (result < 0) { -- LOG(4, ("CP conversion failed.\n")); -- return -EINVAL; -- } -- -- *nameLength = (uint32) result; -- req->payloadSize = reqSize + result; -+ req->payloadSize = reqSize; - - /* Fill in header here as payloadSize needs to be there. */ - HgfsPackHeader(req, opUsed); -@@ -915,10 +927,6 @@ int - HgfsRename(const char* from, const char* to) - { - HgfsReq *req = NULL; -- char *oldName; -- char *newName; -- uint32 *oldNameLength; -- uint32 *newNameLength; - int result = 0; - uint32 reqSize; - HgfsOp opUsed; -@@ -942,33 +950,41 @@ retry: - if (opUsed == HGFS_OP_RENAME_V3) { - HgfsRequestRenameV3 *requestV3 = HgfsGetRequestPayload(req); - -- oldName = requestV3->oldName.name; -- oldNameLength = &requestV3->oldName.length; - requestV3->hints = 0; - requestV3->oldName.flags = 0; - requestV3->oldName.fid = HGFS_INVALID_HANDLE; - requestV3->oldName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; - requestV3->reserved = 0; - reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); -+ /* Convert old name to CP format. */ -+ result = CPName_ConvertTo(from, -+ HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize), -+ requestV3->oldName.name); -+ if (result < 0) { -+ LOG(4, ("oldName CP conversion failed\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ -+ requestV3->oldName.length = result; -+ reqSize += result; - } else { - HgfsRequestRename *request = (HgfsRequestRename *)HGFS_REQ_PAYLOAD(req); - -- oldName = request->oldName.name; -- oldNameLength = &request->oldName.length; - reqSize = sizeof *request; -- } -- /* Convert old name to CP format. */ -- result = CPName_ConvertTo(from, -- HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize), -- oldName); -- if (result < 0) { -- LOG(4, ("oldName CP conversion failed\n")); -- result = -EINVAL; -- goto out; -- } -+ /* Convert old name to CP format. */ -+ result = CPName_ConvertTo(from, -+ HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize), -+ request->oldName.name); -+ if (result < 0) { -+ LOG(4, ("oldName CP conversion failed\n")); -+ result = -EINVAL; -+ goto out; -+ } - -- *oldNameLength = result; -- reqSize += result; -+ request->oldName.length = result; -+ reqSize += result; -+ } - - /* - * Build full new name to send to server. -@@ -983,8 +999,20 @@ retry: - - newNameP = (HgfsFileNameV3 *)((char *)&requestV3->oldName + - sizeof requestV3->oldName + result); -- newName = newNameP->name; -- newNameLength = &newNameP->length; -+ -+ LOG(6, ("New name: \"%s\"\n", newNameP->name)); -+ -+ /* Convert new name to CP format. */ -+ result = CPName_ConvertTo(to, -+ HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize) - result, -+ newNameP->name); -+ if (result < 0) { -+ LOG(4, ("newName CP conversion failed\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ newNameP->length = result; -+ reqSize += result; - newNameP->flags = 0; - newNameP->fid = HGFS_INVALID_HANDLE; - newNameP->caseType = HGFS_FILE_NAME_CASE_SENSITIVE; -@@ -993,24 +1021,22 @@ retry: - HgfsFileName *newNameP; - newNameP = (HgfsFileName *)((char *)&request->oldName + - sizeof request->oldName + result); -- newName = newNameP->name; -- newNameLength = &newNameP->length; -- } - -- LOG(6, ("New name: \"%s\"\n", newName)); -+ LOG(6, ("New name: \"%s\"\n", newNameP->name)); - -- /* Convert new name to CP format. */ -- result = CPName_ConvertTo(to, -- HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize) - result, -- newName); -- if (result < 0) { -- LOG(4, ("newName CP conversion failed\n")); -- result = -EINVAL; -- goto out; -+ /* Convert new name to CP format. */ -+ result = CPName_ConvertTo(to, -+ HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize) - result, -+ newNameP->name); -+ if (result < 0) { -+ LOG(4, ("newName CP conversion failed\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ newNameP->length = result; -+ reqSize += result; - } - -- *newNameLength = result; -- reqSize += result; - req->payloadSize = reqSize; - - /* Fill in header here as payloadSize needs to be there. */ -@@ -1068,7 +1094,7 @@ retry: - } - break; - default: -- LOG(4, ("failed with result %d\n", result)); -+ LOG(4, ("Server protocol result %d\n", result)); - } - break; - default: -@@ -1109,21 +1135,17 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - { - HgfsAttrV2 *attrV2; - HgfsAttr *attrV1; -- HgfsAttrHint *hints; - HgfsAttrChanges *update; -- char *fileName = NULL; -- uint32 *fileNameLength = NULL; - size_t reqBufferSize; - size_t reqSize; -- int result = 0; - ASSERT(req); - - switch (opUsed) { - case HGFS_OP_SETATTR_V3: { -+ int result; - HgfsRequestSetattrV3 *requestV3 = HgfsGetRequestPayload(req); - - attrV2 = &requestV3->attr; -- hints = &requestV3->hints; - - /* - * Clear attributes, mask, and hints before touching them. -@@ -1131,7 +1153,7 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - * make sure to zero them all here. - */ - memset(attrV2, 0, sizeof *attrV2); -- memset(hints, 0, sizeof *hints); -+ requestV3->hints = 0; - - /* - * When possible, issue a setattr using an existing handle. This will -@@ -1143,14 +1165,21 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - * the times also requires write permissions on Windows, so we require it - * here too. Otherwise, any handle will do. - */ -- fileName = requestV3->fileName.name; -- fileNameLength = &requestV3->fileName.length; - requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; - requestV3->fileName.fid = HGFS_INVALID_HANDLE; - requestV3->fileName.flags = 0; - requestV3->reserved = 0; - reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); - reqBufferSize = HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize); -+ result = CPName_ConvertTo(path, -+ reqBufferSize, -+ requestV3->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ requestV3->fileName.length = result; -+ reqSize += result; - - attrV2->mask = attr->mask; - if (attr->mask & (HGFS_ATTR_VALID_SPECIAL_PERMS | -@@ -1173,22 +1202,22 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - } - if (attr->mask & HGFS_ATTR_VALID_ACCESS_TIME) { - attrV2->accessTime = attr->accessTime; -- *hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME; -+ requestV3->hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME; - } - if (attr->mask & HGFS_ATTR_VALID_WRITE_TIME) { - attrV2->writeTime = attr->writeTime; -- *hints |= HGFS_ATTR_HINT_SET_WRITE_TIME; -+ requestV3->hints |= HGFS_ATTR_HINT_SET_WRITE_TIME; - } - - break; - } - case HGFS_OP_SETATTR_V2: { -+ int result; - HgfsRequestSetattrV2 *requestV2; - - requestV2 = (HgfsRequestSetattrV2 *)(HGFS_REQ_PAYLOAD(req)); - - attrV2 = &requestV2->attr; -- hints = &requestV2->hints; - - /* - * Clear attributes, mask, and hints before touching them. -@@ -1196,13 +1225,19 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - * make sure to zero them all here. - */ - memset(attrV2, 0, sizeof *attrV2); -- memset(hints, 0, sizeof *hints); -- -- fileName = requestV2->fileName.name; -- fileNameLength = &requestV2->fileName.length; -+ requestV2->hints = 0; - - reqSize = sizeof *requestV2; - reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV2); -+ result = CPName_ConvertTo(path, -+ reqBufferSize, -+ requestV2->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ requestV2->fileName.length = result; -+ reqSize += result; - - if (attr->mask & (HGFS_ATTR_VALID_SPECIAL_PERMS | - HGFS_ATTR_VALID_OWNER_PERMS | -@@ -1224,16 +1259,17 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - } - if (attr->mask & HGFS_ATTR_VALID_ACCESS_TIME) { - attrV2->accessTime = attr->accessTime; -- *hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME; -+ requestV2->hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME; - } - if (attr->mask & HGFS_ATTR_VALID_WRITE_TIME) { - attrV2->writeTime = attr->writeTime; -- *hints |= HGFS_ATTR_HINT_SET_WRITE_TIME; -+ requestV2->hints |= HGFS_ATTR_HINT_SET_WRITE_TIME; - } - - break; - } - case HGFS_OP_SETATTR: { -+ int result; - HgfsRequestSetattr *request; - - request = (HgfsRequestSetattr *)(HGFS_REQ_PAYLOAD(req)); -@@ -1241,11 +1277,17 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - attrV1 = &request->attr; - update = &request->update; - -- /* We'll use these later. */ -- fileName = request->fileName.name; -- fileNameLength = &request->fileName.length; - reqSize = sizeof *request; - reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, request); -+ result = CPName_ConvertTo(path, -+ reqBufferSize, -+ request->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ request->fileName.length = result; -+ reqSize += result; - - /* - * Clear attributes before touching them. -@@ -1284,16 +1326,7 @@ HgfsPackSetattrRequest(const char *path, // IN: path to file - return -EPROTO; - } - -- result = CPName_ConvertTo(path, -- reqBufferSize, -- fileName); -- if (result < 0) { -- LOG(4, ("CP conversion failed.\n")); -- return -EINVAL; -- } -- -- *fileNameLength = result; -- req->payloadSize = reqSize + result; -+ req->payloadSize = reqSize; - - /* Fill in header here as payloadSize needs to be there. */ - HgfsPackHeader(req, opUsed); -diff --git a/open-vm-tools/vmhgfs-fuse/filesystem.c b/open-vm-tools/vmhgfs-fuse/filesystem.c -index fb9d547d..1931a5d2 100644 ---- a/open-vm-tools/vmhgfs-fuse/filesystem.c -+++ b/open-vm-tools/vmhgfs-fuse/filesystem.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2013 VMware, Inc. All rights reserved. -+ * Copyright (C) 2013,2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -123,36 +123,50 @@ HgfsPackQueryVolumeRequest(const char *path, // IN: File pointer for this - HgfsOp opUsed, // IN: Op to be used. - HgfsReq *req) // IN/OUT: Packet to write into - { -- char *name; -- uint32 *nameLength; - size_t requestSize; -- int result; -+ - - ASSERT(req); - - switch (opUsed) { - case HGFS_OP_QUERY_VOLUME_INFO_V3: { -+ int result; - HgfsRequestQueryVolumeV3 *requestV3 = HgfsGetRequestPayload(req); - -- /* We'll use these later. */ -- name = requestV3->fileName.name; -- nameLength = &requestV3->fileName.length; - requestV3->fileName.flags = 0; - requestV3->fileName.fid = HGFS_INVALID_HANDLE; - requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; - requestV3->reserved = 0; - requestSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (requestSize - 1), -+ requestV3->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ requestV3->fileName.length = result; -+ requestSize += result; - break; - } - case HGFS_OP_QUERY_VOLUME_INFO: { -+ int result; - HgfsRequestQueryVolume *request; - - request = (HgfsRequestQueryVolume *)(HGFS_REQ_PAYLOAD(req)); - -- /* We'll use these later. */ -- name = request->fileName.name; -- nameLength = &request->fileName.length; - requestSize = sizeof *request; -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ HGFS_LARGE_PACKET_MAX - (requestSize - 1), -+ request->fileName.name); -+ if (result < 0) { -+ LOG(4, ("CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ request->fileName.length = result; -+ requestSize += result; - break; - } - default: -@@ -160,17 +174,7 @@ HgfsPackQueryVolumeRequest(const char *path, // IN: File pointer for this - return -EPROTO; - } - -- /* Convert to CP name. */ -- result = CPName_ConvertTo(path, -- HGFS_LARGE_PACKET_MAX - (requestSize - 1), -- name); -- if (result < 0) { -- LOG(4, ("CP conversion failed.\n")); -- return -EINVAL; -- } -- -- *nameLength = (uint32) result; -- req->payloadSize = requestSize + result; -+ req->payloadSize = requestSize; - - /* Fill in header here as payloadSize needs to be there. */ - HgfsPackHeader(req, opUsed); -diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.c b/open-vm-tools/vmhgfs-fuse/fsutil.c -index 042c223c..af85c405 100644 ---- a/open-vm-tools/vmhgfs-fuse/fsutil.c -+++ b/open-vm-tools/vmhgfs-fuse/fsutil.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2013 VMware, Inc. All rights reserved. -+ * Copyright (C) 2013,2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -189,8 +189,6 @@ HgfsPackGetattrRequest(HgfsReq *req, // IN/OUT: Request buffer - size_t reqBufferSize; - size_t reqSize; - int result = 0; -- char *fileName = NULL; -- uint32 *fileNameLength = NULL; - ASSERT(attr); - ASSERT(req); - ASSERT(path); -@@ -204,8 +202,6 @@ HgfsPackGetattrRequest(HgfsReq *req, // IN/OUT: Request buffer - - /* Fill out the request packet. */ - requestV3->hints = 0; -- fileName = requestV3->fileName.name; -- fileNameLength = &requestV3->fileName.length; - requestV3->fileName.flags = 0; - requestV3->fileName.fid = HGFS_INVALID_HANDLE; - requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; -@@ -213,6 +209,19 @@ HgfsPackGetattrRequest(HgfsReq *req, // IN/OUT: Request buffer - requestV3->reserved = 0; - reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); - reqBufferSize = HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize); -+ if (requestV3->fileName.name != NULL) { -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ reqBufferSize, -+ requestV3->fileName.name); -+ LOG(8, ("Converted path %s\n", requestV3->fileName.name)); -+ if (result < 0) { -+ LOG(8, ("CP conversion failed.\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ requestV3->fileName.length = result; -+ } - break; - } - -@@ -223,20 +232,42 @@ HgfsPackGetattrRequest(HgfsReq *req, // IN/OUT: Request buffer - - requestV2 = (HgfsRequestGetattrV2 *)(HGFS_REQ_PAYLOAD(req)); - requestV2->hints = 0; -- fileName = requestV2->fileName.name; -- fileNameLength = &requestV2->fileName.length; - reqSize = sizeof *requestV2; - reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV2); -+ if (requestV2->fileName.name != NULL) { -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ reqBufferSize, -+ requestV2->fileName.name); -+ LOG(8, ("Converted path %s\n", requestV2->fileName.name)); -+ if (result < 0) { -+ LOG(8, ("CP conversion failed.\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ requestV2->fileName.length = result; -+ } - break; - } - - case HGFS_OP_GETATTR: { - HgfsRequestGetattr *requestV1; - requestV1 = (HgfsRequestGetattr *)(HGFS_REQ_PAYLOAD(req)); -- fileName = requestV1->fileName.name; -- fileNameLength = &requestV1->fileName.length; - reqSize = sizeof *requestV1; - reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV1); -+ if (requestV1->fileName.name != NULL) { -+ /* Convert to CP name. */ -+ result = CPName_ConvertTo(path, -+ reqBufferSize, -+ requestV1->fileName.name); -+ LOG(8, ("Converted path %s\n", requestV1->fileName.name)); -+ if (result < 0) { -+ LOG(8, ("CP conversion failed.\n")); -+ result = -EINVAL; -+ goto out; -+ } -+ requestV1->fileName.length = result; -+ } - break; - } - -@@ -246,20 +277,6 @@ HgfsPackGetattrRequest(HgfsReq *req, // IN/OUT: Request buffer - goto out; - } - -- if (fileName != NULL) { -- /* Convert to CP name. */ -- result = CPName_ConvertTo(path, -- reqBufferSize, -- fileName); -- LOG(8, ("Converted path %s\n", fileName)); -- if (result < 0) { -- LOG(8, ("CP conversion failed.\n")); -- result = -EINVAL; -- goto out; -- } -- *fileNameLength = result; -- } -- - req->payloadSize = reqSize + result; - - /* Fill in header here as payloadSize needs to be there. */ -diff --git a/open-vm-tools/vmhgfs-fuse/link.c b/open-vm-tools/vmhgfs-fuse/link.c -index a00e8446..777eb76e 100644 ---- a/open-vm-tools/vmhgfs-fuse/link.c -+++ b/open-vm-tools/vmhgfs-fuse/link.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2013 VMware, Inc. All rights reserved. -+ * Copyright (C) 2013,2019 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -51,36 +51,81 @@ HgfsPackSymlinkCreateRequest(const char* symlink, // IN: path of the link - { - HgfsRequestSymlinkCreateV3 *requestV3 = NULL; - HgfsRequestSymlinkCreate *request = NULL; -- char *symlinkName; -- uint32 *symlinkNameLength; -- char *targetName; -- uint32 *targetNameLength; - size_t targetNameBytes; -- - size_t requestSize; -- int result; -+ -+ targetNameBytes = strlen(symname) + 1; - - switch (opUsed) { - case HGFS_OP_CREATE_SYMLINK_V3: { -+ int result; -+ HgfsFileNameV3 *fileNameP; - requestV3 = HgfsGetRequestPayload(req); - -- /* We'll use these later. */ -- symlinkName = requestV3->symlinkName.name; -- symlinkNameLength = &requestV3->symlinkName.length; - requestV3->symlinkName.flags = 0; - requestV3->symlinkName.fid = HGFS_INVALID_HANDLE; - requestV3->symlinkName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE; - requestV3->reserved = 0; - requestSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize(); -+ /* Convert symlink name to CP format. */ -+ result = CPName_ConvertTo(symlink, -+ HGFS_LARGE_PACKET_MAX - (requestSize - 1), -+ requestV3->symlinkName.name); -+ if (result < 0) { -+ LOG(4, ("SymlinkName CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ requestV3->symlinkName.length = result; -+ requestSize += result; -+ -+ /* Copy target name into request packet. */ -+ if (targetNameBytes > HGFS_LARGE_PACKET_MAX - (requestSize - 1)) { -+ LOG(4, ("Target name is too long.\n")); -+ return -EINVAL; -+ } -+ -+ fileNameP = (HgfsFileNameV3 *)((char *)&requestV3->symlinkName + -+ sizeof requestV3->symlinkName + result); -+ memcpy(fileNameP->name, symname, targetNameBytes); -+ LOG(6, ("Target name: \"%s\"\n", fileNameP->name)); -+ /* Convert target name to CPName-lite format. */ -+ CPNameLite_ConvertTo(fileNameP->name, targetNameBytes - 1, '/'); -+ fileNameP->length = targetNameBytes - 1; -+ fileNameP->flags = 0; -+ fileNameP->fid = HGFS_INVALID_HANDLE; -+ fileNameP->caseType = HGFS_FILE_NAME_CASE_SENSITIVE; - break; - } - case HGFS_OP_CREATE_SYMLINK: { -+ int result; -+ HgfsFileName *fileNameP; - request = (HgfsRequestSymlinkCreate *)(HGFS_REQ_PAYLOAD(req)); - -- /* We'll use these later. */ -- symlinkName = request->symlinkName.name; -- symlinkNameLength = &request->symlinkName.length; - requestSize = sizeof *request; -+ /* Convert symlink name to CP format. */ -+ result = CPName_ConvertTo(symlink, -+ HGFS_LARGE_PACKET_MAX - (requestSize - 1), -+ request->symlinkName.name); -+ if (result < 0) { -+ LOG(4, ("SymlinkName CP conversion failed.\n")); -+ return -EINVAL; -+ } -+ request->symlinkName.length = result; -+ requestSize += result; -+ -+ /* Copy target name into request packet. */ -+ if (targetNameBytes > HGFS_LARGE_PACKET_MAX - (requestSize - 1)) { -+ LOG(4, ("Target name is too long.\n")); -+ return -EINVAL; -+ } -+ -+ fileNameP = (HgfsFileName *)((char *)&request->symlinkName + -+ sizeof request->symlinkName + result); -+ memcpy(fileNameP->name, symname, targetNameBytes); -+ LOG(6, ("Target name: \"%s\"\n", fileNameP->name)); -+ /* Convert target name to CPName-lite format. */ -+ CPNameLite_ConvertTo(fileNameP->name, targetNameBytes - 1, '/'); -+ fileNameP->length = targetNameBytes - 1; - break; - } - default: -@@ -88,59 +133,13 @@ HgfsPackSymlinkCreateRequest(const char* symlink, // IN: path of the link - return -EPROTO; - } - -- -- /* Convert symlink name to CP format. */ -- result = CPName_ConvertTo(symlink, -- HGFS_LARGE_PACKET_MAX - (requestSize - 1), -- symlinkName); -- if (result < 0) { -- LOG(4, ("SymlinkName CP conversion failed.\n")); -- return -EINVAL; -- } -- -- *symlinkNameLength = result; -- req->payloadSize = requestSize + result; -+ req->payloadSize = requestSize; - - /* -- * Note the different buffer length. This is because HgfsRequestSymlink -- * contains two filenames, and once we place the first into the packet we -- * must account for it when determining the amount of buffer available for -- * the second. -- * -- * Also note that targetNameBytes accounts for the NUL character. Once -- * we've converted it to CP name, it won't be NUL-terminated and the length -- * of the string in the packet itself won't account for it. -+ * targetNameBytes accounts for the NUL character. Once we've converted -+ * it to CP name, it won't be NUL-terminated and the length of the string -+ * in the packet itself won't account for it. - */ -- if (opUsed == HGFS_OP_CREATE_SYMLINK_V3) { -- HgfsFileNameV3 *fileNameP; -- fileNameP = (HgfsFileNameV3 *)((char *)&requestV3->symlinkName + -- sizeof requestV3->symlinkName + result); -- targetName = fileNameP->name; -- targetNameLength = &fileNameP->length; -- fileNameP->flags = 0; -- fileNameP->fid = HGFS_INVALID_HANDLE; -- fileNameP->caseType = HGFS_FILE_NAME_CASE_SENSITIVE; -- } else { -- HgfsFileName *fileNameP; -- fileNameP = (HgfsFileName *)((char *)&request->symlinkName + -- sizeof request->symlinkName + result); -- targetName = fileNameP->name; -- targetNameLength = &fileNameP->length; -- } -- targetNameBytes = strlen(symname) + 1; -- -- /* Copy target name into request packet. */ -- if (targetNameBytes > HGFS_LARGE_PACKET_MAX - (requestSize - 1)) { -- LOG(4, ("Target name is too long.\n")); -- return -EINVAL; -- } -- memcpy(targetName, symname, targetNameBytes); -- LOG(6, ("Target name: \"%s\"\n", targetName)); -- -- /* Convert target name to CPName-lite format. */ -- CPNameLite_ConvertTo(targetName, targetNameBytes - 1, '/'); -- -- *targetNameLength = targetNameBytes - 1; - req->payloadSize += targetNameBytes - 1; - - /* Fill in header here as payloadSize needs to be there. */ diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.5.bb b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb index 63a64fc71..9e4aa4881 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb @@ -38,10 +38,12 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://0011-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ file://0012-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ file://0013-misc-Do-not-print-NULL-string-into-logs.patch;patchdir=.. \ - file://0014-Fix-new-warnings-from-gcc9.patch;patchdir=.. \ + file://0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch;patchdir=.. \ + file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ + file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ " -# stable-10.3.5 -SRCREV = "f2ff192717375b95a6b7e278fb47dbb3d3bc56d1" + +SRCREV = "d3edfd142a81096f9f58aff17d84219b457f4987" S = "${WORKDIR}/git/open-vm-tools" @@ -56,8 +58,8 @@ SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ --disable-tests --without-gtkmm --without-xerces --without-pam \ - --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \ - --without-root-privileges --without-kernel-modules" + --disable-vgauth --disable-deploypkg \ + --without-root-privileges --without-kernel-modules --with-tirpc" NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index 67b7c2975..08b2e3c23 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -56,10 +56,6 @@ FILES_${PN}-dbg += " \ INSANE_SKIP_${PN} += "dev-deps" -do_install_append() { - rm -r ${D}/${localstatedir}/run -} - do_install () { rm -rf ${D} install -d ${D}/etc @@ -87,4 +83,6 @@ do_install () { install -dm 755 ${D}${localstatedir}/run/openct touch ${D}${localstatedir}/run/openct/status chmod 644 ${D}${localstatedir}/run/openct/status + + rm -r ${D}/${localstatedir}/run } diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 77b5dd60c..5e89db097 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DCMAKE_SKIP_RPATH=ON \ -DOPENCV_ICV_HASH=${IPP_MD5} \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb index bc1722e39..a1e29dd46 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb @@ -16,20 +16,23 @@ SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47" SRC_URI = "git://github.com/OpenSC/OpenSC \ file://0001-Remove-redundant-logging.patch \ " -DEPENDS = "openct pcsc-lite virtual/libiconv openssl" +DEPENDS = "virtual/libiconv openssl" S = "${WORKDIR}/git" inherit autotools pkgconfig bash-completion EXTRA_OECONF = " \ --disable-static \ - --enable-openct \ - --disable-pcsc \ --disable-ctapi \ --disable-doc \ " EXTRA_OEMAKE = "DESTDIR=${D}" +PACKAGECONFIG ??= "pcsc" + +PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" +PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite" + RDEPENDS_${PN} = "readline" FILES_${PN} += "\ @@ -42,3 +45,5 @@ FILES_${PN}-dev += "\ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb index a87c228a8..6869e2cf9 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb @@ -9,7 +9,6 @@ LICENSE_${PN}-dbg = "BSD & GPLv3+" LICENSE_${PN}-spy = "GPLv3+" LICENSE_${PN}-spy-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" -DEPENDS = "udev" SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" SRC_URI[md5sum] = "c20650a36062ab1689f37f3302c988f2" @@ -19,19 +18,21 @@ inherit autotools systemd pkgconfig EXTRA_OECONF = " \ --disable-libusb \ - --enable-libudev \ --enable-usbdropdir=${libdir}/pcsc/drivers \ " S = "${WORKDIR}/pcsc-lite-${PV}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" +PACKAGECONFIG_class-native ??= "" PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" RRECOMMENDS_${PN} = "ccid" +RRECOMMENDS_${PN}_class-native = "" FILES_${PN} = "${sbindir}/pcscd" FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" @@ -50,3 +51,5 @@ RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "pcscd.socket" RDEPENDS_${PN}-spy +="python" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 5a21cd3fc..04133c1b3 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -12,4 +12,4 @@ SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf572 FILES_${PN} = "${libdir}/pidgin/*" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch new file mode 100644 index 000000000..87a6435f7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch @@ -0,0 +1,50 @@ +From 1110d3036e73d0571f70f6758f3179e5048c0b5d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Nov 2019 11:07:42 -0800 +Subject: [PATCH] Align structs casts with time_t elements to 8byte boundary + +This helps with 64bit time_t conversion, especially where these +structures are typcasted to another struct types which have time_t +element, that now increases the natural alignment boundary of structures +to 8-bytes. + +Fixes +../../../pidgin-sipe-1.25.0/src/core/sipe-user.c:124:43: error: cast from 'struct sipe_core_public *' to 'struct sipe_core_private *' increases required alignment from 4 to 8 [-Werror,-Wcast-align] + struct sipe_core_private *sipe_private = SIPE_CORE_PRIVATE; + ^~~~~~~~~~~~~~~~~ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/api/sipe-core.h | 2 +- + src/core/sipe-http-transport.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/api/sipe-core.h b/src/api/sipe-core.h +index cde0a9c..bd818bb 100644 +--- a/src/api/sipe-core.h ++++ b/src/api/sipe-core.h +@@ -148,7 +148,7 @@ struct sipe_core_public { + + /* server information */ + /* currently nothing */ +-}; ++} __attribute__((aligned(8))); + + /** + * Initialize & destroy functions for the SIPE core +diff --git a/src/core/sipe-http-transport.h b/src/core/sipe-http-transport.h +index d82cd1b..08eb150 100644 +--- a/src/core/sipe-http-transport.h ++++ b/src/core/sipe-http-transport.h +@@ -46,7 +46,7 @@ struct sipe_http_connection_public { + gchar *host; + guint32 port; + gboolean connected; +-}; ++} __attribute__((aligned(8))); + + /** + * Check if we're shutting down the HTTP stack +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-sipe-consider-64bit-time_t-when-printing.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-sipe-consider-64bit-time_t-when-printing.patch new file mode 100644 index 000000000..e7a72953d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-sipe-consider-64bit-time_t-when-printing.patch @@ -0,0 +1,31 @@ +From ae6fa551907006c612cca98b87f339d4d6f45e25 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 11 Nov 2019 21:08:11 -0800 +Subject: [PATCH] sipe: consider 64bit time_t when printing + +This helps printing 64bit time_t on 32bit architectures + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/core/sipe-utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/sipe-utils.c b/src/core/sipe-utils.c +index 12ff8d6..d3d4071 100644 +--- a/src/core/sipe-utils.c ++++ b/src/core/sipe-utils.c +@@ -414,8 +414,8 @@ sipe_utils_time_to_str(time_t timestamp) + if (result) + return(result); + +- SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %lu to ISO8601 string", +- timestamp); ++ SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %lld to ISO8601 string", ++ (long long int)timestamp); + return(g_strdup("")); + } + +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 1d739874b..99fcf3c6d 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -8,6 +8,8 @@ DEPENDS = "pidgin gmime intltool-native glib-2.0-native" inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ + file://0001-sipe-consider-64bit-time_t-when-printing.patch \ + file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ " SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch deleted file mode 100644 index 72d89d09b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ed04c97abe015a226269de391e36c4d251292725 Mon Sep 17 00:00:00 2001 -From: Francis ANDRE <francis.andre.kampbell@orange.fr> -Date: Sun, 6 May 2018 12:28:25 +0200 -Subject: [PATCH] Support of arch riscv64 by Manuel A. Fernandez Montecelo - <mafm@debian.org> - ---- - Foundation/include/Poco/Platform.h | 6 +++++- - Foundation/src/utils.h | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -134,6 +134,7 @@ - #define POCO_ARCH_NIOS2 0x0e - #define POCO_ARCH_AARCH64 0x0f - #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64 -+#define POCO_ARCH_RISCV64 0x10 - - - #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) -@@ -224,6 +225,9 @@ - #elif defined(__AARCH64EB__) - #define POCO_ARCH POCO_ARCH_AARCH64 - #define POCO_ARCH_BIG_ENDIAN 1 -+#elif defined(__riscv) && (__riscv_xlen == 64) -+ #define POCO_ARCH POCO_ARCH_RISCV64 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 - #endif - - ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,6 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || \ -+ defined(__riscv) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch new file mode 100644 index 000000000..c0de32daf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch @@ -0,0 +1,28 @@ +From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 1 Nov 2019 17:53:50 -0700 +Subject: [PATCH] riscv: Enable double operations when using double float abi + +Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Foundation/src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 69cea1aca..ff7a5c9ce 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -63,7 +63,8 @@ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || \ +- defined(nios2) || defined(__nios2) || defined(__nios2__) ++ defined(nios2) || defined(__nios2) || defined(__nios2__) || \ ++ (defined(__riscv) && defined(__riscv_float_abi_double)) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb index 70b251034..c854481de 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb @@ -11,10 +11,10 @@ DEPENDS = "libpcre zlib" SRC_URI = " \ git://github.com/pocoproject/poco.git;branch=poco-${PV} \ file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ - file://0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch \ + file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \ file://run-ptest \ " -SRCREV = "daf00da73ab917e4d4581e3aa00c0ee61e0cc58b" +SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index 18f508519..05e0abede 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -13,11 +13,9 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> cmake/modules/PopplerMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index ccb2790..0f392cb 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") set(_save_cxxflags "${CMAKE_CXX_FLAGS}") @@ -34,5 +32,21 @@ index ccb2790..0f392cb 100644 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") --- -2.14.3 +@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") + # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") + set(_save_cflags "${CMAKE_C_FLAGS}") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") ++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") + # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.82.0.bb index 338af1d87..37f859353 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.82.0.bb @@ -6,8 +6,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[md5sum] = "8ff9964d1fcc9c334a9c66f6f426ab9c" -SRC_URI[sha256sum] = "4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f" +SRC_URI[md5sum] = "4d6106c2382c5e66072e0b355acc3640" +SRC_URI[sha256sum] = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 82b803a4d..14fbc94b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5 S = "${WORKDIR}/Remmina-v${PV}" -inherit cmake distro_features_check +inherit cmake features_check # depends on avahi-ui with this restriction ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb index f5518bd8c..dba89d181 100644 --- a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb @@ -17,7 +17,7 @@ PV = "1.10.1+git${SRCPV}" S = "${WORKDIR}/git" -inherit cmake distro_features_check +inherit cmake features_check EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch index 0fc40be4a..b5bfcd025 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch @@ -1,6 +1,3 @@ -From caeccb7bec45f65bc89efa8195b3853368328361 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 17 Sep 2018 12:49:36 +0800 Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 service start failed since segment fault on arch arm64, @@ -17,12 +14,15 @@ https://github.com/buytenh/ivykis/issues/15 Upstream-Status: Pending Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - lib/ivykis/src/pthr.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + lib/ivykis/src/pthr.h | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index a41eaf3..72c5190 100644 +index 29e4be7..5d29096 100644 --- a/lib/ivykis/src/pthr.h +++ b/lib/ivykis/src/pthr.h @@ -24,6 +24,16 @@ @@ -47,12 +47,12 @@ index a41eaf3..72c5190 100644 #ifdef HAVE_PRAGMA_WEAK -/* -- * On Linux, pthread_atfork() is defined in libpthread_nonshared.a, -- * a static library, and we want to avoid "#pragma weak" for that -- * symbol because that causes it to be undefined even if you link -- * libpthread_nonshared.a in explicitly. +- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for +- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and +- * we want to avoid "#pragma weak" for that symbol because that causes +- * it to be undefined even if you link lib*_nonshared.a in explicitly. - */ --#ifndef HAVE_LIBPTHREAD_NONSHARED +-#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) -#pragma weak pthread_atfork -#endif - @@ -60,16 +60,15 @@ index a41eaf3..72c5190 100644 #pragma weak pthread_create #pragma weak pthread_detach #pragma weak pthread_getspecific -@@ -73,8 +74,7 @@ static inline int +@@ -73,7 +74,7 @@ static inline int pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { if (pthreads_available()) - return pthread_atfork(prepare, parent, child); -- + return __register_atfork(prepare, parent, child, __dso_handle); + return ENOSYS; } - -- 2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch index 553f4a517..4ad0afa95 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch @@ -6,25 +6,28 @@ This would avoid a implicit auto-detecting result. Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - configure.ac | 27 +++++++++++++++++---------- - 1 files changed, 17 insertions(+), 10 deletions(-) + configure.ac | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) -Index: syslog-ng-3.8.1/configure.ac -=================================================================== ---- syslog-ng-3.8.1.orig/configure.ac -+++ syslog-ng-3.8.1/configure.ac -@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h) +diff --git a/configure.ac b/configure.ac +index 00eb566..e7d5ac1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) dnl *************************************************************************** dnl Arguments -+AC_ARG_ENABLE(libnet, ++AC_ARG_ENABLE(libnet, + [ --enable-libnet Enable libnet support.],, enable_libnet="no") + AC_ARG_WITH(libnet, [ --with-libnet=path use path to libnet-config script], , -@@ -893,22 +896,26 @@ dnl ************************************ +@@ -1047,19 +1050,20 @@ dnl *************************************************************************** dnl libnet headers/libraries dnl *************************************************************************** AC_MSG_CHECKING(for LIBNET) @@ -39,7 +42,14 @@ Index: syslog-ng-3.8.1/configure.ac + else + LIBNET_CONFIG="$with_libnet/libnet-config" + fi -+ + +-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then +- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" +- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" +- AC_MSG_RESULT(yes) +-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build +-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till +- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" + if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then + LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" + LIBNET_LIBS="`$LIBNET_CONFIG --libs`" @@ -48,16 +58,8 @@ Index: syslog-ng-3.8.1/configure.ac + AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) + fi --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) else LIBNET_LIBS= - AC_MSG_RESULT(no) - fi - -- - if test "x$enable_spoof_source" = "xauto"; then - AC_MSG_CHECKING(whether to enable spoof source support) - if test "x$LIBNET_LIBS" != "x"; then +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf new file mode 100644 index 000000000..32a795321 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf @@ -0,0 +1 @@ +d /var/run/syslog-ng 0755 root root diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 9e910caa1..965abf722 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,11 +1,16 @@ -@version: 3.15 +@version: 3.19 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) # Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>) +# +# Move to 3.19 +# Only change is to add dns_cache(no) to options to suppress initialization warning. +# +# Joe Slater <joe.slater@windriver.com> # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); +options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); owner("root"); group("adm"); perm(0640); stats_freq(0); bad_hostname("^gconfd$"); }; diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index fb183ee17..2b39b8c1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,11 +1,16 @@ -@version: 3.15 +@version: 3.19 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) # Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>) +# +# Move to 3.19 +# Only change is to add dns_cache(no) to options to suppress initialization warning. +# +# Joe Slater <joe.slater@windriver.com> # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); +options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); owner("root"); group("adm"); perm(0640); stats_freq(0); bad_hostname("^gconfd$"); }; diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 39c3f59ce..0e1d09492 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,16 +1,17 @@ -From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Wed, 17 Jun 2015 14:46:30 +0900 -Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start +Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. Upstream-Status: pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Updated-by: Andrej Valek <andrej.valek@siemens.com> + +Update for 3.24.1 +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - contrib/systemd/syslog-ng.service | 5 ++--- - 1 file changed, 2 insertion(+), 3 deletions(-) + contrib/systemd/syslog-ng@.service | 4 ++-- + contrib/systemd/syslog-ng@default | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service index a28640e..93aec94 100644 @@ -28,19 +29,18 @@ index a28640e..93aec94 100644 StandardError=journal Restart=on-failure diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default -index 02da288..3a8215d 100644 +index 0ccc2b9..7f08c0e 100644 --- a/contrib/systemd/syslog-ng@default +++ b/contrib/systemd/syslog-ng@default @@ -1,5 +1,5 @@ --CONFIG_FILE=/etc/syslog-ng.conf + CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist --CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl +-CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid -+CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" - -- -1.8.4.2 +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index b00cb91ee..3aba4473d 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" # util-linux added to get libuuid DEPENDS = "libpcre flex glib-2.0 openssl util-linux" +# We expect the recipe to add anything specific for that version to these defaults. +# SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ file://syslog-ng.conf.sysvinit \ @@ -74,8 +76,12 @@ do_install_append() { install -d ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog + install -d ${D}/${sysconfdir}/default/volatiles/ install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng + install -d ${D}/${sysconfdir}/tmpfiles.d/ + install -m 755 ${WORKDIR}/syslog-ng-tmp.conf ${D}/${sysconfdir}/tmpfiles.d/syslog-ng.conf + install -d ${D}/${localstatedir}/lib/${BPN} # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run @@ -86,7 +92,6 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service - install -m 0644 ${S}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service install -m 0644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb deleted file mode 100644 index 4eecf6b6a..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require syslog-ng.inc - -SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ - file://syslog-ng.conf.systemd \ - file://syslog-ng.conf.sysvinit \ - file://initscript \ - file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ - file://fix-config-libnet.patch \ - file://fix-invalid-ownership.patch \ - file://syslog-ng.service-the-syslog-ng-service.patch \ - file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ - " - -SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3" -SRC_URI[sha256sum] = "5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb new file mode 100644 index 000000000..01ed76765 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb @@ -0,0 +1,14 @@ +require syslog-ng.inc + +# We only want to add stuff we need to the defaults provided in syslog-ng.inc. +# +SRC_URI += " \ + file://fix-config-libnet.patch \ + file://fix-invalid-ownership.patch \ + file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ + file://syslog-ng-tmp.conf \ + " + +SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" +SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" diff --git a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index 879b67b7f..aba485e1a 100644 --- a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/OSSystems/toscoterm.git" S = "${WORKDIR}/git" -inherit distro_features_check gitpkgv pkgconfig +inherit features_check gitpkgv pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb index 9c9e5e52a..f0aad9538 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb @@ -26,7 +26,7 @@ S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection gettext distro_features_check +inherit autotools systemd gtk-doc gobject-introspection gettext features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb index 8948ebf30..c1136cd99 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -25,7 +25,7 @@ LEAD_SONAME = "libuim.so.1" COMPATIBLE_HOST_riscv64 = "null" COMPATIBLE_HOST_riscv32 = "null" -inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache +inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb new file mode 100644 index 000000000..89ab565ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Unicode Character Database" +HOMEPAGE = "https://unicode.org/ucd/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd" + +SRC_URI = " \ + https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ + https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \ +" +SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" +SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" + +SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c" +SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4" + +inherit allarch + +do_configure[noexec] = "1" + +do_install() { + install -d ${D}${datadir}/unicode + cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode +} + +FILES_${PN} = "${datadir}/unicode/ucd" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb index c4cc62711..640841792 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -10,7 +10,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" -inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check +inherit autotools pkgconfig gettext gobject-introspection systemd features_check PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 8cb180dc8..5f07bf28e 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://bitmath.org/code/mtview/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=4c61b8950dc1aab4d2aa7c2ae6b1cfb3" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb index 0a4c56aa0..40c585ee1 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb @@ -20,8 +20,8 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "69b8d95c009a404462e19f335e650241" -SRC_URI[sha256sum] = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4" +SRC_URI[md5sum] = "4755621ff2a7150e208de6bd7decca10" +SRC_URI[sha256sum] = "b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d2839ab" inherit autotools-brokensep ptest pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb index 0bdafdf3b..481e7303b 100644 --- a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb @@ -7,7 +7,7 @@ inherit autotools pkgconfig DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11 pam" SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb index 75caf8d6b..deda0fd1b 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ " -inherit distro_features_check autotools pkgconfig useradd systemd +inherit features_check autotools pkgconfig useradd systemd DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" diff --git a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb index c9d87e36d..98f2cacf1 100644 --- a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb +++ b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb @@ -17,3 +17,5 @@ EXTRA_OECONF = "--enable-memtrace --enable-automated --enable-basic --enable-con FILES_${PN}-dev += "${datadir}/CUnit" FILES_${PN}-doc += "${docdir}" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.8.1.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index 362d69ff9..e1df9b6e2 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd51 PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "2fe3bd994b3189899d93f1d5a881e725e046fdc2" +SRCREV = "703bd9caab50b139428cea1aaff9974ebee5742e" SRC_URI = "git://github.com/google/googletest.git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb b/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb index 28e967762..ace376ef2 100644 --- a/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb +++ b/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Berkeley TestFloat is a small collection of programs for \ HOMEPAGE = "http://www.jhauser.us/arithmetic/TestFloat.html" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://TestFloat-${PV}/COPYING.txt;md5=e45c175a323b5727777fb6bd4b26eafc" SRC_URI = "\ diff --git a/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.12.bb b/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.13.bb index 3979b3142..58ed37ca8 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.12.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.13.bb @@ -10,8 +10,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=16fd0ec7b73c0e158426f753943f1058" SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETHER/Class-Method-Modifiers-${PV}.tar.gz" -SRC_URI[md5sum] = "f55400c7a8134acf3657f8af89bdd7af" -SRC_URI[sha256sum] = "e44c1073020bf55b8c97975ed77235fd7e2a6a56f29b5c702301721184e27ac8" +SRC_URI[md5sum] = "b1398e3682aa2e075b913b9f9000b596" +SRC_URI[sha256sum] = "ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63" S = "${WORKDIR}/Class-Method-Modifiers-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.62.bb b/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.64.bb index 4af9d3c5c..468add972 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.62.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.64.bb @@ -14,8 +14,8 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${PV}.tar.gz \ file://sqlite-perl-test.pl \ " -SRC_URI[md5sum] = "f2e11a2bea6bd864404c0363d7eddaf8" -SRC_URI[sha256sum] = "bd82ef322a9e5469a7a62d845c32fad1188b76ccb49a88520cec768343cce85c" +SRC_URI[md5sum] = "10796495b52927eb2e1df34c86924027" +SRC_URI[sha256sum] = "f4ae8f7b50842305566aadd90f7bfd12a9e32b6c603a9b1c1529e73eb82aff01" UPSTREAM_CHECK_REGEX = "DBD\-SQLite\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.20.bb index 99df6f33f..594899b07 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.20.bb @@ -12,8 +12,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=81;endline=84;md5=84c0390b90ea8c6702ce659b67bed699" SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETJ/ExtUtils-CppGuess-${PV}.tar.gz" -SRC_URI[md5sum] = "28be49072585b25df87e54180f741a4d" -SRC_URI[sha256sum] = "31c47b5b15e3e9fd5ae7b35881a0fffd26a2983b241e7e3a1bc340d6d446186b" +SRC_URI[md5sum] = "d6ddd5568c84f4c7b11b996b65f2ea3b" +SRC_URI[sha256sum] = "12bf914708885265b5c3b0b8bfb0a9294cf132d5ca30d54bda0e00335fb43e61" S = "${WORKDIR}/ExtUtils-CppGuess-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003006.bb index a260ab87d..0bd0eae92 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003006.bb @@ -7,11 +7,11 @@ SECTION = "libs" HOMEPAGE = "http://metapan.org/release/Moo/" LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;beginline=731;endline=776;md5=27efedd175eeaddbd18f4e3572bd72a8" +LIC_FILES_CHKSUM = "file://README;beginline=742;endline=787;md5=2ee6a628a04af08d75bc73a86da86d4a" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Moo-${PV}.tar.gz" -SRC_URI[md5sum] = "d4fcd0f240033198571fcc81ce7c5f15" -SRC_URI[sha256sum] = "f8bbb625f8e963eabe05cff9048fdd72bdd26777404ff2c40bc690f558be91e1" +SRC_URI[md5sum] = "53af7e7849492a8e3994ee379d12e348" +SRC_URI[sha256sum] = "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472" S = "${WORKDIR}/Moo-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.001004.bb index c2755ea0f..41743d508 100644 --- a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb +++ b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.001004.bb @@ -6,11 +6,11 @@ SECTION = "libs" HOMEPAGE = "https://metacpan.org/pod/Role::Tiny" LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;beginline=177;endline=214;md5=26df7e7c20551fb1906e2286624f0b71" +LIC_FILES_CHKSUM = "file://README;beginline=182;endline=219;md5=26df7e7c20551fb1906e2286624f0b71" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Role-Tiny-${PV}.tar.gz" -SRC_URI[md5sum] = "7c277728a7e090f64b495857cadfed08" -SRC_URI[sha256sum] = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382" +SRC_URI[md5sum] = "98446826608b1e943e65c1f6e35942fe" +SRC_URI[sha256sum] = "92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687" S = "${WORKDIR}/Role-Tiny-${PV}" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc new file mode 100644 index 000000000..42629c261 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTTP/2 State-Machine based protocol implementation" +HOMEPAGE = "https://github.com/python-hyper/hyper-h2" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b6b2f6bbe76528af543242d606c14851" + +SRC_URI[md5sum] = "950b5a62a2a608dc4547a01edf99aa8f" +SRC_URI[sha256sum] = "b8a32bd282594424c0ac55845377eea13fa54fe4a8db012f3a198ed923dc3ab4" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb new file mode 100644 index 000000000..b84129742 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb @@ -0,0 +1,3 @@ +require python-h2.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb new file mode 100644 index 000000000..7230a27e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb @@ -0,0 +1,3 @@ +require python-h2.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc new file mode 100644 index 000000000..eccfa8c56 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Pure-Python HPACK header compression" +HOMEPAGE = "https://github.com/python-hyper/hpack" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393" + +SRC_URI[md5sum] = "556b0ae66180f54c2ce8029a0952088b" +SRC_URI[sha256sum] = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb new file mode 100644 index 000000000..faaeb8555 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb @@ -0,0 +1,3 @@ +require python-hpack.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb new file mode 100644 index 000000000..e196c55b3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb @@ -0,0 +1,3 @@ +require python-hpack.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc new file mode 100644 index 000000000..0066bf8e6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTTP/2 framing layer for Python" +HOMEPAGE = "https://github.com/python-hyper/hyperframe" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393" + +SRC_URI[md5sum] = "6919183242feb26d8bce3b4cba81defd" +SRC_URI[sha256sum] = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb new file mode 100644 index 000000000..4f0c9977a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb @@ -0,0 +1,3 @@ +require python-hyperframe.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb new file mode 100644 index 000000000..f10fb6df1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb @@ -0,0 +1,3 @@ +require python-hyperframe.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc new file mode 100644 index 000000000..aa93819bc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "A pure-Python implementation of the HTTP/2 priority tree" +HOMEPAGE = "https://github.com/python-hyper/priority" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae57d8a09fc8b6b164d7357339619045" + +SRC_URI[md5sum] = "4f1ff52f7fa448e9d9cb46337ae86d1e" +SRC_URI[sha256sum] = "6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb new file mode 100644 index 000000000..cbe262576 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb @@ -0,0 +1,3 @@ +require python-priority.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb new file mode 100644 index 000000000..fe756b56b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb @@ -0,0 +1,3 @@ +require python-priority.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch new file mode 100644 index 000000000..977b4aacd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch @@ -0,0 +1,74 @@ +From 2e84adb042bfb742eb328220b97f79ddb28db44b Mon Sep 17 00:00:00 2001 +From: Haris Okanovic <haris.okanovic@ni.com> +Date: Tue, 23 Oct 2018 21:39:56 +0000 +Subject: [PATCH] Import local modules by relative path for python3 support + +Upstream-Status: Submitted +--- + pyconnman/agent.py | 2 +- + pyconnman/interface.py | 2 +- + pyconnman/manager.py | 2 +- + pyconnman/service.py | 2 +- + pyconnman/technology.py | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pyconnman/agent.py b/pyconnman/agent.py +index f72de8d..453d783 100644 +--- a/pyconnman/agent.py ++++ b/pyconnman/agent.py +@@ -1,5 +1,5 @@ + from __future__ import unicode_literals +-from exceptions import ConnCanceledException ++from .exceptions import ConnCanceledException + + import dbus.service + +diff --git a/pyconnman/interface.py b/pyconnman/interface.py +index 7d82e04..d540c81 100644 +--- a/pyconnman/interface.py ++++ b/pyconnman/interface.py +@@ -4,7 +4,7 @@ import dbus + import types + import pprint + +-from exceptions import ConnSignalNameNotRecognisedException ++from .exceptions import ConnSignalNameNotRecognisedException + + + def translate_to_dbus_type(typeof, value): +diff --git a/pyconnman/manager.py b/pyconnman/manager.py +index f6f40a8..03244cc 100644 +--- a/pyconnman/manager.py ++++ b/pyconnman/manager.py +@@ -1,6 +1,6 @@ + from __future__ import unicode_literals + +-from interface import ConnInterface ++from .interface import ConnInterface + + + class ConnManager(ConnInterface): +diff --git a/pyconnman/service.py b/pyconnman/service.py +index bbccced..c6b9241 100644 +--- a/pyconnman/service.py ++++ b/pyconnman/service.py +@@ -1,6 +1,6 @@ + from __future__ import unicode_literals + +-from interface import ConnInterface ++from .interface import ConnInterface + + + class ConnService(ConnInterface): +diff --git a/pyconnman/technology.py b/pyconnman/technology.py +index 4777229..d25bad6 100644 +--- a/pyconnman/technology.py ++++ b/pyconnman/technology.py +@@ -1,6 +1,6 @@ + from __future__ import unicode_literals + +-from interface import ConnInterface ++from .interface import ConnInterface + + + class ConnTechnology(ConnInterface): diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb index e0f3fdd75..32bbe8b80 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb @@ -2,4 +2,8 @@ require python-pyconnman.inc inherit setuptools3 +SRC_URI_append = " \ + file://0001-Import-local-modules-by-relative-path-for-python3-su.patch \ +" + RDEPENDS_${PN} += "python3-dbus python3-pprint" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.77.bb index 88f5b1855..738cf8677 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.77.bb @@ -2,8 +2,8 @@ SUMMARY = "Python Remote Objects" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc" -SRC_URI[md5sum] = "0375c061b93411feb86da01e801df888" -SRC_URI[sha256sum] = "536b07a097d0619e7ab1effa3747fda177a24168d17a07a93ca9ac30977608f7" +SRC_URI[md5sum] = "21f015ae93cf9ea2bbbc418a2267e9fb" +SRC_URI[sha256sum] = "2bfe12a22f396474b0e57c898c7e2c561a8f850bf2055d8cf0f7119f0c7a523f" PYPI_PACKAGE = "Pyro4" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc index 79a8bfb21..3991a830f 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc @@ -2,8 +2,8 @@ SUMMARY = "Python TUN/TAP tunnel module" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=13f7629e8e4989b66b4a913ab05a91de" -SRC_URI[md5sum] = "5b35b1cf80a02cca7ec72eb95d6b0192" -SRC_URI[sha256sum] = "07595dadf85f5176eb08c8d4d9ba5b862a180e96633f670f91437c47a1bead0d" +SRC_URI[md5sum] = "adcaeea56d0ed06814487cdbde32d198" +SRC_URI[sha256sum] = "5ead86b3391acef239535ebcabeb04d2cdc6b40ab14580d28c6da193c2d1fe53" PYPI_PACKAGE = "python-pytun" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.3.0.bb index 3fc587f3a..3fc587f3a 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.3.0.bb index 938d9d739..938d9d739 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 42f416346..bb05de1f5 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -77,7 +77,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \ python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \ python3-flask-script python3-cassandra-driver python3-cython python3-ujson python3-aws-iot-device-sdk-python \ - python3-pytest-runner python3-pyiface python3-flask-login python3-markupsafe python3-setuptools-scm \ + python3-pytest-runner python3-pyiface python3-docutils python3-flask-login python3-markupsafe python3-setuptools-scm \ python3-semver python3-sdnotify python3-flask-user python3-tornado python3-jsonpatch python3-pexpect \ python3-progress python3-jsonschema python3-xstatic python3-pyroute2 python3-idna python3-sqlalchemy \ python3-urllib3 python3-flask-mail python3-asn1crypto python3-pyinotify python3-intervals python3-pyperclip \ diff --git a/meta-openembedded/meta-python/recipes-devtools/gyp/gyp-py2_git.bb b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp-py2_git.bb new file mode 100644 index 000000000..d69b92ce6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp-py2_git.bb @@ -0,0 +1,2 @@ +inherit setuptools +require gyp.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/gyp/gyp.inc b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp.inc new file mode 100644 index 000000000..98ed42cc9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "GYP is a Meta-Build system: a build system that generates other build systems." +HOMEPAGE = "https://gyp.gsrc.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd" +SECTION = "devel" + +SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https" +SRCREV = "fcd686f1880fa52a1ee78d3e98af1b88cb334528" + +S = "${WORKDIR}/git" +PV = "0.1+git${SRCPV}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb index 2b3f3fb2b..8e48a27fa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb @@ -1,15 +1,2 @@ -DESCRIPTION = "GYP is a Meta-Build system: a build system that generates other build systems." -HOMEPAGE = "https://gyp.gsrc.io/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd" -SECTION = "devel" - -SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https" -SRCREV = "8bee09f4a57807136593ddc906b0b213c21f9014" - -S = "${WORKDIR}/git" -PV = "0.1+git${SRCPV}" - inherit setuptools3 - -BBCLASSEXTEND = "native nativesdk" +require gyp.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/pamela_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/pamela_0.3.0.bb index 8071fcb04..030c22f8f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/pamela_0.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/pamela_0.3.0.bb @@ -11,5 +11,5 @@ inherit pypi setuptools RDEPENDS_${PN} = "libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc index fa178ce08..8245676b2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc @@ -1,9 +1,9 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" -LICENSE = "BSD" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=28aaf14a6592d14dbfb2f4abd597aa27" -SRC_URI[md5sum] = "6fe272274fce2641b93998ef9b702b76" -SRC_URI[sha256sum] = "9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a" +SRC_URI[md5sum] = "81ec3de9e2d9c389657f51bdc0d24984" +SRC_URI[sha256sum] = "e6c6a4243e89c8d3e2342a1562b2388f3b524c9cac2fccc4d2c461a1320cc1c1" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.3.0.bb index efcb2b1de..efcb2b1de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc index b18dbaf33..9b8c1cb04 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" PYPI_PACKAGE = "asn1crypto" -SRC_URI[md5sum] = "cf33950b47b5148e29f1d62a6b6c009b" -SRC_URI[sha256sum] = "0b199f211ae690df3db4fd6c1c4ff976497fb1da689193e368eedbadc53d9292" +SRC_URI[md5sum] = "fc3815cdd4812505e3ee297740c5f5d3" +SRC_URI[sha256sum] = "87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_1.2.0.bb index 46aace286..46aace286 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_1.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc index fae0f13cb..e9a68789e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc @@ -4,11 +4,13 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI[md5sum] = "2dd01ef0d5b5f0fc754c1ba40137b61c" -SRC_URI[sha256sum] = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a" +SRC_URI[md5sum] = "5f3d73d82d1753b59bb49a6bc6046dee" +SRC_URI[sha256sum] = "71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a" inherit pypi +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + PACKAGES =+ "${PN}-tests" FILES_${PN}-tests += " \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_2.3.3.bb index 687394da6..687394da6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_2.3.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc index 13c9e5f25..35d28a44d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.attrs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff" -SRC_URI[sha256sum] = "f913492e1663d3c36f502e5e9ba6cd13cf19d7fab50aa13239e420fef95e1396" -SRC_URI[md5sum] = "d5a6ee80beaa072bd2b3bcb6fee0d508" +SRC_URI[sha256sum] = "f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72" +SRC_URI[md5sum] = "5b2db50fcc31be34d32798183c9bd062" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.3.0.bb index e3bec0fdf..e3bec0fdf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc index f6cbb35c0..ec392216e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" FILESEXTRAPATHS_prepend := "${THISDIR}/python-automat:" -SRC_URI[md5sum] = "b72d5b7a83c2b1bd6e9ec3614a69f9ea" -SRC_URI[sha256sum] = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e" +SRC_URI[md5sum] = "47e980a48201a1dabe37fa11f0187013" +SRC_URI[sha256sum] = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484" PYPI_PACKAGE = "Automat" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.8.0.bb index 8ac8c9c0f..8ac8c9c0f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.8.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc index 7423fa76d..60493e1de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "\ file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ " -SRC_URI[md5sum] = "50a5c46410c2b44b5c09f1ea5eb15a3b" -SRC_URI[sha256sum] = "b3c8af3ce24eab861447a194f3c382509dd70e90452c86a5426f1e7272460177" +SRC_URI[md5sum] = "2b3df629827d8bc18ca4d927b4885a17" +SRC_URI[sha256sum] = "7e67c8cfeee8a1c8fd251bcc418de9d4dca697753565c9a9e614525179d9555d" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.7.bb index 490e97391..490e97391 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc index 427467294..c55b45922 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A collection of tools for internationalizing Python applications" HOMEPAGE = "http://babel.edgewall.org/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=942469df9305abb1c59e95f778310384" SRC_URI[md5sum] = "83c158b7dae9135750a7cf204e6e2eea" @@ -23,3 +23,5 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-threading \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb deleted file mode 100644 index 6a4d267bc..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "collections.abc from Python 3.4" -DESCRIPTION = "A backport of recent additions to the 'collections.abc' module" - -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" - -# pypi package doesn't have valid entry for license -SRC_URI += "https://raw.githubusercontent.com/cython/backports_abc/master/LICENSE;name=license" - -SRC_URI[md5sum] = "0b65a216ce9dc9c1a7e20a729dd7c05b" -SRC_URI[sha256sum] = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5" -SRC_URI[license.md5sum] = "dd98d01d471fac8d8dbdd975229dba03" -SRC_URI[license.sha256sum] = "0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca" - - - -PYPI_PACKAGE = "backports_abc" -inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.5.bb new file mode 100644 index 000000000..b588a31a3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.5.bb @@ -0,0 +1,11 @@ +SUMMARY = "collections.abc from Python 3.5" +DESCRIPTION = "A backport of recent additions to the 'collections.abc' module" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" + +PYPI_PACKAGE = "backports_abc" + +SRC_URI[md5sum] = "7d1936ec183a3586290adf60f6f96764" +SRC_URI[sha256sum] = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde" + +inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.7.0.1.bb index 45492daa6..9032a7c1e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.7.0.1.bb @@ -7,10 +7,10 @@ match_hostname() function for performing this check instead of requiring every a implement the check separately. This backport brings match_hostname() to users of earlier versions of Python" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=95a5ee8fd779fbeca8b4cbca64433c87" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b2adbe8bfdeb625c9a01afd9aaa66619" -SRC_URI[md5sum] = "c03fc5e2c7b3da46b81acf5cbacfe1e6" -SRC_URI[sha256sum] = "502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2" +SRC_URI[md5sum] = "32d2f593af01a046bec3d2f5181a420a" +SRC_URI[sha256sum] = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2" PYPI_PACKAGE = "backports.ssl_match_hostname" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc index 449096978..a26400329 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" DEPENDS += "${PYTHON_PN}-cffi-native" -SRC_URI[md5sum] = "8408abc974446e64862a9742104e97b6" -SRC_URI[sha256sum] = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d" +SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" +SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.7.bb index b136aa489..b136aa489 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc index 480f048b7..da5d11f1c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc @@ -1,10 +1,10 @@ SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=f4ce1ae80a385140f0ddb2bcef410b06" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=00f0d12ccaf4e6b0b4fe501663621fa3" -SRC_URI[md5sum] = "f3131ac2a277f3b70dbb6132ca8f8889" -SRC_URI[sha256sum] = "050cd30b810ddb3aa941e7ddfbe0d8065e793012d0a88cb5739ec23624b9895e" +SRC_URI[md5sum] = "743d396a1012d6f7d791d8a526da302d" +SRC_URI[sha256sum] = "9f578314c7808eb1416620dc7d7977d4787a65a4f61b4c9685343a860712615b" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_0.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_1.1.0.bb index f78c7abd2..f78c7abd2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_0.8.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_1.1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc index 46f085933..7d0100d7d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc @@ -1,10 +1,10 @@ SUMMARY = "Controller Area Network (CAN) interface module for Python" SECTION = "devel/python" LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=38138baa100d7259934590850bc0406e" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI[md5sum] = "dcdd3f6b924e3f20acb1ccf4598236cf" -SRC_URI[sha256sum] = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b" +SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" +SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" PYPI_PACKAGE="python-can" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-can_3.3.2.bb index f0edb6408..f0edb6408 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-can_3.3.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc index 07baa2daf..a2b0c3bb0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[md5sum] = "2c90be6d3bfbf80ab732b28fd677051d" -SRC_URI[sha256sum] = "8fe230f612c18af1df6f348d02d682fe2c28ca0a6c3856c99599cdacae7cf226" +SRC_URI[md5sum] = "652203cf99faa254efff7fab23c2f3a2" +SRC_URI[sha256sum] = "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346" RDEPENDS_${PN}_class-target = " \ ${PYTHON_PN}-ctypes \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.2.bb index bc667b805..bc667b805 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc index 60bc46f82..f9dfd5627 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc @@ -5,7 +5,7 @@ in a composable way with as little code as necessary. It's the "Command \ Line Interface Creation Kit". It's highly configurable but comes with \ sensible defaults out of the box." HOMEPAGE = "http://click.pocoo.org/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc index 7782b1447..3a6bf5472 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://packages.python.org/cmd2/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc" -SRC_URI[md5sum] = "f7a51dc68ad377ebc6a84408044dc1a2" -SRC_URI[sha256sum] = "840cdbf50e83761fea69ca5beadcba7569ab03734e3ee42b0dbf7f6f90e1213d" +SRC_URI[md5sum] = "20f3f76b2aaf36a17372717b469ca969" +SRC_URI[sha256sum] = "c81284083d993af18b8fef57d89d854d49d051d4c2c8a8e12d0281e369ac3682" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.19.bb index 17b6ae285..17b6ae285 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.18.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.19.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc index a1fb6cd29..8ecfe221d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc @@ -9,3 +9,5 @@ SRC_URI[md5sum] = "bc1558ed941cb1acb80ff650726d5af8" SRC_URI[sha256sum] = "bc37850f0cc42a1725a796ef7d92690651bf1af37d744cc63161dac62cabee17" inherit pypi + +BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb index 69f045dba..a8ed1e91b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb @@ -1,2 +1,3 @@ inherit setuptools require python-configparser.inc +RDEPENDS_${PN} += "python-pkgutil" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2.inc new file mode 100644 index 000000000..750721f3d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Backports and enhancements for the contextlib module" +HOMEPAGE = "http://contextlib2.readthedocs.org/" +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=43d1c7827e8fad6454b553caf0e1d734" + +SRC_URI[md5sum] = "d03a631073b40073b5c41364ad8f5979" +SRC_URI[sha256sum] = "7197aa736777caac513dbd800944c209a49765bf1979b12b037dce0277077ed3" + +BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2_0.6.0.bb new file mode 100644 index 000000000..87cffb98f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2_0.6.0.bb @@ -0,0 +1,3 @@ +inherit pypi setuptools +require python-contextlib2.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc index 887d2d3d3..10af48c9f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc @@ -8,8 +8,8 @@ DEPENDS += " \ ${PYTHON_PN}-cryptography \ " -SRC_URI[md5sum] = "1a518a28ed9c924ca6c570aa8ea0c334" -SRC_URI[sha256sum] = "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc" +SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e" +SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116" PYPI_PACKAGE = "cryptography_vectors" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.8.bb index 4975278a9..4975278a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.8.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc index 876fcc273..5acd02d67 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc @@ -12,8 +12,8 @@ DEPENDS += " \ ${PYTHON_PN}-six \ " -SRC_URI[md5sum] = "7dfe1035cae43569e571318f000462a4" -SRC_URI[sha256sum] = "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6" +SRC_URI[md5sum] = "77730058b556c6d9838679a94c6229ce" +SRC_URI[sha256sum] = "3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" RDEPENDS_${PN} += " \ ${PYTHON_PN}-cffi \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.8.bb index 9c2f88418..9c2f88418 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.8.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc index 426159465..3260e92ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "f8109a2a86cded40b3896ee7a63bc5a5" -SRC_URI[sha256sum] = "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e" +SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c" +SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.14.bb index d803a6ed4..d803a6ed4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.14.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.5.0.bb index 98f23aba1..e0f64fcf1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.4.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.5.0.bb @@ -12,5 +12,5 @@ RDEPENDS_${PN} = "\ python-resource \ " -SRC_URI[md5sum] = "6759005b12dfeea0d4305f8536b4b0c2" -SRC_URI[sha256sum] = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8" +SRC_URI[md5sum] = "3d64e7a0219ad22e3fca62460f893b6a" +SRC_URI[sha256sum] = "dd026e4ff8d22cb016ed2130bc738b7d4b1da597ef93c074d2adb9e4dea08bc3" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc index 8cc2373cd..3c89cd62c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc @@ -4,8 +4,8 @@ HOMEPAGE = "https://dateutil.readthedocs.org" LICENSE = "BSD-3-Clause & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996" -SRC_URI[md5sum] = "354db28843d949f1bc3e49e8458e22df" -SRC_URI[sha256sum] = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e" +SRC_URI[md5sum] = "f2a1d4b680b297b367a974664ca3a4f6" +SRC_URI[sha256sum] = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c" PYPI_PACKAGE = "python-dateutil" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.8.1.bb index 12ae4c311..12ae4c311 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.8.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc index 96cf8b475..65db1a961 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc @@ -6,11 +6,11 @@ various non-trivial examples. Of course, as all techniques, decorators \ can be abused and you should not try to solve every problem with a \ decorator, just because you can." -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22" -SRC_URI[md5sum] = "a565a98581c0d110bc247323e89df9b1" -SRC_URI[sha256sum] = "86156361c50488b84a3f148056ea716ca587df2f0de1d34750d35c21312725de" +SRC_URI[md5sum] = "933981f288c4230816b5beee8d40e6ea" +SRC_URI[sha256sum] = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.1.bb index 2a2b455f5..2a2b455f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc index 6a04429b7..84502affe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc @@ -1,10 +1,10 @@ DESCRIPTION = "DNS toolkit for Python" HOMEPAGE = "http://www.dnspython.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b9d855ee0d7bea17c8b0994d37985e1e" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[md5sum] = "05d33ffb5d8f35ae0474bb952778a344" -SRC_URI[sha256sum] = "40f563e1f7a7b80dc5a4e76ad75c23da53d62f1e15e6e517293b04e1f84ead7c" +SRC_URI[md5sum] = "bc9ca3b3a82164667d5730ec6d5248a2" +SRC_URI[sha256sum] = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01" PYPI_PACKAGE_EXT = "zip" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.16.0.bb index 9dbcd0ffb..9dbcd0ffb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.16.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb deleted file mode 100644 index 68436a1a5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Text processing system for documentation" -HOMEPAGE = "http://docutils.sourceforge.net" -SECTION = "devel/python" -LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" - -DEPENDS = "python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "2f4bee6451958252f7bec71f18b05be3" -SRC_URI[sha256sum] = "3caee0bcb2a49fdf24fcfa70849a60abb7a181aa68b030f7cb7494096181830c" - -S = "${WORKDIR}/docutils-${PV}" - -inherit distutils - -BBCLASSEXTEND = "native" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb new file mode 100644 index 000000000..d26e81908 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Text processing system for documentation" +HOMEPAGE = "http://docutils.sourceforge.net" +SECTION = "devel/python" +LICENSE = "PSF & BSD-2-Clause & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" + +inherit pypi setuptools + +PYPI_PACKAGE = "docutils" + +SRC_URI[md5sum] = "e26a308d8000b0bed7416a633217c676" +SRC_URI[sha256sum] = "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc index ecf74a0bc..7e499a6c7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc @@ -2,8 +2,8 @@ SUMMARY = "Dominate is a Python library for creating and manipulating HTML docum LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" -SRC_URI[md5sum] = "45bd97e6f7888aac24ae86013c57638e" -SRC_URI[sha256sum] = "4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69" +SRC_URI[md5sum] = "27d3aa7e0d67902c505e248e705e5e2e" +SRC_URI[sha256sum] = "a92474b4312bd8b4c1789792f3ec8c571cd8afa8e7502a2b1c64dd48cd67e59c" RDEPENDS_${PN} += "\ ${PYTHON_PN}-numbers \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.4.0.bb index c19445e72..c19445e72 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.4.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc index f24da1284..134713064 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc @@ -9,5 +9,5 @@ inherit pypi PYPI_PACKAGE = "python-engineio" -SRC_URI[md5sum] = "11a4f18f5b08a36d07d3c0ff85e7c047" -SRC_URI[sha256sum] = "2a4c874aea686e79f8ea9efc30748110df581df6d577d18bb5eaa1a8f2199d12" +SRC_URI[md5sum] = "bec3b06a112a7f09a0a9c92b627282fe" +SRC_URI[sha256sum] = "9c9a6035b4b5e5a225f426f846afa14cf627f7571d1ae02167cb703fefd134b7" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.10.0.bb index 7dd6ec0e0..7dd6ec0e0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.9.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.10.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc index 5a3884a6f..953094ba7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc @@ -1,10 +1,10 @@ SUMMARY = "Python evdev lib" HOMEPAGE = "https://github.com/gvalkov/python-evdev" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" -SRC_URI[md5sum] = "c7e855ae9f97f869a59e75b29f05ce74" -SRC_URI[sha256sum] = "57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1" +SRC_URI[md5sum] = "53e440943dfa2514f95b3c448d6a36cb" +SRC_URI[sha256sum] = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166" do_compile_prepend() { rm -rf ${S}/evdev/ecodes.c diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_1.2.0.bb index 63541363e..63541363e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_1.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc index a333ef4ee..6ddcaa98e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc @@ -1,7 +1,7 @@ DESCRIPTION = "A Python library for generating news feeds in RSS and Atom formats" HOMEPAGE = "http://code.google.com/p/feedformatter/" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=258e3f39e2383fbd011035d04311008d" SRCREV = "7391193c83e10420b5a2d8ef846d23fc368c6d85" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc index b60ee17d1..0e507f337 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc @@ -1,9 +1,9 @@ DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" -SRC_URI[md5sum] = "07803453743f139309021572a799c6b3" -SRC_URI[sha256sum] = "c0d75710bd4b0fe866f9f2347de6e19208712f9cec006436b4c1c15d4cb0c939" +SRC_URI[md5sum] = "fcf2f360ff279d3133e40974804efd72" +SRC_URI[sha256sum] = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86" PYPI_PACKAGE = "Flask-Babel" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.12.2.bb index 38e78c73f..38e78c73f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.12.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb index f035862de..d090b345e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Bcrypt hashing for Flask." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ee2ee5bee7fe96597770e92db5719a8" SRC_URI[md5sum] = "d345c36ac6637d3ca9fa942e238d00ca" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc index bb0870348..0df276d15 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc @@ -1,7 +1,7 @@ SUMMARY = "Flask extension for sending email" DESCRIPTION = "A Flask extension for sending email" HOMEPAGE = " https://github.com/rduplain/flask-email" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5b16dfa6d3f275ace5985bb92949f770" SRC_URI[md5sum] = "04b35a42a44ec7aa724ec8ce55e2e08e" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc index dfb20e9ee..5202f8be0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc @@ -2,8 +2,8 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[md5sum] = "aaeee55431d0287063657122ff41a0e6" -SRC_URI[sha256sum] = "cd1b4e6cb829eeb41c02ad9202d83bef5f4b7a036dd9fad72ce96ad1e22efb07" +SRC_URI[md5sum] = "bedeb0366740fda6912fea683be11968" +SRC_URI[sha256sum] = "a96ff1875a49a40bd3e8ac04fce73fdb0870b9211e6168608cbafa4eb839d502" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.5.2.bb index ece516f50..ece516f50 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.5.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc index 39251525b..5fc35c193 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc @@ -2,7 +2,7 @@ SUMMARY = "PyMongo support for Flask applications" DESCRIPTION = "PyMongo support for Flask applications." HOMEPAGE = "https://github.com/mitsuhiko/flask/" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://flask_pymongo/wrappers.py;beginline=1;endline=24;md5=424c4e1047d28e01b4e4634a069c019d" SRC_URI[md5sum] = "94df71e6800b1d7915cc91a74b70f959" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc index 0485f85aa..dcbcd0d76 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc @@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/flask-restful/flask-restful" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=685bb55ed99a366bb431995f5eef2783" -SRC_URI[md5sum] = "8243ca101185b130d8fa529cbdbdbddd" -SRC_URI[sha256sum] = "5795519501347e108c436b693ff9a4d7b373a3ac9069627d64e4001c05dd3407" +SRC_URI[md5sum] = "a7217ef1159be38af5faf61aa09aabef" +SRC_URI[sha256sum] = "f8240ec12349afe8df1db168ea7c336c4e5b0271a36982bff7394f93275f2ca9" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.7.bb index 1968d1d9d..1968d1d9d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc index fca777bc5..f48af8bc9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Scripting support for flask" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e686048adb69341fc8a08caeda528b41" SRC_URI[md5sum] = "3fbd91fe13cebedfb2431331f6eabb68" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc index 251d13ede..8d778d4bf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc @@ -9,8 +9,8 @@ inherit pypi PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[md5sum] = "298965a43f6534e8a5b24d1ba1fc4186" -SRC_URI[sha256sum] = "8d8f9f104db5ddff1b06ba322d8e158881d590144199c993fe26cf53218c7edd" +SRC_URI[md5sum] = "b23222fb7dd2f0676d78bbe24153fd80" +SRC_URI[sha256sum] = "2172dff1e42415ba480cee02c30c2fc833671ff326f1598ee3d69aa02cf768ec" RDEPENDS_${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_4.2.1.bb index 3b9ad33bb..3b9ad33bb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_4.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc index e0efbc63a..86ba9dda5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc @@ -1,9 +1,9 @@ DESCRIPTION = "Adds SQLAlchemy support to your Flask application." -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5ed1b8cc741515a835a7f6bf2f62ef4a" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[md5sum] = "373ce61dfd03b593ad2eaba68c9fee35" -SRC_URI[sha256sum] = "5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53" +SRC_URI[md5sum] = "1f5781cf3e1a2b1aabda47a5b20d2073" +SRC_URI[sha256sum] = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d" PYPI_PACKAGE = "Flask-SQLAlchemy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.4.1.bb index 3dc355c5d..3dc355c5d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc index c2b71829c..adef32cc8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Customizable User Account Management for Flask; Register \ Confirm email, Login, Change username, Change password, Forgot Password \ and more." HOMEPAGE = " https://github.com/lingthio/Flask-User" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=97de97cd9d6e23c88129d884588ce71a" SRC_URI[md5sum] = "f7965e66ca139c8436896da07e66c21f" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc index 3c90656ad..863671153 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Simple integration of Flask and WTForms." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3ca6bb31670492f791e6a9f2fb9f8a80" SRC_URI[md5sum] = "586f50f233926cade42e3d744aca3e8f" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc index a1fe14ed4..48ff7149c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc @@ -1,5 +1,5 @@ DESCRIPTION = "XStatic support for flask" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=659968f6ebd4b70b6c3190d20b4a924c" SRC_URI[md5sum] = "2f56023e1444c8bd1fec41afe93de743" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc index ffd783f3d..1263383da 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc @@ -3,11 +3,11 @@ DESCRIPTION = "\ Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \ intentions. And before you ask: It’s BSD licensed!" HOMEPAGE = "https://github.com/mitsuhiko/flask/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c011883ac26229b8ba3084f55c7664c6" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[md5sum] = "824f0f20aae1f44c9c7dc4054adb7969" -SRC_URI[sha256sum] = "2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48" +SRC_URI[md5sum] = "0e3ed44ece1c489ed835d1b7047e349c" +SRC_URI[sha256sum] = "13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask_1.1.1.bb index a0a28ab8b..a0a28ab8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask_1.1.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc index 224756180..c0a2b39ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Clean single-source support for Python 3 and 2" HOMEPAGE = "https://python-future.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f457538b297bd0ef86564b8ac216ad7" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a253924061f8ecc41ad7a2ba1560e8e7" -SRC_URI[md5sum] = "3e8e88a2bda48d54b1da7634d04760d7" -SRC_URI[sha256sum] = "e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb" +SRC_URI[md5sum] = "e4579c836b9c025872efe230f6270349" +SRC_URI[sha256sum] = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" PYPI_PACKAGE_HASH = "99abde815842bc6e97d5a7806ad51236630da14ca2f3b1fce94c0bb94d3d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.18.2.bb index d95e1ba77..d95e1ba77 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.18.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc index 9eb5da954..a53537aa7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc @@ -10,3 +10,5 @@ SRC_URI[sha256sum] = "aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25d DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb index 5c213004c..09c5700db 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb @@ -1,2 +1,7 @@ inherit pypi setuptools require python-importlib-metadata.inc +RDEPENDS_${PN} += "python-configparser \ + python-contextlib2 \ + python-pathlib2 \ + python-compression \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc index a915e09f9..4489aa59d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc @@ -9,7 +9,7 @@ PYPI_PACKAGE := "python-intervals" inherit pypi -SRC_URI[md5sum] = "a35dd44269fdb134bf19cfd80cb2c120" -SRC_URI[sha256sum] = "a8a15b7c2fadb8465310f44aa96e384828b35a29de38ac74738cd665924cb8ac" +SRC_URI[md5sum] = "8955317ff4e42590c90ba6247b1caaed" +SRC_URI[sha256sum] = "0d26746eaed0be78a61dd289bb7a10721b08770bb3e807614835f490d514f2a5" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.10.0.bb index 3c2a33bbc..3c2a33bbc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.5.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.10.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress.inc index 66de8b637..a23020649 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.22.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress.inc @@ -3,11 +3,11 @@ HOMEPAGE = "https://github.com/phihag/ipaddress" LICENSE = "Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7f538584cc3407bf76042def7168548a" -DEPENDS += "python-pip" +DEPENDS += "${PYTHON_PN}-pip" -SRC_URI[md5sum] = "74c1ce3109f30eaa1ab3dd342e7b76d4" -SRC_URI[sha256sum] = "b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c" +SRC_URI[md5sum] = "aaee67a8026782af1831148beb0d9060" +SRC_URI[sha256sum] = "b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2" -inherit pypi setuptools +inherit pypi BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.23.bb new file mode 100644 index 000000000..ed4e6cb19 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.23.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-ipaddress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ipy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ipy.inc new file mode 100644 index 000000000..46b2fad03 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ipy.inc @@ -0,0 +1,19 @@ +SUMMARY = "IPy - class and tools for handling of IPv4 and IPv6 addresses and networks" +DESCRIPTION = "IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks \ +in a fashion similar to perl's Net::IP and friends. The IP class allows \ +a comfortable parsing and handling for most notations in use for IPv4 \ +and IPv6 Addresses and Networks." +SECTION = "devel/python" +HOMEPAGE = "https://github.com/autocracy/python-ipy" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6" + +SRC_URI[md5sum] = "1a90c68174234672241a7e60c7ea0fb9" +SRC_URI[sha256sum] = "2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621" + +inherit pypi + +PYPI_PACKAGE = "IPy" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ipy_1.00.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ipy_1.00.bb new file mode 100644 index 000000000..587a517e3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ipy_1.00.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-ipy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-isodate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-isodate.inc index 3cb6bb816..8c128919e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-isodate.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-isodate.inc @@ -1,5 +1,5 @@ SUMMARY = "ISO 8601 date/time parser" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRC_URI[md5sum] = "0e1203fce27ce65e2d01c5f21c4d428f" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc index 359b18012..324d4cf10 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc @@ -4,8 +4,8 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "fb554e9c8f9aa76e333a03d470a5cf52" -SRC_URI[sha256sum] = "b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8" +SRC_URI[md5sum] = "05d66f2eb7ce2c2d702e86bac24bf9e4" +SRC_URI[sha256sum] = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.21.bb index fa46d89b5..fa46d89b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.21.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc index 84f9e7742..241786a7c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc @@ -1,10 +1,10 @@ SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b61841e2bf5f07884148e2a6f1bcab0c" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=370799bf709a1e4a6a369fa089ac73a6" -SRC_URI[md5sum] = "a3d55aa79369aef5345c036a8a26307f" -SRC_URI[sha256sum] = "cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" +SRC_URI[md5sum] = "9b7f5afa7f1e3acfb7786eeca3d99307" +SRC_URI[sha256sum] = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_0.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_1.1.0.bb index 8c99cb4ca..8c99cb4ca 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_0.24.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_1.1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc index a0e802ca7..b10f00bba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc @@ -5,10 +5,10 @@ DESCRIPTION = "python-javaobj is a python library that provides functions\ representation is a standard data interchange format in Java world." HOMEPAGE = "https://github.com/tcalmant/python-javaobj" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://javaobj.py;beginline=21;endline=33;md5=8b504419ce78f8133b21b4d4a89ef7e9" +LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e" -SRC_URI[md5sum] = "f669bb8099380e3dd84db3d542aa5b68" -SRC_URI[sha256sum] = "b8b0d310fd97e1c7914d7911ee9d3f4b3d84d2a674aa95a4b0da3d8f155fc1bb" +SRC_URI[md5sum] = "1c6189a0d9aef51d74bfc52cd2953991" +SRC_URI[sha256sum] = "a57469e4f0d0eeba7482ad9839595db6e99ca4ac6630a4c8064dda75a2182549" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.3.0.bb index ed34740e8..ed34740e8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc index 8f64c2ab5..b23142d28 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc @@ -1,6 +1,6 @@ SUMMARY = "Appling JSON patches in Python 2.6+ and 3.x" HOMEPAGE = "https://github.com/stefankoegl/python-json-patch" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc index 4ed01ed6c..d36f0294a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc @@ -1,6 +1,6 @@ SUMMARY = "Resolve JSON Pointers in Python" HOMEPAGE = "https://github.com/stefankoegl/python-json-pointer" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc index d9ccf1cad..258beadc4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -1,15 +1,38 @@ SUMMARY = "An implementation of JSON Schema validation for Python" +HOMEPAGE = "https://github.com/Julian/jsonschema" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" +LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ + file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af" +DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-jsonschema:" + +SRC_URI_append = " file://0001-setup.cfg-add-non-GPL-format-option.patch" SRC_URI[md5sum] = "a802ab85600074a726ef6acc4e6a8148" SRC_URI[sha256sum] = "2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f" -DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" +PACKAGECONFIG ??= "format" +PACKAGECONFIG[format] = ",,,\ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-jsonpointer \ + ${PYTHON_PN}-webcolors \ + ${PYTHON_PN}-rfc3987 \ + ${PYTHON_PN}-strict-rfc3339 \ +" +PACKAGECONFIG[nongpl] = ",,,\ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-jsonpointer \ + ${PYTHON_PN}-webcolors \ + ${PYTHON_PN}-rfc3986-validator \ + ${PYTHON_PN}-rfc3339-validator \ +" RDEPENDS_${PN} += " \ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-core \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-importlib-metadata \ ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ ${PYTHON_PN}-netclient \ @@ -17,11 +40,11 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-pprint \ ${PYTHON_PN}-pyrsistent \ - ${PYTHON_PN}-rfc3987 \ ${PYTHON_PN}-shell \ - ${PYTHON_PN}-strict-rfc3339 \ + ${PYTHON_PN}-six \ ${PYTHON_PN}-unittest \ ${PYTHON_PN}-setuptools-scm \ + ${PYTHON_PN}-zipp \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema/0001-setup.cfg-add-non-GPL-format-option.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema/0001-setup.cfg-add-non-GPL-format-option.patch new file mode 100644 index 000000000..afc38a30b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema/0001-setup.cfg-add-non-GPL-format-option.patch @@ -0,0 +1,96 @@ +From 8df0332475991884b8e1801d31f9c3e06d06bf9f Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <nick83ola@gmail.com> +Date: Thu, 14 Nov 2019 18:58:56 +0000 +Subject: [PATCH] setup.cfg: add non GPL format option + +This is a rewrite of the following upstream commits: + + - 10f8a3e Add format validators as separate modules + - af37707 non GPL format option + +removing all the non necessary bits (tox in particular) + +Original author: Nicolas Aimetti <naimetti@yahoo.com.ar> + +Upstream-status: Backported. [ to be removed for releases > 3.1.1 ] +--- + jsonschema/_format.py | 33 ++++++++++++++++++++++++++++----- + setup.cfg | 6 ++++++ + 2 files changed, 34 insertions(+), 5 deletions(-) + +diff --git a/jsonschema/_format.py b/jsonschema/_format.py +index aa04090..c967d98 100644 +--- a/jsonschema/_format.py ++++ b/jsonschema/_format.py +@@ -248,7 +248,26 @@ else: + try: + import rfc3987 + except ImportError: +- pass ++ try: ++ from rfc3986_validator import validate_rfc3986 ++ except ImportError: ++ pass ++ else: ++ @_checks_drafts(name="uri",) ++ def is_uri(instance): ++ if not isinstance(instance, str_types): ++ return True ++ return validate_rfc3986(instance, rule="URI") ++ ++ @_checks_drafts( ++ draft6="uri-reference", ++ draft7="uri-reference", ++ raises=ValueError, ++ ) ++ def is_uri_reference(instance): ++ if not isinstance(instance, str_types): ++ return True ++ return validate_rfc3986(instance, rule="URI_reference") + else: + @_checks_drafts(draft7="iri", raises=ValueError) + def is_iri(instance): +@@ -280,15 +299,19 @@ else: + + + try: +- import strict_rfc3339 ++ from strict_rfc3339 import validate_rfc3339 + except ImportError: +- pass +-else: ++ try: ++ from rfc3339_validator import validate_rfc3339 ++ except ImportError: ++ validate_rfc3339 = None ++ ++if validate_rfc3339: + @_checks_drafts(name="date-time") + def is_datetime(instance): + if not isinstance(instance, str_types): + return True +- return strict_rfc3339.validate_rfc3339(instance) ++ return validate_rfc3339(instance) + + @_checks_drafts(draft7="time") + def is_time(instance): +diff --git a/setup.cfg b/setup.cfg +index 74bc4a7..878221c 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -40,6 +40,12 @@ format = + rfc3987 + strict-rfc3339 + webcolors ++format_nongpl = ++ idna ++ jsonpointer>1.13 ++ webcolors ++ rfc3986-validator>0.1.0 ++ rfc3339-validator + + [options.entry_points] + console_scripts = +-- +2.20.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc index 83d2ea3cd..bbbd66ce6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc @@ -1,10 +1,12 @@ SUMMARY = "A fast and thorough lazy object proxy" HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ec680df42d8ad56427a83308817658cc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" -SRC_URI[md5sum] = "e128152b76eb5b9ba759504936139fd0" -SRC_URI[sha256sum] = "eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "5c64c06affcd2a7c6ddc848af4280cca" +SRC_URI[sha256sum] = "f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.4.3.bb index df4d60bff..df4d60bff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.4.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc index d4e274e60..558e436c9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc @@ -5,7 +5,7 @@ template markup and dynamic rendering logic separate from one \ another. See http://www.entrian.com/PyMeld for a treatise on the \ benefits of this pattern." HOMEPAGE = "https://github.com/supervisor/meld3" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9e7581cef5645475fcefebdc15ed7abf" SRC_URI[md5sum] = "3ccc78cd79cffd63a751ad7684c02c91" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc index 41c334e8d..8dcf00b3f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc @@ -3,7 +3,4 @@ HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" -SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4" -SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832" - -inherit pypi setuptools3 +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb new file mode 100644 index 000000000..6c44df40a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb @@ -0,0 +1,7 @@ +inherit pypi setuptools +require python-more-itertools.inc + +SRC_URI[md5sum] = "f2ea58aa336ce6c13b7b225b3bbe305d" +SRC_URI[sha256sum] = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4" + +PE = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb deleted file mode 100644 index 0702aad4e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-more-itertools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc index 91235b961..bca58f764 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL" HOMEPAGE = "http://python-requests.org" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=ce22c0cd986d2de3f7073cd6b5523ae0" SRC_URI[md5sum] = "b0fc8ea38f87d2c1ab1ed79a95c078f9" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc index 5b6d4dffa..bea9be674 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc @@ -1,5 +1,5 @@ SUMMARY = "A network address manipulation library for Python." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6345d695ffe3776f68a56fe7962db44" SRC_URI[md5sum] = "51019ef59c93f3979bcb37d3b8527e07" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc index c5de8a091..fea071449 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc @@ -1,7 +1,7 @@ SUMMARY = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" HOMEPAGE = "https://github.com/idan/oauthlib" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5ba9ce41463615e082609806255bce1b" SRC_URI = "https://pypi.python.org/packages/a5/8a/212e9b47fb54be109f3ff0684165bb38c51117f34e175c379fce5c7df754/oauthlib-${PV}.tar.gz" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc index 66943ed6c..0a0e61084 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc @@ -8,8 +8,8 @@ SRCNAME = "paho-mqtt" inherit pypi -SRC_URI[md5sum] = "e3ac29cd5dc247a01083a2a8f3fddd08" -SRC_URI[sha256sum] = "e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79" +SRC_URI[md5sum] = "45e80d9b8066a8d0ba1ecfffe271bd3d" +SRC_URI[sha256sum] = "e3d286198baaea195c8b3bc221941d25a3ab0e1507fc1779bdb7473806394be4" DEPENDS += "${PYTHON_PN}-pytest-runner-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.5.0.bb index a1031176e..a1031176e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.5.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb index 60a3b43de..bac349618 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb @@ -11,5 +11,5 @@ inherit pypi setuptools RDEPENDS_${PN} = "libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc index fa55a93c5..ccd5a9377 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc @@ -1,10 +1,10 @@ SUMMARY = "Parse strings using a specification based on the Python format() syntax" HOMEPAGE = "https://github.com/r1chardj0n3s/parse" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://parse.py;beginline=1273;endline=1291;md5=5147afdd9b3615290ad8733f0137a1a1" +LIC_FILES_CHKSUM = "file://parse.py;beginline=1317;endline=1337;md5=fa03bae3f51a2db25e239e869c647437" -SRC_URI[md5sum] = "fa69ab2fe846f9b183411391f7c6897b" -SRC_URI[sha256sum] = "c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939" +SRC_URI[md5sum] = "8fc634769f1d841f14a52dd731ca447a" +SRC_URI[sha256sum] = "a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.12.1.bb index d31ccc72a..d31ccc72a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.12.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc index 9e477ecf9..8a6d7e9b2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc @@ -6,7 +6,7 @@ managing existing password hashes. It’s designed to be useful for a wide range tasks, from verifying a hash found in /etc/shadow, to providing full-strength password \ hashing for multi-user applications." HOMEPAGE = "https://bitbucket.org/ecollins/passlib" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=73eed1a5470b969951dac411086c7036" SRC_URI[md5sum] = "254869dae3fd9f09f0746a3cb29a0b15" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc index c25e5a080..3199b56a0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc @@ -3,7 +3,9 @@ HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a" -SRC_URI[md5sum] = "96da6398b3ea944417b84ccb25b171aa" -SRC_URI[sha256sum] = "446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8" +SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb" +SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" RDEPENDS_${PN} += "${PYTHON_PN}-six" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb deleted file mode 100644 index e4bf78913..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb new file mode 100644 index 000000000..6317e1c16 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb @@ -0,0 +1,6 @@ +inherit pypi setuptools +require python-pathlib2.inc + +RDEPENDS_${PN} += "python-scandir \ + python-misc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc index 539c3579c..ea43e5fa7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc @@ -2,6 +2,6 @@ DESCRIPTION = "A pure Python 2/3 library for peripheral I/O (GPIO, LED, PWM, SPI HOMEPAGE = "http://pythonhosted.org/python-periphery/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=063846af82b555d48822cf43dc6db6af" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=19f978bd6c8afe3fa9e408b71330512f" -PYPI_PACKAGE = "python-periphery"
\ No newline at end of file +PYPI_PACKAGE = "python-periphery" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb deleted file mode 100644 index 6ae7fed81..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools -require python-periphery.inc - -SRC_URI[sha256sum] = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb new file mode 100644 index 000000000..7069f3fdd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools +require python-periphery.inc + +SRC_URI[sha256sum] = "2df05528a7668db4fb3faaff516b34ed99e9009ed9610a4efe3ea6c0ea8a3aab" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pika.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pika.inc index 10be5bb62..bde154fe7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pika.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pika.inc @@ -5,7 +5,7 @@ including RabbitMQ’s extensions. \ " SECTION = "devel/python" HOMEPAGE = "https://pika.readthedocs.io" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=535836bf0a5de515a7bfee026075701d" SRC_URI[md5sum] = "6002400cdd33bf85ec8680ece72910d4" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc index 2bc8e4ab6..0900d91d7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc @@ -9,7 +9,7 @@ PYPI_PACKAGE := "Pint" inherit pypi -SRC_URI[md5sum] = "e1f80f3f8fc4e61f68ad3912db26b3a8" -SRC_URI[sha256sum] = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4" +SRC_URI[md5sum] = "d0681cb7cfaca9fc68ce7edab0d08d88" +SRC_URI[sha256sum] = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.9.bb index 480f08872..480f08872 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.9.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.1.bb index 2b5ee9e7e..2827a1256 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.1.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://pip.pypa.io/" LICENSE = "MIT & LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" -SRC_URI[md5sum] = "a57da8b758cbf1a155cde6a7a4428ba7" -SRC_URI[sha256sum] = "324d234b8f6124846b4e390df255cacbe09ce22791c3b714aa1ea6e44a4f2861" +SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" +SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc index 57660060c..1931532a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc @@ -7,5 +7,8 @@ SRC_URI[md5sum] = "4b8384b69cddbc2e104fdd3ff5631788" SRC_URI[sha256sum] = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-importlib-metadata \ + ${PYTHON_PN}-more-itertools \ +" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc index a744950b6..149fe058f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc @@ -2,7 +2,7 @@ SUMMARY = "Python Lex and Yacc" DESCRIPTION = "Python ply: PLY is yet another implementation of lex and yacc for Python" HOMEPAGE = "https://pypi.python.org/pypi/ply" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://README.md;beginline=5;endline=32;md5=f5ee5c355c0e6719c787a71b8f0fa96c" SRC_URI[md5sum] = "6465f602e656455affcd7c5734c638f8" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pocketsphinx.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pocketsphinx.inc index 4c848b6dd..1f8f66a18 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pocketsphinx.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pocketsphinx.inc @@ -1,6 +1,6 @@ SUMMARY = "This package provides a python interface to CMU Sphinxbase and Pocketsphinx libraries created with SWIG and Setuptools." SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=826ebda787eb48e78aec2624f9faba72" SRC_URI[md5sum] = "c0f2bfd54bc4c438c3bb64825f57d575" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc index b342aef52..58f196199 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc @@ -1,6 +1,6 @@ SUMMARY = "A library for stubbing in Python" HOMEPAGE = "https://github.com/alex/pretend" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=411780c0b7fa756753e94affeee5bc99" SRC_URI[md5sum] = "ad53883ede48aeac7ae584f0de0240e8" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc index 6004ecd33..07e896d2d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc @@ -1,6 +1,6 @@ SUMMARY = "Python library for displaying tabular data in a ASCII table format" HOMEPAGE = "http://code.google.com/p/prettytable" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3e73500ffa52de5071cff65990055282" SRC_URI[md5sum] = "0c1361104caff8b09f220748f9d69899" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc index 9f00615c4..d59ba2cc5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://github.com/verigak/progress/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=aef5566ac4fede9815eccf124c281317" -SRC_URI[md5sum] = "057981e2f09029288f5255b1ea3ab64d" -SRC_URI[sha256sum] = "5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a" +SRC_URI[md5sum] = "408df0e3db0ad4b74f19f6beec814ae4" +SRC_URI[sha256sum] = "69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372" RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.5.bb index 80608627a..80608627a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc index 1a4bd35c3..91aa7bb19 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc @@ -1,9 +1,9 @@ SUMMARY = "Library for building powerful interactive command lines in Python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[md5sum] = "8db8b8e40e91bc6dce133d8d5727a717" -SRC_URI[sha256sum] = "ff58ce8bb82c11c43416dd3eec7701dcbe8c576e2d7649f1d2b9d21a2fd93808" +SRC_URI[md5sum] = "5016c523e603cd7119644fbc0f00ce53" +SRC_URI[sha256sum] = "f15af68f66e664eaa559d4ac8a928111eebd5feda0c11738b5998045224829db" PYPI_PACKAGE = "prompt_toolkit" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.10.bb index 527c905a8..527c905a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.10.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc index 0908c1c92..931226699 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc @@ -1,9 +1,9 @@ SUMMARY = "A cross-platform process and system utilities module for Python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" -SRC_URI[md5sum] = "1bbc1788588cc3c2c461cd98a830ba72" -SRC_URI[sha256sum] = "863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3" +SRC_URI[md5sum] = "5561dfe61b5888fb1b3f17fbe4eeb15d" +SRC_URI[sha256sum] = "d051532ac944f1be0179e0506f6889833cf96e466262523e57a871de65a15147" PACKAGES =+ "${PN}-tests" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.6.5.bb index 9aabfb206..9aabfb206 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.6.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc index 1722875ab..d1d53e125 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc @@ -3,5 +3,5 @@ HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" -SRC_URI[md5sum] = "5b9611041e4ea66b2b919239e3bacd65" -SRC_URI[sha256sum] = "87ff3ae777d9326349af5272974581270b2a0909b2392dc0cc57eb28ce23bcc3" +SRC_URI[md5sum] = "23fdca8191b16ce3e7f38fb9e4252b2d" +SRC_URI[sha256sum] = "72e6def53fb491f7f4e92692029d2e7bb5a0783314f20d80222735ff10a75758" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.4.3.bb index e56743002..e56743002 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.4.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc index c4969f966..50ffd0a66 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc @@ -3,10 +3,10 @@ DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ cryptographic primitives." HOMEPAGE = "http://www.pycryptodome.org" LICENSE = "PD & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=775fe77831c03bf82f35abc0e230d4c1" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" -SRC_URI[md5sum] = "a2587b6381b0ef4eb960cea1e7507d04" -SRC_URI[sha256sum] = "c5dd29e9f1b733e74311bf95d0e544e91bd1d14bc0366e8f443562d8d9920b7d" +SRC_URI[md5sum] = "c4e53f9ed33ca883b18249b9e1546251" +SRC_URI[sha256sum] = "39ddc3c493125494572e0beefa8e8e6a43369e93c3c3e163cb871b37c1c62fba" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.9.3.bb index c7701eb9f..c7701eb9f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.9.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyelftools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyelftools.inc new file mode 100644 index 000000000..7d4f763ff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyelftools.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "pyelftools is a pure-Python library for parsing and analyzing ELF files and DWARF debugging information" +HOMEPAGE = "https://github.com/eliben/pyelftools" +SECTION = "devel/python" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc" + +SRC_URI[md5sum] = "c5629b9a5d19c82107a946cce52eeec2" +SRC_URI[sha256sum] = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24" + +PYPI_PACKAGE = "pyelftools" + +inherit pypi + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyelftools_0.25.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyelftools_0.25.bb new file mode 100644 index 000000000..de4202506 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyelftools_0.25.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pyelftools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc index d2d41d51d..85d9588a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc @@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = "file://README.md;md5=500b884e9dcd5f677a53cbbee8ace939" inherit pypi -SRC_URI[md5sum] = "c71307d6c7096fdbde0813018dfa0092" -SRC_URI[sha256sum] = "d656ef7e07a8aa539ce0a4883a683341037b6fc1c329bf55b63bffbf2cce9582" +SRC_URI[md5sum] = "dc744289858001925c75d21e26f1260f" +SRC_URI[sha256sum] = "bff4654b113dac6c2231e486e11dcb23281ddc0742a5404467303fe7638829ef" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.19.bb index d26beb794..d26beb794 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.19.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc index 2365379aa..2a53574e2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-pyserial \ " -SRC_URI[md5sum] = "ee4c23ca5c35d3091d550a63540811a3" -SRC_URI[sha256sum] = "b54d49d66a9d93c1ef9c72ca01264414cb2de177baac116c12d5cce0c380160c" +SRC_URI[md5sum] = "159673cfb56c72ceafc30fe91eedd847" +SRC_URI[sha256sum] = "cc180d1b30c85a2bbca62c15fef1b871db048cdcfa80959968356d97bd3ff08e" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.1.0.bb index d77e0f385..d77e0f385 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb index 02d4f54e1..8dbb79a42 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Hamcrest framework for matcher objects" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6df1318c6071dd1707f5e3b6c11f24f" PYPI_PACKAGE = "PyHamcrest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc index d866c5650..9a066f7f1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://github.com/kurtbrose/pyjks" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9694d6cc724caf7f7386be88a4a81958" -SRC_URI[md5sum] = "d53501e7c80d465969742bc6bee91d49" -SRC_URI[sha256sum] = "709c44a303dd6b2464078ebeb677417e717818d4b3dc3844a462bef9d215dcc8" +SRC_URI[md5sum] = "b6e8f3b91be355d15e3ba99de2cccf9b" +SRC_URI[sha256sum] = "9ce5b40289bcdffcd6a8e7118b333ba8ba2ec4c9ebc5e324885cc8a69767011a" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_19.0.0.bb index ce99f2835..ce99f2835 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_19.0.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc index 00c38e317..9b8938530 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" -SRC_URI[md5sum] = "2731c6b66b67b95d1944f072f5fa35a9" -SRC_URI[sha256sum] = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176" +SRC_URI[md5sum] = "a4712f980c008696e13e09504120b2a0" +SRC_URI[sha256sum] = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96" PYPI_PACKAGE = "PyJWT" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.7.1.bb index f0a77b674..f0a77b674 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.7.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc index 468a80122..4c61d9fff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[md5sum] = "6d549b36cbfa8c1a3323c5d6e299789e" -SRC_URI[sha256sum] = "f4ed2000cbe1a314f1f88fd8a8eba4ad05974b351b96f1235c6e532158a39fe0" +SRC_URI[md5sum] = "77aef367e57ba7dcc6f9b3d445a960ed" +SRC_URI[sha256sum] = "de67196f6a8916b9c52a84a1c45ea967c53fa9d2b3795b070ad2c1cbc28d79d7" RDEPENDS_${PN} += " \ ${PYTHON_PN}-dateutil \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.93.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.117.2.bb index 1b1fbe956..1b1fbe956 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.93.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.117.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc index 6a3989627..c755c0ae9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc @@ -2,7 +2,7 @@ SUMMARY = "Linux network configuration library for Python" DESCRIPTION = "This library contains Python bindings to ioctl calls" SECTION = "devel/python" HOMEPAGE = "http://github.com/rlisagor/pynetlinux" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=74e1861736ee959824fe7542323c12e9" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc index 556946e76..bf89be662 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pyparsing.wikispaces.com/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" -SRC_URI[md5sum] = "46d02cbe0461fe0571d51649e6006ef5" -SRC_URI[sha256sum] = "6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80" +SRC_URI[md5sum] = "75dfad250d739efa82c7c0eeaacc5e68" +SRC_URI[sha256sum] = "4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.5.bb index 90217f3c3..90217f3c3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc index ed1981e49..7a14b9efb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc @@ -3,8 +3,8 @@ LICENSE = "GPLv2 & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" -SRC_URI[md5sum] = "2f6f951e94356ae9d224f417dc6ebed2" -SRC_URI[sha256sum] = "42bf74495d95a0196a74dd171357f660175aba2bfc23f9b5f63e3830ccbef9ac" +SRC_URI[md5sum] = "371683b62314211b8bc9807ac8ef1144" +SRC_URI[sha256sum] = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyroute2:" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.7.bb index f25f1b4ab..f25f1b4ab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc index 2add037de..fad488dd9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/tobgu/pyrsistent" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.mit;md5=ca574f2891cf528b3e7a2ee570337e7c" -SRC_URI[md5sum] = "0298efae86e009e24136d39dc8b2d33e" -SRC_URI[sha256sum] = "34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" +SRC_URI[md5sum] = "903c518c8829de4ee255cff68ff8da45" +SRC_URI[sha256sum] = "eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778" RDEPENDS_${PN} += " \ ${PYTHON_PN}-six \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.5.bb index 832eb8038..832eb8038 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc index 870f1d8a8..c9580de26 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc @@ -1,5 +1,5 @@ SUMMARY = "Serial Port Support for Python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d476d94926db6e0008a5b3860d1f5c0d" SRC_URI[md5sum] = "ed6183b15519a0ae96675e9c3330c69b" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.3.4.bb index 24759b5d6..43aa4b84c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.3.4.bb @@ -5,11 +5,11 @@ DESCRIPTION = "A pure-Python implementation of SNMP/SMI MIB \ HOMEPAGE = "https://pypi.python.org/pypi/pysmi" SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d8b1bbadd635f187dee74d999a8c67b8" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a088b5c72b59d51a5368ad3b18e219bf" -SRC_URI[md5sum] = "3b0f71e4e9f730d211f09d8ef5371140" -SRC_URI[sha256sum] = "2a315cc3e556b3428372b69da663a24d2f0df9e9ab075b022cb133855f25aef7" +SRC_URI[md5sum] = "10a9dd140ad512eed9f37344df83ce9d" +SRC_URI[sha256sum] = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.4.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.4.9.bb index 9ff4df2c9..8883df9d8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.4.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.4.9.bb @@ -5,7 +5,7 @@ DESCRIPTION = "SNMP v1/v2c/v3 engine and apps written in pure-Python. \ " HOMEPAGE = "https://pypi.python.org/pypi/pysnmp" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=b15d29f500f748d1c2a15709769090a8" SRCNAME = "pysnmp" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc index ceadcb20d..1836e52d0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A Python SOCKS client module" HOMEPAGE = "http://python-requests.org" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1d457bcffb9661b45f799d4efee72f16" SRC_URI[md5sum] = "89b1a6865c61bae67a32417517612ee6" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc index a69867d91..c091ab976 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc @@ -2,9 +2,9 @@ DESCRIPTION = "This plugin does not provide any helpers to pytest, it does, howe HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cc99508c43d9d14fd51c7fac622ffd23" -SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e" -SRC_URI[sha256sum] = "d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113" +SRC_URI[md5sum] = "04ec1d8750f9b154e782a47cf8b30736" +SRC_URI[sha256sum] = "4eff23a19f92410c0166f6dffbfa8901d3e14a80e97d70cd08428b6d597771ce" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2019.1.8.bb index 2b6ee8550..2b6ee8550 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2019.1.8.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc index 113ab41f5..0b443b3d6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc @@ -2,8 +2,8 @@ SUMMARY = "Invoke py.test as distutils command with dependency resolution" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e" -SRC_URI[md5sum] = "a52d65bd3dbc88bed751cf934dc41db3" -SRC_URI[sha256sum] = "25a013c8d84f0ca60bb01bd11913a3bcab420f601f0f236de4423074af656e7a" +SRC_URI[md5sum] = "e5f66b8e8e87f62c59631c35c919d321" +SRC_URI[sha256sum] = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_5.2.bb index 1765a732d..1765a732d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_5.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir.inc index 196f6d644..cf355a364 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir.inc @@ -2,9 +2,9 @@ DESCRIPTION = "Adds support for a predictable and repeatable temporary directory HOMEPAGE = "https://github.com/saltstack/pytest-tempdir" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8751a9cf4a70be4f02697a9b89e686ce" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9872c3a37cc9baf79a464cd168282be5" -SRC_URI[md5sum] = "f87f2583f5f8aaca7203d57ada3948b5" -SRC_URI[sha256sum] = "65ff815966ea6dfc07ca1b43747c9888a6d883971170e67b16290f9f50d434ea" +SRC_URI[md5sum] = "79b997d418fb85c2529ab50cd4333689" +SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63ab36d8" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir_2019.10.12.bb index 8a9b83e3d..8a9b83e3d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-tempdir_2019.10.12.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index fa264f791..a26d41084 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "00561d0295aab167987f8a4f784964c4" -SRC_URI[sha256sum] = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0" +SRC_URI[md5sum] = "889344299c9182aff67d6e461cb7af29" +SRC_URI[sha256sum] = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.2.bb index 39e50aca9..39e50aca9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc index baf2db530..e783dd432 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc @@ -1,6 +1,6 @@ SUMMARY = "PyUSB provides USB access on the Python language" HOMEPAGE = "http://pyusb.sourceforge.net/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=51691ed11cc2c7ae93e383f60ed49b0f" DEPENDS += "libusb1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rdflib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-rdflib.inc index 0eac19788..2fa6d9815 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-rdflib.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rdflib.inc @@ -1,5 +1,5 @@ SUMMARY = "RDFLib is a pure Python package for working with RDF" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=68c1a3bb687bd63b8e5552f3ea249840" SRC_URI[md5sum] = "534fe35b13c5857d53fa1ac5a41eca67" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib.inc index 4bc6a368c..7c4d85f2a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib.inc @@ -1,7 +1,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=22d117a849df10d047ed9b792838e863" -SRC_URI[md5sum] = "4358a879a4377393bcfd37d0f9ae6d4d" -SRC_URI[sha256sum] = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468" +SRC_URI[md5sum] = "1ebcd55f1b1b9281940b4bc33010e2ba" +SRC_URI[sha256sum] = "b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a" RDEPENDS_${PN} += "${PYTHON_PN}-requests" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib_1.3.0.bb index 43189150a..43189150a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib_0.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-requests-oauthlib_1.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator.inc new file mode 100644 index 000000000..3da082984 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator.inc @@ -0,0 +1,25 @@ +SUMMARY = "A pure python RFC3339 validator" +HOMEPAGE = "https://github.com/naimetti/rfc3339-validator" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-rfc3339-validator:" + +SRC_URI[md5sum] = "9d8899041d83f98180bddd8b62ee7e99" +SRC_URI[sha256sum] = "20a600d01fbb1f793cbb6f4ec4ebb2104f4c9e80d74d5f78350b63ecc6cccd08" + +PYPI_PACKAGE = "rfc3339_validator" + +inherit pypi + +SRC_URI_append = " \ + file://0001-setup.py-move-pytest-runner-to-test_requirements.patch \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch new file mode 100644 index 000000000..ce8ca0bc8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch @@ -0,0 +1,32 @@ +From 2de281fdca88f223ace1eb6428a77b9903c69264 Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <nicola.lunghi@jci.com> +Date: Thu, 14 Nov 2019 11:58:28 +0000 +Subject: [PATCH] setup.py: move pytest-runner to test_requirements + +This fixes an issue with yocto build. +pytest-runner is only needed when running tests. + +Upstream-Status: Pending +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9a50767..e3b1c6e 100644 +--- a/setup.py ++++ b/setup.py +@@ -12,9 +12,9 @@ requirements = [ + 'six', + ] + +-setup_requirements = ['pytest-runner', ] ++setup_requirements = [] + +-test_requirements = ['pytest>=3', ] ++test_requirements = ['pytest>=3', 'pytest-runner'] + + setup( + author="Nicolas Aimetti", +-- +2.20.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator_0.1.1.bb new file mode 100644 index 000000000..29b8a6e0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator_0.1.1.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-rfc3339-validator.inc
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator.inc new file mode 100644 index 000000000..71f7a7904 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator.inc @@ -0,0 +1,23 @@ +SUMMARY = "Pure python rfc3986 validator" +HOMEPAGE = "https://github.com/naimetti/rfc3986-validator" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-rfc3986-validator:" + +SRC_URI[md5sum] = "47f7657b790aaf6011a1ab3d86c6be95" +SRC_URI[sha256sum] = "3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055" + +PYPI_PACKAGE = "rfc3986_validator" + +inherit pypi + +SRC_URI_append = " \ + file://0001-setup.py-move-pytest-runner-to-test_requirements.patch \ +" + +RDEPENDS_${PN} += "\ + python3-core \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch new file mode 100644 index 000000000..8a646874e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch @@ -0,0 +1,32 @@ +From 3531ff73631a0d59234eb4713e7b3a7f5ea57bbb Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <nicola.lunghi@jci.com> +Date: Thu, 14 Nov 2019 12:17:51 +0000 +Subject: [PATCH] setup.py: move pytest-runner to test_requirements + +This fixes an issue with yocto build. +pytest-runner is only needed when running tests. + +Upstream-Status: Pending +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 53ebea7..ebb0de2 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,9 +10,9 @@ with open('README.md') as readme_file: + + requirements = [] + +-setup_requirements = ['pytest-runner', ] ++setup_requirements = [] + +-test_requirements = ['pytest>=3', ] ++test_requirements = ['pytest>=3', 'pytest-runner'] + + setup( + author="Nicolas Aimetti", +-- +2.20.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator_0.1.1.bb new file mode 100644 index 000000000..9dddbb4a9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator_0.1.1.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-rfc3986-validator.inc
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-scandir_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-scandir_1.10.0.bb new file mode 100644 index 000000000..9de272417 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-scandir_1.10.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "A better directory iterator and faster os.walk()" +HOMEPAGE = "https://github.com/benhoyt/scandir" +AUTHOR = "Ben Hoyt" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=482ee62da51806409d432a80eed4e3ea" + +SRC_URI = "git://github.com/benhoyt/scandir.git" +SRCREV = "982e6ba60e7165ef965567eacd7138149c9ce292" + +S = "${WORKDIR}/git" + +inherit setuptools + +BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc index 2ba65706b..1a3aac07f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc @@ -1,9 +1,9 @@ SUMMARY = "Serialization based on ast.literal_eval" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5a8193ba89f1083617f32d522f6485e9" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5cd70632b6cdb96df9ddaf6a4ce619e6" -SRC_URI[md5sum] = "0f9684622125a527fa4fbe2587738973" -SRC_URI[sha256sum] = "264a028e059c1b557701ae7c567cdab330dbd228ff924489343efcb39bd828a0" +SRC_URI[md5sum] = "15ef8b67c76a6d19bac9c16731a1e62a" +SRC_URI[sha256sum] = "f306336ca09aa38e526f3b03cab58eb7e45af09981267233167bcf3bfd6436ab" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.25.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.28.bb index 0db3cf98a..0db3cf98a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.25.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.28.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc index 98883ec39..a7e1bf6ad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc @@ -2,8 +2,8 @@ SUMMARY = "the blessed package to manage your versions by scm tags" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "cfec5d2dbbd0a85c40066f79035b5878" -SRC_URI[sha256sum] = "a767141fecdab1c0b3c8e4c788ac912d7c94a0d6c452d40777ba84f918316379" +SRC_URI[md5sum] = "50b2199082fe808d032ec1710c9d7415" +SRC_URI[sha256sum] = "bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5" PYPI_PACKAGE = "setuptools_scm" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_3.3.3.bb index 64b36e3a0..64b36e3a0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_3.3.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc index 3d36f9608..5592eaf3d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc @@ -21,3 +21,5 @@ FILES_${PN}-tests+= " \ ${PYTHON_SITEPACKAGES_DIR}/simplejson/tests \ ${PYTHON_SITEPACKAGES_DIR}/simplejson/tool.py* \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc index f472a57f4..8ba1ab2b8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc @@ -1,11 +1,11 @@ SUMMARY = "Set of i2c tools for linux - Python module" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" +LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=18;md5=46e424fb045901ab25e0f92c28c80055" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/i2c-tools-${PV}.tar.gz " -SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa" -SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403" +SRC_URI[md5sum] = "3536237a6b51fb10caacdc3b8a496237" +SRC_URI[sha256sum] = "ef8f77afc70e7dbfd1171bfeae87a8a7f10074829370ce8d9ccd585a014e0073" DEPENDS += "i2c-tools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.1.bb index 1b9577887..1b9577887 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.13.bb index c5af48dd3..c885a7fbe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.13.bb @@ -8,8 +8,8 @@ DEPENDS += "libsmi python-cffi-native python-vcversioner-native" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=7c53ab2d1240828625c3e093d049d4f4" -SRC_URI[md5sum] = "6d016b6356db432e6a87ad708eb8fcb6" -SRC_URI[sha256sum] = "04efcfba867ffb0e10cc8d7f93a553ceb6bdf2ee34e49762749028a2c76096c1" +SRC_URI[md5sum] = "7c57acac10226df5bf43e10b929942df" +SRC_URI[sha256sum] = "98b1790977b435332c03ab2603f6621eeeee69a50453ac01ca55dc7696d08535" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc index 94fa8a6c0..a2534e401 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Media asset management for Python, with glue code for various frameworks" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b810770075a29bf44b96607440e7c801" SRC_URI[md5sum] = "e8d5dbe36e53d5a35cff227e795e8bbf" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-supervisor.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-supervisor.inc index beab49739..158cd52e1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-supervisor.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-supervisor.inc @@ -4,7 +4,7 @@ Supervisor is a client/server system that allows its users \ to monitorand control a number of processes on UNIX-like \ operating systems." HOMEPAGE = "https://github.com/Supervisor/supervisor" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=5b4e3a2172bba4c47cded5885e7e507e" SRC_URI[md5sum] = "ac70dadd051dcaf1d03c467d51a3aac1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc index 5be5de092..b14f82501 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc @@ -7,7 +7,7 @@ PYPI_PACKAGE = "systemd-python" DEPENDS += "systemd (<=234)" RDEPENDS_${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging" REQUIRED_DISTRO_FEATURES = "systemd" -inherit pypi distro_features_check +inherit pypi features_check SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" @@ -15,4 +15,6 @@ SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895 # allow for common patches for python- and python3-systemd FILESEXTRAPATHS_prepend := "${THISDIR}/python-systemd:" +SRC_URI += "file://endian.patch" + SRC_URI_append_libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/endian.patch new file mode 100644 index 000000000..e09aea733 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/endian.patch @@ -0,0 +1,14 @@ +Include endian.h for missing definitions of htobe16 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/systemd/util.c ++++ b/systemd/util.c +@@ -28,6 +28,7 @@ + #include <stdbool.h> + #include <assert.h> + #include <errno.h> ++#include <endian.h> + #include <fcntl.h> + #include <unistd.h> + #include <net/if.h> diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc index 16899f88c..7cb61931a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://www.tornadoweb.org/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "bd264851c409f926d1dae1ad5055d28d" -SRC_URI[sha256sum] = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582" +SRC_URI[md5sum] = "cab4b11480f6d032e46465586192d343" +SRC_URI[sha256sum] = "c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9" RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email \ ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi ${PYTHON_PN}-threading \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_6.0.3.bb index 193a4db7d..193a4db7d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_6.0.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm.inc index 967a80c20..1e410f402 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=054ef7105cba050017d1368262a1623c" inherit pypi -SRC_URI[md5sum] = "807e8c13e16e3660ac88e05d711daeb0" -SRC_URI[sha256sum] = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05" +SRC_URI[md5sum] = "9a092a5878090996bbb0ed92bf572a8a" +SRC_URI[sha256sum] = "c1d677f3a85fa291b34bdf8f770f877119b9754b32673699653556f85e2c2f13" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm_4.31.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm_4.38.0.bb index b3810097e..b3810097e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm_4.31.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-tqdm_4.38.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc index d70104dc2..34f8846b0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc @@ -7,8 +7,8 @@ HOMEPAGE = "http://www.twistedmatrix.com" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6" -SRC_URI[sha256sum] = "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d" -SRC_URI[md5sum] = "5e9296a952430d288cdcdc6ad9eb5ee8" +SRC_URI[sha256sum] = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d" +SRC_URI[md5sum] = "f2d70f7a66ecdf54152310164cceadfe" PYPI_PACKAGE = "Twisted" PYPI_PACKAGE_EXT = "tar.bz2" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.10.0.bb index 5903db3e0..5903db3e0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.10.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twitter.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twitter.inc index f5657eeb2..ac3f65279 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twitter.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twitter.inc @@ -2,10 +2,10 @@ SUMMARY = "Twitter for Python" DESCRIPTION = "Python module to support twitter API" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0307fffd8c4d9946c029daa1426d26e7" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8f702b489acb6863cec8b261a55931d8" -SRC_URI[md5sum] = "c6dc2f315ded761aafc96bea3351c7f6" -SRC_URI[sha256sum] = "fe85a79f58a01dd335968523b91c5fce760e7fe78bf25a6e71c72204fe499d0b" +SRC_URI[md5sum] = "8aeff278b7cefcd384c65929bc921e2c" +SRC_URI[sha256sum] = "8abd828ba51a85a2b5bb7373715d6d3bb32d18ac624e3a4db02e4ef8ab48316b" PYPI_PACKAGE = "tweepy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twitter_3.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twitter_3.8.0.bb index 6a28b08ae..6a28b08ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twitter_3.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twitter_3.8.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal.inc index 42f93e6a5..3e423d227 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal.inc @@ -3,6 +3,6 @@ HOMEPAGE = "https://pypi.org/project/tzlocal/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" -SRC_URI[md5sum] = "4553be891efa0812c4adfb0c6e818eec" -SRC_URI[sha256sum] = "4ebeb848845ac898da6519b9b31879cf13b6626f7184c496037b818e238f2c4e" +SRC_URI[md5sum] = "b14262cecca16ec9220ca8dff2ca7c5d" +SRC_URI[sha256sum] = "949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal_2.0.0.bb index b7980dd55..b7980dd55 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-tzlocal_2.0.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc index c3d0bfeed..8f05de856 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc @@ -1,7 +1,7 @@ SUMMARY = "Ultra fast JSON encoder and decoder for Python" DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e" SRC_URI[md5sum] = "42f77b0cce686dfa4da2e68480b1dd24" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc index 398b5f2ac..b7edc03f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" -SRC_URI[md5sum] = "a7504a9fcb7ed4ffa482fe098c80b6d4" -SRC_URI[sha256sum] = "9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86" +SRC_URI[md5sum] = "85e1e3925f8c1095172bff343f3312ed" +SRC_URI[sha256sum] = "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745" RDEPENDS_${PN} += "\ ${PYTHON_PN}-certifi \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.7.bb index 6c81f1db9..6c81f1db9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc index a02bbbbed..ef254e33b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc @@ -1,5 +1,5 @@ SUMMARY = "Simple Python module for working with HTML/CSS color definitions." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=197add016087e6884a012b0f185d44ad" SRC_URI[md5sum] = "40890db38b2a856e526a568864025fe6" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc index c04a4e0c4..e292d93bb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc @@ -7,11 +7,11 @@ HTTP utilities to handle entity tags, cache control headers, HTTP dates, \ cookie handling, file uploads, a powerful URL routing system and a bunch \ of community contributed addon modules." HOMEPAGE = "http://werkzeug.pocoo.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ed9a0b7c0254616d72dadb98b293ef1b" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[md5sum] = "6d20b5be2d245be4ac7706cc390d130c" -SRC_URI[sha256sum] = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c" +SRC_URI[md5sum] = "5b23b4953efc4f52b1d0b33af6f7cd2d" +SRC_URI[sha256sum] = "7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7" PYPI_PACKAGE = "Werkzeug" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.16.0.bb index db41161b3..db41161b3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.16.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc index a4ca5dcd4..040b32458 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc @@ -4,7 +4,7 @@ Whoosh is a fast, featureful full-text indexing and searching library \ implemented in pure Python. Programmers can use it to easily add search \ functionality to their applications and websites. Every part of how \ Whoosh works can be extended or replaced to meet your needs exactly." -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05303186defc6141143629961c7c8a60" SRC_URI[md5sum] = "893433e9c0525ac043df33e6e04caab2" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc index ed49811fe..496c73fa8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc @@ -1,6 +1,6 @@ SUMMARY = "A Python module for decorators, wrappers and monkey patching." HOMEPAGE = "http://wrapt.readthedocs.org/" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=fdfc019b57affbe1d7a32e3d34e83db4" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc index 868686bfe..93c5bc4e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc @@ -1,7 +1,7 @@ DESCRIPTION = "A flexible forms validation and rendering library for python web development." HOMEPAGE = "https://pypi.python.org/pypi/WTForms" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=c4660c132770d5d0a5757541f6b79493" SRC_URI[md5sum] = "41c0008dbe7bd98892c58f7457a46a4a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc index 893e82e05..f87d2ab7c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc @@ -3,11 +3,11 @@ DESCRIPTION = "Extract data from Excel spreadsheets (.xls and .xlsx,\ versions 2.0 onwards) on any platform. Pure Python (2.6, 2.7, 3.2+). \ Strong support for Excel dates. Unicode-aware." HOMEPAGE = "http://www.python-excel.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=08bd814936237b6e1355e6370b24b2c1" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5f4244d51fcc1e7cc2d43e96891b2f80" -SRC_URI[md5sum] = "b85c9916ac755cad489a9005f5a0d390" -SRC_URI[sha256sum] = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2" +SRC_URI[md5sum] = "e5d5b96924d791b22898b622eb3e918e" +SRC_URI[sha256sum] = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2" RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.2.0.bb index 3a4d709eb..3a4d709eb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc index f7c7db99a..c44d66853 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc @@ -2,12 +2,12 @@ DESCRIPTION = "XStatic base package with minimal support code" HOMEPAGE = "https://pypi.python.org/pypi/XStatic" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.txt;md5=36a1e7eaa71e1bd07b8d2247839f228e" +LIC_FILES_CHKSUM = "file://README.txt;md5=1418684272f85f400cebf1b1a255c5cd" PYPI_PACKAGE = "XStatic" -SRC_URI[md5sum] = "7064b5ea7fd1ee990e0ae0538301d9bc" -SRC_URI[sha256sum] = "0ec93d7c66ebb9e0d31b664753437dc8634cb66e13310cb47c9eb1e0bc66d726" +SRC_URI[md5sum] = "dea172b7b14b0dbcd5ed63075221af4b" +SRC_URI[sha256sum] = "80b78dfe37bce6dee4343d64c65375a80bcf399b46dd47c0c7d56161568a23a8" DEPENDS += " \ ${PYTHON_PN}-pip \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.2.bb index 807303704..807303704 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc index 93b2a15a7..1ec3937b1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc @@ -1,6 +1,6 @@ SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" SRC_URI[md5sum] = "80461eff10ac62214fa788a6045aab43" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc index 651ce7731..54d408742 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc @@ -2,10 +2,10 @@ SUMMARY = "Yet Another Python Profiler" HOMEPAGE = "http://yappi.googlecode.com/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b131c3041637f6a5175a43112dde05c" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9a193c13f346884e597acdcac7fe9ac8" -SRC_URI[md5sum] = "dc56240575c99938a924eaeb7c0d8beb" -SRC_URI[sha256sum] = "5f657129e1b9b952379ffbc009357d0dcdb58c50f3bfe88ffbb992e4b27b263c" +SRC_URI[md5sum] = "a545101aa8a435b0780f06f4723f58c8" +SRC_URI[sha256sum] = "7f814131515d51db62b1a3468bcb84de30499124752806a5a6e11caf0b4344bf" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_0.98.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_1.0.bb index a3bdde5c2..a3bdde5c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_0.98.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc index ba18f7216..5f63852ad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc @@ -8,3 +8,5 @@ SRC_URI[sha256sum] = "3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += "${PYTHON_PN}-more-itertools" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc index 7213bc8ac..df8f1ff3b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc @@ -2,8 +2,8 @@ SUMMARY = "Interface definitions for Zope products" LICENSE = "ZPL-2.1" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423ec128974bd9d46" -SRC_URI[md5sum] = "a3b24f9d079bae5e13dd7a88aa512112" -SRC_URI[sha256sum] = "1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5" +SRC_URI[md5sum] = "1bc66758275c5eb66d169acba3c8e50e" +SRC_URI[sha256sum] = "4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487" PYPI_PACKAGE = "zope.interface" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.7.1.bb index 1bdfd4d37..1bdfd4d37 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.7.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.3.0.bb index e248fe7ce..e248fe7ce 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-apply-defaults_0.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-apply-defaults_0.1.4.bb new file mode 100644 index 000000000..8d23678a0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-apply-defaults_0.1.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Apply values to optional params" +HOMEPAGE = "https://github.com/bcb/apply_defaults" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15" + +PYPI_PACKAGE = "apply_defaults" + +SRC_URI[md5sum] = "719abb133f4b46283ebd940fcdf30a78" +SRC_URI[sha256sum] = "1ce26326a61d8773d38a9726a345c6525a91a6120d7333af79ad792dacb6246c" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-core" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.2.0.bb index cfbe57520..cfbe57520 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch new file mode 100644 index 000000000..823699339 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch @@ -0,0 +1,87 @@ +From f820f3ff7ad8818475b6e107e63aa9a54252d2a9 Mon Sep 17 00:00:00 2001 +From: Jonathan Ringer <jonringer117@gmail.com> +Date: Thu, 17 Oct 2019 16:54:16 -0700 +Subject: [PATCH] Fix packaging for setuptools>=41.4 + +--- + astor/VERSION | 1 + + astor/__init__.py | 5 ++++- + setup.cfg | 3 ++- + setup.py | 16 +--------------- + 4 files changed, 8 insertions(+), 17 deletions(-) + create mode 100644 astor/VERSION + +diff --git a/astor/VERSION b/astor/VERSION +new file mode 100644 +index 0000000..a3df0a6 +--- /dev/null ++++ b/astor/VERSION +@@ -0,0 +1 @@ ++0.8.0 +diff --git a/astor/__init__.py b/astor/__init__.py +index 3b02983..8dfcdb1 100644 +--- a/astor/__init__.py ++++ b/astor/__init__.py +@@ -9,6 +9,7 @@ + + """ + ++import os + import warnings + + from .code_gen import SourceGenerator, to_source # NOQA +@@ -19,7 +20,9 @@ + from .op_util import symbol_data # NOQA + from .tree_walk import TreeWalk # NOQA + +-__version__ = '0.8.0' ++ROOT = os.path.dirname(__file__) ++with open(os.path.join(ROOT, 'VERSION')) as version_file: ++ __version__ = version_file.read().strip + + parse_file = code_to_ast.parse_file + +diff --git a/setup.cfg b/setup.cfg +index 1baf6fc..a43634f 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -2,6 +2,7 @@ + name = astor + description = Read/rewrite/write Python ASTs + long_description = file:README.rst ++version = file: astor/VERSION + author = Patrick Maupin + author_email = pmaupin@gmail.com + platforms = Independent +@@ -40,7 +41,7 @@ test_suite = nose.collector + [options.packages.find] + exclude = tests + +-[wheel] ++[bdist_wheel] + universal = 1 + + [build-system] +diff --git a/setup.py b/setup.py +index 4a111b5..6068493 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,17 +1,3 @@ +-import os +-import sys +- + from setuptools import setup +-from setuptools.config import read_configuration +- +-from setuputils import find_version +- +- +-def here(*paths): +- return os.path.join(os.path.dirname(__file__), *paths) +- +-config = read_configuration(here('setup.cfg')) +-config['metadata']['version'] = find_version(here('astor', '__init__.py')) +-config['options'].update(config['metadata']) + +-setup(**config['options']) ++setup() diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.8.bb index c2dc9245c..17cc540f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.8.bb @@ -4,8 +4,10 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7" -SRC_URI = "git://github.com/berkerpeksag/astor.git" -SRCREV ?= "4ca3a26e52f08678854c2841cd0fdf223461e47d" +SRC_URI = "git://github.com/berkerpeksag/astor.git \ + file://f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch \ + " +SRCREV ?= "3a7607e31f0c17e747ded5cfe0b582d99f7caecf" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb index 6e32c288f..6e32c288f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb index c34693f50..c34693f50 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb index 2c747643f..2c747643f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb index c43649dbf..c43649dbf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb index d2ec9e386..d2ec9e386 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_0.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.1.0.bb index 7ee444dc9..7ee444dc9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_0.8.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.2.bb index aaa9e811c..aaa9e811c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.2.bb index e88808434..e88808434 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.19.bb index f5c5c7e1a..f5c5c7e1a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.18.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.19.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb new file mode 100644 index 000000000..1c0b560b4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb @@ -0,0 +1,3 @@ +inherit pypi setuptools3 +require python-contextlib2.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb index 58994ffff..58994ffff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb index 195923343..195923343 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb index 2ce6bdbd6..2ce6bdbd6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb index 1d2baf55c..1d2baf55c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.2.bb new file mode 100644 index 000000000..2784013a1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "A zero-dependency DBus library for Python with asyncio support" +HOMEPAGE = "https://github.com/acrisci/python-dbus-next" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b32e18a71bcdd072bce21f204629a104" + +SRC_URI[md5sum] = "df838d695284dd1775860f9691a8663f" +SRC_URI[sha256sum] = "a567d845ceed5feac48dda7faeb9ff2571f9a434a3c32b9b363f763e82368762" + +PYPI_PACKAGE = "dbus_next" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb index 844cbdc9a..844cbdc9a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb index ce4dfdc74..ce4dfdc74 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb new file mode 100644 index 000000000..321f55572 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Text processing system for documentation" +HOMEPAGE = "http://docutils.sourceforge.net" +SECTION = "devel/python" +LICENSE = "PSF & BSD-2-Clause & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "docutils" + +SRC_URI[md5sum] = "e26a308d8000b0bed7416a633217c676" +SRC_URI[sha256sum] = "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.4.0.bb index 5304ccc18..5304ccc18 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.4.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.10.0.bb index 028d1104a..028d1104a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.9.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.10.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb index 3a92b6ec9..3a92b6ec9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb index 104e7c28f..104e7c28f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.2.bb index c98cbfddb..c98cbfddb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.7.bb index 6bff59a56..6bff59a56 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.2.1.bb index ffc4aa7fd..ffc4aa7fd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.1.bb index 07f45bcff..07f45bcff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_1.1.1.bb index cd439900c..cd439900c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_1.1.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb index f059186bf..f059186bf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.16.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.4.4.bb new file mode 100644 index 000000000..ff89087a1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.4.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Client for MQTT protocol" +HOMEPAGE = "https://github.com/wialon/gmqtt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" + +SRC_URI[md5sum] = "af3a2c6c2f8e3c934b31159ffdce5fd6" +SRC_URI[sha256sum] = "b96bca8a54b8af057d4cc42a79f9e2b40cdbb5a2bfebbc5f05ee35575d3e3089" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-asyncio \ + python3-core \ + python3-datetime \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-typing \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.9.0.bb index bca7757ad..7822e463e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.9.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Provides both a high- and low-level interface to the HDF5 library from Python. " HOMEPAGE = "https://www.h5py.org/" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://setup.py;beginline=107;endline=107;md5=795ecad0d261c998cc526c84a822dff6" SRC_URI = "git://github.com/h5py/h5py.git \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb index d71c45b5f..8a971dac0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb @@ -1,2 +1,5 @@ inherit pypi setuptools3 require python-importlib-metadata.inc + +RDEPENDS_${PN}_append_class-target = " python3-misc" +RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb index 8cbe1090f..8cbe1090f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.5.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb new file mode 100644 index 000000000..77e978710 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-ipaddress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb new file mode 100644 index 000000000..ea6a1055a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-ipy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb index 755b3e2f2..755b3e2f2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_0.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_1.1.0.bb index a71c20f0e..a71c20f0e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_0.24.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_1.1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.3.0.bb index 0ec23ba99..0ec23ba99 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb new file mode 100644 index 000000000..bf9eb0a1c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library to process JSON-RPC requests" +HOMEPAGE = "https://github.com/bcb/jsonrpcserver" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15" + +SRC_URI[md5sum] = "d41e9f6b310cb29b0d8f213ff9d57567" +SRC_URI[sha256sum] = "240c517f49b0fdd3bfa428c9a7cc581126a0c43eca60d29762da124017d9d9f4" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-apply-defaults \ + python3-asyncio \ + python3-core \ + python3-json \ + python3-jsonschema \ + python3-logging \ + python3-netclient \ + python3-pkgutil \ + python3-typing \ +" + +BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb index 150e12fd4..150e12fd4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb index b6d2f18c8..68cd723ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb @@ -1,5 +1,5 @@ SUMMARY = "A Python implementation of John Gruber's Markdown." -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb index 28ddf88fb..06d45ce54 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb @@ -1,2 +1,5 @@ inherit pypi setuptools3 require python-more-itertools.inc + +SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4" +SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.3.bb new file mode 100644 index 000000000..24e1ccb3b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Mycroft Skill Manager, in python!" +HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-manager" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa" + +SRC_URI[md5sum] = "d5f580c58389b337f5577cb92f36e788" +SRC_URI[sha256sum] = "c201785997f3b766ec376a89bbb3367889ac542183ca26733ffe002bb94917b4" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-pako \ + python3-monotonic \ + python3-appdirs \ +" + +do_install_append() { + # Stop this from being installed + rm -rf ${D}/usr/share +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb index 4981e61ed..4981e61ed 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb new file mode 100644 index 000000000..21c48fca6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "The universal package manager library" +HOMEPAGE = "https://github.com/MycroftAI/pako" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa" + +SRC_URI[md5sum] = "8eb7077075091c50e4b8a9f939607277" +SRC_URI[sha256sum] = "6be55fd8c5a2a6f02974f37438c1c47a3d9e764ce81c9d0a1a8c9a1815a59778" + +inherit pypi setuptools3 + +do_install_append() { + rm -rf ${D}/usr/share +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.12.1.bb index b1242545c..b1242545c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.8.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.12.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb index 66f71e57a..66f71e57a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb deleted file mode 100644 index ba9a95dbf..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools3 -require python-periphery.inc - -SRC_URI[sha256sum] = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb new file mode 100644 index 000000000..d0c8bed26 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools3 +require python-periphery.inc + +SRC_URI[sha256sum] = "2df05528a7668db4fb3faaff516b34ed99e9009ed9610a4efe3ea6c0ea8a3aab" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch index d4372696f..35aee4214 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch @@ -1,4 +1,4 @@ -From 9f3073bf6a7c7c51bb49d25f65c8f75cc704a5ee Mon Sep 17 00:00:00 2001 +From 862a981ce462cd83a99e3db9faeeda1f8c64983f Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 18 Mar 2019 23:23:55 -0400 Subject: [PATCH] explicitly set compile options @@ -10,18 +10,19 @@ explicitly set build_ext options for oe-core's Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- setup.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/setup.cfg b/setup.cfg -index 3ab2e127..e92615f3 100644 +index 1c6ebc84..1ccc3d69 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -4,3 +4,15 @@ test=pytest - [flake8] - extend-ignore = E203, W503 - max-line-length = 88 +@@ -13,3 +13,15 @@ multi_line_output = 3 + + [tool:pytest] + addopts = -rs + +[build_ext] +disable-platform-guessing = 1 @@ -34,6 +35,3 @@ index 3ab2e127..e92615f3 100644 +disable-webp = 1 +disable-webpmux = 1 +disable-imagequant = 1 --- -2.20.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb index 1d9106648..a383a3ff9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://pillow.readthedocs.io" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=55c0f320370091249c1755c0d2b48e89" -SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.1.x \ +SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.2.x \ file://0001-support-cross-compiling.patch \ file://0001-explicitly-set-compile-options.patch \ " -SRCREV ?= "aaca672173413883fbcefd659f04d74fe44fb5d5" +SRCREV ?= "6e0f07bbe38def22d36ee176b2efd9ea74b453a6" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.9.bb index f793ac4ac..f793ac4ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.9.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.5.bb index 45e264213..45e264213 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb index 0e99917c2..0e99917c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.6.5.bb index c1969ea65..c1969ea65 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.6.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb index c60d40e3a..4f52ac70d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb @@ -12,7 +12,7 @@ SRCREV = "dc4565208fca00da06b972915a080ad3c63f640d" S = "${WORKDIR}/git" # Same restriction as gtk+ -inherit distro_features_check +inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" inherit pkgconfig autotools python3native diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.4.3.bb index 355e28460..355e28460 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.4.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.3.bb index 0c062dddf..0c062dddf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb new file mode 100644 index 000000000..56eb8c4cd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyelftools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb index bfd584041..bfd584041 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb index 25af1b5c0..25af1b5c0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_19.0.0.bb index 8982fcebc..8982fcebc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_19.0.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb index dc16d2282..dc16d2282 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.93.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.117.2.bb index 4523d9e30..4523d9e30 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.93.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.117.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.5.bb index 0805fee3e..0805fee3e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.7.bb index a23e72c4a..a23e72c4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.5.bb index 2e567e9f9..2e567e9f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb index 89d718de6..02a5c8f85 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb @@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "b1fc072c87e3766711f64caf86fd633dca393e20c8a0a37a5058dd70a2 DEPENDS = "systemd" REQUIRED_DISTRO_FEATURES = "systemd" -inherit pypi setuptools3 distro_features_check +inherit pypi setuptools3 features_check BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2019.1.8.bb index f03f5d415..f03f5d415 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2019.1.8.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.2.bb index df56ba6d4..df56ba6d4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb index 02e821563..02e821563 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.2.bb index eba6632a2..eba6632a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.0.bb index 129466150..129466150 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_0.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb new file mode 100644 index 000000000..f4ee8feda --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-rfc3339-validator.inc
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb new file mode 100644 index 000000000..6491308cb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-rfc3986-validator.inc
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.25.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.28.bb index 1e04def7b..1e04def7b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.25.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.28.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb index 5bf598387..5bf598387 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb index b357bcd82..b357bcd82 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.0.3.bb index 77c9fb516..77c9fb516 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.0.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.31.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.38.0.bb index 348337f0d..348337f0d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.31.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.38.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb index dfb9d4a4c..dfb9d4a4c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.8.0.bb index c2e4d2ebd..c2e4d2ebd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.8.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_2.0.0.bb index 813934c81..813934c81 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_2.0.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.7.bb index 19eb7025b..19eb7025b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.16.0.bb index 145a1de0a..145a1de0a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.16.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.2.0.bb index b7bd969c7..b7bd969c7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.2.bb index 76cb70273..76cb70273 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.0.bb index 07da5b6eb..07da5b6eb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.7.1.bb index be11858d3..be11858d3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.7.1.bb diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb index fe9d27ab8..2b5b253b5 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb @@ -25,7 +25,7 @@ SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \ UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P<pver>\d+(\.\d+)+)$" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "systemd" inherit setuptools3 python3native diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb index b7e2493c3..92402bee5 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ file://0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch \ " -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd" inherit setuptools3 python3native diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.47.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.48.bb index 95d6d183c..9ca7a56bd 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.47.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.48.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ " -SRCREV = "78d868d99104317ce8820f39f61d207566e61a55" +SRCREV = "760f78a634ecf0e2380abcbd751bc233d29300ef" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" FILES_${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.6.0.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.7.0.bb index e28ce6ccc..422f0dbc4 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.6.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.7.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://rhodesmill.org/pyephem/" LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f288303760f6e5ceaafe3aaa32186ab1" -SRC_URI[md5sum] = "405a109f3017251ecd8c2890d850f649" -SRC_URI[sha256sum] = "7a4c82b1def2893e02aec0394f108d24adb17bd7b0ca6f4bc78eb7120c0212ac" +SRC_URI[md5sum] = "46c035b4a903ff26e0d8ad0f1fe6cc35" +SRC_URI[sha256sum] = "607148429f85412915e32265779c0cf6d09f73aa97cf1ff0d101ac22c69c4436" PYPI_PACKAGE = "ephem" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch index 81e351b11..7ab734686 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch @@ -17,7 +17,7 @@ fixup! add comments of shutdown for user 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py -index 2c1b1c0..b3ec717 100644 +index 75a6d916..edfe83ff 100644 --- a/pykickstart/commands/reboot.py +++ b/pykickstart/commands/reboot.py @@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand): @@ -31,18 +31,18 @@ index 2c1b1c0..b3ec717 100644 return retval diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index e68174d..efd78a6 100644 +index bc59131b..b2d09d45 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -385,7 +385,7 @@ class Packages(KickstartObject): +@@ -428,7 +428,7 @@ class Packages(KickstartObject): if not self.default: if self.environment: - pkgs += "@^%s\n" % self.environment + pkgs += "#@^%s\n" % self.environment - grps = self.groupList - grps.sort() + grps = self.groupList + grps.sort() -- 2.7.4 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb index ed10ce958..041abd3e8 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ " -SRCREV = "487edfded19d5969db0673b200ee4272b7dc6697" +SRCREV = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc index f769f95a0..97054487f 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "\ DEPENDS += "parted" # upstream only publishes releases in github archives which are discouraged -SRCREV = "2396ba7df56de277b4999bdd5f7d1a1706a6388a" +SRCREV = "481510c10866851844b19f3d2ffcdaa37efc0cf8" SRC_URI = "git://github.com/rhinstaller/pyparted.git;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.2.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.3.bb index 32aa378cc..32aa378cc 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.3.bb diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.2.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.3.bb index d83901ff3..d83901ff3 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.3.bb diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index 6157d4d30..2c6fad4ac 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -23,4 +23,5 @@ LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phpmyadmin->bash \ + phpmyadmin->php \ " diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch new file mode 100644 index 000000000..0f4384275 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch @@ -0,0 +1,47 @@ +From c73415021f3f3b2b30062ab74b25fe49c51c2242 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 10 Nov 2019 15:59:44 -0800 +Subject: [PATCH] common-internal.h: Define LLONG_MAX if undefined + +time_t can also be long long type, therefore check for that as fallback +Fixes build on 32bit hosts where time_t is fixed for Y2K38 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cherokee/common-internal.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/cherokee/common-internal.h b/cherokee/common-internal.h +index 5c28da97..5646ec0f 100644 +--- a/cherokee/common-internal.h ++++ b/cherokee/common-internal.h +@@ -222,6 +222,16 @@ char *strcasestr(char *s, char *find); + # endif + #endif + ++/* Long Long limit ++ */ ++#ifndef LLONG_MAX ++# if (__SIZEOF_LONG_LONG__ == 8) ++# define LLONG_MAX 0x7fffffffffffffffLL ++# else ++# error "Can't define LLONG_MAX" ++# endif ++#endif ++ + /* time_t limit + */ + #ifndef TIME_MAX +@@ -229,6 +239,8 @@ char *strcasestr(char *s, char *find); + # define TIME_MAX ((time_t)INT_MAX) + # elif (SIZEOF_TIME_T == SIZEOF_LONG) + # define TIME_MAX ((time_t)LONG_MAX) ++# elif (SIZEOF_TIME_T == __SIZEOF_LONG_LONG__) ++# define TIME_MAX ((time_t)LLONG_MAX) + # else + # error "Can't define TIME_MAX" + # endif +-- +2.24.0 + diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 3f7eae4c1..490fc53f9 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -SRCREV = "75f041e2255e6dd0692db2f14611c2647dbe8425" +SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59" PV = "1.2.104+git${SRCPV}" SRC_URI = "git://github.com/cherokee/webserver \ file://cherokee.init \ @@ -15,6 +15,7 @@ SRC_URI = "git://github.com/cherokee/webserver \ file://cherokee-install-configured.py-once.patch \ file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \ file://0001-make-Do-not-build-po-files.patch \ + file://0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index e202e8563..0d229ff40 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -93,9 +93,9 @@ do_install () { >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi install -d ${D}${sysconfdir}/${BPN} - ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run + lnr ${D}${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run install -d ${D}${NGINX_WWWDIR} - mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ + mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} install -d ${D}${sysconfdir}/init.d diff --git a/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb b/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb index 8b2ff44c0..1d66d1301 100644 --- a/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb +++ b/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb @@ -1,7 +1,7 @@ SUMMARRY = "spawn-fcgi is used to spawn FastCGI applications" HOMEPAGE = "http://redmine.lighttpd.net/projects/spawn-fcgi" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb index d54d6223c..112365d4b 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb @@ -1,6 +1,6 @@ SUMMARY = "Web-based administration interface" HOMEPAGE = "http://www.webmin.com" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass b/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass index 76b0e7233..854d96b3a 100644 --- a/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass +++ b/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass @@ -1,4 +1,4 @@ -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/classes/xfce-app.bbclass b/meta-openembedded/meta-xfce/classes/xfce-app.bbclass index 1c31c2faa..d1b07d745 100644 --- a/meta-openembedded/meta-xfce/classes/xfce-app.bbclass +++ b/meta-openembedded/meta-xfce/classes/xfce-app.bbclass @@ -1,4 +1,4 @@ -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass b/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass index 29c1245ca..594d40d0d 100644 --- a/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass +++ b/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass @@ -1,14 +1,14 @@ -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libxfce4ui libxfce4util xfce4-panel" -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" FILES_${PN} += "${datadir}/xfce4/panel-plugins/" FILES_${PN} += "${datadir}/xfce4/panel/plugins/" FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" FILES_${PN} += "${libdir}/xfce4/panel/plugins/*.so" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la"
\ No newline at end of file +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb index 8196e6c17..f1d9c04b8 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb @@ -9,7 +9,7 @@ DEPENDS = " \ intltool-native \ " -inherit distutils3 gtk-icon-cache distro_features_check +inherit distutils3 gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index 7445cd7c5..d6990476a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -12,7 +12,7 @@ SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" PV = "0.5.4.14" S = "${WORKDIR}/git" -inherit gettext pkgconfig autotools gtk-icon-cache distro_features_check +inherit gettext pkgconfig autotools gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch deleted file mode 100644 index e872249d5..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fb1f83c04dd5262897b09e60fa8b39090d0d4619 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Thu, 12 Nov 2015 13:53:03 -0600 -Subject: [PATCH] fix Name/Comment fields - -Validate as a valid .desktop file per -http://standards.freedesktop.org/desktop-entry-spec/latest/ - -See also issue #2 - -Upstream-Status: Applied [1] - -[1] https://github.com/ncopa/xfce-polkit/commit/fb1f83c04dd5262897b09e60fa8b39090d0d4619 ---- - xfce-polkit.desktop.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xfce-polkit.desktop.in b/xfce-polkit.desktop.in -index 8575896..dd9f09c 100644 ---- a/xfce-polkit.desktop.in -+++ b/xfce-polkit.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application --_Name=XFCE PolKit --_Comment=Policykit Authentication Agent -+Name=XFCE PolKit -+Comment=Policykit Authentication Agent - Exec=@xfce_polkit_libexecdir@/xfce-polkit - Icon=gtk-dialog-authentication - NotShowIn=GNOME;KDE; --- -2.14.3 - diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 62d8d6de9..2ef81f286 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" DEPENDS = "libxfce4ui polkit" -inherit xfce-app distro_features_check +inherit xfce-app features_check REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = " \ git://github.com/ncopa/${BPN}.git \ - file://0001-fix-Name-Comment-fields.patch \ " -SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283" +SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index 4d128ac51..2dd3f01d8 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -13,7 +13,7 @@ SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" S = "${WORKDIR}/git" -inherit gettext meson distro_features_check +inherit gettext meson features_check REQUIRED_DISTRO_FEATURES = "systemd x11" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb index 5fa2a7bce..467e0953c 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb @@ -3,7 +3,7 @@ SECTION = "x11/application" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit python3native gettext distro_features_check +inherit python3native gettext features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.8.bb index 4a1aae764..9c9c327b7 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf" +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" inherit xfce-app @@ -16,11 +16,12 @@ SRC_URI_append = " \ file://fix-cross-compile.patch \ file://fix-pam-config.patch \ " -SRC_URI[md5sum] = "982f9a355456320933ec08313523a567" -SRC_URI[sha256sum] = "fdecf0fc432b59defba2dd706051696d47227ca0744c7971014021190126f2d5" +SRC_URI[md5sum] = "0fea7b676e6e533a3f305c6f642fe0cd" +SRC_URI[sha256sum] = "4056045ea5fd3eccfe328b86ae245ee4949b9e3044e42ca29c492c0f4ac860d7" do_install_append() { install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver } FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" +RDEPENDS_${PN} += "python3-core" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb index 7f6756fc9..a0de63004 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb @@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup- inherit xfce-app -SRC_URI[md5sum] = "9e4026d9ae7850b290992c9d2aea80dd" -SRC_URI[sha256sum] = "88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658" +SRC_URI[md5sum] = "9b63c0fa7cbde8ec4e6cacb75fc44b65" +SRC_URI[sha256sum] = "0f7161053a23a6413376f4d17db6b774d4849384a9b1ffe01fdb2b0035a070d1" do_compile_prepend() { mkdir -p lib diff --git a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 68dbc69af..2f5d820f0 100644 --- a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native" -inherit xfce pkgconfig distro_features_check +inherit xfce pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb b/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb index 21930ba14..8009acdd9 100644 --- a/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb +++ b/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb @@ -6,7 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot \ kernel-modules \ " -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11" IMAGE_LINGUAS ?= " " diff --git a/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb index c3da3e9b9..24d0d901f 100644 --- a/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb +++ b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" -inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache +inherit features_check autotools pkgconfig pythonnative gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb index 5c94cb6bc..c8f495edb 100644 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb @@ -10,7 +10,7 @@ SECTION = "Applications/System" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit autotools gtk-doc gobject-introspection gettext distro_features_check +inherit autotools gtk-doc gobject-introspection gettext features_check DEPENDS = "gtk+3 libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb index a6475cef6..a6d335a2e 100644 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb @@ -25,7 +25,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc +inherit autotools pkgconfig gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.4.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb index 68556a2ab..efee1aa93 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.4.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb @@ -16,8 +16,8 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "c23621eb44df292f828e86074d4e719d" -SRC_URI[sha256sum] = "e92b8ec369e53d921b47d2473c2e2a1e9e04d3c5d536d419abdff40e5e136dc1" +SRC_URI[md5sum] = "74fcde5da018c011e5febd9649817c05" +SRC_URI[sha256sum] = "1adb4bd96c4cc4b4a79eeafe1316e170f506426e3737e8ba8898f7ea6bec572a" RDEPENDS_${PN} += "gstreamer1.0-plugins-good" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb index 002e93da4..3108a7760 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" inherit xfce-panel-plugin -SRC_URI[md5sum] = "9dd0681c179302d56d92bbda5765bd09" -SRC_URI[sha256sum] = "4c6ce37fbe71094548b44862587c2813da991aeaaecff8e572724dbbec83ab86" +SRC_URI[md5sum] = "d808fe77a438c95b97ec6feda6162d22" +SRC_URI[sha256sum] = "256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb index 8b8f5f21c..fc380c153 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Pulseaudio mixer for the xfce panel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" -inherit xfce-panel-plugin distro_features_check +inherit xfce-panel-plugin features_check REQUIRED_DISTRO_FEATURES = "pulseaudio x11" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb index 4218c0c50..c3de5964d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin -SRC_URI[md5sum] = "81e1a961032c7b87d672bed09c681a73" -SRC_URI[sha256sum] = "7f9cd4694e83d9cc5e41140d174dcc5ffe00fd546f2706f619031039ad7e0f6b" +SRC_URI[md5sum] = "afa0ef865a49f28165098d3fe625df44" +SRC_URI[sha256sum] = "ee4a51a35076d50cba3824079f8312585373ff2f0d9ebc740d8f3c0426430a19" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb index c53ca13c8..96c2048be 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "e0bde3ba6a7e863022a86a23c7871255" -SRC_URI[sha256sum] = "7cdc18b8df759dee4ceaaf6ce303eff7fda48e247dbc26b78142929213506cfd" +SRC_URI[md5sum] = "7ff4ab636f93addba0817bf6436d2964" +SRC_URI[sha256sum] = "4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572" FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb index a05f0dc6f..595e3c815 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "21f1e1d8d4a030f23d358d6c5ac50f2a" -SRC_URI[sha256sum] = "e0c6cc4fc1e685bc9601ec217a803d5489ca3276f4008bf056600471c6ac1848" +SRC_URI[md5sum] = "ee9e378fae78b230a23b241cf727c84b" +SRC_URI[sha256sum] = "84d3de35695a023aab181f7a9b75f59029eb3b07c3e47a5e11e8bd79db62570e" RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb b/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb index 994c65282..d85063678 100644 --- a/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb +++ b/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Quickly share a folder using Samba from Thunar" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit thunar-plugin distro_features_check +inherit thunar-plugin features_check REQUIRED_DISTRO_FEATURES = "pam" SRC_URI[md5sum] = "a1773168c0b3c7c0f253a339f02e5ae2" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.8.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.9.bb index fdd50d435..8d59be13b 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.8.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.9.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 libxfce4ui virtual/libx11 liburi-perl-native cairo" DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" -inherit xfce pythonnative perlnative gtk-doc distro_features_check +inherit xfce pythonnative perlnative gtk-doc features_check REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES_class-native = "" @@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "e618ce760a12ac7427a48a44c69f3d31" -SRC_URI[sha256sum] = "3400a2e64aa41ede25bedaca4909bde7ea4f8698d9598d1b80f02a40ac89fcde" +SRC_URI[md5sum] = "9730f9d270b4968a8bbebe73e6de934f" +SRC_URI[sha256sum] = "9ba0bf0fd59aeb1cd32ae3863e7a78222655eb15eb675ba08f3b3fb933b6fbfe" PACKAGECONFIG ??= "" PACKAGECONFIG_class-target ??= "gtk" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.4.bb index 62c789019..75997de7b 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.4.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" -inherit xfce gtk-doc distro_features_check +inherit xfce gtk-doc features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb index 805e893f7..0dd4a4c3f 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+ xfce4-dev-tools-native" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb index 6b26200aa..053eb201b 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "intltool-native perl-native gtk+ gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" -inherit xfce gtk-doc gobject-introspection distro_features_check +inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index daee73eb3..412c6ae80 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -2,7 +2,7 @@ SUMMARY = "All packages required for a base installation of XFCE" SECTION = "x11/wm" PR = "r5" -inherit packagegroup distro_features_check +inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 527f81f1f..42f20c9d2 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -3,7 +3,7 @@ SECTION = "x11/wm" PR = "r10" -inherit packagegroup distro_features_check +inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb index fff7c0302..d499e22ea 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "exo libnotify libgudev" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.9.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.9.bb index ff020d0c7..bc996c15d 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.9.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.9.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" -inherit xfce gobject-introspection distro_features_check +inherit xfce gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb index 2d6b7a550..e4f35b0fc 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb index a1b571e68..cc3f323bd 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" -inherit xfce gtk-doc gobject-introspection distro_features_check remove-libtool +inherit xfce gtk-doc gobject-introspection features_check remove-libtool REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb index 284a29ba2..295e2e4ed 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb @@ -5,7 +5,7 @@ SECTION = "x11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.0.bb index 6b4cafd00..37560c2db 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" -inherit xfce update-alternatives distro_features_check +inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb index a24928cf6..d326f9209 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "exo exo-native garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.1.bb index ec4f00f3d..fe9f40b38 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libxfce4ui libwnck thunar garcon exo" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.0.bb index 77b45a7c9..b77e619b3 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" -inherit xfce update-alternatives distro_features_check +inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" |