Hello community, here is the log from the commit of package libmtp for openSUSE:Factory checked in at 2016-02-17 10:30:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmtp (Old) and /work/SRC/openSUSE:Factory/.libmtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmtp" Changes: -------- --- /work/SRC/openSUSE:Factory/libmtp/libmtp.changes 2015-11-04 15:30:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmtp.new/libmtp.changes 2016-02-17 12:14:27.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 10 21:06:21 UTC 2016 - [email protected] + +- updated to 1.1.11 release + - lots of new USB id updates + - small usb 3 bugfix +- libmtp.keyring: temporary add my older key, as I mistakenly + used that to sign the tarball + +------------------------------------------------------------------- Old: ---- libmtp-1.1.10.tar.gz libmtp-1.1.10.tar.gz.asc New: ---- libmtp-1.1.11.tar.gz libmtp-1.1.11.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmtp.spec ++++++ --- /var/tmp/diff_new_pack.PkANJH/_old 2016-02-17 12:14:28.000000000 +0100 +++ /var/tmp/diff_new_pack.PkANJH/_new 2016-02-17 12:14:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmtp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Summary: Commandline utilities for access to MTP Players License: LGPL-2.1+ Group: Productivity/Multimedia/Sound/Players -Version: 1.1.10 +Version: 1.1.11 Release: 0 %define sonum 9 Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz ++++++ libmtp-1.1.10.tar.gz -> libmtp-1.1.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/aclocal.m4 new/libmtp-1.1.11/aclocal.m4 --- old/libmtp-1.1.10/aclocal.m4 2015-10-04 15:36:54.000000000 +0200 +++ new/libmtp-1.1.11/aclocal.m4 2016-02-10 21:17:33.000000000 +0100 @@ -1143,32 +1143,63 @@ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <[email protected]>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant <[email protected]>. +dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -1190,18 +1221,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -1211,8 +1243,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -1224,10 +1258,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -1235,19 +1270,17 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -1301,16 +1334,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -1321,16 +1378,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -1341,13 +1400,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -1356,7 +1417,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2014 Free Software Foundation, Inc. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/config.h.in new/libmtp-1.1.11/config.h.in --- old/libmtp-1.1.10/config.h.in 2015-10-04 15:37:03.000000000 +0200 +++ new/libmtp-1.1.11/config.h.in 2016-02-10 21:17:43.000000000 +0100 @@ -54,10 +54,6 @@ /* Define to 1 if you have the <locale.h> header file. */ #undef HAVE_LOCALE_H -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -204,9 +200,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - /* Define to `long int' if <sys/types.h> does not define. */ #undef off_t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/configure new/libmtp-1.1.11/configure --- old/libmtp-1.1.10/configure 2015-10-04 15:36:56.000000000 +0200 +++ new/libmtp-1.1.11/configure 2016-02-10 21:17:35.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libmtp 1.1.10. +# Generated by GNU Autoconf 2.69 for libmtp 1.1.11. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libmtp' PACKAGE_TARNAME='libmtp' -PACKAGE_VERSION='1.1.10' -PACKAGE_STRING='libmtp 1.1.10' +PACKAGE_VERSION='1.1.11' +PACKAGE_STRING='libmtp 1.1.11' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1360,7 +1360,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libmtp 1.1.10 to adapt to many kinds of systems. +\`configure' configures libmtp 1.1.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libmtp 1.1.10:";; + short | recursive ) echo "Configuration of libmtp 1.1.11:";; esac cat <<\_ACEOF @@ -1562,7 +1562,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libmtp configure 1.1.10 +libmtp configure 1.1.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2042,7 +2042,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libmtp $as_me 1.1.10, which was +It was created by libmtp $as_me 1.1.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2906,7 +2906,7 @@ # Define the identity of the package. PACKAGE='libmtp' - VERSION='1.1.10' + VERSION='1.1.11' cat >>confdefs.h <<_ACEOF @@ -14698,73 +14698,6 @@ # Checks for library functions. -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if ${ac_cv_func_malloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_malloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include <stdlib.h> -#else -char *malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_malloc_0_nonnull=yes -else - ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_MALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_MALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -$as_echo "#define malloc rpl_malloc" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } if ${ac_cv_func_memcmp_working+:} false; then : @@ -16700,7 +16633,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libmtp $as_me 1.1.10, which was +This file was extended by libmtp $as_me 1.1.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16766,7 +16699,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libmtp config.status 1.1.10 +libmtp config.status 1.1.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/configure.ac new/libmtp-1.1.11/configure.ac --- old/libmtp-1.1.10/configure.ac 2015-10-04 15:36:51.000000000 +0200 +++ new/libmtp-1.1.11/configure.ac 2016-02-10 21:17:28.000000000 +0100 @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([libmtp], [1.1.10], [[email protected]]) +AC_INIT([libmtp], [1.1.11], [[email protected]]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([src/libmtp.c]) @@ -188,7 +188,6 @@ AC_STRUCT_ST_BLKSIZE # Checks for library functions. -AC_FUNC_MALLOC AC_FUNC_MEMCMP AC_FUNC_STAT AC_CHECK_FUNCS(basename memset select strdup strerror strndup strrchr strtoul usleep mkstemp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/libmtp.pc new/libmtp-1.1.11/libmtp.pc --- old/libmtp-1.1.10/libmtp.pc 2015-10-04 15:37:02.000000000 +0200 +++ new/libmtp-1.1.11/libmtp.pc 2016-02-10 21:17:43.000000000 +0100 @@ -7,7 +7,7 @@ Name: libmtp Description: libmtp is a library for accessing Media Transfer Protocol devices -Version: 1.1.10 +Version: 1.1.11 Requires.private: libusb-1.0 Conflicts: Libs: -L${libdir} -lmtp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/src/libmtp.c new/libmtp-1.1.11/src/libmtp.c --- old/libmtp-1.1.10/src/libmtp.c 2015-10-04 13:20:04.000000000 +0200 +++ new/libmtp-1.1.11/src/libmtp.c 2015-11-23 08:29:22.000000000 +0100 @@ -7271,7 +7271,7 @@ * if the device does not support all the characters in the * name. * @param parent_id id of parent folder to add the new folder to, - * or 0 to put it in the root directory. + * or 0xFFFFFFFF to put it in the root directory. * @param storage_id id of the storage to add this new folder to. * notice that you cannot mismatch storage id and parent id: * they must both be on the same storage! Pass in 0 if you diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/src/libmtp.h new/libmtp-1.1.11/src/libmtp.h --- old/libmtp-1.1.10/src/libmtp.h 2015-10-04 15:37:02.000000000 +0200 +++ new/libmtp-1.1.11/src/libmtp.h 2016-02-10 21:17:42.000000000 +0100 @@ -29,8 +29,8 @@ #ifndef LIBMTP_H_INCLUSION_GUARD #define LIBMTP_H_INCLUSION_GUARD -#define LIBMTP_VERSION 1.1.10 -#define LIBMTP_VERSION_STRING "1.1.10" +#define LIBMTP_VERSION 1.1.11 +#define LIBMTP_VERSION_STRING "1.1.11" /* This handles MSVC pecularities */ #ifdef _MSC_VER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/src/libopenusb1-glue.c new/libmtp-1.1.11/src/libopenusb1-glue.c --- old/libmtp-1.1.10/src/libopenusb1-glue.c 2015-06-17 21:17:13.000000000 +0200 +++ new/libmtp-1.1.11/src/libopenusb1-glue.c 2016-02-05 22:24:08.000000000 +0100 @@ -1351,7 +1351,7 @@ break; } } - if (rlen == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) { + if (rlen == ptp_usb->inep_maxpacket) { /* Copy first part of data to 'data' */ putfunc_ret = handler->putfunc( @@ -1433,7 +1433,7 @@ return putfunc_ret; if (FLAG_NO_ZERO_READS(ptp_usb) && - len + PTP_USB_BULK_HDR_LEN == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) { + len + PTP_USB_BULK_HDR_LEN == ptp_usb->inep_maxpacket) { LIBMTP_USB_DEBUG("Reading in extra terminating byte\n"); @@ -1459,8 +1459,8 @@ xread = bulk.result.transferred_bytes; if (result != 1) - LIBMTP_INFO("Could not read in extra byte for PTP_USB_BULK_HS_MAX_PACKET_LEN_READ long file, return value 0x%04x\n", result); - } else if (len + PTP_USB_BULK_HDR_LEN == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ && params->split_header_data == 0) { + LIBMTP_INFO("Could not read in extra byte for %d bytes long file, return value 0x%04x\n", ptp_usb->inep_maxpacket, result); + } else if (len + PTP_USB_BULK_HDR_LEN == ptp_usb->inep_maxpacket && params->split_header_data == 0) { int zeroresult = 0, xread; unsigned char zerobyte = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/src/libusb-glue.c new/libmtp-1.1.11/src/libusb-glue.c --- old/libmtp-1.1.10/src/libusb-glue.c 2015-06-17 21:17:13.000000000 +0200 +++ new/libmtp-1.1.11/src/libusb-glue.c 2016-02-05 22:23:27.000000000 +0100 @@ -1341,7 +1341,7 @@ break; } } - if (rlen == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) { + if (rlen == ptp_usb->inep_maxpacket) { /* Copy first part of data to 'data' */ putfunc_ret = handler->putfunc( @@ -1423,7 +1423,7 @@ return putfunc_ret; if (FLAG_NO_ZERO_READS(ptp_usb) && - len+PTP_USB_BULK_HDR_LEN == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) { + len+PTP_USB_BULK_HDR_LEN == ptp_usb->inep_maxpacket) { LIBMTP_USB_DEBUG("Reading in extra terminating byte\n"); @@ -1437,8 +1437,8 @@ ptp_usb->timeout); if (result != 1) - LIBMTP_INFO("Could not read in extra byte for PTP_USB_BULK_HS_MAX_PACKET_LEN_READ long file, return value 0x%04x\n", result); - } else if (len+PTP_USB_BULK_HDR_LEN == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ && params->split_header_data == 0) { + LIBMTP_INFO("Could not read in extra byte for %d bytes long file, return value 0x%04x\n", ptp_usb->inep_maxpacket, result); + } else if (len+PTP_USB_BULK_HDR_LEN == ptp_usb->inep_maxpacket && params->split_header_data == 0) { int zeroresult = 0; char zerobyte = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/src/libusb1-glue.c new/libmtp-1.1.11/src/libusb1-glue.c --- old/libmtp-1.1.10/src/libusb1-glue.c 2015-10-04 13:27:14.000000000 +0200 +++ new/libmtp-1.1.11/src/libusb1-glue.c 2016-02-05 22:20:31.000000000 +0100 @@ -1362,7 +1362,7 @@ break; } } - if (rlen == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) { + if (rlen == ptp_usb->inep_maxpacket) { /* Copy first part of data to 'data' */ putfunc_ret = handler->putfunc( @@ -1444,7 +1444,7 @@ return putfunc_ret; if (FLAG_NO_ZERO_READS(ptp_usb) && - len+PTP_USB_BULK_HDR_LEN == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) { + len+PTP_USB_BULK_HDR_LEN == ptp_usb->inep_maxpacket) { LIBMTP_USB_DEBUG("Reading in extra terminating byte\n"); @@ -1459,8 +1459,8 @@ ptp_usb->timeout); if (result != 1) - LIBMTP_INFO("Could not read in extra byte for PTP_USB_BULK_HS_MAX_PACKET_LEN_READ long file, return value 0x%04x\n", result); - } else if (len+PTP_USB_BULK_HDR_LEN == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ && params->split_header_data == 0) { + LIBMTP_INFO("Could not read in extra byte for %d byte long file, return value 0x%04x\n", ptp_usb->inep_maxpacket, result); + } else if (len+PTP_USB_BULK_HDR_LEN == ptp_usb->inep_maxpacket && params->split_header_data == 0) { int zeroresult = 0, xread; unsigned char zerobyte = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/src/music-players.h new/libmtp-1.1.11/src/music-players.h --- old/libmtp-1.1.10/src/music-players.h 2015-10-04 13:31:37.000000000 +0200 +++ new/libmtp-1.1.11/src/music-players.h 2016-02-10 19:42:13.000000000 +0100 @@ -439,6 +439,8 @@ { "Microsoft/Sharp/nVidia", 0x045e, "Kin TwoM", 0x0641, DEVICE_FLAG_NONE }, // Reported by Farooq Zaman (used for all Zunes) { "Microsoft", 0x045e, "Zune", 0x0710, DEVICE_FLAG_NONE }, + /* https://sourceforge.net/p/libmtp/feature-requests/155/ */ + { "Microsoft", 0x045e, "Lumia 950 XL Dual SIM (RM-1116)", 0x0a00, DEVICE_FLAG_NONE }, // Reported by Olegs Jeremejevs { "Microsoft/HTC", 0x045e, "HTC 8S", 0xf0ca, DEVICE_FLAG_NONE }, @@ -478,6 +480,8 @@ { "Philips", 0x0471, "GoGear SA6125/SA6145/SA6185", 0x2002, DEVICE_FLAG_UNLOAD_DRIVER }, // From anonymous Sourceforge user, not verified to be MTP! { "Philips", 0x0471, "GoGear SA3345", 0x2004, DEVICE_FLAG_UNLOAD_DRIVER }, + /* https://sourceforge.net/p/libmtp/support-requests/163/ */ + { "Philips", 0x0471, "W6610", 0x2008, DEVICE_FLAG_UNLOAD_DRIVER }, // From Roberto Vidmar <[email protected]> { "Philips", 0x0471, "SA5285", 0x2022, DEVICE_FLAG_UNLOAD_DRIVER }, // From Elie De Brauwer <[email protected]> @@ -600,6 +604,12 @@ /* https://sourceforge.net/p/libmtp/support-requests/188/ */ { "Acer", 0x0502, "Liquid Z220", 0x3750, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1478/ */ + { "Acer", 0x0502, "Liquid Z330", 0x3750, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1469/ */ + { "Acer", 0x0502, "Z530", 0x3822, + DEVICE_FLAGS_ANDROID_BUGS }, /* * SanDisk @@ -963,8 +973,11 @@ { "Archos", 0x0e79, "101 XS", 0x1548, DEVICE_FLAGS_ANDROID_BUGS }, { "Archos", 0x0e79, "70it2 (ID 1)", 0x1568, DEVICE_FLAGS_ANDROID_BUGS }, { "Archos", 0x0e79, "70it2 (ID 2)", 0x1569, DEVICE_FLAGS_ANDROID_BUGS }, + { "Archos", 0x0e79, "70 Cobalt", 0x15ba, DEVICE_FLAGS_ANDROID_BUGS }, { "Archos", 0x0e79, "50c", 0x2008, DEVICE_FLAGS_ANDROID_BUGS }, { "Archos", 0x0e79, "C40", 0x31ab, DEVICE_FLAGS_ANDROID_BUGS }, + /* via libmtp-discuss Tonton <[email protected]> */ + { "Archos", 0x0e79, "Helium 45B", 0x31d8, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1393/ */ { "Archos", 0x0e79, "Phone", 0x31e1, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1325/ */ @@ -1145,6 +1158,8 @@ /* https://sourceforge.net/p/libmtp/bugs/1308/ */ { "Nokia", 0x0421, "N300", 0x0524, DEVICE_FLAG_NONE }, { "Nokia", 0x0421, "C5-00", 0x0592, DEVICE_FLAG_NONE }, + /* https://sourceforge.net/p/libmtp/bugs/1457/ */ + { "Nokia", 0x0421, "C5-00 (ID2)", 0x0595, DEVICE_FLAG_NONE }, { "Nokia", 0x0421, "808 PureView", 0x05d3, DEVICE_FLAG_NONE }, // Reported by Sampo Savola // Covers Lumia 920, 820 and probably any WP8 device. @@ -1158,6 +1173,8 @@ * ID is the same for various Lumia version. */ { "Nokia", 0x0421, "Lumia (RM-975)", 0x06fc, DEVICE_FLAG_NONE }, + /* https://sourceforge.net/p/libmtp/bugs/1453/ */ + { "Nokia", 0x0421, "X2 Dual Sim", 0x0708, DEVICE_FLAG_NONE }, /* @@ -1188,6 +1205,9 @@ { "Qualcomm (for PhiComm)", 0x05c6, "C230w (MTP)", 0x9039, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1513/ */ + { "Qualcomm (for OnePlus)", 0x05c6, "One Plus 2 (A2003) (MTP)", + 0xf003, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1284/ */ { "Qualcomm (for Highscreen)", 0x05c6, "Omega Prime S", 0xf003, DEVICE_FLAGS_ANDROID_BUGS }, @@ -1228,6 +1248,9 @@ /* https://sourceforge.net/p/libmtp/feature-requests/137/ */ { "Fujitsu, Ltd", 0x04c5, "F02-E", 0x1378, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1495/ */ + { "Fujitsu, Ltd", 0x04c5, "Arrows 202F", 0x13dd, + DEVICE_FLAGS_ANDROID_BUGS }, /* * Palm device userland program named Pocket Tunes @@ -1428,6 +1451,9 @@ DEVICE_FLAGS_ANDROID_BUGS }, { "LG Electronics Inc.", 0x1004, "G3", 0x627f, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1463/ */ + { "LG Electronics Inc.", 0x1004, "810 tablet", 0x6263, + DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/support-requests/134/ */ { "LG Electronics Inc.", 0x1004, "G3 (VS985)", 0x626e, DEVICE_FLAGS_ANDROID_BUGS }, @@ -1745,6 +1771,8 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "Xperia Z2 MTP", 0x01af, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "Xperia Z3v MTP", 0x01b0, + DEVICE_FLAGS_ANDROID_BUGS }, { "SONY", 0x0fce, "Xperia Z2 Tablet MTP", 0x01b1, DEVICE_FLAGS_ANDROID_BUGS }, { "SONY", 0x0fce, "Xperia Z Ultra MTP", 0x01b6, @@ -1757,6 +1785,8 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "Xperia E3 MTP", 0x01bc, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "Xperia Z3 Tablet MTP", 0x01c0, + DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP", 0x01c4, DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "E2115 MTP", 0x01c5, @@ -1765,6 +1795,10 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "XPeria E4g MTP", 0x01cb, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "XPeria Z5 MTP", 0x01d9, + DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "XPeria Z5 Compact MTP", 0x01da, + DEVICE_FLAG_NONE }, /* @@ -1834,6 +1868,8 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "Xperia Z2 MTP+CDROM", 0x41af, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "Xperia Z3v MTP+CDROM", 0x41b0, + DEVICE_FLAGS_ANDROID_BUGS }, { "SONY", 0x0fce, "Xperia Z2 Tablet MTP+CDROM", 0x41b1, DEVICE_FLAGS_ANDROID_BUGS }, { "SONY", 0x0fce, "Xperia Z Ultra MTP+CDROM", 0x41b6, @@ -1846,6 +1882,8 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "Xperia E3 MTP+CDROM", 0x41bc, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+CDROM", 0x41c0, + DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP+CDROM", 0x41c4, DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "E2115 MTP+CDROM", 0x41c5, @@ -1854,6 +1892,10 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "XPeria E4g MTP+CDROM", 0x41cb, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "XPeria Z5 MTP+CDROM", 0x41d9, + DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "XPeria Z5 Compact MTP+CDROM", 0x41da, + DEVICE_FLAG_NONE }, /* * MTP+ADB personalities of MTP devices (see above) @@ -1946,6 +1988,8 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "Xperia Z2 MTP+ADB", 0x51af, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "Xperia Z3v MTP+ADB", 0x51b0, + DEVICE_FLAGS_ANDROID_BUGS }, { "SONY", 0x0fce, "Xperia Z2 Tablet MTP+ADB", 0x51b1, DEVICE_FLAGS_ANDROID_BUGS }, { "SONY", 0x0fce, "Xperia Z Ultra MTP+ADB", 0x51b6, @@ -1958,6 +2002,8 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "Xperia E3 MTP+ADB", 0x51bc, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+ADB", 0x41c0, + DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP+ADB", 0x51c4, DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "E2115 MTP+ADB", 0x51c5, @@ -1966,6 +2012,10 @@ DEVICE_FLAG_NONE }, { "SONY", 0x0fce, "XPeria E4g MTP+ADB", 0x51cb, DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "XPeria Z5 MTP+ADB", 0x51d9, + DEVICE_FLAG_NONE }, + { "SONY", 0x0fce, "XPeria Z5 Compact MTP+ADB", 0x51da, + DEVICE_FLAG_NONE }, /* * MTP+UMS modes @@ -2037,6 +2087,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1030/, PTP Id */ { "Motorola", 0x22b8, "Moto G (XT1032)", 0x2e84, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1477/ */ + { "Motorola", 0x22b8, "Moto Maxx (XT1225)", 0x2ea4, + DEVICE_FLAGS_ANDROID_BUGS }, // Reported by Jader Rodrigues Simoes <[email protected]> { "Motorola", 0x22b8, "Xoom 2 Media Edition (ID3)", 0x41cf, DEVICE_FLAGS_ANDROID_BUGS }, @@ -2164,13 +2217,18 @@ DEVICE_FLAGS_ANDROID_BUGS }, { "Google Inc (for LG Electronics/Samsung)", 0x18d1, "Nexus 4/5/7/10 (MTP)", 0x4ee1, - DEVICE_FLAGS_ANDROID_BUGS }, + (DEVICE_FLAGS_ANDROID_BUGS | DEVICE_FLAG_PROPLIST_OVERRIDES_OI) & ~DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, { "Google Inc (for LG Electronics/Samsung)", 0x18d1, "Nexus 4/5/7/10 (MTP+ADB)", 0x4ee2, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1255/ */ { "Google", 0x18d1, "Nexus 5 (MTP)", 0x4ee5, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1444/ */ + { "Google", 0x18d1, "Pixel C (MTP)", 0x5202, + DEVICE_FLAGS_ANDROID_BUGS }, + { "Google", 0x18d1, "Pixel C (MTP+ADB)", 0x5203, + DEVICE_FLAGS_ANDROID_BUGS }, // WiFi-only version of Xoom // See: http://bugzilla.gnome.org/show_bug.cgi?id=647506 { "Google Inc (for Motorola)", 0x18d1, "Xoom (MZ604)", 0x70a8, @@ -2537,6 +2595,24 @@ /* https://sourceforge.net/p/libmtp/bugs/1360/ */ { "Lenovo", 0x17ef, "K3 Note", 0x7883, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1488/ */ + { "Lenovo", 0x17ef, "A10-70F", 0x789a, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1497/ */ + { "Lenovo", 0x17ef, "A10-70L", 0x789b, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1480/ */ + { "Medion", 0x17ef, "P8312 Tablet", 0x78ae, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/support-requests/201/ */ + { "Lenovo", 0x17ef, "Lifetab S1034X", 0x78b0, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1465/ */ + { "Lenovo", 0x17ef, "A1000 Smartphone", 0x7928, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1465/ */ + { "Lenovo", 0x17ef, "A1000 Smartphone ADB", 0x7929, + DEVICE_FLAGS_ANDROID_BUGS }, /* * Huawei @@ -2546,6 +2622,9 @@ DEVICE_FLAGS_ANDROID_BUGS }, { "Huawei", 0x12d1, "MTP device (ID2)", 0x1052, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1507/ */ + { "Huawei", 0x12d1, "Honor 7", 0x1074, + DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1381/ */ { "Huawei", 0x12d1, "H60-L11", 0x1079, DEVICE_FLAGS_ANDROID_BUGS }, @@ -2593,6 +2672,15 @@ /* https://sourceforge.net/p/libmtp/bugs/1221/ */ { "HTC", 0x0bb4, "One M8 Google Play Edition (MTP+ADB)", 0x060b, DEVICE_FLAG_NONE }, + /* https://sourceforge.net/p/libmtp/bugs/1500/ */ + { "HTC", 0x0bb4, "One Mini 2 (MTP)", 0x0629, + DEVICE_FLAG_NONE }, + /* https://sourceforge.net/p/libmtp/bugs/1508/ */ + { "HTC", 0x0bb4, "One M9 (MTP)", 0x065c, + DEVICE_FLAG_NONE }, + /* https://sourceforge.net/p/libmtp/support-requests/200/ */ + { "HTC", 0x0bb4, "HTC Desire 520", 0x0670, + DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/support-requests/153/ */ { "HTC", 0x0bb4, "HTC6515LVW/One Remix", 0x07d8, DEVICE_FLAG_NONE }, @@ -2673,6 +2761,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1182/ */ { "HTC", 0x0bb4, "Desire 310 (MTP)", 0x0ec6, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1481/ */ + { "HTC", 0x0bb4, "Desire 310 (2nd id) (MTP)", 0x0ec7, + DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1420/ */ { "HTC", 0x0bb4, "Desire 816G (MTP)", 0x0edb, DEVICE_FLAGS_ANDROID_BUGS }, @@ -2716,6 +2807,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1198/ */ { "HTC", 0x0bb4, "Motorola Razr D1", 0x2012, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1440/ */ + { "HTC", 0x0bb4, "Motorola P98 4G", 0x201d, + DEVICE_FLAGS_ANDROID_BUGS }, // These identify themselves as "cm_tenderloin", fun... // Done by HTC for HP I guess. { "HTC (for Hewlett-Packard)", 0x0bb4, "HP Touchpad (MTP)", 0x685c, @@ -2745,6 +2839,9 @@ DEVICE_FLAGS_ANDROID_BUGS }, { "nVidia", 0x0955, "Shield (ID1)", 0xb400, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1447/ */ + { "nVidia", 0x0955, "Shield (Tegra4)", 0xb401, + DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1087/ */ { "nVidia", 0x0955, "Tegra Note", 0xcf02, DEVICE_FLAGS_ANDROID_BUGS }, @@ -2792,6 +2889,15 @@ /* https://sourceforge.net/p/libmtp/bugs/1353/ */ { "Amazon", 0x1949, "Kindle Fire HD6", 0x00f2, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1460/ */ + { "Amazon", 0x1949, "Kindle Fire 8", 0x0211, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1448/ */ + { "Amazon", 0x1949, "Kindle Fire 7", 0x0221, + DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1491/ */ + { "Amazon", 0x1949, "Kindle Fire 5", 0x0222, + DEVICE_FLAGS_ANDROID_BUGS }, { "Amazon", 0x1949, "Fire Phone", 0x0800, DEVICE_FLAGS_ANDROID_BUGS }, @@ -2802,6 +2908,9 @@ DEVICE_FLAGS_ANDROID_BUGS }, { "Barnes&Noble", 0x2080, "Nook HD", 0x0006, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1504/ */ + { "Barnes&Noble", 0x2080, "Nook Glowlight+", 0x000a, + DEVICE_FLAGS_ANDROID_BUGS }, /* * Viewpia, bq, YiFang @@ -2859,6 +2968,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1149/ */ { "Xiaomi", 0x2717, "MiPad (MTP)", 0x0660, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1489/ */ + { "Xiaomi", 0x2717, "MiPad (MTP+ADB)", 0x0668, + DEVICE_FLAGS_ANDROID_BUGS }, { "Xiaomi", 0x2717, "Hongmi (MTP+ADB)", 0x1240, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1095/ */ @@ -2886,6 +2998,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1402/ */ { "Xiaomi", 0x2717, "Redmi 2 (MTP)", 0xff60, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1445/ */ + { "Xiaomi", 0x2717, "Redmi 2 2014811 (MTP)", 0xff68, + DEVICE_FLAGS_ANDROID_BUGS }, /* * XO Learning Tablet @@ -2936,12 +3051,18 @@ * Kyocera */ { "Kyocera", 0x0482, "Rise", 0x0571, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1492/ */ + { "Kyocera", 0x0482, "Event", 0x0591, DEVICE_FLAGS_ANDROID_BUGS & ~DEVICE_FLAG_FORCE_RESET_ON_CLOSE }, /* https://sourceforge.net/p/libmtp/feature-requests/134/ */ { "Kyocera", 0x0482, "Torque Model E6715", 0x0059a, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/discussion/535190/thread/6270f5ce/ */ { "Kyocera", 0x0482, "KYL22", 0x0810, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1518/ */ + { "Kyocera", 0x0482, "302KC", 0x09fc, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1345/ */ { "Kyocera", 0x0482, "DuraForce", 0x0979, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1476/ */ + { "Kyocera", 0x0482, "KC-S701", 0x09cb, DEVICE_FLAGS_ANDROID_BUGS }, /* * HiSense @@ -2968,6 +3089,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1422/ */ { "MediaTek Inc", 0x0e8d, "MT65xx", 0x2008, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1467/ */ + { "elephone", 0x0e8d, "p6000", 0x2008, + DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/feature-requests/79/ */ { "MediaTek Inc", 0x0e8d, "Elephone P8000", 0x201d, DEVICE_FLAGS_ANDROID_BUGS }, @@ -3029,6 +3153,8 @@ { "Prestigio", 0x29e4, "5504 DUO ", 0x1203, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/feature-requests/141/ */ { "Prestigio", 0x29e4, "3405 DUO ", 0x3201, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/feature-requests/148/ */ + { "Prestigio", 0x29e4, "Multipad Color 7.0", 0xb003, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1283/ */ { "Megafon", 0x201e, "MFLogin3T", 0x42ab, DEVICE_FLAGS_ANDROID_BUGS }, @@ -3071,6 +3197,9 @@ /* https://sourceforge.net/p/libmtp/bugs/1212/ */ { "Fly", 0x2970, "Evo Tech 4", 0x2008, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/feature-requests/146/ */ + { "Wileyfox", 0x2970, "Swift", 0x2281, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1303/ */ { "Megafon", 0x1271, "Login+", 0x2012, DEVICE_FLAGS_ANDROID_BUGS }, @@ -3098,11 +3227,30 @@ /* https://sourceforge.net/p/libmtp/bugs/1423/ */ { "OnePlus", 0x2a70, "ONE A2001", 0x9011, DEVICE_FLAGS_ANDROID_BUGS }, + /* https://sourceforge.net/p/libmtp/bugs/1450/ */ + { "OnePlus", 0x2a70, "OnePlus 2 A2005", 0xf003, DEVICE_FLAGS_ANDROID_BUGS }, /* https://sourceforge.net/p/libmtp/bugs/1436/ */ { "Parrot", 0x19cf, "Bebop Drone", 0x5038, DEVICE_FLAGS_ANDROID_BUGS }, + + /* + * GoPro Action Cams. + */ + { "GoPro" , 0x2672, "HERO3+ Black", 0x0011, DEVICE_FLAG_NONE }, + { "GoPro" , 0x2672, "HERO", 0x000c, DEVICE_FLAG_NONE }, + { "GoPro" , 0x2672, "HERO4 Silver", 0x000d, DEVICE_FLAG_NONE }, + { "Gopro" , 0x2672, "HERO4 Black", 0x000e, DEVICE_FLAG_NONE }, + { "GoPro" , 0x2672, "HERO4 Session", 0x000f, DEVICE_FLAG_NONE }, + + /* https://sourceforge.net/p/libmtp/bugs/1490/ */ + { "Marshall" , 0x2ad9, "London", 0x000b, DEVICE_FLAG_NONE }, + + /* https://sourceforge.net/p/libmtp/support-requests/202/ */ + { "Fairphone" , 0x2ae5, "Fairphone 2", 0xf003, DEVICE_FLAGS_ANDROID_BUGS }, + + /* https://sourceforge.net/p/libmtp/bugs/1512/ */ + { "Allview" , 0x271d, "Energy P5", 0x4016, DEVICE_FLAGS_ANDROID_BUGS }, /* * Other strange stuff. */ { "Isabella", 0x0b20, "Her Prototype", 0xddee, DEVICE_FLAG_NONE } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmtp-1.1.10/util/mtp-probe.c new/libmtp-1.1.11/util/mtp-probe.c --- old/libmtp-1.1.10/util/mtp-probe.c 2015-10-04 13:28:59.000000000 +0200 +++ new/libmtp-1.1.11/util/mtp-probe.c 2015-12-06 21:03:57.000000000 +0100 @@ -248,7 +248,7 @@ dirbuf[len++] = '/'; /* Check for dirs that identify interfaces */ - ret = regcomp(&r, "^[0-9]+-[0-9]+(.[0-9])?\\:[0-9]+\\.[0-9]+$", REG_EXTENDED | REG_NOSUB); + ret = regcomp(&r, "^[0-9]+-[0-9]+(\\.[0-9])*\\:[0-9]+\\.[0-9]+$", REG_EXTENDED | REG_NOSUB); if (ret) { closedir(dir); return -1; ++++++ libmtp.keyring ++++++ --- /var/tmp/diff_new_pack.PkANJH/_old 2016-02-17 12:14:29.000000000 +0100 +++ /var/tmp/diff_new_pack.PkANJH/_new 2016-02-17 12:14:29.000000000 +0100 @@ -62,3 +62,32 @@ gg== =LAla -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBD++QmYRBADIRMQKks4iY+k5VbZOFk+N0c8SDW0N2He3nJBqH3rT9JYKJT6c +4Mmg/sjuZ0KSqDbs154Ci2sx7nQrYOGklFhN1sYwd5BcGJ2sGQMcYxBInOUGV0Pu +31vAAj9FLVlrYLVsf+QvWGMnKds/i1V6PAZebhX6bPyW2AoeIG7ostXjMwCgv/2P +3rY7Hc4Klv0IEK7gJ69nXEkD/26IRV4HKXFKXi7qbLsr7KIRnuOxkh2vuIVXrDtH +Hfgu/IzSD7QtmTg4RUMlSc61e4XthzdxEtQl5bMoh6chcznlzt2qrBhK5qs6oRcJ +UFTh5VD27PCPoV4Pzbo4+GI1cxQk1EZgpB2XMQcspLcenZBjCfOA8Q0YPFb2Wcoi +1xoUA/9ypTlpjUJl6K6mTEN/kpytCuW/I8eCtrzxoyIH5vOnBPc7Fa9thDwebSbl +SEr85JlwIhLicnHQglTxDfwJNbxc720FQcFsJG6Y8Hd+DpH3AjFsB7WA1jxPaVj3 +wqvgBu9lf3rFNoYHVMDSRo1dDlrgGZsKb6RoYqVvv7lxmYnIW7QlTWFyY3VzIE1l +aXNzbmVyIDxtZWlzc25lckBub3ZlbGwuY29tPohgBBMRAgAgAhsjAh4BAheABQJQ +hbyFBgsJCAcDAgQVAggDBBYCAwEACgkQ6nvzlwF1Yj4amACgtjJSPpexM7RIawlK +TkFL8aq05sQAniW1RkeREMW37th2bV+TNrYyJx9itCNNYXJjdXMgTWVpc3NuZXIg +PG1laXNzbmVyQHN1c2UuY29tPohgBBMRAgAgAhsjAh4BAheABQJQhbyJBgsJCAcD +AgQVAggDBBYCAwEACgkQ6nvzlwF1Yj6i/gCeJvvrDb4sUzXYQme9P9kQTYx/CKYA +nRsQkK9YdgBh3eANzkB9OZvoCGk/tCJNYXJjdXMgTWVpc3NuZXIgPG1laXNzbmVy +QHN1c2UuZGU+iF0EExECAB0CHgECF4AFAlCFvIkGCwkIBwMCBBUCCAMEFgIDAQAK +CRDqe/OXAXViPq08AJ4s4d8TqL8glx5QoidtAzAgA1vMeQCfeT7NzLnk8MKgvBYu +KLWlukHjkcm5AQ0EP75CaRAEAMrHw0+H/2VCqLHOyEPSlk23aUNFLvNzp9p7pXrX +qQ+arJuFrAG79/iPXOBbV9pbxR385shJQOn+QFLGnwvA8AyMfqsy27RmcMD8mXPE +8gGdo45SqVcZXQ+azBCsuF/QxHJnY/WcDlcuhB5nEDtZJval//qRqgNbnkZK3pyO +8JhfAAMFBACsoUNMtaDj2gXi/lugJu0795o0F9ETte5PLl6FeOeAzGunfsnTYeY5 +DIIToC7zwSKRhz24ceoZl+q6lhlmSWWkyLaRnXBbjdUsDt5p5uMdfAyg868swJ7x +E4aCTHiWZ6GxZWKEyHsumBraztXYoSTqfnWLvndWt2gG89ufcd1hBYhGBBgRAgAG +BQJETkdZAAoJEOp785cBdWI+Mr4An1j8RYTRnqWFx5tUSqIUodF6wKnsAKCCLHoQ +/QqHyxmdf9dq8TkZEUEKxA== +=+M03 +-----END PGP PUBLIC KEY BLOCK-----
