aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2004-07-22 01:26:13 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2004-07-22 01:26:13 +0000
commit0cda34b8529c2b6b5e57a2a31ff4f5c5c8432617 (patch)
treed9effc6d540ef8673b0572f4b877102647d65857 /audio
parent321fa2cd9c05de3cd3a5509eb6e498d4e058905d (diff)
downloadports-0cda34b8529c2b6b5e57a2a31ff4f5c5c8432617.tar.gz
ports-0cda34b8529c2b6b5e57a2a31ff4f5c5c8432617.zip
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/faac/Makefile2
-rw-r--r--audio/faac/files/patch-gcc79
2 files changed, 81 insertions, 0 deletions
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 230bf65583ff..434cbe98e9e8 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -7,6 +7,7 @@
PORTNAME= faac
PORTVERSION= 1.24
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= faac
@@ -31,6 +32,7 @@ INSTALLS_SHLIB= yes
pre-patch: build-depends
post-patch:
+ @${ECHO_CMD} "" >>${WRKSRC}/libfaac/psych.h
@cd ${WRKSRC}; ${ACLOCAL} -I .; \
${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
@${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
diff --git a/audio/faac/files/patch-gcc b/audio/faac/files/patch-gcc
new file mode 100644
index 000000000000..848d3ac22375
--- /dev/null
+++ b/audio/faac/files/patch-gcc
@@ -0,0 +1,79 @@
+--- include/faac.h.orig Mon Nov 24 13:10:32 2003
++++ include/faac.h Wed Jul 21 14:00:09 2004
+@@ -36,7 +36,6 @@
+ # endif
+ #endif
+
+-#pragma pack(push, 1)
+
+ typedef struct {
+ void *ptr;
+@@ -77,16 +76,11 @@
+ unsigned long *pSizeOfDecoderSpecificInfo);
+
+
+-int FAACAPI faacEncEncode(faacEncHandle hEncoder, int32_t * inputBuffer, unsigned int samplesInput,
+- unsigned char *outputBuffer,
+- unsigned int bufferSize);
+-
+
+ int FAACAPI faacEncClose(faacEncHandle hEncoder);
+
+
+
+-#pragma pack(pop)
+
+ #ifdef __cplusplus
+ }
+--- include/faaccfg.h.orig Wed Oct 29 05:31:24 2003
++++ include/faaccfg.h Wed Jul 21 14:00:09 2004
+@@ -45,7 +45,6 @@
+ #define SHORTCTL_NOSHORT 1
+ #define SHORTCTL_NOLONG 2
+
+-#pragma pack(push, 1)
+ typedef struct faacEncConfiguration
+ {
+ /* config version */
+@@ -117,6 +116,5 @@
+
+ } faacEncConfiguration, *faacEncConfigurationPtr;
+
+-#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);