From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 12 21:50:25 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 C994E16A4CE for ; Wed, 12 May 2004 21:50:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8172E43D55 for ; Wed, 12 May 2004 21:50:24 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4D4oOdO041367 for ; Wed, 12 May 2004 21:50:24 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4D4oOu2041366; Wed, 12 May 2004 21:50:24 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 12 May 2004 21:50:24 -0700 (PDT) Resent-Message-Id: <200405130450.i4D4oOu2041366@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 41AF716A4CE for ; Wed, 12 May 2004 21:44:12 -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 69BCE43D1D for ; Wed, 12 May 2004 21:44:10 -0700 (PDT) (envelope-from root@ahze.net) Received: by ahze.ahze.net (Postfix, from userid 0) id B351B671E; Thu, 13 May 2004 00:44:59 -0400 (EDT) Message-Id: <20040513044459.B351B671E@ahze.ahze.net> Date: Thu, 13 May 2004 00:44:59 -0400 (EDT) From: michael johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66592: [MAINTAINER] audio/faad2: [update to 2.0 release] 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: Thu, 13 May 2004 04:50:25 -0000 >Number: 66592 >Category: ports >Synopsis: [MAINTAINER] audio/faad2: [update to 2.0 release] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 12 21:50:23 PDT 2004 >Closed-Date: >Last-Modified: >Originator: michael johnson >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #45: Mon May 3 05:09:04 EDT >Description: - update to 2.0 release I removed both patches so please remove them I'm not 100% sure about PORTEPOCH & PORTREVISIONi but I'm guessing if you bump PORTEPOCH you can remove PORTREVISION. Sorry if I'm wrong. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- faad2-2.0,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/faad/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 12 May 2004 13:23:47 -0000 1.15 +++ Makefile 13 May 2004 04:37:54 -0000 @@ -7,11 +7,10 @@ PORTNAME= faad2 PORTVERSION= 2.0 -PORTREVISION= 2 +PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= faac -DISTNAME= ${PORTNAME}-${PORTVERSION}-rc3 MAINTAINER= ahze@ahze.net COMMENT= A LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder @@ -20,15 +19,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOMAKE_VER= 15 -USE_AUTOHEADER= yes +USE_AUTOMAKE_VER=15 +USE_AUTOHEADER= yes AUTOMAKE_ARGS= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_GETOPT_LONG= yes +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +USE_GETOPT_LONG=yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 USE_REINPLACE= yes +USE_SDL= yes CONFIGURE_ARGS= --with-mp4v2 --with-drm CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ @@ -36,6 +36,8 @@ INSTALLS_SHLIB= yes +.include + pre-patch: build-depends post-patch: @@ -45,17 +47,26 @@ ${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake @${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \ ${WRKSRC}/aclocal.m4 + @${REINPLACE_CMD} -e 's|uint8_t|unsigned char|; \ + s|uint16_t|unsigned short|; s|uint32_t|unsigned long|; \ + s|int8_t|char|;' ${WRKSRC}/libfaad/structs.h + @${REINPLACE_CMD} -e 's| \ + ${WRKSRC}/Makefile.am +.if ${OSVERSION} < 500000 + @${REINPLACE_CMD} -e 's|stdint.h|sys/inttypes.h|' \ + ${WRKSRC}/common/mp4ff/mp4ff_int_types.h +.endif # CFLAGS safeness - @${FIND} ${WRKSRC} -type f -name Makefile.am | \ + @${FIND} ${WRKSRC} -type f -name Makefile.am | \ ${XARGS} -n 5 -x \ ${REINPLACE_CMD} -e \ 's|-O2|${CFLAGS}|' -post-configure: -# sync the multiple libtool copies - @${CP} ${WRKSRC}/libtool ${WRKSRC}/common/mp4v2/ - post-install: @${INSTALL_DATA} ${WRKSRC}/common/mp4v2/systems.h ${PREFIX}/include -.include +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/audio/faad/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 12 May 2004 13:23:47 -0000 1.3 +++ distinfo 13 May 2004 02:03:05 -0000 @@ -1,2 +1,2 @@ -MD5 (faad2-2.0-rc3.tar.gz) = 0080076438655ed7facf1089a9805aff -SIZE (faad2-2.0-rc3.tar.gz) = 704005 +MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07 +SIZE (faad2-2.0.tar.gz) = 766660 Index: files/patch-frontend_main_c =================================================================== RCS file: /home/ncvs/ports/audio/faad/files/patch-frontend_main_c,v retrieving revision 1.2 diff -u -r1.2 patch-frontend_main_c --- files/patch-frontend_main_c 5 Mar 2004 07:27:02 -0000 1.2 +++ files/patch-frontend_main_c 13 May 2004 01:54:47 -0000 @@ -1,38 +0,0 @@ ---- frontend/main.c.orig Thu Nov 6 16:45:08 2003 -+++ frontend/main.c Wed Dec 10 06:27:37 2003 -@@ -1074,7 +1074,7 @@ - if (optarg) - { - char dr[10]; -- if (sscanf(optarg, "%s", dr) < 1) { -+ if (sscanf(optarg, "%9s", dr) < 1) { - def_srate = 0; - } else { - def_srate = atoi(dr); -@@ -1085,7 +1085,7 @@ - if (optarg) - { - char dr[10]; -- if (sscanf(optarg, "%s", dr) < 1) -+ if (sscanf(optarg, "%9s", dr) < 1) - { - format = 1; - } else { -@@ -1099,7 +1099,7 @@ - if (optarg) - { - char dr[10]; -- if (sscanf(optarg, "%s", dr) < 1) -+ if (sscanf(optarg, "%9s", dr) < 1) - { - outputFormat = FAAD_FMT_16BIT; /* just use default */ - } else { -@@ -1113,7 +1113,7 @@ - if (optarg) - { - char dr[10]; -- if (sscanf(optarg, "%s", dr) < 1) -+ if (sscanf(optarg, "%9s", dr) < 1) - { - object_type = LC; /* default */ - } else { Index: files/patch-structs.h =================================================================== RCS file: /home/ncvs/ports/audio/faad/files/patch-structs.h,v retrieving revision 1.1 diff -u -r1.1 patch-structs.h --- files/patch-structs.h 13 Apr 2004 12:57:26 -0000 1.1 +++ files/patch-structs.h 13 May 2004 02:02:44 -0000 @@ -1,92 +1 @@ ---- libfaad/structs.h.orig Thu Nov 13 07:47:59 2003 -+++ libfaad/structs.h Sun Apr 11 22:01:09 2004 -@@ -297,57 +297,57 @@ - typedef struct mp4AudioSpecificConfig - { - /* Audio Specific Info */ -- uint8_t objectTypeIndex; -- uint8_t samplingFrequencyIndex; -- uint32_t samplingFrequency; -- uint8_t channelsConfiguration; -+ unsigned char objectTypeIndex; -+ unsigned char samplingFrequencyIndex; -+ unsigned long samplingFrequency; -+ unsigned char channelsConfiguration; - - /* GA Specific Info */ -- uint8_t frameLengthFlag; -- uint8_t dependsOnCoreCoder; -- uint16_t coreCoderDelay; -- uint8_t extensionFlag; -- uint8_t aacSectionDataResilienceFlag; -- uint8_t aacScalefactorDataResilienceFlag; -- uint8_t aacSpectralDataResilienceFlag; -- uint8_t epConfig; -+ unsigned char frameLengthFlag; -+ unsigned char dependsOnCoreCoder; -+ unsigned short coreCoderDelay; -+ unsigned char extensionFlag; -+ unsigned char aacSectionDataResilienceFlag; -+ unsigned char aacScalefactorDataResilienceFlag; -+ unsigned char aacSpectralDataResilienceFlag; -+ unsigned char epConfig; - -- int8_t sbr_present_flag; -- int8_t forceUpSampling; -+ char sbr_present_flag; -+ char forceUpSampling; - } mp4AudioSpecificConfig; - - typedef struct faacDecConfiguration - { -- uint8_t defObjectType; -- uint32_t defSampleRate; -- uint8_t outputFormat; -- uint8_t downMatrix; -- uint8_t useOldADTSFormat; -+ unsigned char defObjectType; -+ unsigned long defSampleRate; -+ unsigned char outputFormat; -+ unsigned char downMatrix; -+ unsigned char useOldADTSFormat; - } faacDecConfiguration, *faacDecConfigurationPtr; - - typedef struct faacDecFrameInfo - { -- uint32_t bytesconsumed; -- uint32_t samples; -- uint8_t channels; -- uint8_t error; -- uint32_t samplerate; -+ unsigned long bytesconsumed; -+ unsigned long samples; -+ unsigned char channels; -+ unsigned char error; -+ unsigned long samplerate; - - /* SBR: 0: off, 1: on; normal, 2: on; downsampled */ -- uint8_t sbr; -+ unsigned char sbr; - - /* MPEG-4 ObjectType */ -- uint8_t object_type; -+ unsigned char object_type; - - /* AAC header type; MP4 will be signalled as RAW also */ -- uint8_t header_type; -+ unsigned char header_type; - - /* multichannel configuration */ -- uint8_t num_front_channels; -- uint8_t num_side_channels; -- uint8_t num_back_channels; -- uint8_t num_lfe_channels; -- uint8_t channel_position[MAX_CHANNELS]; -+ unsigned char num_front_channels; -+ unsigned char num_side_channels; -+ unsigned char num_back_channels; -+ unsigned char num_lfe_channels; -+ unsigned char channel_position[MAX_CHANNELS]; - } faacDecFrameInfo; - - typedef struct + --- faad2-2.0,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: