From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 18 17:30:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9538106566B for ; Wed, 18 Feb 2009 17:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B45958FC0A for ; Wed, 18 Feb 2009 17:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n1IHU46x012454 for ; Wed, 18 Feb 2009 17:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n1IHU44Q012449; Wed, 18 Feb 2009 17:30:04 GMT (envelope-from gnats) Resent-Date: Wed, 18 Feb 2009 17:30:04 GMT Resent-Message-Id: <200902181730.n1IHU44Q012449@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A7541065674 for ; Wed, 18 Feb 2009 17:24:13 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE4B8FC18 for ; Wed, 18 Feb 2009 17:24:13 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa102lp.auone-net.jp (MSA102lp [172.27.12.180]) by msa102lp.auone-net.jp (au one net msa) with ESMTP id EE1A478237 for ; Thu, 19 Feb 2009 02:02:06 +0900 (JST) Received: from localhost.localdomain (ZT037157.ppp.dion.ne.jp [59.128.37.157]) by msa102lp.auone-net.jp (au one net msa) with ESMTP id C5FA44AC031 for ; Thu, 19 Feb 2009 02:01:59 +0900 (JST) Message-Id: <20090219020014.21bb1a3c.tkato432@yahoo.com> Date: Thu, 19 Feb 2009 02:00:14 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org X-Mailman-Approved-At: Wed, 18 Feb 2009 17:36:21 +0000 Cc: Subject: ports/131829: Update port: audio/faad to 2.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2009 17:30:05 -0000 >Number: 131829 >Category: ports >Synopsis: Update port: audio/faad to 2.7 >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: Wed Feb 18 17:30:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.1-RELEASE-p1 i386 >Organization: >Environment: >Description: - Update to version 2.7 Remove file: files/patch-configure.in files/patch-frontend_main.c >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/faad/Makefile audio/faad/Makefile --- /usr/ports/audio/faad/Makefile 2008-11-13 03:55:01.000000000 +0900 +++ audio/faad/Makefile 2009-02-18 22:55:58.000000000 +0900 @@ -6,38 +6,40 @@ # PORTNAME= faad2 -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.7 PORTEPOCH= 1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= faac +MASTER_SITES= SFE/faac MAINTAINER= multimedia@FreeBSD.org COMMENT= MPEG-2 and MPEG-4 AAC audio decoder -WRKSRC= ${WRKDIR}/${PORTNAME} - +USE_BZIP2= yes USE_DOS2UNIX= yes -USE_AUTOTOOLS= automake:15 autoheader:262 libtool:15 -AUTOMAKE_ARGS= --add-missing -GNU_CONFIGURE= yes USE_GMAKE= yes -USE_LDCONFIG= yes +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal +AUTOMAKE_ARGS= --add-missing CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +USE_LDCONFIG= yes + +MAN1= faad.1 .include -post-patch: - @${REINPLACE_CMD} -e 's|||g' \ - ${WRKSRC}/common/mp4ff/mp4ff_int_types.h +post-extract: + @${LN} -sf faad.man ${WRKSRC}/frontend/faad.1 -pre-configure: - ${MKDIR} ${WRKSRC}/plugins/bmp - @cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \ - ${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake +post-patch: + @${REINPLACE_CMD} -e '/AC_CONFIG_FILES(plugins/d' \ + ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e 's|faad.man|faad.1|g' \ + ${WRKSRC}/frontend/Makefile.am @${ECHO_CMD} "SUBDIRS = libfaad common frontend" > \ ${WRKSRC}/Makefile.am +pre-configure: + @cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake + .include diff -urN /usr/ports/audio/faad/distinfo audio/faad/distinfo --- /usr/ports/audio/faad/distinfo 2008-02-25 15:59:43.000000000 +0900 +++ audio/faad/distinfo 2009-02-18 22:19:24.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (faad2-2.6.1.tar.gz) = 74e92df40c270f216a8305fc87603c8a -SHA256 (faad2-2.6.1.tar.gz) = 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c -SIZE (faad2-2.6.1.tar.gz) = 839410 +MD5 (faad2-2.7.tar.bz2) = 4c332fa23febc0e4648064685a3d4332 +SHA256 (faad2-2.7.tar.bz2) = 14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5 +SIZE (faad2-2.7.tar.bz2) = 901043 diff -urN /usr/ports/audio/faad/files/patch-configure.in audio/faad/files/patch-configure.in --- /usr/ports/audio/faad/files/patch-configure.in 2006-08-25 08:33:51.000000000 +0900 +++ audio/faad/files/patch-configure.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,13 +0,0 @@ ---- configure.in.orig Thu Aug 24 08:55:38 2006 -+++ configure.in Thu Aug 24 08:55:58 2006 -@@ -128,10 +128,6 @@ - AC_CONFIG_FILES(libfaad/Makefile) - AC_CONFIG_FILES(common/Makefile) - AC_CONFIG_FILES(common/mp4ff/Makefile) --AC_CONFIG_FILES(plugins/Makefile) --AC_CONFIG_FILES(plugins/xmms/Makefile) --AC_CONFIG_FILES(plugins/xmms/src/Makefile) --AC_CONFIG_FILES(plugins/mpeg4ip/Makefile) - AC_CONFIG_FILES(faad2.spec) - AC_CONFIG_FILES(frontend/Makefile) - AC_CONFIG_FILES(Makefile) diff -urN /usr/ports/audio/faad/files/patch-frontend_main.c audio/faad/files/patch-frontend_main.c --- /usr/ports/audio/faad/files/patch-frontend_main.c 2008-11-13 01:31:27.000000000 +0900 +++ audio/faad/files/patch-frontend_main.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,17 +0,0 @@ ---- frontend/main.c.orig 2007-11-01 13:33:30.000000000 -0700 -+++ frontend/main.c 2008-09-16 11:01:40.000000000 -0700 -@@ -911,12 +911,14 @@ - if (sampleId == 0) dur = 0; - - if (useAacLength || (timescale != samplerate)) { - sample_count = frameInfo.samples; - } else { - sample_count = (unsigned int)(dur * frameInfo.channels); -+ if (sample_count > frameInfo.samples) -+ sample_count = frameInfo.samples; - - if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples)) - { - faad_fprintf(stderr, "MP4 seems to have incorrect frame duration, using values from AAC data.\n"); - useAacLength = 1; - sample_count = frameInfo.samples; diff -urN /usr/ports/audio/faad/pkg-plist audio/faad/pkg-plist --- /usr/ports/audio/faad/pkg-plist 2006-08-25 08:33:51.000000000 +0900 +++ audio/faad/pkg-plist 2009-02-18 23:56:49.000000000 +0900 @@ -1,7 +1,10 @@ bin/faad include/faad.h +include/mp4ff.h +include/mp4ffint.h include/neaacdec.h lib/libfaad.a lib/libfaad.la lib/libfaad.so -lib/libfaad.so.0 +lib/libfaad.so.2 +lib/libmp4ff.a >Release-Note: >Audit-Trail: >Unformatted: