Fix very obvious alignment issue

3 files changed, 53 insertions, 1 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 391682cd728..82c43c95c3c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2009/08/23 23:56:19 martin Exp $
+$NetBSD: distinfo,v 1.90 2009/08/26 21:07:31 martin Exp $
 
 SHA1 (firefox-3.5.2-source.tar.bz2) = 6439923ff9d316297926ebe193bac3ac1a41b494
 RMD160 (firefox-3.5.2-source.tar.bz2) = d5e0b5f0e8b19b216394584ccabf37d776b89a39
@@ -39,6 +39,8 @@ SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0
 SHA1 (patch-mn) = 17641f46ecf1019f3cc02583a22baa9f9a327d1f
 SHA1 (patch-mp) = 33128f10b6146419bcebd85f7e6e7fa72e770be1
 SHA1 (patch-na) = 3f1a8919965cdc46359c2c7a4bce47f3feaf5778
+SHA1 (patch-nb) = 5d9b66b3f29580893df5e5a9ef11a61aaffe1d70
+SHA1 (patch-nc) = e4cb6798786dddf3a243675ccb131d34d67cb7b3
 SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
 SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
 SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
diff --git a/www/firefox/patches/patch-nb b/www/firefox/patches/patch-nb
new file mode 100644
index 00000000000..fbb0e40708d
--- /dev/null
+++ b/www/firefox/patches/patch-nb
@@ -0,0 +1,31 @@
+$NetBSD: patch-nb,v 1.1 2009/08/26 21:07:32 martin Exp $
+
+# not reported upstream yet
+
+--- media/liboggz/src/liboggz/oggz_byteorder.h.orig	2009-08-26 22:28:18.000000000 +0200
++++ media/liboggz/src/liboggz/oggz_byteorder.h	2009-08-26 22:41:39.000000000 +0200
+@@ -123,4 +123,24 @@ int32_be_at (unsigned char *c)
+   return (c [0] <<  24) + (c [1] <<  16) + (c [2] <<  8) + c [3] ;
+ }
+ 
++static ogg_uint32_t
++_le_32_at (unsigned char *c)
++{
++  return (c [3] <<  24) + (c [2] <<  16) + (c [1] <<  8) + c [0] ;
++}
++
++static uint64_t
++_le_64_at (unsigned char *c)
++{
++  return (uint64_t)((uint64_t)c[7] <<  56) + ((uint64_t)c[6] <<  48)
++    + ((uint64_t)c[5] <<  40) + ((uint64_t)c[4] << 32)
++    + (c [3] <<  24) + (c [2] <<  16) + (c [1] <<  8) + c [0] ;
++}
++
++static ogg_uint16_t
++_be_16_at (unsigned char *c)
++{
++  return (c [0] <<  8) + c [1] ;
++}
++
+ #endif /* __OGGZ_BYTEORDER_H__ */
diff --git a/www/firefox/patches/patch-nc b/www/firefox/patches/patch-nc
new file mode 100644
index 00000000000..917baa21571
--- /dev/null
+++ b/www/firefox/patches/patch-nc
@@ -0,0 +1,19 @@
+$NetBSD: patch-nc,v 1.1 2009/08/26 21:07:32 martin Exp $
+
+# not reported upstream yet
+
+--- media/liboggz/src/liboggz/oggz_auto.c.orig	2009-08-26 22:20:35.000000000 +0200
++++ media/liboggz/src/liboggz/oggz_auto.c	2009-08-26 22:40:51.000000000 +0200
+@@ -62,9 +62,9 @@ int oggz_set_metric_linear (OGGZ * oggz,
+ 			    ogg_int64_t granule_rate_numerator,
+ 			    ogg_int64_t granule_rate_denominator);
+ 
+-#define INT16_BE_AT(x) _be_16((*(ogg_int32_t *)(x)))
+-#define INT32_LE_AT(x) _le_32((*(ogg_int32_t *)(x)))
+-#define INT64_LE_AT(x) _le_64((*(ogg_int64_t *)(x)))
++#define INT16_BE_AT(x) _be_16_at(x)
++#define INT32_LE_AT(x) _le_32_at(x)
++#define INT64_LE_AT(x) _le_64_at(x)
+ 
+ static int
+ oggz_stream_set_numheaders (OGGZ * oggz, long serialno, int numheaders)