Add patch to make gtkpod compile against faad2 too, make the dependency a ||. Also clean up version 0.60

6 files changed, 39 insertions, 44 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 18869713ab6a..f861765b1498 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.8 2004/02/05 16:24:19 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.9 2004/02/27 13:47:43 tester Exp $
+
+  27 Feb 2004; <tester@gentoo.org> gtkpod-0.72.ebuild,
+  files/gtkpod-0.72-faad2.patch:
+  Add patch to allow gtkpod's m4a support to work with the libmp4v2 from faad2
+  too. The dependency is now mpeg4ip or faad2.
 
   05 Feb 2004; <tester@gentoo.org> gtkpod-0.72.ebuild,
   files/gtkpod-0.72-c89_fix.patch:
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 3e103fd984d8..88852d09ba32 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,9 +1,8 @@
-MD5 0e28fb0368d39be5503704372535f352 gtkpod-0.72.ebuild 870
-MD5 01dd74fd3575e207e81872105a507cf1 ChangeLog 1240
+MD5 84ddd79c7ce00bb46240c9fc630fe799 gtkpod-0.72.ebuild 947
+MD5 6e09754fa0c3623cfdef86782ab60747 ChangeLog 1455
 MD5 50b72dc36a1b67c4f473a91cbf985f30 metadata.xml 214
-MD5 7a1c0256d8a1f66ccdb332cf80a92e96 gtkpod-0.60.ebuild 680
 MD5 a26b39e8dacb711727b48a72c6c03267 gtkpod-0.70.ebuild 718
-MD5 444d83d13b7069265586b3bee811b963 files/digest-gtkpod-0.60 63
+MD5 5f7578af27cf2dd6523b3c038d52be63 files/gtkpod-0.72-faad2.patch 947
 MD5 a1d883cfc4bf4b1787612b279424f7ec files/digest-gtkpod-0.70 63
 MD5 088b3dbbc030a735776a312cd68cca03 files/gtkpod-0.72-c89_fix.patch 587
 MD5 92603f4d2d8a0b96d273c6b8b7fffcc0 files/digest-gtkpod-0.72 116
diff --git a/app-pda/gtkpod/files/digest-gtkpod-0.60 b/app-pda/gtkpod/files/digest-gtkpod-0.60
deleted file mode 100644
index df3169e60c49..000000000000
--- a/app-pda/gtkpod/files/digest-gtkpod-0.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4108e065a6865b98ae677b031426b945 gtkpod-0.60.tar.gz 536755
diff --git a/app-pda/gtkpod/files/gtkpod-0.72-faad2.patch b/app-pda/gtkpod/files/gtkpod-0.72-faad2.patch
new file mode 100644
index 000000000000..1c7c7a4343b8
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-0.72-faad2.patch
@@ -0,0 +1,26 @@
+--- src/mp4file.c.orig	2004-01-17 10:37:49.000000000 +0100
++++ src/mp4file.c	2004-02-27 12:30:05.469188568 +0100
+@@ -107,6 +107,10 @@
+ /* define metadata bug is present (see note at file_write_mp4_info()) */
+ #define MP4V2_HAS_METADATA_BUG TRUE
+ 
++#include <sys/types.h>
++#include <stdint.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "mp4.h"
+ 
+ Track *file_get_mp4_info (gchar *mp4FileName)
+@@ -126,9 +130,9 @@
+ 	    gchar *value;
+ 	    uint16_t numvalue, numvalue2;
+ 	    MP4Duration trackDuration = MP4GetTrackDuration(mp4File, trackId);
+-	    double msDuration = UINT64_TO_DOUBLE(
+-		MP4ConvertFromTrackDuration(mp4File, trackId, 
+-					    trackDuration, MP4_MSECS_TIME_SCALE));
++	    double msDuration = (double) MP4ConvertFromTrackDuration(mp4File, 
++								     trackId, 
++					  trackDuration, MP4_MSECS_TIME_SCALE);
+ 	    u_int32_t avgBitRate = MP4GetTrackBitRate(mp4File, trackId);
+ 
+ 	    track = g_malloc0 (sizeof (Track));
diff --git a/app-pda/gtkpod/gtkpod-0.60.ebuild b/app-pda/gtkpod/gtkpod-0.60.ebuild
deleted file mode 100644
index d700873babb2..000000000000
--- a/app-pda/gtkpod/gtkpod-0.60.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.60.ebuild,v 1.2 2003/11/21 15:57:54 tester Exp $
-
-DESCRIPTION="GUI for iPod using GTK2"
-
-HOMEPAGE="http://gtkpod.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="x86"
-
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.0.0
-		>=x11-libs/pango-1.2.1
-		media-libs/id3lib"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc README
-}
diff --git a/app-pda/gtkpod/gtkpod-0.72.ebuild b/app-pda/gtkpod/gtkpod-0.72.ebuild
index 5c332bc7bfb4..de65b919d865 100644
--- a/app-pda/gtkpod/gtkpod-0.72.ebuild
+++ b/app-pda/gtkpod/gtkpod-0.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.72.ebuild,v 1.2 2004/02/05 16:24:19 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.72.ebuild,v 1.3 2004/02/27 13:47:43 tester Exp $
 
 DESCRIPTION="GUI for iPod using GTK2"
 
@@ -20,7 +20,7 @@ IUSE="mpeg4"
 DEPEND=">=x11-libs/gtk+-2.0.0
 		>=x11-libs/pango-1.2.1
 		media-libs/libid3tag
-		mpeg4? ( media-video/mpeg4ip )"
+		mpeg4? ( || ( media-libs/faad2 media-video/mpeg4ip ) )"
 
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
 #RDEPEND=""
@@ -30,7 +30,9 @@ S=${WORKDIR}/${P}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/gtkpod-0.72-c89_fix.patch
+	cd ${S}
 	cp ${DISTDIR}/mp4file.c ${S}/src
+	epatch ${FILESDIR}/gtkpod-0.72-faad2.patch
 }
 
 src_compile() {