Bug 449754 - Ogg Theora backend for HTML5 video element failed to compile/work on Solaris; libogg; r=chris.double sr=roc

This commit is contained in:
Boying Lu 2008-12-06 16:17:23 +01:00
Родитель 66690c1bb8
Коммит fc6581aa0f
4 изменённых файлов: 33 добавлений и 2 удалений

Просмотреть файл

@ -2,3 +2,7 @@ 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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -11,3 +11,4 @@ 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