--- a/media/liboggz/README_MOZILLA
+++ b/media/liboggz/README_MOZILLA
@@ -14,8 +14,12 @@ endian.patch is applied to fix bug 45269
 bounded_seek.patch is applied to fix bug 469408.
 
 key_frame_seek.patch fixes bug 463358.
 
 offset_next.patch fixes bug 495366.
 
 bug487519.patch: Fix for bug 487519.
 bug496063.patch: Fix for infinite loop during seek while shutting down.
+
+oggz_os2.patch: Bug 448918 - add OS/2 support (this patch should be
+                removed when OS/2 support is added upstream)
+

--- a/media/liboggz/include/oggz/oggz_off_t_generated.h
+++ b/media/liboggz/include/oggz/oggz_off_t_generated.h
@@ -54,17 +54,17 @@
  <pre>
    echo "gcc -E oggz.h | grep oggz_off_t
  </pre>
  * 
  */
 
 #include <sys/types.h>
 
-#if defined(__APPLE__) || defined(SOLARIS)
+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
 typedef off_t oggz_off_t;
 #else
 typedef loff_t oggz_off_t;
 #endif
 
 #define PRI_OGGZ_OFF_T "PRId64"
 
 #endif /* __OGGZ_OFF_T_GENERATED__ */

new file mode 100644
--- /dev/null
+++ b/media/liboggz/oggz_os2.patch
@@ -0,0 +1,22 @@
+diff --git a/media/liboggz/include/oggz/oggz_off_t_generated.h b/media/liboggz/include/oggz/oggz_off_t_generated.h
+--- a/media/liboggz/include/oggz/oggz_off_t_generated.h
++++ b/media/liboggz/include/oggz/oggz_off_t_generated.h
+@@ -54,17 +54,17 @@
+  <pre>
+    echo "gcc -E oggz.h | grep oggz_off_t
+  </pre>
+  * 
+  */
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
+ #endif
+ 
+ #define PRI_OGGZ_OFF_T "PRId64"
+ 
+ #endif /* __OGGZ_OFF_T_GENERATED__ */

--- a/media/liboggz/update.sh
+++ b/media/liboggz/update.sh
@@ -46,8 +46,9 @@ sed s/\#include\ \"config.h\"/\#ifdef\ W
 cp $1/AUTHORS ./AUTHORS
 patch -p3 <wince.patch
 patch -p3 <endian.patch
 patch -p3 <bounded_seek.patch
 patch -p3 <key_frame_seek.patch
 patch -p3 <offset_next.patch
 patch -p3 <bug487519.patch
 patch -p3 <bug496063.patch
+patch -p3 <oggz_os2.patch