Date: Sat, 14 Aug 2004 21:23:26 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: david@dyn-ns.net Subject: ports/70464: [PATCH] audio/gtkpod: [Remove faad support and only use mpeg4ip] Message-ID: <200408150123.i7F1NQND022280@gentoo.ahze.net> Resent-Message-ID: <200408150130.i7F1U9Gn084245@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70464
>Category: ports
>Synopsis: [PATCH] audio/gtkpod: [Remove faad support and only use mpeg4ip]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 15 01:30:06 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #61: Tue Aug 10 19:01:49 EDT 2004
>Description:
- Remove faad support and only use mpeg4ip for aac
libmp4v2 from faad is outdated and does not work gtkpod anymore.
faad uses mpeg4ip for libmp4v2 unless WITHOUT_MPEG4IP is defined.
Port maintainer (david@dyn-ns.net) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
if mpeg4ip is installed it needs to be removed first then the following.
cd ports/audio/faad && make install WITHOUT_MPEG4IP=yes && \
cd ports/audio/gtkpod && make configure WITH_FAAD=yes
>Fix:
--- gtkpod-0.80_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/audio/gtkpod/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 28 Jul 2004 22:28:48 -0000 1.15
+++ Makefile 15 Aug 2004 01:18:19 -0000
@@ -29,21 +29,12 @@
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/lib/libmp4v2.so)
-.if exists(${LOCALBASE}/include/mpeg4ip_config.h)
WITH_AAC= YES
-.else
-WITH_FAAD= YES
-.endif
-.endif
-.if defined(WITH_AAC) && defined(WITH_FAAD)
-BROKEN= "WITH_AAC and WITH_FAAD are exclusive."
.endif
+
.if defined(WITH_AAC)
LIB_DEPENDS+= mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip
.endif
-.if defined(WITH_FAAD)
-LIB_DEPENDS+= mp4v2.0:${PORTSDIR}/audio/faad
-.endif
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
@@ -52,7 +43,6 @@
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "To enable AAC support with mpeg4ip define the WITH_AAC knob."
- @${ECHO_MSG} "To enable AAC support with faad2 define the WITH_FAAD knob."
@${ECHO_MSG}
.endif
--- gtkpod-0.80_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408150123.i7F1NQND022280>