[gtk-osx: 3/7] Add libwebp

[John Ralls <jralls src gnome org>]

commit a6e2148d072a090ea3489ebde41185e40a61862b
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Dec 14 22:45:12 2014 -0700

    Add libwebp
    
    Dependency of WebKit.

 modulesets-stable/gtk-osx-unsupported.modules   |    6 ++++++
 modulesets-unstable/gtk-osx-unsupported.modules |   11 ++++++-----
 modulesets/gtk-osx-unsupported.modules          |    6 ++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 80cf38f..ccab350 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -24,6 +24,8 @@
   <repository type="tarball" name="p11-glue"
               href="http://p11-glue.freedesktop.org/releases/"/>
   <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
+  <repository type="tarball" name="webm"
+              href="http://downloads.webmproject.org/releases/"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -176,6 +178,10 @@
     <branch repo="curl.haxx.se" module="curl-7.28.0.tar.bz2" version="7.28.0" />
   </autotools>
 
+  <autotools id="libwebp" autogen-sh="configure">
+    <branch repo="webm" module="webp/libwebp-0.4.2.tar.gz" version="0.4.2"/>
+  </autotools>
+
   <!-- This is WebKitGTK 1.x, for GTK 2.x.
     disable-geolocation: Requires geoclue. No module for this yet.
     disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 898e5b9..031a1c2 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -29,13 +29,10 @@
              href="git://anongit.freedesktop.org"/>
   <repository type="git" name="lysator"
              href="https://git.lysator.liu.se/"/>
-<<<<<<< HEAD
-  <repository type="tarball" name="icu"
-             href="http://download.icu-project.org/files/"/>
   <repository type="git" name="gitorious" href="git://gitorious.org/"/>
   <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
-=======
->>>>>>> Move icu out of unsupported
+  <repository type="git" name="chromium"
+              href="https://chromium.googlesource.com/"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -168,6 +165,10 @@
     </dependencies>
   </cmake>
 
+  <autotools id="libwebp">
+    <branch repo="chromium" module="webm/libwebp"/>
+  </autotools>
+
   <!-- This is WebKitGTK 1.x, for GTK 2.x.
     disable-geolocation: Requires geoclue. No module for this yet.
     disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 9c681bb..8e71fe5 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -18,6 +18,8 @@
   <repository type='svn' name='libproxy.google.com'
               href='http://libproxy.googlecode.com/svn/'
               tags-template="tags/%(tag)s"/>
+  <repository type="git" name="chromium"
+              href="https://chromium.googlesource.com/"/>
   <repository type="tarball" name="webkit.org"
               href="http://www.webkitgtk.org/releases/"/>
   <repository type="git" name="freedesktop"
@@ -170,6 +172,10 @@
             module="libtasn1/libtasn1-4.2.tar.gz"/>
   </autotools>
 
+  <autotools id="libwebp">
+    <branch repo="chromium" module="webm/libwebp" revision="0.4.2"/>
+  </autotools>
+
   <!-- This is WebKitGTK 1.x, for GTK 2.x.
     disable-geolocation: Requires geoclue. No module for this yet.
     disable-video: Requires gstreamer. If you want video, add to .jhbuildrc: