Bug 449754 - Ogg Theora backend for HTML5 video element failed to compile/work on Solaris; liboggz; r=chris.double sr=roc
authorBoying Lu <brian.lu@sun.com>
Sat, 06 Dec 2008 16:17:52 +0100
changeset 22427 d503a9f90157a476b106560e2864f2fefc1a5e89
parent 22426 534ba368b35153a2b8446756b2bf7b17d85177b5
child 22428 ec95b93b3ae8310b551a3649419910f40113f66e
push idunknown
push userunknown
push dateunknown
reviewerschris.double, roc
bugs449754
milestone1.9.2a1pre
Bug 449754 - Ogg Theora backend for HTML5 video element failed to compile/work on Solaris; liboggz; r=chris.double sr=roc
media/liboggz/README_MOZILLA
media/liboggz/include/oggz/oggz_off_t_generated.h
media/liboggz/oggz_off_t.patch
media/liboggz/update.sh
--- a/media/liboggz/README_MOZILLA
+++ b/media/liboggz/README_MOZILLA
@@ -7,8 +7,11 @@ Mozilla build system.
 The seek.patch address a bug in liboggz when a seek call returns an
 error. It also addresses an issue where the guess for the seek
 position can exceed the file size. These will be upstreamed to liboggz.
 
 The warning.patch addresses a printf in liboggz that is not wrapped
 in a DEBUG #ifdef. See Mozilla bug 450891 and Annodex ticket 431:
 
 http://trac.annodex.net/ticket/431
+
+The oggz_off_t.patch fixes a compile error on Solaris see bug 449754
+for details
--- 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>
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(SOLARIS)
 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_off_t.patch
@@ -0,0 +1,12 @@
+diff -r 070e364189c8 media/liboggz/include/oggz/oggz_off_t_generated.h
+--- a/media/liboggz/include/oggz/oggz_off_t_generated.h	Wed Nov 26 09:04:13 2008 -0600
++++ b/media/liboggz/include/oggz/oggz_off_t_generated.h	Thu Nov 27 17:56:54 2008 +0800
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(SOLARIS)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
--- a/media/liboggz/update.sh
+++ b/media/liboggz/update.sh
@@ -38,8 +38,9 @@ cp $1/src/liboggz/oggz_auto.h ./src/libo
 sed s/\#include\ \"config.h\"/\#ifdef\ WIN32\\n\#include\ \"config_win32.h\"\\n\#else\\n\#include\ \"config.h\"\\n\#endif/g $1/src/liboggz/oggz_io.c >./src/liboggz/oggz_io.c
 sed s/\#include\ \"config.h\"/\#ifdef\ WIN32\\n\#include\ \"config_win32.h\"\\n\#else\\n\#include\ \"config.h\"\\n\#endif/g $1/src/liboggz/oggz_vector.c >./src/liboggz/oggz_vector.c
 sed s/\#include\ \"config.h\"/\#ifdef\ WIN32\\n\#include\ \"config_win32.h\"\\n\#else\\n\#include\ \"config.h\"\\n\#endif/g $1/src/liboggz/oggz_seek.c >./src/liboggz/oggz_seek.c
 cp $1/src/liboggz/oggz_dlist.h ./src/liboggz/oggz_dlist.h
 sed s/\#include\ \"config.h\"/\#ifdef\ WIN32\\n\#include\ \"config_win32.h\"\\n\#else\\n\#include\ \"config.h\"\\n\#endif/g $1/src/liboggz/metric_internal.c >./src/liboggz/metric_internal.c
 cp $1/AUTHORS ./AUTHORS
 patch -p4 <seek.patch
 patch -p4 <warning.patch
+patch -p3 <oggz_off_t.patch