One pack/push #pragma's was missed in previous.

Add missing RCS Id. from Brad.
avsm · Oct 18, 2011 · 5b2d7a0 · 5b2d7a0
1 parent 814326b
commit 5b2d7a0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2011/08/28 13:19:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2011/10/18 08:40:55 ajacoutot Exp $
 
 COMMENT=	MPEG-2 and MPEG-4 AAC encoder
 
 DISTNAME=	faac-1.28
-REVISION=	1
+REVISION=	2
 CATEGORIES=    	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 

diff --git a/audio/faac/patches/patch-configure_in b/audio/faac/patches/patch-configure_in
@@ -1,3 +1,4 @@
+$OpenBSD: patch-configure_in,v 1.5 2011/10/18 08:40:55 ajacoutot Exp $
 --- configure.in.orig	Wed Feb  4 19:55:38 2009
 +++ configure.in	Wed Jun 29 17:49:41 2011
 @@ -1,7 +1,7 @@

diff --git a/audio/faac/patches/patch-libfaac_aacquant_h b/audio/faac/patches/patch-libfaac_aacquant_h
@@ -0,0 +1,20 @@
+$OpenBSD: patch-libfaac_aacquant_h,v 1.3 2011/10/18 08:40:55 ajacoutot Exp $
+--- libfaac/aacquant.h.orig	Sun Aug 28 19:44:54 2011
++++ libfaac/aacquant.h	Sun Aug 28 19:45:36 2011
+@@ -37,14 +37,14 @@ extern "C" {
+ #define POW20(x)  pow(2.0,((double)x)*.25)
+ #define IPOW20(x)  pow(2.0,-((double)x)*.1875)
+
+-#pragma pack(push, 1)
++/* #pragma pack(push, 1) */
+ typedef struct
+   {
+     double *pow43;
+     double *adj43;
+     double quality;
+   } AACQuantCfg;
+-#pragma pack(pop)
++/* #pragma pack(pop) */
+
+ void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels,
+ 		     AACQuantCfg *aacquantCfg);