Attachment 39044 Details for Bug 61649 – gtkpod.diff

[patch] gtkpod.diff

gtkpod.diff (text/plain), 3.04 KB, created by David on 2004-01-20 21:40:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David

Created: 2004-01-20 21:40:13 UTC

Size: 3.04 KB

patch

obsolete

>diff -ruN gtkpod.old/Makefile gtkpod/Makefile
>--- gtkpod.old/Makefile	Sat Jan  3 14:19:05 2004
>+++ gtkpod/Makefile	Tue Jan 20 22:06:38 2004
>@@ -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 @@
> 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 -ruN gtkpod.old/distinfo gtkpod/distinfo
>--- gtkpod.old/distinfo	Thu Dec  4 22:17:19 2003
>+++ gtkpod/distinfo	Mon Jan 19 23:26:04 2004
>@@ -1 +1 @@
>-MD5 (gtkpod-0.70.tar.gz) = 496605746630db2e35b8b4d2577701ee
>+MD5 (gtkpod-0.72.tar.gz) = f0373e30ecff643f4aa4d720a0cfb397
>diff -ruN gtkpod.old/files/patch-configure gtkpod/files/patch-configure
>--- gtkpod.old/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ gtkpod/files/patch-configure	Tue Jan 20 00:28:15 2004
>@@ -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 -ruN gtkpod.old/files/patch-src::mp4file.c gtkpod/files/patch-src::mp4file.c
>--- gtkpod.old/files/patch-src::mp4file.c	Thu Jan  1 01:00:00 1970
>+++ gtkpod/files/patch-src::mp4file.c	Tue Jan 20 21:34:04 2004
>@@ -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;

Actions: View | Diff

Attachments on bug 61649: 39044