← Back to branch summary

~ubuntu-branches/ubuntu/raring/banshee/raring

« back to all changes in this revision

Viewing changes to debian/patches/Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2013-02-15 13:32:06 UTC
  • mfrom: (6.3.31 experimental)
  • Revision ID: package-import@ubuntu.com-20130215133206-tw11r3dsi8ewj8ed
Tags: 2.6.0-6ubuntu1
* [6e1f0dd] Merge from Debian Experimental, remaining changes:
  - Enable and recommend SoundMenu and Disable NotificationArea by default
  - Disable boo and karma extensions
  - Move desktop file for Meego UI to /usr/share/une/applications
  - Change the url for the Amazon store redirector
  - [9b356d6] Add workaround for set_Height exception.
  - [ccbcbbd] Make Banshee translatable in Launchpad
  - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
  - [03c8cad] Set debian-branch to ubuntu/raring

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch
 
1
From: IBBoard <dev@ibboard.co.uk>
 
2
Date: Sat, 5 Jan 2013 09:24:28 +0000
 
3
Subject: Mtp: Fix file type in sync with libmtp > 1.1.0 (bgo#688540)
 
4
 
 
5
libmtp 1.1.0 added a new file type at the beginning of the FileType
 
6
enum. Update the enum to match and made it conditional based on the
 
7
detected libmtp features.
 
8
 
 
9
(Cherry-picked from 56d199d2a04cf145d599cef5aabe3ea2fc0bb171)
 
10
 
 
11
Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
 
12
---
 
13
 build/m4/banshee/dap-mtp.m4       |    9 +++++++++
 
14
 src/Libraries/Mtp/Makefile.am     |    4 ++++
 
15
 src/Libraries/Mtp/Mtp/FileType.cs |    5 +++++
 
16
 3 files changed, 18 insertions(+)
 
17
 
 
18
diff --git a/build/m4/banshee/dap-mtp.m4 b/build/m4/banshee/dap-mtp.m4
 
19
index 0721b92..264d32b 100644
 
20
--- a/build/m4/banshee/dap-mtp.m4
 
21
+++ b/build/m4/banshee/dap-mtp.m4
 
22
@@ -21,10 +21,19 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
 
23
                                LIBMTP_HAS_MODDATE=yes,
 
24
                                LIBMTP_HAS_MODDATE=no,
 
25
                                [[#include <libmtp.h>]])
 
26
+
 
27
+               AC_MSG_CHECKING([whether LIBMTP_FILETYPE_FOLDER enum value is defined])
 
28
+               AC_COMPUTE_INT([LIBMTP_HAS_FOLDER], [LIBMTP_FILETYPE_FOLDER], [#include <libmtp.h>], LIBMTP_HAS_FOLDER=no)
 
29
+               if test "x$LIBMTP_HAS_FOLDER" = "xno"; then
 
30
+                       AC_MSG_RESULT([no])
 
31
+               else
 
32
+                       AC_MSG_RESULT([yes])
 
33
+               fi
 
34
        fi
 
35
 
 
36
        AM_CONDITIONAL(ENABLE_MTP, test "x$enable_libmtp" = "xyes")
 
37
        AM_CONDITIONAL(LIBMTP_TRACK_STRUCT_HAS_MODDATE, [test "$LIBMTP_HAS_MODDATE" = "yes"])
 
38
+       AM_CONDITIONAL(LIBMTP_FILETYPE_ENUM_HAS_FOLDER, [test "$LIBMTP_HAS_FOLDER" = "0"])
 
39
        AC_CHECK_SIZEOF(time_t)
 
40
        AM_CONDITIONAL(LIBMTP_SIZEOF_TIME_T_64, [test "x$ac_cv_sizeof_time_t" = "x8"])
 
41
 ])
 
42
diff --git a/src/Libraries/Mtp/Makefile.am b/src/Libraries/Mtp/Makefile.am
 
43
index d52fbc2..d219070 100644
 
44
--- a/src/Libraries/Mtp/Makefile.am
 
45
+++ b/src/Libraries/Mtp/Makefile.am
 
46
@@ -8,6 +8,10 @@ if LIBMTP_TRACK_STRUCT_HAS_MODDATE
 
47
 BUILD_DEFINES += "-define:LIBMTP_TRACK_HAS_MODDATE"
 
48
 endif
 
49
 
 
50
+if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
 
51
+BUILD_DEFINES += "-define:LIBMTP_FILETYPE_ENUM_HAS_FOLDER"
 
52
+endif
 
53
+
 
54
 if LIBMTP_SIZEOF_TIME_T_64
 
55
 BUILD_DEFINES += "-define:LIBMTP_SIZEOF_TIME_T_64"
 
56
 endif
 
57
diff --git a/src/Libraries/Mtp/Mtp/FileType.cs b/src/Libraries/Mtp/Mtp/FileType.cs
 
58
index bfb2dcf..d48baba 100644
 
59
--- a/src/Libraries/Mtp/Mtp/FileType.cs
 
60
+++ b/src/Libraries/Mtp/Mtp/FileType.cs
 
61
@@ -33,6 +33,9 @@ namespace Mtp
 
62
 {
 
63
     public enum FileType
 
64
     {
 
65
+#if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
 
66
+        FOLDER,
 
67
+#endif
 
68
         WAV,
 
69
         MP3,
 
70
         WMA,
 
71
@@ -74,6 +77,8 @@ namespace Mtp
 
72
         MHT,
 
73
         JP2,
 
74
         JPX,
 
75
+        ALBUM,
 
76
+        PLAYLIST,
 
77
         UNKNOWN
 
78
     }
 
79
 }