rpms/amarok/devel amarok-1.4.4-libgpod-0.4.2.patch, NONE, 1.1 amarok.spec, 1.71, 1.72

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8911/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.4-libgpod-0.4.2.patch 
Log Message:
patch to work with libgpod 0.4.2

amarok-1.4.4-libgpod-0.4.2.patch:

--- NEW FILE amarok-1.4.4-libgpod-0.4.2.patch ---
--- amarok-1.4.4/amarok/src/mediadevice/ipod/ipodmediadevice.cpp.mediatype	2006-10-26 16:40:20.000000000 -0400
+++ amarok-1.4.4/amarok/src/mediadevice/ipod/ipodmediadevice.cpp	2006-12-14 16:22:41.000000000 -0500
@@ -302,7 +302,7 @@
     track->genre = g_strdup( metaBundle.genre()->utf8() );
 
 
-    track->unk208 = 0x01; // for audio
+    track->mediatype = 0x01; // for audio
     if(type=="wav")
     {
         track->filetype = g_strdup( "wav" );
@@ -323,7 +323,7 @@
 #else
         track->flag3 |= 0x01; // remember current position in track
 #endif
-        track->unk208 = 0x08; // for audiobooks
+        track->mediatype = 0x08; // for audiobooks
     }
     else if(type=="m4v" || type=="mp4v" || type=="mov" || type=="mpg" || type=="mp4")
     {
@@ -331,7 +331,7 @@
 #ifdef HAVE_ITDB_SKIP_SHUFFLE_FLAG
         track->movie_flag = 0x01; // for videos
 #endif
-        track->unk208 = 0x02; // for videos
+        track->mediatype = 0x02; // for videos
     }
     else if(type=="aa")
     {
@@ -341,7 +341,7 @@
 #else
         track->flag3 |= 0x01; // remember current position in track
 #endif
-        track->unk208 = 0x08; // for audiobooks
+        track->mediatype = 0x08; // for audiobooks
 
         TagLib::Audible::File f( QFile::encodeName( propertiesBundle.url().path() ) );
         TagLib::Audible::Tag *t = f.getAudibleTag();
@@ -384,7 +384,7 @@
 #ifdef HAVE_ITDB_MARK_UNPLAYED
         track->mark_unplayed = podcastInfo->listened ? 0x01 : 0x02;
 #endif
-        track->unk208 = track->unk208==0x02 ? 0x06 : 0x04; // video or audio podcast
+        track->mediatype = track->mediatype==0x02 ? 0x06 : 0x04; // video or audio podcast
         track->flag4 = 0x01; // also show description on iPod
         QString plaindesc = podcastInfo->description;
         plaindesc.replace( QRegExp("<[^>]*>"), "" );


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- amarok.spec	17 Jan 2007 22:27:44 -0000	1.71
+++ amarok.spec	25 Jan 2007 19:12:30 -0000	1.72
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.4
-Release:    6%{?dist}
+Release:    7%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -12,6 +12,7 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Patch0:     amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
+Patch1:     amarok-1.4.4-libgpod-0.4.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -82,6 +83,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .lastfm
+%patch1 -p1 -b .libgpod
 
 
 
@@ -240,6 +242,9 @@
 
 
 %changelog
+* Thu Jan 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-7
+- add patch to enable building with libgpod >= 0.4.2, thanks go to Todd Zullinger
+
 * Wed Jan 17 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-6
 - rebuild for new libgpod