From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 23 18:00:20 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 96DDD16A4CF for ; Fri, 23 Jul 2004 18:00:20 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8625D43D1D for ; Fri, 23 Jul 2004 18:00:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6NI0KUs040281 for ; Fri, 23 Jul 2004 18:00:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6NI0Kks040279; Fri, 23 Jul 2004 18:00:20 GMT (envelope-from gnats) Resent-Date: Fri, 23 Jul 2004 18:00:20 GMT Resent-Message-Id: <200407231800.i6NI0Kks040279@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 08C2716A4CE for ; Fri, 23 Jul 2004 17:56:10 +0000 (GMT) Received: from imf18aec.mail.bellsouth.net (imf18aec.mail.bellsouth.net [205.152.59.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8118643D53 for ; Fri, 23 Jul 2004 17:56:09 +0000 (GMT) (envelope-from ahze@gentoo.ahze.net) Received: from gentoo.ahze.net ([68.209.163.3]) by imf18aec.mail.bellsouth.netESMTP <20040723175607.DUJB1786.imf18aec.mail.bellsouth.net@gentoo.ahze.net>; Fri, 23 Jul 2004 13:56:07 -0400 Received: (from root@localhost) by gentoo.ahze.net (8.12.11/8.12.11/Submit) id i6NHu6i7059175; Fri, 23 Jul 2004 13:56:06 -0400 (EDT) (envelope-from ahze) Message-Id: <200407231756.i6NHu6i7059175@gentoo.ahze.net> Date: Fri, 23 Jul 2004 13:56:06 -0400 (EDT) From: Michael Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: amistry@am-productions.biz Subject: ports/69499: [PATCH] multimedia/avidemux2: [SDL/faad 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: Fri, 23 Jul 2004 18:00:20 -0000 >Number: 69499 >Category: ports >Synopsis: [PATCH] multimedia/avidemux2: [SDL/faad 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: Fri Jul 23 18:00:19 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 #57: Fri Jul 16 00:36:31 EDT 2004 >Description: - Add SDL & faad support - add nasm to i386 build (for MMX) Port maintainer (amistry@am-productions.biz) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- avidemux2-2.0.26.patch begins here --- Index: Makefile =================================================================== RCS file: /usr/opt/cvs/freebsd-src/ports/multimedia/avidemux2/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 23 Jul 2004 09:06:06 -0000 1.11 +++ Makefile 23 Jul 2004 17:48:59 -0000 @@ -24,6 +24,7 @@ USE_X_PREFIX= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomeprefix gnomehack gtk20 +WANT_SDL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ -I${LOCALBASE}/include/ffmpeg \ @@ -37,6 +38,14 @@ .include +.if ${HAVE_SDL:Msdl}!="" +WITH_SDL= yes +.endif + +.if exists(${LOCALBASE}/lib/libfaad.so.0) +WITH_FAAD= yes +.endif + .if exists(${LOCALBASE}/bin/mpeg2enc) WITH_MPEGENC= yes .endif @@ -60,12 +69,22 @@ .if ${ARCH} != "i386" CONFIGURE_ARGS+= --disable-mmx +.else +BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif .if defined(WITH_A52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 .endif +.if defined(WITH_SDL) +USE_SDL+= sdl +.endif + +.if defined(WITH_FAAD) +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +.endif + pre-everything:: .if !defined(WITH_MPEGENC) @${ECHO_MSG} "To enable mpeg support define WITH_MPEGENC." @@ -79,6 +98,14 @@ @${ECHO_MSG} "To enable A/52 support define WITH_A52." .endif +.if !defined(WITH_SDL) + @${ECHO_MSG} "To enable SDL support define WITH_SDL." +.endif + +.if !defined(WITH_FAAD) + @${ECHO_MSG) "To enable FAAD (mpeg4/aac) support define WITH_FAAD." +.endif + post-patch: @${TOUCH} ${WRKSRC}/* @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile @@ -87,5 +114,9 @@ @${REINPLACE_CMD} 's|ADM_LOCALEDIR=$${datadir}/locale|ADM_LOCALEDIR=${PREFIX}/share/locale|' ${WRKSRC}/configure @${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/adm_lavcodec/Makefile @${REINPLACE_CMD} "s|-O2||" ${WRKSRC}/configure + @${REINPLACE_CMD} 's|SDL/|SDL11/|' \ + ${WRKSRC}/avidemux/ADM_audiodevice/ADM_deviceSDL.cpp \ + ${WRKSRC}/avidemux/ADM_gui2/GUI_sdlDraw.cpp \ + ${WRKSRC}/avidemux/main.cpp .include --- avidemux2-2.0.26.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: