[Amarok] 84b4360 Bump libMTP dependency to version 1.0.0.

Mark Kretschmann kretschmann at kde.org
Fri Dec 25 14:06:03 CET 2009


commit 84b436004975d1d0497798d996d2ea71bf8457ed
Author: Mark Kretschmann <kretschmann at kde.org>
Date:   Fri Dec 25 13:53:57 2009 +0100

    Bump libMTP dependency to version 1.0.0.
    
    I think it really makes sense to increase this, as the version we dependeded on
    before (0.3.0) is hopelessly outdated, and buggy. As far as I know, all
    distros are able to provide version 1.0.0, but we could notify the packagers
    to make sure. Also, version 1.0.0 is API compatible.
    
    CCMAIL: amarok-devel at kde.org

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94de59d..71c9e33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ if( WITH_PLAYER )
     endif( WITH_IPOD )
 
     macro_optional_find_package(Mtp)
-    macro_log_feature( MTP_FOUND "libmtp" "Enable Support for portable media devices that use the media transfer protocol" "http://libmtp.sourceforge.net/" FALSE "0.3.0" "")
+    macro_log_feature( MTP_FOUND "libmtp" "Enable Support for portable media devices that use the media transfer protocol" "http://libmtp.sourceforge.net/" FALSE "1.0.0" "")
 
     if( WITH_MP3Tunes )
         find_package(CURL)
diff --git a/ChangeLog b/ChangeLog
index 2e8a56e..238a067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,10 @@ Amarok ChangeLog
 ================
 (C) 2002-2009 the Amarok authors.
 
-VERSION 2.2.2
-  FEATURES:
 
+VERSION 2.2.2
   CHANGES:
+    * Bumped libMTP dependency to version 1.0.0.
     * The inline playlist editor now also allows resizing of auto sized items that 
       are invisible because fixed sized items already use up 100% width.
     * Enhanced the playlist sorting breadcrumb items to separately highlight
@@ -57,6 +57,7 @@ VERSION 2.2.2
     * Made "Last.fm Love" (and potentially other global actions avaiable for all 
       tracks) correctly show up in the Current Track applet.
 
+
 VERSION 2.2.2-beta1
   FEATURES
     * Dailymotion video can now be rendered within the applet in HQ if HQ is selected 
diff --git a/README b/README
index 5a7ead8..5afd19d 100644
--- a/README
+++ b/README
@@ -68,7 +68,7 @@ Optional
       (iPod support)
       http://www.gtkpod.org/libgpod/
 
-    * libmtp 0.3.x
+    * libmtp 1.0.0
       (MTP device support)
       http://libmtp.sourceforge.net/
 
diff --git a/cmake/modules/FindMtp.cmake b/cmake/modules/FindMtp.cmake
index 92dafa6..5bc6fd7 100644
--- a/cmake/modules/FindMtp.cmake
+++ b/cmake/modules/FindMtp.cmake
@@ -31,7 +31,7 @@ else (MTP_INCLUDE_DIR AND MTP_LIBRARIES AND MTP_VERSION_OKAY)
     ${_MTPLinkDir}
   )
 
-  exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.3.0 libmtp OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE MTP_VERSION_OKAY)
+  exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=1.0.0 libmtp OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE MTP_VERSION_OKAY)
   
   if (MTP_INCLUDE_DIR AND MTP_LIBRARIES AND MTP_VERSION_OKAY STREQUAL "0")
      set(MTP_FOUND TRUE)


More information about the Amarok-devel mailing list