[SVN-Commit] r1515 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Wed Feb 26 17:09:20 UTC 2014
Author: jbeich
Date: Wed Feb 26 17:09:11 2014
New Revision: 1515
Log:
misc fixups for system libogg
Modified:
trunk/mail/thunderbird/files/patch-zz-bug517422
trunk/www/firefox-esr/files/patch-zz-bug517422
trunk/www/firefox-nightly/files/patch-z-bug517422
trunk/www/firefox/files/patch-z-bug517422
trunk/www/libxul/files/patch-zz-bug517422
trunk/www/seamonkey/files/patch-z-bug517422
Modified: trunk/mail/thunderbird/files/patch-zz-bug517422
==============================================================================
--- trunk/mail/thunderbird/files/patch-zz-bug517422 Wed Feb 26 13:37:15 2014 (r1514)
+++ trunk/mail/thunderbird/files/patch-zz-bug517422 Wed Feb 26 17:09:11 2014 (r1515)
@@ -49,12 +49,13 @@
index b711fc3..fd3c14f 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -1152,3 +1152,16 @@ graphite2/Segment.h
+@@ -1152,3 +1152,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
++ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
@@ -198,6 +199,50 @@
ifdef MOZ_WEBM
SHARED_LIBRARY_LIBS += \
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libtheora/Makefile.in
+@@ -0,0 +1,16 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++DEPTH = @DEPTH@
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libtremor/Makefile.in
+@@ -0,0 +1,16 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++DEPTH = @DEPTH@
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
Modified: trunk/www/firefox-esr/files/patch-zz-bug517422
==============================================================================
--- trunk/www/firefox-esr/files/patch-zz-bug517422 Wed Feb 26 13:37:15 2014 (r1514)
+++ trunk/www/firefox-esr/files/patch-zz-bug517422 Wed Feb 26 17:09:11 2014 (r1515)
@@ -49,12 +49,13 @@
index b711fc3..fd3c14f 100644
--- config/system-headers
+++ config/system-headers
-@@ -1152,3 +1152,16 @@ graphite2/Segment.h
+@@ -1152,3 +1152,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
++ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
@@ -198,6 +199,50 @@
ifdef MOZ_WEBM
SHARED_LIBRARY_LIBS += \
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtheora/Makefile.in
+@@ -0,0 +1,16 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++DEPTH = @DEPTH@
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtremor/Makefile.in
+@@ -0,0 +1,16 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++DEPTH = @DEPTH@
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
Modified: trunk/www/firefox-nightly/files/patch-z-bug517422
==============================================================================
--- trunk/www/firefox-nightly/files/patch-z-bug517422 Wed Feb 26 13:37:15 2014 (r1514)
+++ trunk/www/firefox-nightly/files/patch-z-bug517422 Wed Feb 26 17:09:11 2014 (r1515)
@@ -18,11 +18,14 @@
index c22a36c..740402e 100644
--- config/external/moz.build
+++ config/external/moz.build
-@@ -15,13 +15,13 @@ if CONFIG['MOZ_UPDATER']:
+@@ -15,13 +15,16 @@ if CONFIG['MOZ_UPDATER']:
if not CONFIG['MOZ_NATIVE_BZ2']:
external_dirs += ['modules/libbz2']
-if CONFIG['MOZ_VORBIS']:
++if not CONFIG['MOZ_NATIVE_OGG']:
++ external_dirs += ['media/libogg']
++
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
external_dirs += ['media/libvorbis']
@@ -34,14 +37,7 @@
external_dirs += ['media/libopus']
if CONFIG['MOZ_WEBM']:
-@@ -35,11 +35,13 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
-
- if not CONFIG['MOZ_NATIVE_PNG']:
- external_dirs += ['media/libpng']
-+
-+if not CONFIG['MOZ_NATIVE_OGG']:
-+ external_dirs += ['media/libogg']
-
+@@ -39,7 +42,6 @@ if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += [
'media/kiss_fft',
'media/libcubeb',
@@ -53,12 +49,13 @@
index b711fc3..fd3c14f 100644
--- config/system-headers
+++ config/system-headers
-@@ -1152,3 +1152,16 @@ graphite2/Segment.h
+@@ -1153,3 +1153,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
++ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
@@ -74,7 +71,7 @@
index df49287..05e97ff 100644
--- configure.in
+++ configure.in
-@@ -5143,6 +5143,40 @@ if test -n "$MOZ_OGG"; then
+@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
@@ -115,7 +112,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5151,6 +5185,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5138,6 +5172,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -162,6 +159,36 @@
+endif
+
AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtheora/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtremor/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
Modified: trunk/www/firefox/files/patch-z-bug517422
==============================================================================
--- trunk/www/firefox/files/patch-z-bug517422 Wed Feb 26 13:37:15 2014 (r1514)
+++ trunk/www/firefox/files/patch-z-bug517422 Wed Feb 26 17:09:11 2014 (r1515)
@@ -49,12 +49,13 @@
index b711fc3..fd3c14f 100644
--- config/system-headers
+++ config/system-headers
-@@ -1152,3 +1152,16 @@ graphite2/Segment.h
+@@ -1153,3 +1153,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
++ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
@@ -70,7 +71,7 @@
index df49287..05e97ff 100644
--- configure.in
+++ configure.in
-@@ -5143,6 +5143,40 @@ if test -n "$MOZ_OGG"; then
+@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
@@ -111,7 +112,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5151,6 +5185,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5138,6 +5172,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -158,6 +159,36 @@
+endif
+
AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtheora/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtremor/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
Modified: trunk/www/libxul/files/patch-zz-bug517422
==============================================================================
--- trunk/www/libxul/files/patch-zz-bug517422 Wed Feb 26 13:37:15 2014 (r1514)
+++ trunk/www/libxul/files/patch-zz-bug517422 Wed Feb 26 17:09:11 2014 (r1515)
@@ -49,12 +49,13 @@
index b711fc3..fd3c14f 100644
--- config/system-headers
+++ config/system-headers
-@@ -1152,3 +1152,16 @@ graphite2/Segment.h
+@@ -1152,3 +1152,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
++ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
@@ -198,6 +199,50 @@
ifdef MOZ_WEBM
SHARED_LIBRARY_LIBS += \
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtheora/Makefile.in
+@@ -0,0 +1,16 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++DEPTH = @DEPTH@
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ media/libtremor/Makefile.in
+@@ -0,0 +1,16 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++DEPTH = @DEPTH@
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
Modified: trunk/www/seamonkey/files/patch-z-bug517422
==============================================================================
--- trunk/www/seamonkey/files/patch-z-bug517422 Wed Feb 26 13:37:15 2014 (r1514)
+++ trunk/www/seamonkey/files/patch-z-bug517422 Wed Feb 26 17:09:11 2014 (r1515)
@@ -49,12 +49,13 @@
index b711fc3..fd3c14f 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -1152,3 +1152,16 @@ graphite2/Segment.h
+@@ -1153,3 +1153,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
++ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
@@ -70,7 +71,7 @@
index df49287..05e97ff 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5143,6 +5143,40 @@ if test -n "$MOZ_OGG"; then
+@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
@@ -111,7 +112,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5151,6 +5185,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5138,6 +5172,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -158,6 +159,36 @@
+endif
+
AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libtheora/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libtremor/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
More information about the freebsd-gecko
mailing list