Date: Tue, 25 Dec 2012 15:34:12 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1128 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files Message-ID: <201212251534.qBPFYCIf047947@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Dec 25 15:34:11 2012
New Revision: 1128
Log:
unbreak tests with webrtc
To build with tests remove --disable-tests from bsd.gecko.mk.
And run them as usual e.g.,
$ gmake check -C $(make -V MOZ_OBJDIR)
$ gmake reftest -C $(make -V MOZ_OBJDIR)
...
Added:
trunk/mail/thunderbird/files/patch-bug817481
trunk/mail/thunderbird/files/patch-z-bug815916
trunk/www/firefox-nightly/files/patch-bug815916
trunk/www/firefox/files/patch-bug817481
trunk/www/firefox/files/patch-z-bug815916
trunk/www/seamonkey/files/patch-bug817481
trunk/www/seamonkey/files/patch-z-bug815916
Modified:
trunk/mail/thunderbird/files/patch-bug807492
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox/files/patch-bug807492
trunk/www/seamonkey/files/patch-bug807492
Modified: trunk/mail/thunderbird/files/patch-bug807492
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127)
+++ trunk/mail/thunderbird/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128)
@@ -133,6 +133,36 @@
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
$(NULL)
DEFINES += -DLINUX
+diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in
+index c1d5bf4..2ecf2c7 100644
+--- mozilla/media/mtransport/test/Makefile.in
++++ mozilla/media/mtransport/test/Makefile.in
+@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
+ else
+ #default_fallback; probably doesn't work
+ DEFINES += -D__Userspace_os_$(OS_TARGET)=1
+ endif
+ endif
+ endif
+ endif
+
+-ifeq ($(OS_ARCH), Darwin)
++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
++ifeq ($(OS_TARGET), Darwin)
+ DEFINES += \
+ -DGTEST_USE_OWN_TR1_TUPLE=1 \
+ $(NULL)
+ endif
++endif
+
+ ifeq ($(OS_ARCH), Linux)
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
+ endif
+
+ ifneq ($(OS_TARGET),WINNT)
+ CPP_UNIT_TESTS = \
+ ice_unittest.cpp \
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
index 0e1f8b4..9a4b995 100644
--- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
@@ -587,6 +617,45 @@
msgq = (cpr_msg_queue_t *) msgQueue;
if (msgq == NULL) {
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index a30e330..cfbd8a3 100644
+--- mozilla/media/webrtc/signaling/test/Makefile.in
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -22,32 +22,32 @@ LIBS = \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \
+ $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
+ $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+ ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_ALSA_LIBS) \
+ $(NULL)
+ endif
+ endif
+
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
+ $(MOZ_GTK2_LIBS) \
+ -lgthread-2.0 \
+ $(NULL)
+ endif
+
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_CAIRO_OSLIBS) \
+ $(NULL)
+ endif
+
+ ifeq ($(OS_ARCH),Darwin)
+ LIBS += \
+ -framework AudioToolbox \
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
--- mozilla/media/webrtc/trunk/build/common.gypi
Added: trunk/mail/thunderbird/files/patch-bug817481
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug817481 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,26 @@
+commit 93d56d2
+Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
+Date: Mon Dec 3 17:01:16 2012 +0900
+
+ Bug 817481 - Build failure on WebRTC unit test with --with-system-libvpx. r=jesup
+---
+ media/webrtc/signaling/test/Makefile.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index 81a38ff..e10e869 100644
+--- mozilla/media/webrtc/signaling/test/Makefile.in
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -34,6 +34,12 @@ LIBS += \
+ endif
+ endif
+
++ifdef MOZ_NATIVE_LIBVPX
++LIBS += \
++ $(MOZ_LIBVPX_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Added: trunk/mail/thunderbird/files/patch-z-bug815916
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-z-bug815916 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,27 @@
+--- mozilla/media/webrtc/signaling/test/Makefile.in~
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -34,12 +34,24 @@ LIBS += \
+ endif
+ endif
+
++ifdef MOZ_NATIVE_JPEG
++LIBS += \
++ $(MOZ_JPEG_LIBS) \
++ $(NULL)
++endif
++
+ ifdef MOZ_NATIVE_LIBVPX
+ LIBS += \
+ $(MOZ_LIBVPX_LIBS) \
+ $(NULL)
+ endif
+
++ifndef MOZ_TREE_PIXMAN
++LIBS += \
++ $(MOZ_PIXMAN_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128)
@@ -133,6 +133,36 @@
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
$(NULL)
DEFINES += -DLINUX
+diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in
+index c1d5bf4..2ecf2c7 100644
+--- media/mtransport/test/Makefile.in
++++ media/mtransport/test/Makefile.in
+@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
+ else
+ #default_fallback; probably doesn't work
+ DEFINES += -D__Userspace_os_$(OS_TARGET)=1
+ endif
+ endif
+ endif
+ endif
+
+-ifeq ($(OS_TARGET), Darwin)
++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
++ifeq ($(OS_TARGET), Darwin)
+ DEFINES += \
+ -DGTEST_USE_OWN_TR1_TUPLE=1 \
+ $(NULL)
+ endif
++endif
+
+ ifeq ($(OS_TARGET), Linux)
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
+ endif
+
+ ifeq ($(OS_TARGET), Android)
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include
+
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
index 0e1f8b4..9a4b995 100644
--- media/mtransport/third_party/nICEr/nicer.gyp
@@ -587,6 +617,48 @@
msgq = (cpr_msg_queue_t *) msgQueue;
if (msgq == NULL) {
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index a30e330..cfbd8a3 100644
+--- media/webrtc/signaling/test/Makefile.in
++++ media/webrtc/signaling/test/Makefile.in
+@@ -22,17 +22,17 @@ LIBS = \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \
+ $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
+ $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+ ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_TARGET),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_ALSA_LIBS) \
+ $(NULL)
+ endif
+ endif
+
+ ifeq ($(OS_TARGET),Android)
+ LIBS += \
+@@ -65,17 +65,17 @@ endif
+ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
+ $(TK_LIBS) \
+ $(MOZ_PANGO_LIBS) \
+ $(NULL)
+ endif
+
+-ifeq ($(OS_TARGET),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_CAIRO_OSLIBS) \
+ $(NULL)
+ endif
+
+ ifeq ($(OS_TARGET),Darwin)
+ LIBS += \
+ -framework AudioToolbox \
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
--- media/webrtc/trunk/build/common.gypi
Added: trunk/www/firefox-nightly/files/patch-bug815916
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug815916 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,27 @@
+--- media/webrtc/signaling/test/Makefile.in~
++++ media/webrtc/signaling/test/Makefile.in
+@@ -47,6 +47,11 @@ DEFINES += \
+ $(NULL)
+ endif
+
++ifdef MOZ_NATIVE_JPEG
++LIBS += \
++ $(MOZ_JPEG_LIBS) \
++ $(NULL)
++endif
+
+ ifdef MOZ_NATIVE_LIBVPX
+ LIBS += \
+@@ -54,6 +59,12 @@ LIBS += \
+ $(NULL)
+ endif
+
++ifndef MOZ_TREE_PIXMAN
++LIBS += \
++ $(MOZ_PIXMAN_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127)
+++ trunk/www/firefox/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128)
@@ -133,6 +133,36 @@
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
$(NULL)
DEFINES += -DLINUX
+diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in
+index c1d5bf4..2ecf2c7 100644
+--- media/mtransport/test/Makefile.in
++++ media/mtransport/test/Makefile.in
+@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
+ else
+ #default_fallback; probably doesn't work
+ DEFINES += -D__Userspace_os_$(OS_TARGET)=1
+ endif
+ endif
+ endif
+ endif
+
+-ifeq ($(OS_ARCH), Darwin)
++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
++ifeq ($(OS_TARGET), Darwin)
+ DEFINES += \
+ -DGTEST_USE_OWN_TR1_TUPLE=1 \
+ $(NULL)
+ endif
++endif
+
+ ifeq ($(OS_ARCH), Linux)
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
+ endif
+
+ ifneq ($(OS_TARGET),WINNT)
+ CPP_UNIT_TESTS = \
+ ice_unittest.cpp \
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
index 0e1f8b4..9a4b995 100644
--- media/mtransport/third_party/nICEr/nicer.gyp
@@ -587,6 +617,45 @@
msgq = (cpr_msg_queue_t *) msgQueue;
if (msgq == NULL) {
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index a30e330..cfbd8a3 100644
+--- media/webrtc/signaling/test/Makefile.in
++++ media/webrtc/signaling/test/Makefile.in
+@@ -22,32 +22,32 @@ LIBS = \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \
+ $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
+ $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+ ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_ALSA_LIBS) \
+ $(NULL)
+ endif
+ endif
+
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
+ $(MOZ_GTK2_LIBS) \
+ -lgthread-2.0 \
+ $(NULL)
+ endif
+
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_CAIRO_OSLIBS) \
+ $(NULL)
+ endif
+
+ ifeq ($(OS_ARCH),Darwin)
+ LIBS += \
+ -framework AudioToolbox \
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
--- media/webrtc/trunk/build/common.gypi
Added: trunk/www/firefox/files/patch-bug817481
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug817481 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,26 @@
+commit 93d56d2
+Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
+Date: Mon Dec 3 17:01:16 2012 +0900
+
+ Bug 817481 - Build failure on WebRTC unit test with --with-system-libvpx. r=jesup
+---
+ media/webrtc/signaling/test/Makefile.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index 81a38ff..e10e869 100644
+--- media/webrtc/signaling/test/Makefile.in
++++ media/webrtc/signaling/test/Makefile.in
+@@ -34,6 +34,12 @@ LIBS += \
+ endif
+ endif
+
++ifdef MOZ_NATIVE_LIBVPX
++LIBS += \
++ $(MOZ_LIBVPX_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Added: trunk/www/firefox/files/patch-z-bug815916
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-z-bug815916 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,27 @@
+--- media/webrtc/signaling/test/Makefile.in~
++++ media/webrtc/signaling/test/Makefile.in
+@@ -34,12 +34,24 @@ LIBS += \
+ endif
+ endif
+
++ifdef MOZ_NATIVE_JPEG
++LIBS += \
++ $(MOZ_JPEG_LIBS) \
++ $(NULL)
++endif
++
+ ifdef MOZ_NATIVE_LIBVPX
+ LIBS += \
+ $(MOZ_LIBVPX_LIBS) \
+ $(NULL)
+ endif
+
++ifndef MOZ_TREE_PIXMAN
++LIBS += \
++ $(MOZ_PIXMAN_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Modified: trunk/www/seamonkey/files/patch-bug807492
==============================================================================
--- trunk/www/seamonkey/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127)
+++ trunk/www/seamonkey/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128)
@@ -133,6 +133,36 @@
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
$(NULL)
DEFINES += -DLINUX
+diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in
+index c1d5bf4..2ecf2c7 100644
+--- mozilla/media/mtransport/test/Makefile.in
++++ mozilla/media/mtransport/test/Makefile.in
+@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
+ else
+ #default_fallback; probably doesn't work
+ DEFINES += -D__Userspace_os_$(OS_TARGET)=1
+ endif
+ endif
+ endif
+ endif
+
+-ifeq ($(OS_ARCH), Darwin)
++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
++ifeq ($(OS_TARGET), Darwin)
+ DEFINES += \
+ -DGTEST_USE_OWN_TR1_TUPLE=1 \
+ $(NULL)
+ endif
++endif
+
+ ifeq ($(OS_ARCH), Linux)
+ LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
+ endif
+
+ ifneq ($(OS_TARGET),WINNT)
+ CPP_UNIT_TESTS = \
+ ice_unittest.cpp \
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
index 0e1f8b4..9a4b995 100644
--- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
@@ -587,6 +617,45 @@
msgq = (cpr_msg_queue_t *) msgQueue;
if (msgq == NULL) {
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index a30e330..cfbd8a3 100644
+--- mozilla/media/webrtc/signaling/test/Makefile.in
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -22,32 +22,32 @@ LIBS = \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \
+ $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \
+ $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
+ $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+ ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_ALSA_LIBS) \
+ $(NULL)
+ endif
+ endif
+
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
+ $(MOZ_GTK2_LIBS) \
+ -lgthread-2.0 \
+ $(NULL)
+ endif
+
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
+ LIBS += \
+ $(MOZ_CAIRO_OSLIBS) \
+ $(NULL)
+ endif
+
+ ifeq ($(OS_ARCH),Darwin)
+ LIBS += \
+ -framework AudioToolbox \
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
--- mozilla/media/webrtc/trunk/build/common.gypi
Added: trunk/www/seamonkey/files/patch-bug817481
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug817481 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,26 @@
+commit 93d56d2
+Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
+Date: Mon Dec 3 17:01:16 2012 +0900
+
+ Bug 817481 - Build failure on WebRTC unit test with --with-system-libvpx. r=jesup
+---
+ media/webrtc/signaling/test/Makefile.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index 81a38ff..e10e869 100644
+--- mozilla/media/webrtc/signaling/test/Makefile.in
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -34,6 +34,12 @@ LIBS += \
+ endif
+ endif
+
++ifdef MOZ_NATIVE_LIBVPX
++LIBS += \
++ $(MOZ_LIBVPX_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Added: trunk/www/seamonkey/files/patch-z-bug815916
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-z-bug815916 Tue Dec 25 15:34:11 2012 (r1128)
@@ -0,0 +1,27 @@
+--- mozilla/media/webrtc/signaling/test/Makefile.in~
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -34,12 +34,24 @@ LIBS += \
+ endif
+ endif
+
++ifdef MOZ_NATIVE_JPEG
++LIBS += \
++ $(MOZ_JPEG_LIBS) \
++ $(NULL)
++endif
++
+ ifdef MOZ_NATIVE_LIBVPX
+ LIBS += \
+ $(MOZ_LIBVPX_LIBS) \
+ $(NULL)
+ endif
+
++ifndef MOZ_TREE_PIXMAN
++LIBS += \
++ $(MOZ_PIXMAN_LIBS) \
++ $(NULL)
++endif
++
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += \
+ $(XLIBS) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212251534.qBPFYCIf047947>