diff options
| author | ijliao <ijliao@FreeBSD.org> | 2004-07-22 09:26:13 +0800 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2004-07-22 09:26:13 +0800 |
| commit | c85fe280c5ea1cb159ab1fdc87090edfd1ea180e (patch) | |
| tree | 4fd2292e668ceaf3d171ea85b81d8993f3a0ac9a /audio | |
| parent | 98a9e38a13446798081a05090a98e99494bde959 (diff) | |
| download | freebsd-ports-gnome-c85fe280c5ea1cb159ab1fdc87090edfd1ea180e.tar.gz freebsd-ports-gnome-c85fe280c5ea1cb159ab1fdc87090edfd1ea180e.tar.zst freebsd-ports-gnome-c85fe280c5ea1cb159ab1fdc87090edfd1ea180e.zip | |
Remove windows stuff and fix so faac will compile with gstreamer-plugins
PR: 69388
Submitted by: maintainer
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/faac/Makefile | 2 | ||||
| -rw-r--r-- | audio/faac/files/patch-gcc | 79 |
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); |