[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.6.0-6

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit f745fd06cecec693a9f900fc9a4207d171d099a0
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Feb 4 23:32:39 2013 +0800

    Cherry-pick patch to re-sync an MTP enum

diff --git a/debian/patches/Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch b/debian/patches/Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch
new file mode 100644
index 0000000..9ed0f27
--- /dev/null
+++ b/debian/patches/Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch
@@ -0,0 +1,79 @@
+From: IBBoard <dev at ibboard.co.uk>
+Date: Sat, 5 Jan 2013 09:24:28 +0000
+Subject: Mtp: Fix file type in sync with libmtp > 1.1.0 (bgo#688540)
+
+libmtp 1.1.0 added a new file type at the beginning of the FileType
+enum. Update the enum to match and made it conditional based on the
+detected libmtp features.
+
+(Cherry-picked from 56d199d2a04cf145d599cef5aabe3ea2fc0bb171)
+
+Signed-off-by: Bertrand Lorentz <bertrand.lorentz at gmail.com>
+---
+ build/m4/banshee/dap-mtp.m4       |    9 +++++++++
+ src/Libraries/Mtp/Makefile.am     |    4 ++++
+ src/Libraries/Mtp/Mtp/FileType.cs |    5 +++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/build/m4/banshee/dap-mtp.m4 b/build/m4/banshee/dap-mtp.m4
+index 0721b92..264d32b 100644
+--- a/build/m4/banshee/dap-mtp.m4
++++ b/build/m4/banshee/dap-mtp.m4
+@@ -21,10 +21,19 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
+ 				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/src/Libraries/Mtp/Makefile.am b/src/Libraries/Mtp/Makefile.am
+index d52fbc2..d219070 100644
+--- a/src/Libraries/Mtp/Makefile.am
++++ b/src/Libraries/Mtp/Makefile.am
+@@ -8,6 +8,10 @@ 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 bfb2dcf..d48baba 100644
+--- a/src/Libraries/Mtp/Mtp/FileType.cs
++++ b/src/Libraries/Mtp/Mtp/FileType.cs
+@@ -33,6 +33,9 @@ namespace Mtp
+ {
+     public enum FileType
+     {
++#if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
++        FOLDER,
++#endif
+         WAV,
+         MP3,
+         WMA,
+@@ -74,6 +77,8 @@ namespace Mtp
+         MHT,
+         JP2,
+         JPX,
++        ALBUM,
++        PLAYLIST,
+         UNKNOWN
+     }
+ }
diff --git a/debian/patches/Remove-check-for-new-enough-playbin-for-gapless-play.patch b/debian/patches/Remove-check-for-new-enough-playbin-for-gapless-play.patch
deleted file mode 100644
index 5b8435c..0000000
--- a/debian/patches/Remove-check-for-new-enough-playbin-for-gapless-play.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Sat, 24 Nov 2012 18:20:02 +0800
-Subject: Remove check for new enough playbin for gapless playback
-
-Now that we've switched to Gstreamer 1.0, we're guaranteed to have a new enough
-playbin, so this check has become irrelevant.
----
- configure.ac |    5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ac949c7..36da2fd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -179,10 +179,7 @@ AC_ARG_ENABLE(gapless-playback,
- 		enable_gapless=$enableval,
- 		enable_gapless=auto)
- if test "x$enable_gapless" != "xno" ; then
--   	PKG_CHECK_MODULES([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10 > 0.10.25.2], ENABLE_GAPLESS=yes, ENABLE_GAPLESS=no)
--   	if test "x$enable_gapless" == "xyes" -a "x$ENABLE_GAPLESS" == "xno" ; then
--	   	AC_MSG_ERROR([Gapless playback requires gstreamer-plugins-base > 0.10.25.2])
--	fi
-+	enable_gapless=yes
- fi
- AM_CONDITIONAL(ENABLE_GAPLESS, test "x$ENABLE_GAPLESS" = "xyes")   
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6e1443f..503e586 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ libossifer-Fix-certificate-validation-with-libsoup-2.patch
 Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
 Initial-port-to-GStreamer-1.0.patch
 Remove-build-time-enable-gapless-playback-option.patch
+Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch

-- 
banshee