From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 1 21:40:36 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46F2A16A4E0 for ; Tue, 1 Jun 2004 21:40:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FADA43D49 for ; Tue, 1 Jun 2004 21:40:36 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i524eZhN047713 for ; Tue, 1 Jun 2004 21:40:35 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i524eZr1047712; Tue, 1 Jun 2004 21:40:35 -0700 (PDT) (envelope-from gnats) Resent-Date: Tue, 1 Jun 2004 21:40:35 -0700 (PDT) Resent-Message-Id: <200406020440.i524eZr1047712@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, michael johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 040E916A4CE for ; Tue, 1 Jun 2004 21:37:03 -0700 (PDT) Received: from ahze.ahze.net (adsl-068-209-163-003.sip.clt.bellsouth.net [68.209.163.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id A636543D39 for ; Tue, 1 Jun 2004 21:37:02 -0700 (PDT) (envelope-from root@ahze.ahze.net) Received: by ahze.ahze.net (Postfix, from userid 0) id 32E9D5CD8; Wed, 2 Jun 2004 00:37:02 -0400 (EDT) Message-Id: <20040602043702.32E9D5CD8@ahze.ahze.net> Date: Wed, 2 Jun 2004 00:37:02 -0400 (EDT) From: michael johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: holger@e-gitt.net Subject: ports/67479: [PATCH] multimedia/avifile: [add faad knob & change libmad support] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2004 04:40:36 -0000 >Number: 67479 >Category: ports >Synopsis: [PATCH] multimedia/avifile: [add faad knob & change libmad support] >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: Tue Jun 01 21:40:35 PDT 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 #45: Mon May 3 05:09:04 EDT >Description: - add faad knob - Don't build libmad when using libmad from ports. Port maintainer (holger@e-gitt.net) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- avifile-0.7.38_3,2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/avifile/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- Makefile 9 Apr 2004 18:59:40 -0000 1.52 +++ Makefile 2 Jun 2004 04:32:29 -0000 @@ -31,7 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \ +CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \ --disable-v4l \ --disable-divx4 CONFIGURE_TARGET= @@ -106,12 +106,20 @@ PLIST_SUB+= A52="@comment " .endif +# faad +.if !defined(WITHOUT_FAAD) +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad + +CONFIGURE_ARGS+= --with-faad-prefix=${LOCALBASE} +.else +CONFIGURE_ARGS+= --disable-faad +.endif + # libmad .if !defined(WITHOUT_MAD) LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad -CONFIGURE_ARGS+= --enable-mad \ - --enable-libmad +CONFIGURE_ARGS+= --enable-libmad PLIST_SUB+= MAD="" .else CONFIGURE_ARGS+= --disable-mad @@ -171,6 +179,9 @@ .if !defined(WITHOUT_A52) @${ECHO_MSG} "You can disable ac3 (liba52) support by defining WITHOUT_A52." .endif +.if !defined(WITHOUT_FAAD) + @${ECHO_MSG} "You can disable faad support by defining WITHOUT_FAAD." +.endif .if !defined(WITHOUT_MAD) @${ECHO_MSG} "You can disable mad support by defining WITHOUT_MAD." .endif @@ -211,7 +222,9 @@ @${REINPLACE_CMD} -E -e 's|^(SUBDIRS.+)qtvidcap|\1|' \ ${WRKSRC}/samples/Makefile.in .if !defined(WITHOUT_MAD) - @${REINPLACE_CMD} -e 's|MAD_LDADD = \@MAD_LDADD\@|MAD_LDADD = -L${LOCALBASE}/lib \@MAD_LDADD\@|' \ + @${REINPLACE_CMD} -e 's|"mad.h"||' \ + ${WRKSRC}/plugins/libmad/libmad.cpp + @${REINPLACE_CMD} -e 's|@AMM_USE_LIBMAD_FALSE@CUSTOMFLAGS = -I$(SUBDIRS)||' \ ${WRKSRC}/plugins/libmad/Makefile.in .endif .if !defined(WITHOUT_QT) --- avifile-0.7.38_3,2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: