Changeset 106340 in webkit

Timestamp:

Jan 31, 2012 12:02:56 AM (12 years ago)

Author:

Philippe Normand

Message:

[GStreamer] 0.11 build support
​https://bugs.webkit.org/show_bug.cgi?id=77085

Reviewed by Martin Robinson.

• configure.ac: New --with-gstreamer option, defaulting to 0.10.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (4 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-01-25  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] 0.11 build support
+        https://bugs.webkit.org/show_bug.cgi?id=77085
+
+        Reviewed by Martin Robinson.
+
+        * configure.ac: New --with-gstreamer option, defaulting to 0.10.
+
 2012-01-30  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/configure.ac

@@ -270 +270 @@
 fi
 
+AC_MSG_CHECKING([the GStreamer version to use])
+AC_ARG_WITH([gstreamer],
+        [AS_HELP_STRING([--with-gstreamer=0.10|0.11], [the GStreamer version to use (default: 0.10)])],
+        [case "$with_gstreamer" in
+        0.10|0.11) ;;
+        *) AC_MSG_ERROR([invalid GStreamer version specified]) ;;
+        esac],
+        [with_gstreamer=0.10])
+AC_MSG_RESULT([$with_gstreamer])
+
+GSTREAMER_0_10_REQUIRED_VERSION=0.10
+GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
+GSTREAMER_0_11_REQUIRED_VERSION=0.11
+GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION=0.11.0.2
+
+case "$with_gstreamer" in
+     0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
+           GST_API_VERSION=0.10
+           ;;
+     0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
+           GST_API_VERSION=0.11
+           ;;
+esac
+
+AC_SUBST([GST_API_VERSION])
+if test "$GST_API_VERSION" = "0.11"; then
+AC_DEFINE([GST_USE_UNSTABLE_API], [1], [Using unstable GStreamer API])
+AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 0.11])
+fi
+
 # minimum base dependencies
 LIBSOUP_REQUIRED_VERSION=2.37.2.1
@@ -283 +315 @@
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
-GSTREAMER_REQUIRED_VERSION=0.10
-GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
 ENCHANT_REQUIRED_VERSION=0.22
 LIBFFTW_REQUIRED_VERSION=3.2.2
@@ -1033 +1063 @@
 if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
    PKG_CHECK_MODULES([GSTREAMER],
-                     [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
-                     gstreamer-app-0.10
-                     gstreamer-audio-0.10
-                     gstreamer-base-0.10
-                     gstreamer-interfaces-0.10
-                     gstreamer-pbutils-0.10
-                     gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
-                     gstreamer-video-0.10],
+                     [gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION
+                     gstreamer-app-$GST_API_VERSION
+                     gstreamer-audio-$GST_API_VERSION
+                     gstreamer-base-$GST_API_VERSION
+                     gstreamer-interfaces-$GST_API_VERSION
+                     gstreamer-pbutils-$GST_API_VERSION
+                     gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
+                     gstreamer-video-$GST_API_VERSION],
                      [have_gstreamer=yes])
 
@@ -1338 +1368 @@
  GDK target                                               : $with_target
  Hildon UI extensions                                     : $with_hildon
+ GStreamer version                                        : $with_gstreamer
  Introspection support                                    : $enable_introspection
  Generate documentation                                   : $enable_gtk_doc