aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/gtkpod/Makefile18
-rw-r--r--audio/gtkpod/distinfo2
-rw-r--r--audio/gtkpod/files/patch-configure27
-rw-r--r--audio/gtkpod/files/patch-src::mp3file.c19
-rw-r--r--audio/gtkpod/files/patch-src::mp4file.c11
5 files changed, 67 insertions, 10 deletions
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 87423c52b65d..6851fb88d325 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gtkpod
-PORTVERSION= 0.70
-PORTREVISION= 1
+PORTVERSION= 0.72
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,16 +14,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= david@dyn-ns.net
COMMENT= GUI for Apple iPods using GTK2
-LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS= id3tag.2:${PORTSDIR}/audio/libid3tag
RUN_DEPENDS= mp3gain:${PORTSDIR}/audio/mp3gain
.if defined(WITH_AAC)
- LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mpeg4ip
-.else
-pre-everything::
- @${ECHO_MSG}
- @${ECHO_MSG} "To enable AAC support define the WITH_AAC knob."
- @${ECHO_MSG}
+BROKEN= "need mpeg4ip-1.0 for AAC support."
+#LIB_DEPENDS+= mp4v2.1:${PORTSDIR}/multimedia/mpeg4ip
+#.else
+#pre-everything::
+# @${ECHO_MSG}
+# @${ECHO_MSG} "To enable AAC support define the WITH_AAC knob."
+# @${ECHO_MSG}
.endif
USE_REINPLACE= yes
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index 378334e09faf..eea4273e87e4 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1 +1 @@
-MD5 (gtkpod-0.70.tar.gz) = 496605746630db2e35b8b4d2577701ee
+MD5 (gtkpod-0.72.tar.gz) = f0373e30ecff643f4aa4d720a0cfb397
diff --git a/audio/gtkpod/files/patch-configure b/audio/gtkpod/files/patch-configure
new file mode 100644
index 000000000000..6b7e1e014e9e
--- /dev/null
+++ b/audio/gtkpod/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.old Mon Jan 19 13:54:37 2004
++++ configure Tue Jan 20 00:27:43 2004
+@@ -6409,7 +6409,6 @@
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_cv_search_MP4FileInfo" = no; then
+ for ac_lib in "mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6468,16 +6467,7 @@
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_search_MP4FileInfo" >&5
+ echo "${ECHO_T}$ac_cv_search_MP4FileInfo" >&6
+-if test "$ac_cv_search_MP4FileInfo" != no; then
+- test "$ac_cv_search_MP4FileInfo" = "none required" || LIBS="$ac_cv_search_MP4FileInfo $LIBS"
+- have_mp4v2="yes -- will build with aac support"
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBMP4V2 1
+-_ACEOF
+-
+-else
+ have_mp4v2="***no -- will build without aac support"
+-fi
+
+
+
diff --git a/audio/gtkpod/files/patch-src::mp3file.c b/audio/gtkpod/files/patch-src::mp3file.c
new file mode 100644
index 000000000000..b178d0c877ce
--- /dev/null
+++ b/audio/gtkpod/files/patch-src::mp3file.c
@@ -0,0 +1,19 @@
+--- src/mp3file.c.orig Thu Jan 22 19:20:45 2004
++++ src/mp3file.c Thu Jan 22 19:21:41 2004
+@@ -1296,6 +1296,7 @@
+ {
+ Track *track = NULL;
+ File_Tag filetag;
++ mp3info *mp3info;
+
+ track = g_malloc0 (sizeof (Track));
+
+@@ -1370,7 +1371,7 @@
+ }
+
+ /* Get additional info (play time and bitrate */
+- mp3info *mp3info = mp3file_get_info (name);
++ mp3info = mp3file_get_info (name);
+ if (mp3info)
+ {
+ track->tracklen = mp3info->milliseconds;
diff --git a/audio/gtkpod/files/patch-src::mp4file.c b/audio/gtkpod/files/patch-src::mp4file.c
new file mode 100644
index 000000000000..56f67b658f3e
--- /dev/null
+++ b/audio/gtkpod/files/patch-src::mp4file.c
@@ -0,0 +1,11 @@
+--- src/mp4file.c.old Sat Jan 17 10:37:49 2004
++++ src/mp4file.c Tue Jan 20 21:33:20 2004
+@@ -342,7 +342,7 @@
+ return NULL;
+ }
+
+-gboolean file_write_mp4_info (gchar *filename, Track *track, T_item tag_id)
++gboolean file_write_mp4_info (gchar *filename, Track *track)
+ {
+ gtkpod_warning (_("m4a/m4p metadata update for '%s' failed: m4a/m4p not supported without the mp4v2 library. You must compile the gtkpod source together with the mp4v2 library.\n"), filename);
+ return FALSE;