Christian Weisgerber <[email protected]> wrote:
> I think we should just remove those pragmas from audio/faac,
Like this. Now also tested on sparc64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/faac/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 30 Jun 2011 07:39:09 -0000 1.11
+++ Makefile 25 Aug 2011 10:55:22 -0000
@@ -3,7 +3,7 @@
COMMENT= MPEG-2 and MPEG-4 AAC encoder
DISTNAME= faac-1.28
-REVISION= 0
+REVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
Index: patches/patch-include_faac_h
===================================================================
RCS file: /cvs/ports/audio/faac/patches/patch-include_faac_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_faac_h
--- patches/patch-include_faac_h 29 Jun 2011 10:57:17 -0000 1.3
+++ patches/patch-include_faac_h 25 Aug 2011 10:55:22 -0000
@@ -1,6 +1,15 @@
$OpenBSD: patch-include_faac_h,v 1.3 2011/06/29 10:57:17 jasper Exp $
---- include/faac.h.orig Wed Jun 29 11:33:41 2011
-+++ include/faac.h Wed Jun 29 11:33:58 2011
+--- include/faac.h.orig Sun Jan 25 19:50:32 2009
++++ include/faac.h Thu Aug 25 00:55:16 2011
+@@ -36,7 +36,7 @@ extern "C" {
+ # endif
+ #endif
+
+-#pragma pack(push, 1)
++/* #pragma pack(push, 1) */
+
+ typedef struct {
+ void *ptr;
@@ -49,9 +49,6 @@ psymodellist_t;
typedef void *faacEncHandle;
@@ -11,3 +20,12 @@ $OpenBSD: patch-include_faac_h,v 1.3 201
/*
Allows an application to get FAAC version info. This is intended
+@@ -90,7 +87,7 @@ int FAACAPI faacEncClose(faacEncHandle hEncoder);
+
+
+
+-#pragma pack(pop)
++/* #pragma pack(pop) */
+
+ #ifdef __cplusplus
+ }
Index: patches/patch-include_faaccfg_h
===================================================================
RCS file: patches/patch-include_faaccfg_h
diff -N patches/patch-include_faaccfg_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_faaccfg_h 25 Aug 2011 10:55:22 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- include/faaccfg.h.orig Thu Aug 25 00:55:37 2011
++++ include/faaccfg.h Thu Aug 25 00:56:00 2011
+@@ -45,7 +45,7 @@
+ #define SHORTCTL_NOSHORT 1
+ #define SHORTCTL_NOLONG 2
+
+-#pragma pack(push, 1)
++/* #pragma pack(push, 1) */
+ typedef struct faacEncConfiguration
+ {
+ /* config version */
+@@ -117,6 +117,6 @@ typedef struct faacEncConfiguration
+
+ } faacEncConfiguration, *faacEncConfigurationPtr;
+
+-#pragma pack(pop)
++/* #pragma pack(pop) */
+
+ #endif /* _FAACCFG_H_ */
Index: patches/patch-libfaac_frame_h
===================================================================
RCS file: patches/patch-libfaac_frame_h
diff -N patches/patch-libfaac_frame_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libfaac_frame_h 25 Aug 2011 10:55:22 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- libfaac/frame.h.orig Thu Aug 25 00:57:46 2011
++++ libfaac/frame.h Thu Aug 25 00:58:19 2011
+@@ -60,7 +60,7 @@ extern "C" {
+ #endif
+ #endif
+
+-#pragma pack(push, 1)
++/* #pragma pack(push, 1) */
+
+ typedef struct {
+ psymodel_t *model;
+@@ -151,7 +151,7 @@ int FAACAPI faacEncEncode(faacEncHandle hEncoder,
+ int FAACAPI faacEncClose(faacEncHandle hEncoder);
+
+
+-#pragma pack(pop)
++/* #pragma pack(pop) */
+
+ #ifdef __cplusplus
+ }
--
Christian "naddy" Weisgerber [email protected]
