Date: Wed, 21 Jul 2004 14:37:23 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69388: [MAINTAINER] audio/faac: [Remove windows stuff and fix for gstreamer-plugins] Message-ID: <200407211837.i6LIbNvR096193@gentoo.ahze.net> Resent-Message-ID: <200407211840.i6LIeLd8084292@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69388
>Category: ports
>Synopsis: [MAINTAINER] audio/faac: [Remove windows stuff and fix for gstreamer-plugins]
>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 Jul 21 18:40:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #57: Fri Jul 16 00:36:31 EDT 2004
>Description:
- Remove windows stuff and fix so faac will compile with gstreamer-plugins
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- faac-1.24_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/faac.orig/Makefile /usr/ports/audio/faac/Makefile
--- /usr/ports/audio/faac.orig/Makefile Wed Jul 21 13:59:39 2004
+++ /usr/ports/audio/faac/Makefile Wed Jul 21 14:10:51 2004
@@ -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 @@
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 -ruN --exclude=CVS /usr/ports/audio/faac.orig/files/patch-gcc /usr/ports/audio/faac/files/patch-gcc
--- /usr/ports/audio/faac.orig/files/patch-gcc Wed Dec 31 19:00:00 1969
+++ /usr/ports/audio/faac/files/patch-gcc Wed Jul 21 14:09:29 2004
@@ -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);
--- faac-1.24_1.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?200407211837.i6LIbNvR096193>