Reland: Uprev libmtp to 1.1.12

src/device-flags.h

 /**
  * \file device-flags.h
  * Special device flags to deal with bugs in specific devices.
  *
  * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
  * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2007 Marcus Meissner
  * Copyright (C) 2007 Ted Bullock
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 223 matching lines @@
 /**
  * Broken capture support where cameras do not send CaptureComplete events.
  * (libgphoto2)
  */
 #define DEVICE_FLAG_NO_CAPTURE_COMPLETE         0x00400000
 
 /**
  * Direct PTP match required.
  * (libgphoto2)
  */
-#define DEVICE_FLAG_MATCH_PTP_INTERFACE         0x00800000
+#define DEVICE_FLAG_OLYMPUS_XML_WRAPPED         0x00800000
 /**
  * This flag is like DEVICE_FLAG_OGG_IS_UNKNOWN but for FLAC
  * files instead. Using the unknown filetype for FLAC files.
  */
 #define DEVICE_FLAG_FLAC_IS_UNKNOWN             0x01000000
 /**
  * Device needs unique filenames, no two files can be
  * named the same string.
  */
 #define DEVICE_FLAG_UNIQUE_FILENAMES            0x02000000
@@ skipping 10 matching lines @@
 /**
  * This flag indicates that the device need an explicit
  * USB reset after each connection. Some devices don't
  * like this, so it's not done by default.
  */
 #define DEVICE_FLAG_FORCE_RESET_ON_CLOSE        0x10000000
 /**
  * Early Creative Zen (etc) models actually only support
  * command 9805 (Get object property list) and will hang
  * if you try to get individual properties of an object.
+ * Or so it seemed. Later bug fixes to the library has made
+ * this work flawlessly so the bug flag is moot.
+ * NOT USED ANYMORE, THIS FLAG MAY BE RECYCLED.
  */
 #define DEVICE_FLAG_BROKEN_GET_OBJECT_PROPVAL   0x20000000
 /**
  * It seems that some devices return an bad data when
  * using the GetObjectInfo operation. So in these cases
  * we prefer to override the PTP-compatible object infos
  * with the MTP property list.
  *
  * For example Some Samsung Galaxy S devices contain an MTP
  * stack that present the ObjectInfo in 64 bit instead of
  * 32 bit.
  */
 #define DEVICE_FLAG_PROPLIST_OVERRIDES_OI       0x40000000
 
 /**
  * All these bug flags need to be set on SONY NWZ Walkman
  * players, and will be autodetected on unknown devices
  * by detecting the vendor extension descriptor "sony.net"
  */
 #define DEVICE_FLAGS_SONY_NWZ_BUGS \
   (DEVICE_FLAG_UNLOAD_DRIVER | \
    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | \
    DEVICE_FLAG_UNIQUE_FILENAMES | \
-   DEVICE_FLAG_FORCE_RESET_ON_CLOSE )
+   DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
 /**
  * All these bug flags need to be set on Android devices,
  * they claim to support MTP operations they actually
  * cannot handle, especially 9805 (Get object property list).
  * These are auto-assigned to devices reporting
  * "android.com" in their device extension descriptor.
  */
 #define DEVICE_FLAGS_ANDROID_BUGS \
   (DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | \
    DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | \
    DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
    DEVICE_FLAG_UNLOAD_DRIVER | \
-   DEVICE_FLAG_LONG_TIMEOUT )
+   DEVICE_FLAG_LONG_TIMEOUT | \
+   DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
 /**
  * All these bug flags appear on a number of SonyEricsson
  * devices including Android devices not using the stock
  * Android 4.0+ (Ice Cream Sandwich) MTP stack. It is highly
  * supected that these bugs comes from an MTP implementation
  * from Aricent, so it is called the Aricent bug flags as a
  * shorthand. Especially the header errors that need to be
  * ignored is typical for this stack.
  *
  * After some guesswork we auto-assign these bug flags to
  * devices that present the "microsoft.com/WPDNA", and
  * "sonyericsson.com/SE" but NOT the "android.com"
  * descriptor.
  */
 #define DEVICE_FLAGS_ARICENT_BUGS \
   (DEVICE_FLAG_IGNORE_HEADER_ERRORS | \
    DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
-   DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST )
+   DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST)