- Revision
- 124182
- Author
- [email protected]
- Date
- 2012-07-31 01:46:59 -0700 (Tue, 31 Jul 2012)
Log Message
add Farstream flags/deps to WebKit, for WebRTC
https://bugs.webkit.org/show_bug.cgi?id=87524
Patch by Danilo Cesar Lemes de Paula <[email protected]> on 2012-07-31
Reviewed by Philippe Normand.
Since Farstream will be used as the backend for GTK's WebRTC, this
patch adds it as a dependency to the build system.
.:
* GNUmakefile.am:
* configure.ac:
Source/WebCore:
No new features or code changes were added, so new tests aren't necessary.
* GNUmakefile.am:
Source/WebKit2:
* GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/ChangeLog (124181 => 124182)
--- trunk/ChangeLog 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/ChangeLog 2012-07-31 08:46:59 UTC (rev 124182)
@@ -1,3 +1,16 @@
+2012-07-31 Danilo Cesar Lemes de Paula <[email protected]>
+
+ add Farstream flags/deps to WebKit, for WebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=87524
+
+ Reviewed by Philippe Normand.
+
+ Since Farstream will be used as the backend for GTK's WebRTC, this
+ patch adds it as a dependency to the build system.
+
+ * GNUmakefile.am:
+ * configure.ac:
+
2012-07-30 Ryosuke Niwa <[email protected]>
/api/test/runs/chart expires on perf-o-matic
Modified: trunk/GNUmakefile.am (124181 => 124182)
--- trunk/GNUmakefile.am 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/GNUmakefile.am 2012-07-31 08:46:59 UTC (rev 124182)
@@ -202,6 +202,11 @@
-DWTF_USE_GSTREAMER=1
endif
+if USE_FARSTREAM
+global_cppflags += \
+ -DWTF_USE_FARSTREAM=1
+endif
+
if USE_ACCELERATED_COMPOSITING
global_cppflags += \
-DWTF_USE_ACCELERATED_COMPOSITING=1 \
Modified: trunk/Source/WebCore/ChangeLog (124181 => 124182)
--- trunk/Source/WebCore/ChangeLog 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/Source/WebCore/ChangeLog 2012-07-31 08:46:59 UTC (rev 124182)
@@ -1,3 +1,17 @@
+2012-07-31 Danilo Cesar Lemes de Paula <[email protected]>
+
+ add Farstream flags/deps to WebKit, for WebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=87524
+
+ Reviewed by Philippe Normand.
+
+ Since Farstream will be used as the backend for GTK's WebRTC, this
+ patch adds it as a dependency to the build system.
+
+ No new features or code changes were added, so new tests aren't necessary.
+
+ * GNUmakefile.am:
+
2012-07-31 Zan Dobersek <[email protected]>
Unreviewed crash fix after r124135.
Modified: trunk/Source/WebCore/GNUmakefile.am (124181 => 124182)
--- trunk/Source/WebCore/GNUmakefile.am 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-07-31 08:46:59 UTC (rev 124182)
@@ -1044,6 +1044,7 @@
$(HILDON_CPPFLAGS) \
$(COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
+ $(FARSTREAM_CFLAGS) \
$(GAIL_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GLIB_CFLAGS) \
Modified: trunk/Source/WebKit2/ChangeLog (124181 => 124182)
--- trunk/Source/WebKit2/ChangeLog 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-31 08:46:59 UTC (rev 124182)
@@ -1,3 +1,15 @@
+2012-07-31 Danilo Cesar Lemes de Paula <[email protected]>
+
+ add Farstream flags/deps to WebKit, for WebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=87524
+
+ Reviewed by Philippe Normand.
+
+ Since Farstream will be used as the backend for GTK's WebRTC, this
+ patch adds it as a dependency to the build system.
+
+ * GNUmakefile.am:
+
2012-07-30 Huang Dongsung <[email protected]>
[Texmap] Remove the backing store after 'style.visibility' for an element sets 'hidden'.
Modified: trunk/Source/WebKit2/GNUmakefile.am (124181 => 124182)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-07-31 08:46:59 UTC (rev 124182)
@@ -163,6 +163,7 @@
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
$(ENCHANT_LIBS) \
+ $(FARSTREAM_LIBS) \
$(GAIL_LIBS) \
$(GAMEPAD_LIBS) \
$(GEOCLUE_LIBS) \
@@ -388,6 +389,7 @@
$(COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(GEOCLUE_CFLAGS) \
+ $(FARSTREAM_CFLAGS) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GTK2_CFLAGS) \
Modified: trunk/configure.ac (124181 => 124182)
--- trunk/configure.ac 2012-07-31 08:09:49 UTC (rev 124181)
+++ trunk/configure.ac 2012-07-31 08:46:59 UTC (rev 124182)
@@ -470,6 +470,13 @@
AC_SUBST(ENCHANT_LIBS)
fi
+if test "$enable_media_stream" = "yes"; then
+ PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1], [have_farstream=yes],
+ AC_MSG_ERROR([farstream is required to enable media_stream]))
+ AC_SUBST([FARSTREAM_CFLAGS])
+ AC_SUBST([FARSTREAM_LIBS])
+fi
+
PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
AC_SUBST(GAIL_CFLAGS)
AC_SUBST(GAIL_LIBS)
@@ -1412,6 +1419,9 @@
AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
AM_CONDITIONAL([USE_LEVELDB],[test "$enable_indexed_database" = "yes"])
+# Farstream feature conditional
+AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
+
# WebKit feature conditionals
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])
