From: commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 21 Jan 2016 15:27:39 +0000 (+0000)
Subject: Ensure to use compatible liborc version with wanted gstreamer version
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=25862ae294270024ef1664b4f189fd1e2ea82bf4

Ensure to use compatible liborc version with wanted gstreamer version
https://bugs.webkit.org/show_bug.cgi?id=153276

For example gst-plugins-base-1.4.4 fails to build with liborc-0.4.24.
The user may have a very recent liborc installed on his system.

Patch by Julien Isorce <j.isorce@samsung.com> on 2016-01-21
Reviewed by Philippe Normand.

* efl/jhbuild.modules: add liborc-0.4.17 and make it a gst dependency.
* gtk/jhbuild.modules: add liborc-0.4.17 and make it a gst depencendy.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0ce01cc..8142d25 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2016-01-21  Julien Isorce  <j.isorce@samsung.com>
+
+        Ensure to use compatible liborc version with wanted gstreamer version
+        https://bugs.webkit.org/show_bug.cgi?id=153276
+
+        For example gst-plugins-base-1.4.4 fails to build with liborc-0.4.24.
+        The user may have a very recent liborc installed on his system.
+
+        Reviewed by Philippe Normand.
+
+        * efl/jhbuild.modules: add liborc-0.4.17 and make it a gst dependency.
+        * gtk/jhbuild.modules: add liborc-0.4.17 and make it a gst depencendy.
+
 2016-01-21  Nan Wang  <n_wang@apple.com>
 
         AX: [IOS] Implement next/previous text marker functions using TextIterator
diff --git a/Tools/efl/jhbuild.modules b/Tools/efl/jhbuild.modules
index a7bd044..123cc5f 100644
--- a/Tools/efl/jhbuild.modules
+++ b/Tools/efl/jhbuild.modules
@@ -239,7 +239,17 @@
             md5sum="9c0cfef285d5c4a5c80d00904ddab380"/>
   </autotools>
 
+  <autotools id="orc" autogenargs="--disable-gtk-doc" autogen-sh="configure">
+    <branch module="orc/orc-0.4.17.tar.gz" version="0.4.17"
+            repo="gstreamer"
+            hash="sha256:4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8"
+            md5sum="af1bf3dab9e69f3c36f389285e2a12a1"/>
+  </autotools>
+
   <autotools id="gstreamer" autogenargs="--disable-gtk-doc" autogen-sh="configure">
+    <dependencies>
+      <dep package="orc"/>
+    </dependencies>
     <branch module="gstreamer/gstreamer-1.4.4.tar.xz" version="1.4.4"
             repo="gstreamer"
             hash="sha256:f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237"
diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index febda24..449f71d 100644
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -318,11 +318,21 @@
             md5sum="9c0cfef285d5c4a5c80d00904ddab380"/>
   </autotools>
 
+  <autotools id="orc" autogenargs="--disable-gtk-doc" autogen-sh="configure">
+    <branch module="orc/orc-0.4.17.tar.gz" version="0.4.17"
+            repo="gstreamer"
+            hash="sha256:4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8"
+            md5sum="af1bf3dab9e69f3c36f389285e2a12a1"/>
+  </autotools>
+
   <autotools id="gstreamer" autogenargs="--disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
       <makeargs value="CFLAGS+=-Wno-error"/>
     </if>
+    <dependencies>
+      <dep package="orc"/>
+    </dependencies>
     <branch module="gstreamer/gstreamer-1.4.4.tar.xz" version="1.4.4"
             repo="gstreamer"
             hash="sha256:f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237"