Date: Fri, 22 Oct 2004 20:11:19 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73021: [MAINTAINER] audio/faac: [Re-add accidentally removed prototype] Message-ID: <200410230011.i9N0BJMG037352@blueheron.ahze.net> Resent-Message-ID: <200410230020.i9N0KRV2011690@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73021
>Category: ports
>Synopsis: [MAINTAINER] audio/faac: [Re-add accidentally removed prototype]
>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: Sat Oct 23 00:20:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.3-STABLE FreeBSD 5.3-STABLE #68: Sat Oct 16 21:30:18 EDT 2004
>Description:
- Re-add accidentally removed prototype
Reported by: sean@mcneil.com
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- faac-1.24_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/faac/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 13 Oct 2004 01:48:28 -0000 1.9
+++ Makefile 23 Oct 2004 00:05:50 -0000
@@ -7,7 +7,7 @@
PORTNAME= faac
PORTVERSION= 1.24
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= faac
Index: files/patch-gcc
===================================================================
RCS file: /home/ncvs/ports/audio/faac/files/patch-gcc,v
retrieving revision 1.1
diff -u -r1.1 patch-gcc
--- files/patch-gcc 22 Jul 2004 01:26:13 -0000 1.1
+++ files/patch-gcc 23 Oct 2004 00:03:40 -0000
@@ -1,5 +1,5 @@
--- include/faac.h.orig Mon Nov 24 13:10:32 2003
-+++ include/faac.h Wed Jul 21 14:00:09 2004
++++ include/faac.h Fri Oct 22 20:03:09 2004
@@ -36,7 +36,6 @@
# endif
#endif
@@ -8,14 +8,18 @@
typedef struct {
void *ptr;
-@@ -77,16 +76,11 @@
+@@ -76,17 +75,16 @@
+ int FAACAPI faacEncGetDecoderSpecificInfo(faacEncHandle hEncoder, unsigned char **ppBuffer,
unsigned long *pSizeOfDecoderSpecificInfo);
-
--int FAACAPI faacEncEncode(faacEncHandle hEncoder, int32_t * inputBuffer, unsigned int samplesInput,
+-
+ int FAACAPI faacEncEncode(faacEncHandle hEncoder, int32_t * inputBuffer, unsigned int samplesInput,
- unsigned char *outputBuffer,
- unsigned int bufferSize);
--
++ unsigned char *outputBuffer,
++ unsigned int bufferSize);
++
+
int FAACAPI faacEncClose(faacEncHandle hEncoder);
@@ -26,7 +30,7 @@
#ifdef __cplusplus
}
--- include/faaccfg.h.orig Wed Oct 29 05:31:24 2003
-+++ include/faaccfg.h Wed Jul 21 14:00:09 2004
++++ include/faaccfg.h Fri Oct 22 19:59:53 2004
@@ -45,7 +45,6 @@
#define SHORTCTL_NOSHORT 1
#define SHORTCTL_NOLONG 2
@@ -42,38 +46,3 @@
-#pragma pack(pop)
#endif /* _FAACCFG_H_ */
---- libfaac/frame.h.orig Wed Jul 21 14:08:23 2004
-+++ libfaac/frame.h Wed Jul 21 14:08:32 2004
-@@ -60,7 +60,6 @@
- #endif
- #endif
-
--#pragma pack(push, 1)
-
- typedef struct {
- psymodel_t *model;
-@@ -151,7 +150,6 @@
- int FAACAPI faacEncClose(faacEncHandle hEncoder);
-
-
--#pragma pack(pop)
-
- #ifdef __cplusplus
- }
---- libfaac/aacquant.h.orig Wed Jul 21 14:08:45 2004
-+++ libfaac/aacquant.h Wed Jul 21 14:08:53 2004
-@@ -37,14 +37,12 @@
- #define POW20(x) pow(2.0,((double)x)*.25)
- #define IPOW20(x) pow(2.0,-((double)x)*.1875)
-
--#pragma pack(push, 1)
- typedef struct
- {
- double *pow43;
- double *adj43;
- double quality;
- } AACQuantCfg;
--#pragma pack(pop)
-
- void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels,
- AACQuantCfg *aacquantCfg);
--- faac-1.24_2.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?200410230011.i9N0BJMG037352>