[GTK] GStreamer 1.0 support in configure.ac
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Apr 2012 15:35:30 +0000 (15:35 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Apr 2012 15:35:30 +0000 (15:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=84029

Reviewed by Martin Robinson.

The GStreamer version was recently changed to 1.0 in the git
repositories of the project so we need to reflect this change in
configure.ac.

* configure.ac:

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

ChangeLog
configure.ac

index 4db92b7..40e29c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-16  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] GStreamer 1.0 support in configure.ac
+        https://bugs.webkit.org/show_bug.cgi?id=84029
+
+        Reviewed by Martin Robinson.
+
+        The GStreamer version was recently changed to 1.0 in the git
+        repositories of the project so we need to reflect this change in
+        configure.ac.
+
+        * configure.ac:
+
 2012-04-16  Yael Aharon  <yael.aharon@nokia.com>
 
         [Qt][WK2] Fixed elements position is wrong after zooming.
index 98828af..bc9bedd 100644 (file)
@@ -343,9 +343,9 @@ 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)])],
+        [AS_HELP_STRING([--with-gstreamer=0.10|1.0], [the GStreamer version to use (default: 0.10)])],
         [case "$with_gstreamer" in
-        0.10|0.11) ;;
+        0.10|1.0) ;;
         *) AC_MSG_ERROR([invalid GStreamer version specified]) ;;
         esac],
         [with_gstreamer=0.10])
@@ -353,24 +353,24 @@ 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
+GSTREAMER_1_0_REQUIRED_VERSION=1.0
+GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION=0.11.90
 
 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
+     1.0) GSTREAMER_REQUIRED_VERSION=GSTREAMER_1_0_REQUIRED_VERSION
+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION
+           GST_API_VERSION=1.0
            ;;
 esac
 
 AC_SUBST([GST_API_VERSION])
-if test "$GST_API_VERSION" = "0.11"; then
+if test "$GST_API_VERSION" = "1.0"; then
 AC_DEFINE([GST_USE_UNSTABLE_API], [1], [Using unstable GStreamer API])
-AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 0.11])
+AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 1.0])
 fi
 
 # minimum base dependencies
@@ -1199,18 +1199,18 @@ fi
 
 # check if gstreamer is available
 if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
-   PKG_CHECK_MODULES([GSTREAMER],
-                     [gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION
-                     gstreamer-app-$GST_API_VERSION
-                     gstreamer-audio-$GST_API_VERSION
-                     gstreamer-fft-$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])
-
+    gstreamer_modules="gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION
+                       gstreamer-app-$GST_API_VERSION
+                       gstreamer-audio-$GST_API_VERSION
+                       gstreamer-fft-$GST_API_VERSION
+                       gstreamer-base-$GST_API_VERSION
+                       gstreamer-pbutils-$GST_API_VERSION
+                       gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
+                       gstreamer-video-$GST_API_VERSION";
+   if test "$GST_API_VERSION" != "1.0"; then
+       gstreamer_modules="$gstreamer_modules gstreamer-interfaces-$GST_API_VERSION";
+   fi
+   PKG_CHECK_MODULES([GSTREAMER], [$gstreamer_modules], [have_gstreamer=yes])
    AC_SUBST([GSTREAMER_CFLAGS])
    AC_SUBST([GSTREAMER_LIBS])
 fi