1 |
diff -up comm-release/mozilla/config/external/moz.build.system-ogg comm-release/mozilla/config/external/moz.build |
2 |
--- comm-release/mozilla/config/external/moz.build.system-ogg 2015-09-04 19:11:53.343987747 +0200 |
3 |
+++ comm-release/mozilla/config/external/moz.build 2015-09-04 19:43:03.929844386 +0200 |
4 |
@@ -19,12 +19,15 @@ if CONFIG['MOZ_UPDATER']: |
5 |
# There's no "native brotli" yet, but probably in the future... |
6 |
external_dirs += ['modules/brotli'] |
7 |
|
8 |
-if CONFIG['MOZ_VORBIS']: |
9 |
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_OGG']: |
10 |
external_dirs += ['media/libvorbis'] |
11 |
|
12 |
if CONFIG['MOZ_TREMOR']: |
13 |
external_dirs += ['media/libtremor'] |
14 |
|
15 |
+if not CONFIG['MOZ_NATIVE_OGG']: |
16 |
+ external_dirs += ['media/libopus'] |
17 |
+ |
18 |
if CONFIG['MOZ_WEBM']: |
19 |
external_dirs += ['media/libnestegg'] |
20 |
|
21 |
@@ -37,12 +40,12 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ |
22 |
if not CONFIG['MOZ_NATIVE_PNG']: |
23 |
external_dirs += ['media/libpng'] |
24 |
|
25 |
+if not CONFIG['MOZ_NATIVE_OGG']: |
26 |
+ external_dirs += ['media/libogg', 'media/libtheora'] |
27 |
+ |
28 |
external_dirs += [ |
29 |
'media/kiss_fft', |
30 |
'media/libcubeb', |
31 |
- 'media/libogg', |
32 |
- 'media/libopus', |
33 |
- 'media/libtheora', |
34 |
'media/libspeex_resampler', |
35 |
'media/libstagefright', |
36 |
'media/libsoundtouch', |
37 |
diff -up comm-release/mozilla/config/Makefile.in.system-ogg comm-release/mozilla/config/Makefile.in |
38 |
--- comm-release/mozilla/config/Makefile.in.system-ogg 2015-09-02 11:28:07.000000000 +0200 |
39 |
+++ comm-release/mozilla/config/Makefile.in 2015-09-04 19:11:53.356987620 +0200 |
40 |
@@ -76,6 +76,7 @@ export:: $(export-preqs) |
41 |
-DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ |
42 |
-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ |
43 |
-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ |
44 |
+ -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \ |
45 |
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ |
46 |
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers |
47 |
$(INSTALL) system_wrappers $(DIST) |
48 |
diff -up comm-release/mozilla/config/system-headers.system-ogg comm-release/mozilla/config/system-headers |
49 |
--- comm-release/mozilla/config/system-headers.system-ogg 2015-09-02 11:28:08.000000000 +0200 |
50 |
+++ comm-release/mozilla/config/system-headers 2015-09-04 19:11:53.365987532 +0200 |
51 |
@@ -1333,6 +1333,17 @@ ogg/os_types.h |
52 |
nestegg/nestegg.h |
53 |
cubeb/cubeb.h |
54 |
#endif |
55 |
+#if MOZ_NATIVE_OGG==1 |
56 |
+vorbis/codec.h |
57 |
+vorbis/vorbisenc.h |
58 |
+theora/theoradec.h |
59 |
+ogg/ogg.h |
60 |
+ogg/os_types.h |
61 |
+opus/opus_defines.h |
62 |
+opus/opus.h |
63 |
+opus/opus_multistream.h |
64 |
+opus/opus_types.h |
65 |
+#endif |
66 |
gst/gst.h |
67 |
gst/app/gstappsink.h |
68 |
gst/app/gstappsrc.h |
69 |
diff -up comm-release/mozilla/configure.in.system-ogg comm-release/mozilla/configure.in |
70 |
--- comm-release/mozilla/configure.in.system-ogg 2015-09-04 19:11:51.985000989 +0200 |
71 |
+++ comm-release/mozilla/configure.in 2015-09-04 19:45:04.503679790 +0200 |
72 |
@@ -5230,6 +5230,34 @@ fi |
73 |
|
74 |
AC_SUBST(MOZ_RAW) |
75 |
|
76 |
+dnl system ogg Support |
77 |
+dnl ======================================================== |
78 |
+MOZ_ARG_WITH_BOOL(system-ogg, |
79 |
+[ --with-system-ogg Use system ogg, vorbis, theora, and opus libraries (located with pkgconfig)], |
80 |
+ MOZ_NATIVE_OGG=1) |
81 |
+ |
82 |
+MOZ_OGG_CFLAGS= |
83 |
+MOZ_OGG_LIBS= |
84 |
+MOZ_VORBIS_CFLAGS= |
85 |
+MOZ_VORBIS_LIBS= |
86 |
+MOZ_THEORA_CFLAGS= |
87 |
+MOZ_THEORA_LIBS= |
88 |
+MOZ_OPUS_CFLAGS= |
89 |
+MOZ_OPUS_LIBS= |
90 |
+ |
91 |
+if test -n "$MOZ_NATIVE_OGG"; then |
92 |
+ dnl ============================ |
93 |
+ dnl === ogg (version) check === |
94 |
+ dnl ============================ |
95 |
+ dnl Check to see if we have system ogg and theora packages. |
96 |
+ PKG_CHECK_MODULES(OGG, ogg) |
97 |
+ PKG_CHECK_MODULES(THEORA, theoradec) |
98 |
+ MOZ_OGG_CFLAGS="$OGG_CFLAGS" |
99 |
+ MOZ_OGG_LIBS="$OGG_LIBS" |
100 |
+ MOZ_THEORA_CFLAGS="$THEORA_CFLAGS" |
101 |
+ MOZ_THEORA_LIBS="$THEORA_LIBS" |
102 |
+fi |
103 |
+ |
104 |
dnl Checks for __attribute__(aligned()) directive need by libogg |
105 |
AC_CACHE_CHECK([__attribute__ ((aligned ())) support], |
106 |
[ac_cv_c_attribute_aligned], |
107 |
@@ -5592,6 +5620,17 @@ fi |
108 |
|
109 |
if test -n "$MOZ_VORBIS"; then |
110 |
AC_DEFINE(MOZ_VORBIS) |
111 |
+ |
112 |
+ if test -n "$MOZ_NATIVE_OGG"; then |
113 |
+ dnl ============================ |
114 |
+ dnl === vorbis (version) check === |
115 |
+ dnl ============================ |
116 |
+ dnl Check to see if we have a system vorbis package. |
117 |
+ PKG_CHECK_MODULES(VORBIS, vorbis) |
118 |
+ PKG_CHECK_MODULES(VORBISENC, vorbisenc) |
119 |
+ MOZ_VORBIS_CFLAGS="$VORBIS_CFLAGS $VORBISENC_CFLAGS" |
120 |
+ MOZ_VORBIS_LIBS="$VORBIS_LIBS $VORBISENC_LIBS" |
121 |
+ fi |
122 |
fi |
123 |
|
124 |
if test -n "$MOZ_TREMOR"; then |
125 |
@@ -5600,6 +5639,27 @@ if test -n "$MOZ_TREMOR"; then |
126 |
MOZ_WEBM_ENCODER= |
127 |
fi |
128 |
|
129 |
+ |
130 |
+if test -n "$MOZ_NATIVE_OGG"; then |
131 |
+ dnl ============================ |
132 |
+ dnl === opus (version) check === |
133 |
+ dnl ============================ |
134 |
+ dnl Check to see if we have a system opus package. |
135 |
+ PKG_CHECK_MODULES(OPUS, opus) |
136 |
+ MOZ_OPUS_CFLAGS="$OPUS_CFLAGS" |
137 |
+ MOZ_OPUS_LIBS="$OPUS_LIBS" |
138 |
+fi |
139 |
+ |
140 |
+AC_SUBST(MOZ_NATIVE_OGG) |
141 |
+AC_SUBST_LIST(MOZ_OGG_CFLAGS) |
142 |
+AC_SUBST_LIST(MOZ_OGG_LIBS) |
143 |
+AC_SUBST_LIST(MOZ_VORBIS_CFLAGS) |
144 |
+AC_SUBST_LIST(MOZ_VORBIS_LIBS) |
145 |
+AC_SUBST_LIST(MOZ_THEORA_CFLAGS) |
146 |
+AC_SUBST_LIST(MOZ_THEORA_LIBS) |
147 |
+AC_SUBST_LIST(MOZ_OPUS_CFLAGS) |
148 |
+AC_SUBST_LIST(MOZ_OPUS_LIBS) |
149 |
+ |
150 |
if test -n "$MOZ_WEBM_ENCODER"; then |
151 |
AC_DEFINE(MOZ_WEBM_ENCODER) |
152 |
fi |
153 |
diff -up comm-release/mozilla/layout/media/symbols.def.in.system-ogg comm-release/mozilla/layout/media/symbols.def.in |
154 |
--- comm-release/mozilla/layout/media/symbols.def.in.system-ogg 2015-09-02 11:28:24.000000000 +0200 |
155 |
+++ comm-release/mozilla/layout/media/symbols.def.in 2015-09-04 19:45:26.873463779 +0200 |
156 |
@@ -66,6 +66,7 @@ vpx_mem_set_functions |
157 |
#endif |
158 |
#endif |
159 |
#ifdef MOZ_VORBIS |
160 |
+#ifndef MOZ_NATIVE_OGG |
161 |
ogg_page_bos |
162 |
ogg_page_granulepos |
163 |
ogg_page_serialno |
164 |
@@ -110,6 +111,7 @@ vorbis_synthesis_pcmout |
165 |
vorbis_synthesis_read |
166 |
vorbis_synthesis_restart |
167 |
#endif |
168 |
+#endif |
169 |
moz_speex_resampler_init |
170 |
moz_speex_resampler_destroy |
171 |
moz_speex_resampler_process_float |
172 |
@@ -140,6 +142,7 @@ cubeb_stream_set_panning |
173 |
cubeb_stream_get_current_device |
174 |
cubeb_stream_device_destroy |
175 |
cubeb_stream_register_device_changed_callback |
176 |
+#ifndef MOZ_NATIVE_OGG |
177 |
th_comment_clear |
178 |
th_comment_init |
179 |
th_decode_alloc |
180 |
@@ -171,6 +174,7 @@ opus_encoder_destroy |
181 |
opus_encoder_ctl |
182 |
opus_encode |
183 |
opus_encode_float |
184 |
+#endif |
185 |
#ifndef MOZ_NATIVE_PNG |
186 |
MOZ_APNG_get_first_frame_is_hidden |
187 |
MOZ_APNG_get_next_frame_blend_op |
188 |
diff -up comm-release/mozilla/toolkit/library/moz.build.system-ogg comm-release/mozilla/toolkit/library/moz.build |
189 |
--- comm-release/mozilla/toolkit/library/moz.build.system-ogg 2015-09-02 11:27:31.000000000 +0200 |
190 |
+++ comm-release/mozilla/toolkit/library/moz.build 2015-09-04 19:11:53.422986977 +0200 |
191 |
@@ -231,6 +231,12 @@ if CONFIG['MOZ_NATIVE_LIBEVENT']: |
192 |
if CONFIG['MOZ_NATIVE_LIBVPX']: |
193 |
OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] |
194 |
|
195 |
+if CONFIG['MOZ_NATIVE_OGG']: |
196 |
+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] |
197 |
+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] |
198 |
+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] |
199 |
+ OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] |
200 |
+ |
201 |
if not CONFIG['MOZ_TREE_PIXMAN']: |
202 |
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] |
203 |
|
204 |
diff -up comm-release/mozilla/xpcom/build/XPCOMInit.cpp.system-ogg comm-release/mozilla/xpcom/build/XPCOMInit.cpp |
205 |
--- comm-release/mozilla/xpcom/build/XPCOMInit.cpp.system-ogg 2015-09-02 11:27:33.000000000 +0200 |
206 |
+++ comm-release/mozilla/xpcom/build/XPCOMInit.cpp 2015-09-04 19:11:53.434986860 +0200 |
207 |
@@ -669,11 +669,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul |
208 |
// this oddness. |
209 |
mozilla::SetICUMemoryFunctions(); |
210 |
|
211 |
+#if 0 |
212 |
// Do the same for libogg. |
213 |
ogg_set_mem_functions(OggReporter::CountingMalloc, |
214 |
OggReporter::CountingCalloc, |
215 |
OggReporter::CountingRealloc, |
216 |
OggReporter::CountingFree); |
217 |
+#endif |
218 |
|
219 |
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) |
220 |
// And for VPX. |