cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not gratuitously pack (and misalign) internal data structures.

Browse Source
This commit is contained in:
naddy 2011-08-28 13:19:45 +00:00
parent 0c379e36ff
commit 1fc82f7bc8
4 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/faac/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2011/06/30 07:39:09 jasper Exp $
# $OpenBSD: Makefile,v 1.12 2011/08/28 13:19:45 naddy Exp $
COMMENT= MPEG-2 and MPEG-4 AAC encoder
DISTNAME= faac-1.28
REVISION= 0
REVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}

24
audio/faac/patches/patch-include_faac_h
View File

@ -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
$OpenBSD: patch-include_faac_h,v 1.4 2011/08/28 13:19:45 naddy Exp $
--- 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 2011/06/29 10:57:17 jasper Exp $
/*
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
}

20
audio/faac/patches/patch-include_faaccfg_h Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-include_faaccfg_h,v 1.3 2011/08/28 13:19:45 naddy Exp $
--- 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_ */

21
audio/faac/patches/patch-libfaac_frame_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-libfaac_frame_h,v 1.4 2011/08/28 13:19:45 naddy Exp $
--- 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
}