Revision: 70959 http://trac.macports.org/changeset/70959 Author: rmsfisher@macports.org Date: 2010-08-27 22:36:50 -0700 (Fri, 27 Aug 2010) Log Message: ----------- multimedia/gtkpod upgraded version from 0.99.14 to 1.0.0, fixed faulty python behaviors that led to compilation errors, removed redundant dependencies, added patch to work around lack of endian.h header file Modified Paths: -------------- trunk/dports/multimedia/gtkpod/Portfile Added Paths: ----------- trunk/dports/multimedia/gtkpod/files/patch-src-mp4file.c.diff Removed Paths: ------------- trunk/dports/multimedia/gtkpod/files/patch-src_Makefile.in.diff Modified: trunk/dports/multimedia/gtkpod/Portfile =================================================================== --- trunk/dports/multimedia/gtkpod/Portfile 2010-08-28 05:34:48 UTC (rev 70958) +++ trunk/dports/multimedia/gtkpod/Portfile 2010-08-28 05:36:50 UTC (rev 70959) @@ -4,8 +4,7 @@ PortSystem 1.0 name gtkpod -version 0.99.14 -revision 1 +version 1.0.0 categories multimedia gnome platforms darwin maintainers rmsfisher openmaintainer @@ -13,20 +12,28 @@ long_description ${description} It supports the first to fifth Generation including the iPod mini, iPod Photo, iPod Shuffle, iPod nano, and iPod Video. homepage http://www.gtkpod.org/ master_sites sourceforge:gtkpod -checksums md5 f7948eceb955b302f4c47da4c0e1ec12 \ - sha1 92977420c0b54e85ddc80fbe2e99cd4a5e4e81b9 \ - rmd160 ec4806918310b3071c33d461af3a354b5826a84c +checksums md5 cadd402dcd1cfbedda0357bf24965a7c \ + sha1 77b768663458069a414c59b7aad285020c93a035 \ + rmd160 271e9aeb25493b89933f203ebce4c004ce0da573 +depends_build port:pkgconfig depends_lib port:autoconf \ - port:curl \ port:flex \ - port:gnome-vfs \ + port:glib2 \ port:libglade2 \ port:libgpod \ - port:openssl \ - port:libid3tag -configure.args --mandir=${prefix}/share/man --without-ogg --without-flac -patchfiles patch-src_Makefile.in.diff + port:libid3tag \ + port:mp4v2 +set python.branch 2.6 +set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch} +set python.bin ${python.prefix}/bin/python${python.branch} + +configure.args-append --prefix=${python.prefix} +configure.env-append PYGOBJECT_CODEGEN=${python.prefix}/bin/pygobject-codegen-2.0 +configure.pkg_config_path ${python.prefix}/lib/pkgconfig + +patchfiles patch-src-mp4file.c.diff + livecheck.type regex livecheck.url http://sourceforge.net/projects/gtkpod/files/ livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" Added: trunk/dports/multimedia/gtkpod/files/patch-src-mp4file.c.diff =================================================================== --- trunk/dports/multimedia/gtkpod/files/patch-src-mp4file.c.diff (rev 0) +++ trunk/dports/multimedia/gtkpod/files/patch-src-mp4file.c.diff 2010-08-28 05:36:50 UTC (rev 70959) @@ -0,0 +1,42 @@ +--- src/mp4file.c.orig 2010-08-28 00:23:14.000000000 -0500 ++++ src/mp4file.c 2010-08-28 00:25:46.000000000 -0500 +@@ -31,9 +31,9 @@ + # include <config.h> + #endif + +-#ifdef HAVE_ENDIAN_H +-# include <endian.h> /* for be32toh () */ +-#endif ++/* #ifdef HAVE_ENDIAN_H ++# include <endian.h> for be32toh () ++#endif */ + + #include "charset.h" + #include "itdb.h" +@@ -150,7 +150,7 @@ + + #define DEFAULT(x) + +-typedef int bool; ++/* typedef int bool; */ + typedef void* MP4FileHandle; + typedef u_int32_t MP4TrackId; + typedef u_int32_t MP4SampleId; +@@ -534,7 +534,7 @@ + + /* pos now points to a 1-byte atom version followed by a 3-byte class/flag field */ + atom_version = *pos; +- class_flag = be32toh(*(guint32*)pos) & 0x00ffffff; ++ class_flag = *(guint32*)pos & 0x00ffffff; + if (class_flag == 21 || class_flag == 0) + { + pos += 4; /* Skip over the atom version and class/flag */ +@@ -566,7 +566,7 @@ + pos += 8; /* Skip over the length and the atom name */ + /* pos now points to a 1-byte atom version followed by a 3-byte class/flag field */ + atom_version = *pos; +- class_flag = be32toh(*(guint32*)pos) & 0x00ffffff; ++ class_flag = *(guint32*)pos & 0x00ffffff; + if (class_flag == 1) + { + pos += 4; /* Skip over the atom version and class/flag */ Deleted: trunk/dports/multimedia/gtkpod/files/patch-src_Makefile.in.diff =================================================================== --- trunk/dports/multimedia/gtkpod/files/patch-src_Makefile.in.diff 2010-08-28 05:34:48 UTC (rev 70958) +++ trunk/dports/multimedia/gtkpod/files/patch-src_Makefile.in.diff 2010-08-28 05:36:50 UTC (rev 70959) @@ -1,13 +0,0 @@ -Index: src/Makefile.in -=================================================================== ---- src/Makefile.in.orig 2007-11-10 12:16:20.000000000 +0100 -+++ src/Makefile.in 2008-07-29 20:31:34.000000000 +0200 -@@ -98,7 +98,7 @@ - AWK = @AWK@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ --CC = @CC@ -+CC = @CC@ -fnested-functions - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@