add Farstream flags/deps to WebKit, for WebRTC
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jul 2012 08:46:59 +0000 (08:46 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jul 2012 08:46:59 +0000 (08:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=87524

Patch by Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@124182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
configure.ac

index 1cd4520..42c31e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-31  Danilo Cesar Lemes de Paula  <danilo.cesar@collabora.co.uk>
+
+        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  <rniwa@webkit.org>
 
         /api/test/runs/chart expires on perf-o-matic
index 6a4e977..8eeb9ff 100644 (file)
@@ -202,6 +202,11 @@ global_cppflags += \
        -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 \
index 0c1b32e..ad12798 100644 (file)
@@ -1,3 +1,17 @@
+2012-07-31  Danilo Cesar Lemes de Paula  <danilo.cesar@collabora.co.uk>
+
+        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  <zandobersek@gmail.com>
 
         Unreviewed crash fix after r124135.
index 29589ab..ba10af1 100644 (file)
@@ -1044,6 +1044,7 @@ libWebCoreGtk_la_CPPFLAGS = \
        $(HILDON_CPPFLAGS) \
        $(COVERAGE_CFLAGS) \
        $(ENCHANT_CFLAGS) \
+       $(FARSTREAM_CFLAGS) \
        $(GAIL_CFLAGS) \
        $(GEOCLUE_CFLAGS) \
        $(GLIB_CFLAGS) \
index fe02b7b..6d77df7 100644 (file)
@@ -1,3 +1,15 @@
+2012-07-31  Danilo Cesar Lemes de Paula  <danilo.cesar@collabora.co.uk>
+
+        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  <luxtella@company100.net>
 
         [Texmap] Remove the backing store after 'style.visibility' for an element sets 'hidden'.
index 9108bb4..f561f83 100644 (file)
@@ -163,6 +163,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
        $(CAIRO_LIBS) \
        $(COVERAGE_LDFLAGS) \
        $(ENCHANT_LIBS) \
+       $(FARSTREAM_LIBS) \
        $(GAIL_LIBS) \
        $(GAMEPAD_LIBS) \
        $(GEOCLUE_LIBS) \
@@ -388,6 +389,7 @@ libWebCoreGtk2_la_CPPFLAGS = \
        $(COVERAGE_CFLAGS) \
        $(ENCHANT_CFLAGS) \
        $(GEOCLUE_CFLAGS) \
+       $(FARSTREAM_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(GTK2_CFLAGS) \
index 2a90aaf..7f58c65 100644 (file)
@@ -470,6 +470,13 @@ AC_SUBST(ENCHANT_CFLAGS)
 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([USE_OPENGL], [test "$with_acceleration_backend" = "opengl"])
 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"])