diff options
| -rw-r--r-- | media-sound/amarok/ChangeLog | 4 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 15 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.0.2.ebuild | 2 | ||||
| -rw-r--r-- | media-sound/amarok/files/2.0.2-ipod.patch | 175 |
4 files changed, 184 insertions, 12 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index b5852d38ebe..fdabb1ed796 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm> + +files/2.0.2-ipod.patch, amarok-2.0.2.ebuild: + Added ipod patch + *amarok-2.0.2 (05 Mar 2009) 05 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> +amarok-2.0.2.ebuild: diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index cbc25f3c4c4..032ed5b2920 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX 2.0.2-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61 DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651 -EBUILD amarok-2.0.2.ebuild 2883 RMD160 a0a6b00b2603c45b6f8b0838afc7ec1bc6719872 SHA1 6888b33db2977a5e25ee4cb108a0ab67c978b6d4 SHA256 dd86e7107f661fd88b44fbbb928d86f5abe90b5b68d9f22fc3b993210d36444e +EBUILD amarok-2.0.2.ebuild 2927 RMD160 88f7f894ca790a645429723c3779928c660e85f8 SHA1 a49cdf66656d244b7f12513db861fe9979289a55 SHA256 36527638df074bfe9e937b7b407bd7b4f19ae079bbf1ce3a183112458478cd37 EBUILD amarok-9999.ebuild 2680 RMD160 a0fbde690dc72832810076b98cd00658bacb99fa SHA1 3fbf20fb126917b886488773947c918b7416a460 SHA256 03b3806b8f7b069808212d5fcea68dee144b468fa69497b5db6aa6f5887b3513 -MISC ChangeLog 3475 RMD160 b1f633dc047f305e4ac8de5018b9b644c01f7717 SHA1 9023f9f58fb01d816ed654c6d34fb809f89f5ed0 SHA256 a7f7a34109e544a970aa89509d14ef37e95635dd82ea2df17ec919bff24e6a67 +MISC ChangeLog 3607 RMD160 1df49bd021afce4ee0ebb65bff740d27b5ae7073 SHA1 9e266aa441baf787ffef311f0ac97c4441af2a46 SHA256 ca9a70a585e918b8d6001d7c30b209f7377e28033e1ba8d3f79f7ef9d4686d1a MISC metadata.xml 2242 RMD160 5c8dc1dad24c8ced0799cec417f365eb6f5b34f4 SHA1 d34e266daa2e6b1e9b90930003b7aafdd9354195 SHA256 b51d1bb69f0f14303609a332c31fcf88b1a54b8b317e275550a26803ba076cae ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAkmwK+YACgkQ5BmOA85PVLia8gCfVkLn13VRy6nStIEsmaMwMSD7 -1gUAoJ9CsnagFj003h/FlJu+kFNgFfmc -=rm4K ------END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-2.0.2.ebuild b/media-sound/amarok/amarok-2.0.2.ebuild index c180fcc92dd..6188c7fa81b 100644 --- a/media-sound/amarok/amarok-2.0.2.ebuild +++ b/media-sound/amarok/amarok-2.0.2.ebuild @@ -56,6 +56,8 @@ RDEPEND="${DEPEND} semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL}[kdeprefix=] ) " +PATCHES=( "${FILESDIR}/${PV}-ipod.patch" ) + pkg_setup() { if use amd64 ; then echo diff --git a/media-sound/amarok/files/2.0.2-ipod.patch b/media-sound/amarok/files/2.0.2-ipod.patch new file mode 100644 index 00000000000..2e4300ed514 --- /dev/null +++ b/media-sound/amarok/files/2.0.2-ipod.patch @@ -0,0 +1,175 @@ +diff -urN amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake amarok-2.0.1.1/cmake/modules/FindIpod.cmake +--- amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100 ++++ amarok-2.0.1.1/cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100 +@@ -2,45 +2,35 @@ + # Once done this will define + # + # IPOD_FOUND - system has libgpod +-# IPOD_INCLUDE_DIR - the libgpod include directory ++# IPOD_INCLUDE_DIRS - the libgpod include directory + # IPOD_LIBRARIES - Link these to use libgpod +-# IPOD_DEFINITIONS - Compiler switches required for using libgpod ++# IPOD_CFLAGS - Compiler switches required for using libgpod ++# IPOD_VERSION - Version number of libgpod + # + +-if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) ++if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) + + # in cache already + SET(IPOD_FOUND TRUE) + +-else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) ++else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) + if(NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls +- INCLUDE(UsePkgConfig) +- +- PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags) +- +- set(IPOD_DEFINITIONS ${_IPODCflags}) ++ find_package(PkgConfig) ++ PKG_SEARCH_MODULE(IPOD libgpod-1.0) ++ + endif(NOT WIN32) ++ IF (IPOD_FOUND) ++ IF (NOT IPOD_FIND_QUIETLY) ++ MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}") ++ ENDIF (NOT IPOD_FIND_QUIETLY) ++ ELSE (IPOD_FOUND) ++ IF (IPOD_FIND_REQUIRED) ++ MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!") ++ ENDIF (IPOD_FIND_REQUIRED) ++ ENDIF (IPOD_FOUND) ++ ++ MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS) + +- FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0 +- ${_IPODIncDir} +- ) +- +- FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod +- PATHS +- ${_IPODLinkDir} +- ) +- +- if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) +- SET(IPOD_FOUND TRUE) +- else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) +- SET(IPOD_FOUND_FALSE) +- endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) +- +- include(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES ) +- +- MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES) +- +-endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) ++endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) +diff -urN amarok-2.0.1.1.old/CMakeLists.txt amarok-2.0.1.1/CMakeLists.txt +--- amarok-2.0.1.1.old/CMakeLists.txt 2009-01-06 14:12:50.000000000 +0100 ++++ amarok-2.0.1.1/CMakeLists.txt 2009-02-10 18:22:23.000000000 +0100 +@@ -56,7 +56,10 @@ + macro_log_feature( GDK_FOUND "Gdk" "Support for artwork on iPod audio devices via GdkPixbuf" "http://developer.gnome.org/arch/imaging/gdkpixbuf.html" FALSE "2.0.x" "" ) + + macro_optional_find_package(Ipod) +-macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" ) ++if(IPOD_FOUND) ++ macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7) ++endif(IPOD_FOUND) ++macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" ) + + #macro_optional_find_package(MySQL) + #macro_log_feature( MYSQL_FOUND "mysql" "Store Collection in a mysql database instead of a sqlite one" "http://www.mysql.com" FALSE "4.1.0" "" ) +diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt +--- amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100 ++++ amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100 +@@ -17,7 +17,7 @@ + handler + ${GLIB2_INCLUDE_DIR} + ${GDK_INCLUDE_DIR} +- ${IPOD_INCLUDE_DIR} ++ ${IPOD_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR}/../.. + ${AMAROK_COLLECTION_SUPPORT_DIR} + ${KDE4_INCLUDE_DIR} +diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp +--- amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100 ++++ amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100 +@@ -1339,73 +1339,12 @@ + QFileInfo tempImageFileInfo( tempImageFile ); // get info for path + QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path + +- Itdb_Thumb *thumb = NULL; + GdkPixbuf *gpixbuf = NULL; +- QString thumbPath; + + // pull image out of ipod + +- if( ipodtrack->has_artwork == 0x01 ) +- { +- // try small first +- +- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL ); +- +- // then large if needed +- if( thumb == NULL) +- { +- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE ); +- } +- +- if( thumb != NULL) +- { +- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); +- } +- else +- { +- GList *thumbs = ipodtrack->artwork->thumbnails; +- +- for(; thumbs; thumbs = thumbs->next) +- { +- Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data; +- if( curThumb == NULL) +- continue; +- +- switch( curThumb->type ) +- { +- case ITDB_THUMB_PHOTO_SMALL: +- break; +- case ITDB_THUMB_PHOTO_LARGE: +- break; +- case ITDB_THUMB_PHOTO_FULL_SCREEN: +- break; +- case ITDB_THUMB_PHOTO_TV_SCREEN: +- break; +- case ITDB_THUMB_COVER_XLARGE: +- break; +- case ITDB_THUMB_COVER_MEDIUM: +- break; +- case ITDB_THUMB_COVER_SMEDIUM: +- break; +- case ITDB_THUMB_COVER_XSMALL: +- break; +- +- default: +- break; +- } +- +- thumb = curThumb; +- break; +- +- } +- +- if( thumb != NULL) +- { +- thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) ); +- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); +- } +- } +- } ++ if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false ++ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 ); + + if(gpixbuf != NULL) + { |