[banshee] build: Bump libmtp dependency to 1.1.0

[Bertrand Lorentz <blorentz src gnome org>]

commit 40a78764595406f6576826164fa11d893e601535
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sun Jan 6 16:20:07 2013 +0100

    build: Bump libmtp dependency to 1.1.0
    
    Libmtp 1.1.0 has been released in June 2011 and has several ABI changes
    compared to 0.3.0. Requiring this version allows us to get rid of
    several compile-time checks and trickery.
    
    Original suggestion and patch by IBBoard and Andres Aragoneses.

 README                            |    2 +-
 build/m4/banshee/dap-mtp.m4       |   16 +---------------
 extras/create-release-notes       |    2 +-
 src/Libraries/Mtp/Makefile.am     |    8 --------
 src/Libraries/Mtp/Mtp/FileType.cs |    2 --
 src/Libraries/Mtp/Mtp/Track.cs    |    2 --
 6 files changed, 3 insertions(+), 29 deletions(-)
---
diff --git a/README b/README
index bd70bf4..5d0beec 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ acceptable; higher versions are fine.
   * TagLib#             2.0.3.7
 
 - Required unless you pass some --disable flags to configure
-  * libmtp              0.3.0
+  * libmtp              1.1.0
   * mono-zeroconf       0.8.0
   * boo                 0.8.1
   * gio-sharp           2.22.3
diff --git a/build/m4/banshee/dap-mtp.m4 b/build/m4/banshee/dap-mtp.m4
index 264d32b..b939f6f 100644
--- a/build/m4/banshee/dap-mtp.m4
+++ b/build/m4/banshee/dap-mtp.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
 [
-	LIBMTP_REQUIRED=0.3.0
+	LIBMTP_REQUIRED=1.1.0
 
 	AC_ARG_ENABLE(mtp, AC_HELP_STRING([--disable-mtp], [Disable MTP DAP support]), , enable_mtp="yes")
 	
@@ -17,23 +17,9 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
 	if test "x$enable_libmtp" = "xyes"; then
 		LIBMTP_SO_MAP=$(basename $(find $($PKG_CONFIG --variable=libdir libmtp) -maxdepth 1 -regex '.*libmtp\.so\.[[0-9]][[0-9]]*$' | sort | tail -n 1))
 		AC_SUBST(LIBMTP_SO_MAP)
-		AC_CHECK_MEMBER([struct LIBMTP_track_struct.modificationdate],
-				LIBMTP_HAS_MODDATE=yes,
-				LIBMTP_HAS_MODDATE=no,
-				[[#include <libmtp.h>]])
-
-		AC_MSG_CHECKING([whether LIBMTP_FILETYPE_FOLDER enum value is defined])
-		AC_COMPUTE_INT([LIBMTP_HAS_FOLDER], [LIBMTP_FILETYPE_FOLDER], [#include <libmtp.h>], LIBMTP_HAS_FOLDER=no)
-		if test "x$LIBMTP_HAS_FOLDER" = "xno"; then
-			AC_MSG_RESULT([no])
-		else
-			AC_MSG_RESULT([yes])
-		fi
 	fi
 
 	AM_CONDITIONAL(ENABLE_MTP, test "x$enable_libmtp" = "xyes")
-	AM_CONDITIONAL(LIBMTP_TRACK_STRUCT_HAS_MODDATE, [test "$LIBMTP_HAS_MODDATE" = "yes"])
-	AM_CONDITIONAL(LIBMTP_FILETYPE_ENUM_HAS_FOLDER, [test "$LIBMTP_HAS_FOLDER" = "0"])
 	AC_CHECK_SIZEOF(time_t)
 	AM_CONDITIONAL(LIBMTP_SIZEOF_TIME_T_64, [test "x$ac_cv_sizeof_time_t" = "x8"])
 ])
diff --git a/extras/create-release-notes b/extras/create-release-notes
index bfe0816..322fa43 100755
--- a/extras/create-release-notes
+++ b/extras/create-release-notes
@@ -81,7 +81,7 @@ $features
 	<li>TagLib# (taglib-sharp) &gt;= 2.0.3.7</li>
 	<li>Required to build default feature stack:
 <ul>
-	<li>libmtp &gt;= 0.3.0</li>
+	<li>libmtp &gt;= 1.1.0</li>
 	<li>mono-zeroconf &gt;= 0.8.0</li>
 	<li>boo &gt;= 0.8.1</li>
 	<li>webkit-1.0 &gt;= 1.2.2</li>
diff --git a/src/Libraries/Mtp/Makefile.am b/src/Libraries/Mtp/Makefile.am
index d219070..9150446 100644
--- a/src/Libraries/Mtp/Makefile.am
+++ b/src/Libraries/Mtp/Makefile.am
@@ -4,14 +4,6 @@ LINK = $(REF_MTP)
 
 BUILD_DEFINES = ""
 
-if LIBMTP_TRACK_STRUCT_HAS_MODDATE
-BUILD_DEFINES += "-define:LIBMTP_TRACK_HAS_MODDATE"
-endif
-
-if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
-BUILD_DEFINES += "-define:LIBMTP_FILETYPE_ENUM_HAS_FOLDER"
-endif
-
 if LIBMTP_SIZEOF_TIME_T_64
 BUILD_DEFINES += "-define:LIBMTP_SIZEOF_TIME_T_64"
 endif
diff --git a/src/Libraries/Mtp/Mtp/FileType.cs b/src/Libraries/Mtp/Mtp/FileType.cs
index d48baba..c2e16c7 100644
--- a/src/Libraries/Mtp/Mtp/FileType.cs
+++ b/src/Libraries/Mtp/Mtp/FileType.cs
@@ -33,9 +33,7 @@ namespace Mtp
 {
     public enum FileType
     {
-#if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
         FOLDER,
-#endif
         WAV,
         MP3,
         WMA,
diff --git a/src/Libraries/Mtp/Mtp/Track.cs b/src/Libraries/Mtp/Mtp/Track.cs
index 22e15d3..7b97bdc 100644
--- a/src/Libraries/Mtp/Mtp/Track.cs
+++ b/src/Libraries/Mtp/Mtp/Track.cs
@@ -283,13 +283,11 @@ namespace Mtp
         public ushort rating;    // 0 -> 100
         public uint usecount;
         public ulong filesize;
-#if LIBMTP_TRACK_HAS_MODDATE
 #if LIBMTP_SIZEOF_TIME_T_64
         public ulong modificationdate;
 #else
         public uint modificationdate;
 #endif
-#endif
         public FileType filetype;
         public IntPtr next; // Track Null if last
         /*