projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d60e46)
Add patch to fix building with newer versions of libgpod; closes bug #162725; thanks...
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Fri, 19 Jan 2007 00:41:20 +0000 (00:41 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Fri, 19 Jan 2007 00:41:20 +0000 (00:41 +0000)
Package-Manager: portage-2.1.2

media-sound/amarok/ChangeLog patch | blob | history
media-sound/amarok/Manifest patch | blob | history
media-sound/amarok/amarok-1.4.4-r3.ebuild patch | blob | history
media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch [new file with mode: 0644] patch | blob

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index dbfd24146eb3138272cda86d022b2d717e585100..2ac06c4839fb5eb7acaafa969bd35e54d20810ae 100644 (file)
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.193 2006/12/31 12:56:45 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.194 2007/01/19 00:41:20 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4+libgpod-0.4.0.patch, amarok-1.4.4-r3.ebuild:
+  Add patch to fix building with newer versions of libgpod; closes bug
+  #162725; thanks to Alessio Cassiba for reporting, and Olivier Crete for
+  pointing out the problem.
 
   31 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-9999.ebuild:
   As the current SVN version requires a newer libmtp, make the 9999 ebuild
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 4dd0643893562272523f1d7b354c7f148945b39e..c0e597b8f2d819aac170045f4d6253841283b5eb 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,6 +5,10 @@ AUX amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c07
 MD5 0e211053265ad86a0f6656c07463b43a files/amarok-1.4.3-playlist-encoding.patch 365
 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 files/amarok-1.4.3-playlist-encoding.patch 365
 SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d files/amarok-1.4.3-playlist-encoding.patch 365
+AUX amarok-1.4.4+libgpod-0.4.0.patch 2738 RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c SHA1 bc6e39a93490be265e3f37e3af73a31c0d27bc59 SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26
+MD5 2b0195629a6a2b52f22db726bc59cd2f files/amarok-1.4.4+libgpod-0.4.0.patch 2738
+RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c files/amarok-1.4.4+libgpod-0.4.0.patch 2738
+SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26 files/amarok-1.4.4+libgpod-0.4.0.patch 2738
 DIST amarok-1.4.3.tar.bz2 17175603 RMD160 287d6652868f50023d8602941fdc99aed5296d22 SHA1 624b5f9fd74ead1c0e75f7d8f935abcaf0313e70 SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847
 DIST amarok-1.4.4-gentoo.tar.bz2 2830 RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 SHA1 0a9bb86e197f4af47e17a4aaa5cb82eb4850b49d SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33
 DIST amarok-1.4.4.tar.bz2 17635707 RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 SHA1 932ab971407172a86746e473a1d1cf6871aea93c SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea
@@ -12,18 +16,18 @@ EBUILD amarok-1.4.3-r1.ebuild 2101 RMD160 1f5f9a3f6196cada0c991cf49bfaef4f2e1d47
 MD5 92afad9b9a442e3e05ed835f67ee5517 amarok-1.4.3-r1.ebuild 2101
 RMD160 1f5f9a3f6196cada0c991cf49bfaef4f2e1d4730 amarok-1.4.3-r1.ebuild 2101
 SHA256 1fa7844ed89fcb170d9477031eed546c34e0b9a762a21aca41d42f7eb1d2a035 amarok-1.4.3-r1.ebuild 2101
-EBUILD amarok-1.4.4-r3.ebuild 2161 RMD160 13323f28ec8914b275cb24f18338070990c14ab3 SHA1 e5636420fb764d3794a8391ab1a58ce55dfa8d4b SHA256 2334848db43611ca0a0d3da40d6085b8d756b6926370c75b996447acc98c4faf
-MD5 9f05e6fec75ee515b0572c7f7ada2b38 amarok-1.4.4-r3.ebuild 2161
-RMD160 13323f28ec8914b275cb24f18338070990c14ab3 amarok-1.4.4-r3.ebuild 2161
-SHA256 2334848db43611ca0a0d3da40d6085b8d756b6926370c75b996447acc98c4faf amarok-1.4.4-r3.ebuild 2161
+EBUILD amarok-1.4.4-r3.ebuild 2200 RMD160 bd25dc97348272bbf54fbf6a1883af1c5487a576 SHA1 5c20fffee5452eb1995bce53feb27912604afb10 SHA256 61ae19e39efe309a5af72de9043cbc686813e2e2d0ecb94f48894342a38797f6
+MD5 c5ffff9129cf00a0dc3f2a78dc4d84db amarok-1.4.4-r3.ebuild 2200
+RMD160 bd25dc97348272bbf54fbf6a1883af1c5487a576 amarok-1.4.4-r3.ebuild 2200
+SHA256 61ae19e39efe309a5af72de9043cbc686813e2e2d0ecb94f48894342a38797f6 amarok-1.4.4-r3.ebuild 2200
 EBUILD amarok-9999.ebuild 2263 RMD160 c9d842618f6126c6187338032ede495fc6caf930 SHA1 a85f5a27436d8224c54276fcbd9242fb638838f7 SHA256 5b595c55aa016400798805666f4e174d6a44743b2d4eb3724f94b6ff0d1f52f0
 MD5 4987182a85db2acb265cf63b5bc93a31 amarok-9999.ebuild 2263
 RMD160 c9d842618f6126c6187338032ede495fc6caf930 amarok-9999.ebuild 2263
 SHA256 5b595c55aa016400798805666f4e174d6a44743b2d4eb3724f94b6ff0d1f52f0 amarok-9999.ebuild 2263
-MISC ChangeLog 31836 RMD160 4d98eed80b4cdea858cb9214f64bac64762a609b SHA1 9d20785278099ba50b91d02092ea1a60bf5989dd SHA256 54fe3d6c58493d2401ea89a49a69c2d0d48e98e391540bb590edc21cdbdf85cf
-MD5 fb64e791a297b6abdf34b6afdbf5c980 ChangeLog 31836
-RMD160 4d98eed80b4cdea858cb9214f64bac64762a609b ChangeLog 31836
-SHA256 54fe3d6c58493d2401ea89a49a69c2d0d48e98e391540bb590edc21cdbdf85cf ChangeLog 31836
+MISC ChangeLog 32130 RMD160 5df99b0814202da918765553c28858dcfec7e7e0 SHA1 634d5704b5a1c62eb8d1cb123b78fd34e8f38a43 SHA256 a3b9893ae3b578090dc267c8000ec01a7bd3602c26144413df32062bf8a49e89
+MD5 eefc3e1e5516d74e31d9d1ecfd3a8c4a ChangeLog 32130
+RMD160 5df99b0814202da918765553c28858dcfec7e7e0 ChangeLog 32130
+SHA256 a3b9893ae3b578090dc267c8000ec01a7bd3602c26144413df32062bf8a49e89 ChangeLog 32130
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -40,7 +44,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFl7OcAiZjviIA2XgRAnXiAJ4rObIq6P4d4/LW3R5BypXbgQaxOACggBhC
-aRmqBcgTBZOCwidertM3xjk=
-=tOhF
+iD8DBQFFsBPEAiZjviIA2XgRAj2NAJsFE6CF4giNMkmK/ZPJxakcJ4p4iACdEsHy
+OBJspdn68CRrUk+4FMRYX1o=
+=Yf54
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.4-r3.ebuild b/media-sound/amarok/amarok-1.4.4-r3.ebuild
index 8d500ab1425398a0648bd8d34e2c2fe7e0b53dbb..baa27b00b1b28d8cb5ab4f60f61d711c3e904bdd 100644 (file)
--- a/media-sound/amarok/amarok-1.4.4-r3.ebuild
+++ b/media-sound/amarok/amarok-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r3.ebuild,v 1.5 2006/12/26 14:49:34 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r3.ebuild,v 1.6 2007/01/19 00:41:20 flameeyes Exp $
 
 LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it
 ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg
@@ -50,7 +50,8 @@ DEPEND="${RDEPEND}"
 
 need-kde 3.3
 
-PATCHES="${WORKDIR}/${P}-gentoo/*.patch"
+PATCHES="${WORKDIR}/${P}-gentoo/*.patch
+       ${FILESDIR}/${P}+libgpod-0.4.0.patch"
 
 src_compile() {
        # Extra, unsupported engines are forcefully disabled.
diff --git a/media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch b/media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch
new file mode 100644 (file)
index 0000000..4109649
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch
@@ -0,0 +1,80 @@
+Index: src/mediadevice/ipod/ipodmediadevice.cpp
+===================================================================
+--- amarok-svn/amarok/src/mediadevice/ipod/ipodmediadevice.cpp (revision 605590)
++++ amarok-svn/amarok/src/mediadevice/ipod/ipodmediadevice.cpp (revision 605591)
+@@ -302,7 +302,11 @@
+     track->genre = g_strdup( metaBundle.genre()->utf8() );
+ 
+ 
++#ifdef HAVE_ITDB_MEDIATYPE
++    track->mediatype = 0x01; // for audio
++#else
+     track->unk208 = 0x01; // for audio
++#endif
+     if(type=="wav")
+     {
+         track->filetype = g_strdup( "wav" );
+@@ -323,7 +327,11 @@
+ #else
+         track->flag3 |= 0x01; // remember current position in track
+ #endif
++#ifdef HAVE_ITDB_MEDIATYPE
++        track->mediatype = 0x08; // for audiobooks
++#else
+         track->unk208 = 0x08; // for audiobooks
++#endif
+     }
+     else if(type=="m4v" || type=="mp4v" || type=="mov" || type=="mpg" || type=="mp4")
+     {
+@@ -331,7 +339,11 @@
+ #ifdef HAVE_ITDB_SKIP_SHUFFLE_FLAG
+         track->movie_flag = 0x01; // for videos
+ #endif
++#ifdef HAVE_ITDB_MEDIATYPE
++        track->mediatype = 0x02; // for videos
++#else
+         track->unk208 = 0x02; // for videos
++#endif
+     }
+     else if(type=="aa")
+     {
+@@ -341,7 +353,11 @@
+ #else
+         track->flag3 |= 0x01; // remember current position in track
+ #endif
++#ifdef HAVE_ITDB_MEDIATYPE
++        track->mediatype = 0x08; // for audiobooks
++#else
+         track->unk208 = 0x08; // for audiobooks
++#endif
+ 
+         TagLib::Audible::File f( QFile::encodeName( propertiesBundle.url().path() ) );
+         TagLib::Audible::Tag *t = f.getAudibleTag();
+@@ -384,7 +400,11 @@
+ #ifdef HAVE_ITDB_MARK_UNPLAYED
+         track->mark_unplayed = podcastInfo->listened ? 0x01 : 0x02;
+ #endif
++#ifdef HAVE_ITDB_MEDIATYPE
++        track->mediatype = track->mediatype==0x02 ? 0x06 : 0x04; // video or audio podcast
++#else
+         track->unk208 = track->unk208==0x02 ? 0x06 : 0x04; // video or audio podcast
++#endif
+         track->flag4 = 0x01; // also show description on iPod
+         QString plaindesc = podcastInfo->description;
+         plaindesc.replace( QRegExp("<[^>]*>"), "" );
+Index: configure.in.in
+===================================================================
+--- amarok-svn/amarok/configure.in.in  (revision 605590)
++++ amarok-svn/amarok/configure.in.in  (revision 605591)
+@@ -910,6 +910,11 @@
+                   ,
+                   [#include <gpod/itdb.h>])
+ 
++            AC_CHECK_MEMBER(struct _Itdb_Track.mediatype,
++                  [AC_DEFINE(HAVE_ITDB_MEDIATYPE, 1, [have libgpod mediatype flag])],
++                  ,
++                  [#include <gpod/itdb.h>])
++
+             CPPFLAGS=$ac_cppflags_save
+             CFLAGS=$ac_cflags_save
+             LDFLAGS=$ac_ldflags_save
Unnamed repository; edit this file 'description' to name the repository.