Attachment #44910 for bug #69388

View | Details | Raw Unified | Return to bug 69388
Collapse All | Expand All

Lines 7-12 Link Here

(-)/usr/ports/audio/faac/Makefile (+2 lines)
7		7
8	PORTNAME= faac	8	PORTNAME= faac
9	PORTVERSION= 1.24	9	PORTVERSION= 1.24
		10	PORTREVISION= 1
10	CATEGORIES= audio	11	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
12	MASTER_SITE_SUBDIR= faac	13	MASTER_SITE_SUBDIR= faac
Lines 31-36 Link Here
31	pre-patch: build-depends	32	pre-patch: build-depends
32		33
33	post-patch:	34	post-patch:
		35	@${ECHO_CMD} "" >>${WRKSRC}/libfaac/psych.h
34	@cd ${WRKSRC}; ${ACLOCAL} -I .; \	36	@cd ${WRKSRC}; ${ACLOCAL} -I .; \
35	${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake	37	${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
36	@${REINPLACE_CMD} -e 's\|$$lt_target\|$$host\|' \	38	@${REINPLACE_CMD} -e 's\|$$lt_target\|$$host\|' \




--- 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);

Return to bug 69388

Line 0 Link Here

(-)/usr/ports/audio/faac/files/patch-gcc (+79 lines)
		1	--- include/faac.h.orig Mon Nov 24 13:10:32 2003
		2	+++ include/faac.h Wed Jul 21 14:00:09 2004
		3	@@ -36,7 +36,6 @@
		4	# endif
		5	#endif
		6
		7	-#pragma pack(push, 1)
		8
		9	typedef struct {
		10	void *ptr;
		11	@@ -77,16 +76,11 @@
		12	unsigned long *pSizeOfDecoderSpecificInfo);
		13
		14
		15	-int FAACAPI faacEncEncode(faacEncHandle hEncoder, int32_t * inputBuffer, unsigned int samplesInput,
		16	- unsigned char *outputBuffer,
		17	- unsigned int bufferSize);
		18	-
		19
		20	int FAACAPI faacEncClose(faacEncHandle hEncoder);
		21
		22
		23
		24	-#pragma pack(pop)
		25
		26	#ifdef __cplusplus
		27	}
		28	--- include/faaccfg.h.orig Wed Oct 29 05:31:24 2003
		29	+++ include/faaccfg.h Wed Jul 21 14:00:09 2004
		30	@@ -45,7 +45,6 @@
		31	#define SHORTCTL_NOSHORT 1
		32	#define SHORTCTL_NOLONG 2
		33
		34	-#pragma pack(push, 1)
		35	typedef struct faacEncConfiguration
		36	{
		37	/* config version */
		38	@@ -117,6 +116,5 @@
		39
		40	} faacEncConfiguration, *faacEncConfigurationPtr;
		41
		42	-#pragma pack(pop)
		43
		44	#endif /* _FAACCFG_H_ */
		45	--- libfaac/frame.h.orig Wed Jul 21 14:08:23 2004
		46	+++ libfaac/frame.h Wed Jul 21 14:08:32 2004
		47	@@ -60,7 +60,6 @@
		48	#endif
		49	#endif
		50
		51	-#pragma pack(push, 1)
		52
		53	typedef struct {
		54	psymodel_t *model;
		55	@@ -151,7 +150,6 @@
		56	int FAACAPI faacEncClose(faacEncHandle hEncoder);
		57
		58
		59	-#pragma pack(pop)
		60
		61	#ifdef __cplusplus
		62	}
		63	--- libfaac/aacquant.h.orig Wed Jul 21 14:08:45 2004
		64	+++ libfaac/aacquant.h Wed Jul 21 14:08:53 2004
65	@@ -37,14 +37,12 @@
66	#define POW20(x) pow(2.0,((double)x)*.25)
67	#define IPOW20(x) pow(2.0,-((double)x)*.1875)
68
69	-#pragma pack(push, 1)
70	typedef struct
71	{
72	double *pow43;
73	double *adj43;
74	double quality;
75	} AACQuantCfg;
76	-#pragma pack(pop)
77
78	void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels,
79	AACQuantCfg *aacquantCfg);