Bug 449754 - Ogg Theora backend for HTML5 video element failed to compile/work on Solaris; libogg; r=chris.double sr=roc
authorBoying Lu <brian.lu@sun.com>
Sat, 06 Dec 2008 16:17:23 +0100
changeset 22426 534ba368b35153a2b8446756b2bf7b17d85177b5
parent 22425 917509259a362a7c35511c5471d3f9ed0596d1f4
child 22427 d503a9f90157a476b106560e2864f2fefc1a5e89
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschris, roc
bugs449754
milestone1.9.2a1pre
Bug 449754 - Ogg Theora backend for HTML5 video element failed to compile/work on Solaris; libogg; r=chris.double sr=roc
media/libogg/README_MOZILLA
media/libogg/include/ogg/config_types.h
media/libogg/int-types.patch
media/libogg/update.sh
--- a/media/libogg/README_MOZILLA
+++ b/media/libogg/README_MOZILLA
@@ -1,4 +1,8 @@
 The source from this directory was copied from the libogg-1.1.3 source
 distribution using the update.sh script. The only changes made were
 those applied by update.sh and the addition/upate of Makefile.in files
 for the Mozilla build system.
+
+The int-types.patch address a bug that config_types.h generated from
+Linux platform can't be used on OpenSolaris directly see Mozilla bug
+449754
--- a/media/libogg/include/ogg/config_types.h
+++ b/media/libogg/include/ogg/config_types.h
@@ -1,11 +1,17 @@
 #ifndef __CONFIG_TYPES_H__
 #define __CONFIG_TYPES_H__
 
 /* these are filled in by configure */
 typedef int16_t ogg_int16_t;
-typedef u_int16_t ogg_uint16_t;
 typedef int32_t ogg_int32_t;
-typedef u_int32_t ogg_uint32_t;
 typedef int64_t ogg_int64_t;
 
+#ifdef SOLARIS
+typedef uint16_t ogg_uint16_t;
+typedef uint32_t ogg_uint32_t;
+#else
+typedef u_int16_t ogg_uint16_t;
+typedef u_int32_t ogg_uint32_t;
 #endif
+
+#endif
new file mode 100644
--- /dev/null
+++ b/media/libogg/int-types.patch
@@ -0,0 +1,20 @@
+--- include/ogg/config_types.h.old	2008-11-10 15:24:49.465597010 +0800
++++ include/ogg/config_types.h	2008-11-10 15:25:19.249016710 +0800
+@@ -3,9 +3,15 @@
+ 
+ /* these are filled in by configure */
+ typedef int16_t ogg_int16_t;
+-typedef u_int16_t ogg_uint16_t;
+ typedef int32_t ogg_int32_t;
+-typedef u_int32_t ogg_uint32_t;
+ typedef int64_t ogg_int64_t;
+ 
++#ifdef SOLARIS
++typedef uint16_t ogg_uint16_t;
++typedef uint32_t ogg_uint32_t;
++#else
++typedef u_int16_t ogg_uint16_t;
++typedef u_int32_t ogg_uint32_t;
++#endif
++
+ #endif
--- a/media/libogg/update.sh
+++ b/media/libogg/update.sh
@@ -6,8 +6,9 @@ cp $1/include/ogg/config_types.h ./inclu
 cp $1/include/ogg/ogg.h ./include/ogg/ogg.h
 cp $1/include/ogg/os_types.h ./include/ogg/os_types.h
 cp $1/CHANGES ./CHANGES
 cp $1/COPYING ./COPYING
 cp $1/README ./README
 cp $1/src/bitwise.c ./src/ogg_bitwise.c
 cp $1/src/framing.c ./src/ogg_framing.c
 cp $1/AUTHORS ./AUTHORS
+patch -p0 < int-types.patch