Source/WebCore/ChangeLog

 12012-07-20 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
 2
 3 add Farstream flags/deps to WebKit, for WebRTC
 4 https://bugs.webkit.org/show_bug.cgi?id=87524
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Since Farstream will be used as the backend for GTK's WebRTC, this
 9 patch adds it as a dependency to the build system.
 10
 11 No new features or code changes were added, so new tests aren't necessary.
 12
 13 * GNUmakefile.am:
 14
1152012-07-10 Sheriff Bot <webkit.review.bot@gmail.com>
216
317 Unreviewed, rolling out r122178.

Source/WebKit2/ChangeLog

 12012-07-20 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
 2
 3 add Farstream flags/deps to WebKit, for WebRTC
 4 https://bugs.webkit.org/show_bug.cgi?id=87524
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Since Farstream will be used as the backend for GTK's WebRTC, this
 9 patch adds it as a dependency to the build system.
 10
 11 * GNUmakefile.am:
 12
1132012-07-10 Sheriff Bot <webkit.review.bot@gmail.com>
214
315 Unreviewed, rolling out r122178.

Source/WebCore/GNUmakefile.am

@@libWebCoreGtk_la_CPPFLAGS = \
10201020 $(HILDON_CPPFLAGS) \
10211021 $(COVERAGE_CFLAGS) \
10221022 $(ENCHANT_CFLAGS) \
 1023 $(FARSTREAM_CFLAGS) \
10231024 $(GAIL_CFLAGS) \
10241025 $(GEOCLUE_CFLAGS) \
10251026 $(GLIB_CFLAGS) \

Source/WebKit2/GNUmakefile.am

@@libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
161161 $(CAIRO_LIBS) \
162162 $(COVERAGE_LDFLAGS) \
163163 $(ENCHANT_LIBS) \
 164 $(FARSTREAM_LIBS) \
164165 $(GAIL_LIBS) \
165166 $(GAMEPAD_LIBS) \
166167 $(GEOCLUE_LIBS) \

@@libWebCoreGtk2_la_CPPFLAGS = \
386387 $(COVERAGE_CFLAGS) \
387388 $(ENCHANT_CFLAGS) \
388389 $(GEOCLUE_CFLAGS) \
 390 $(FARSTREAM_CFLAGS) \
389391 $(GLIB_CFLAGS) \
390392 $(GSTREAMER_CFLAGS) \
391393 $(GTK2_CFLAGS) \

Tools/ChangeLog

 12012-07-20 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
 2
 3 add Farstream flags/deps to WebKit, for WebRTC
 4 https://bugs.webkit.org/show_bug.cgi?id=87524
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Since Farstream will be used as the backend for GTK's WebRTC, this
 9 patch adds it as a dependency to the build system.
 10
 11 * gtk/jhbuild.modules:
 12
1132012-07-10 Adam Barth <abarth@webkit.org>
214
315 LayoutTestController.dumpConfigurationForViewport should move to Internals

Tools/gtk/jhbuild.modules

1818 <dep package="libsoup"/>
1919 <dep package="at-spi2-core"/>
2020 <dep package="at-spi2-atk"/>
 21 <dep package="farstream"/>
2122 </dependencies>
2223 </metamodule>
2324

167168 tag="LIBSOUP_2_39_2"/>
168169 </autotools>
169170
 171 <autotools id="farstream">
 172 <branch module="software/farstream/releases/farstream/farstream-0.1.2.tar.gz" version="0.1.2"
 173 repo="freedesktop.org"
 174 hash="sha256:fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9"
 175 md5sum="5d6e561b3688d0d0c8906fec4f356df3"/>
 176 </autotools>
 177
170178 <autotools id="fontconfig" autogen-sh="configure">
171179 <branch module="software/fontconfig/release/fontconfig-2.8.0.tar.gz" version="2.8.0"
172180 repo="freedesktop.org"

ChangeLog

 12012-07-20 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
 2
 3 add Farstream flags/deps to WebKit, for WebRTC
 4 https://bugs.webkit.org/show_bug.cgi?id=87524
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Since Farstream will be used as the backend for GTK's WebRTC, this
 9 patch adds it as a dependency to the build system.
 10
 11 * GNUmakefile.am:
 12 * configure.ac:
 13
1142012-07-10 Sheriff Bot <webkit.review.bot@gmail.com>
215
316 Unreviewed, rolling out r122178.

GNUmakefile.am

@@global_cppflags += \
202202 -DWTF_USE_GSTREAMER=1
203203endif
204204
 205if USE_FARSTREAM
 206global_cppflags += \
 207 -DWTF_USE_FARSTREAM=1
 208endif
 209
205210if USE_ACCELERATED_COMPOSITING
206211global_cppflags += \
207212 -DWTF_USE_ACCELERATED_COMPOSITING=1 \

configure.ac

@@AC_SUBST(ENCHANT_CFLAGS)
470470AC_SUBST(ENCHANT_LIBS)
471471fi
472472
 473if test "$enable_media_stream" = "yes"; then
 474 PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1], [have_farstream=yes],
 475 AC_MSG_ERROR([farstream is required to enable media_stream]))
 476 AC_SUBST([FARSTREAM_CFLAGS])
 477 AC_SUBST([FARSTREAM_LIBS])
 478fi
 479
473480PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
474481AC_SUBST(GAIL_CFLAGS)
475482AC_SUBST(GAIL_LIBS)

@@AM_CONDITIONAL([USE_OPENGL], [test "$with_acceleration_backend" = "opengl"])
13961403AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
13971404AM_CONDITIONAL([USE_LEVELDB],[test "$enable_indexed_database" = "yes"])
13981405
 1406# Farstream feature conditional
 1407AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
 1408
13991409# WebKit feature conditionals
14001410AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
14011411AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])