rpms/amarok/F-10 amarok-2.0.96-old-libgpod.patch, 1.6, 1.7 amarok.spec, 1.143, 1.144

Rex Dieter rdieter at fedoraproject.org
Tue Jun 2 21:10:15 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17606

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.96-old-libgpod.patch 
Log Message:
one-off compatible-with-libgpod-0.6.0 build


amarok-2.0.96-old-libgpod.patch:

Index: amarok-2.0.96-old-libgpod.patch
===================================================================
RCS file: amarok-2.0.96-old-libgpod.patch
diff -N amarok-2.0.96-old-libgpod.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ amarok-2.0.96-old-libgpod.patch	2 Jun 2009 21:10:14 -0000	1.7
@@ -0,0 +1,106 @@
+diff -ur amarok-2.0.96/CMakeLists.txt amarok-2.0.96-old-libgpod/CMakeLists.txt
+--- amarok-2.0.96/CMakeLists.txt	2009-05-26 23:22:01.000000000 +0200
++++ amarok-2.0.96-old-libgpod/CMakeLists.txt	2009-05-26 23:22:54.000000000 +0200
+@@ -54,10 +54,7 @@
+     macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "" )
+ 
+     macro_optional_find_package(Ipod)
+-    if(IPOD_FOUND)
+-        macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7)
+-    endif(IPOD_FOUND)
+-    macro_log_feature( IPOD_0_7 "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" )
++    macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" )
+  
+     if( WITH_Ipod )
+         macro_optional_find_package(Gdk)
+diff -ur amarok-2.0.96/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.96-old-libgpod/src/collection/ipodcollection/CMakeLists.txt
+--- amarok-2.0.96/src/collection/ipodcollection/CMakeLists.txt	2009-05-26 23:22:01.000000000 +0200
++++ amarok-2.0.96-old-libgpod/src/collection/ipodcollection/CMakeLists.txt	2009-05-26 23:23:35.000000000 +0200
+@@ -7,7 +7,7 @@
+    SET(GDK_LIBRARIES "")
+ endif(NOT GDK_FOUND)
+ 
+-if (IPOD_FOUND AND IPOD_0_7 AND WITH_Ipod)
++if (IPOD_FOUND AND WITH_Ipod)
+    include_directories( ../..
+    ../../plugin
+    ../../meta
+@@ -66,4 +66,4 @@
+         amarok_collection-ipodcollection.desktop 
+         DESTINATION 
+         ${SERVICES_INSTALL_DIR})
+-endif (IPOD_FOUND AND IPOD_0_7 AND WITH_Ipod)
++endif (IPOD_FOUND AND WITH_Ipod)
+diff -ur amarok-2.0.96/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.96-old-libgpod/src/collection/ipodcollection/handler/IpodHandler.cpp
+--- amarok-2.0.96/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-05-26 23:22:01.000000000 +0200
++++ amarok-2.0.96-old-libgpod/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-05-27 00:21:50.000000000 +0200
+@@ -1299,7 +1299,68 @@
+     if( ipodtrack->has_artwork == 0x02 )
+         return;
+ 
+-    GdkPixbuf *pixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( ipodtrack->itdb->device, ipodtrack->artwork, -1, -1 );
++    Itdb_Thumb *thumb = NULL;
++    GdkPixbuf *pixbuf = NULL;
++    QString thumbPath;
++
++    // 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)
++    {
++        pixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( ipodtrack->itdb->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( ipodtrack->itdb->device, thumb ) );
++            pixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( ipodtrack->itdb->device, thumb );
++        }
++    }
++
+     if( !pixbuf )
+         return;
+ 


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- amarok.spec	30 May 2009 16:58:36 -0000	1.143
+++ amarok.spec	2 Jun 2009 21:10:14 -0000	1.144
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1
-Release: 1%{?dist}
+Release: 0.9%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -10,6 +10,9 @@ Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# This basically reverts http://websvn.kde.org/?view=rev&revision=916188
+# (replaces itdb_artwork_get_pixbuf (new in 0.7) by the old code from 2.0.2).
+Patch0:  amarok-2.0.96-old-libgpod.patch
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 # svn diff \
@@ -26,7 +29,7 @@ BuildRequires: libifp-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
-BuildRequires: libgpod-devel >= 0.7.0
+#BuildRequires: libgpod-devel = 0.6.0
 %endif
 BuildRequires: libnjb-devel
 BuildRequires: libusb-devel
@@ -67,6 +70,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q
 
+%patch0 -p1 -b .libgpod06
 %patch50 -p1 -b .qtscript_not_required
 
 
@@ -149,8 +153,9 @@ fi
 
 
 %changelog
-* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1-1
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1-0.9
 - amarok-2.1
+- temp build against libgpod-0.6.0
 
 * Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-2.20090518
 - 20090518svn snapshot

More information about the fedora-extras-commits mailing list