From 3adcbb265c7f592abd6a7a98a257cbb610235d52 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon, 13 Feb 2012 11:43:26 +0000
Subject: [PATCH] Update the Clutter moduleset

---
 build/clutter.modules | 459 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 272 insertions(+), 187 deletions(-)

diff --git a/build/clutter.modules b/build/clutter.modules
index 786e48b..154eef7 100644
--- a/build/clutter.modules
+++ b/build/clutter.modules
@@ -5,12 +5,10 @@
 <moduleset>
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/"/>
-  <repository type="git" name="git.gnome.org"
+  <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
   <repository type="git" name="git.clutter-project.org"
       href="git://git.clutter-project.org/"/>
-  <repository type="git" name="git.moblin.org"
-      href="git://git.moblin.org/"/>
   <repository type="git" name="github.com/rib"
       href="git://github.com/rib/"/>
   <repository type="git" name="github.com/clutter-project"
@@ -18,80 +16,267 @@
   <repository type="git" name="gstreamer.freedesktop.org"
       href="git://anongit.freedesktop.org/gstreamer/"/>
 
-  <!-- tarballs -->
+  <repository type="tarball" name="gnome.org"
+      href="http://download.gnome.org/sources/"/>
+  <repository type="tarball" name="gnupg.org"
+      href="ftp://ftp.gnupg.org/gcrypt/"/>
+  <repository type="tarball" name="xmlsoft.org"
+      href="ftp://xmlsoft.org/"/>
   <repository type="tarball" name="cairo.org"
-    href="http://cairographics.org/"/>
+      href="http://cairographics.org/"/>
+  <repository type="tarball" name="people.freedesktop.org"
+      href="http://people.freedesktop.org/"/>
 
-  <tarball id="expat" version="1.95.8">
-    <source href="http://downloads.sourceforge.net/project/expat/expat/1.95.8/expat-1.95.8.tar.gz"
-            hash="sha256:c6aaa0b427e775a0fd5a956a75ae41e5110f22760723d9bda316100010e891ca"
-            md5sum="aff487543845a82fe262e6e2922b4c8e" size="318349"/>
+<!-- This is a special module: it's needed to build from git, but not
+     needed to build from tarballs, so it doesn't need to be in our suites
+     and it doesn't need to be an external dependency -->
+  <autotools id="gnome-common">
+    <branch/>
+  </autotools>
+
+  <autotools id="libxml2">
+    <pkg-config>libxml-2.0.pc</pkg-config>
+    <branch module="libxml2/libxml2-2.7.8.tar.gz"
+            repo="xmlsoft.org" version="2.7.8"
+            hash="sha256:cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
+            md5sum="8127a65e8c3b08856093099b52599c86" size="4881808"/>
+  </autotools>
+
+  <autotools id="libxslt" check-target="false">
+    <pkg-config>libxslt.pc</pkg-config>
+    <branch module="libxml2/libxslt-1.1.26.tar.gz"
+            repo="xmlsoft.org" version="1.1.26"
+            hash="sha256:55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
+            md5sum="e61d0364a30146aaa3001296f853b2b9" size="3401513"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+
+  <tarball id="intltool" version="0.41.1">
+    <source href="http://launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz"
+            hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"
+            md5sum="d6c91bf06681919ccfdf3624035b75dc" size="139287"/>
+    <dependencies>
+      <dep package="gnome-common"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="expat" version="2.0.1">
+    <source href="http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz"
+            hash="sha256:847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93"
+            md5sum="ee8b492592568805593f81f8cdf2a04c" size="446456"/>
   </tarball>
 
-  <tarball id="fontconfig" version="2.7.1">
-    <source href="http://www.fontconfig.org/release/fontconfig-2.7.1.tar.gz"
-            hash="sha256:08502404aa451ddc5f9ca4bf45cc3b3f1e86e3f0779ff273c72e1c48e0c25b94"
-            md5sum="41024d11765acdd7520d1f5458e751db" size="1539165"/>
+  <tarball id="rarian" version="0.8.1" supports-non-srcdir-builds="no">
+    <pkg-config>rarian.pc</pkg-config>
+    <source href="http://download.gnome.org/sources/rarian/0.8/rarian-0.8.1.tar.bz2"
+            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
+            md5sum="75091185e13da67a0ff4279de1757b94" size="324441"/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.71">
+    <source href="http://people.freedesktop.org/~hadess/shared-mime-info-0.71.tar.bz2"
+            hash="sha256:1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f"
+            md5sum="0a90508234d415f761a79fbffdff74f4" size="493216"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="libgpg-error" autogen-sh="configure" check-target="false">
+    <branch module="libgpg-error/libgpg-error-1.8.tar.bz2"
+            repo="gnupg.org" version="1.8"
+            hash="sha256:bdfbf2677147239d2d26d4e37f44635d9fd97c133c9ef9fd9793a12a059508c5"
+            md5sum="1d2005268a2f096db28cf9cf77b3229a" size="435341" />
+  </autotools>
+
+  <autotools id="libgcrypt" autogen-sh="configure" check-target="false">
+    <branch module="libgcrypt/libgcrypt-1.4.5.tar.bz2"
+            repo="gnupg.org" version="1.4.5"
+            hash="sha256:496f907c5324de75367ec61c63bfeed1309ef0bc64845dc20b3597731abd9e40"
+            md5sum="cc2017ad09b4543f8b3b5e9a53cfd89d" size="1148382">
+      <patch file="libgcrypt-1.4.5-ImplicitDSOLinking.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libgpg-error" />
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-doc-utils">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="libxslt"/>
+      <dep package="libxml2"/>
+      <dep package="intltool"/>
+      <dep package="rarian"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-doc">
+    <branch/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="atk">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk-doc"/>
+    </dependencies>
+  </autotools>
+
+  <tarball id="fontconfig" version="2.8.0">
+    <pkg-config>fontconfig.pc</pkg-config>
+    <source href="http://www.fontconfig.org/release/fontconfig-2.8.0.tar.gz"
+            hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
+            md5sum="77e15a92006ddc2adbb06f840d591c0e" size="1548409"/>
     <dependencies>
       <dep package="expat"/>
     </dependencies>
   </tarball>
 
-  <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch module="releases/pixman-0.18.4.tar.gz" version="1.18.4"
+  <autotools id="pixman"
+             autogenargs="--disable-gtk">
+    <pkg-config>pixman-1.pc</pkg-config>
+    <branch module="releases/pixman-0.20.2.tar.gz" version="0.20.2"
             repo="cairo.org"
-            hash="sha256:1484092277c5187f5458229a2b7fd7fbc0cb07e1f220c7f8f9ac65de6dba7989"
-            md5sum="532db4194e18c108d0b7dd85f20d39b8" size="510878">
+            hash="sha256:27b4e58ae8dcf8787cc309bc2b119ca6b6e353b3283a7821896e454ae8bd9725"
+            md5sum="a923c20af88e469ac29ba42cfedb88c2" size="542724">
     </branch>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-xlib">
-    <branch module="releases/cairo-1.10.0.tar.gz" version="1.10.0"
+    <pkg-config>cairo.pc</pkg-config>
+    <branch module="releases/cairo-1.10.2.tar.gz" version="1.10.2"
             repo="cairo.org"
-            hash="sha256:0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"
-            md5sum="70a2ece66cf473d976e2db0f75bf199e" size="24022822">
+            hash="sha256:32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
+            md5sum="f101a9e88b783337b20b2e26dfd26d5f" size="23558405">
     </branch>
     <dependencies>
       <dep package="fontconfig"/>
       <dep package="gtk-doc"/>
       <dep package="pixman"/>
     </dependencies>
+    <after>
+      <dep package="glitz"/>
+    </after>
   </autotools>
 
-  <tarball id="poppler" version="0.14.0" autogenargs="--disable-poppler-cpp">
-  <!--Remove disable-poppler-cpp if bumping up poppler version.
-      See GNOME bug 622859 -->
-    <source href="http://poppler.freedesktop.org/poppler-0.14.0.tar.gz"
-            hash="sha256:aba6fff01a90b44ac6f4ed570d52a43c9790e0445ceaab59abe23d0c7c87bcaf"
-            md5sum="76f003b8fa2b905674088c306aa857c5" size="1782119"/>
+  <autotools id="cogl">
+    <pkg-config>cogl-1.0.pc</pkg-config>
+    <branch/>
     <dependencies>
-      <dep package="cairo"/>
+      <dep package="glib"/>
     </dependencies>
     <suggests>
+      <dep package="mesa"/>
+      <dep package="gobject-introspection"/>
+      <dep package="UProf"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="clutter">
+    <branch/>
+    <dependencies>
+      <dep package="cogl"/>
+      <dep package="atk"/>
       <dep package="glib"/>
-      <dep package="poppler-data"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="gtk-doc"/>
+      <dep package="json-glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="gdk-pixbuf"/>
     </suggests>
+  </autotools>
+
+  <autotools id="gdk-pixbuf">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk-doc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="glib">
+    <branch/>
+    <dependencies>
+      <dep package="gtk-doc"/>
+    </dependencies>
     <after>
-      <dep package="gtk+"/>
+      <dep package="shared-mime-info"/>
+    </after>
+    <suggests>
+      <!-- these provide gnome implementations of glib
+           extension points -->
+      <dep package="gvfs"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gtk+">
+    <branch/>
+    <dependencies>
+      <dep package="atk"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="shared-mime-info"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="pango">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <after>
+      <dep package="libXft"/>
     </after>
-  </tarball>
+  </autotools>
 
-  <tarball id="liboil" version="0.3.17">
-    <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz"
-            hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
-            md5sum="47dc734f82faeb2964d97771cfd2e701" size="912563"/>
-  </tarball>
+  <autotools id="clutter-gtk">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="clutter"/>
+    </dependencies>
+  </autotools>
 
-<!--
-  <autotools id="libXft" supports-non-srcdir-builds="no">
-    <branch repo="git.freedesktop.org"
-            module="xorg/lib/libXft" checkoutdir="libXft" />
+  <autotools id="clutter-gst">
+    <branch/>
     <dependencies>
-      <dep package="fontconfig"/>
+      <dep package="clutter"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
   </autotools>
--->
 
   <autotools id="mesa">
     <branch repo="git.freedesktop.org"
@@ -110,84 +295,33 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc">
-    <branch repo="git.gnome.org"
-            module="gtk-doc"
-            revision="master"/>
-  </autotools>
-
-  <autotools id="glib">
-    <branch repo="git.gnome.org"
-            module="glib"
-            revision="master"/>
-    <dependencies>
-      <dep package="gtk-doc"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="UProf">
-    <branch repo="github.com/rib"
-            module="UProf"
-            revision="master"/>
-  </autotools>
-
-  <autotools id="libccss" autogenargs="--without-rsvg --without-soup --disable-ccss-cairo --disable-ccss-gtk --disable-examples">
-    <branch repo="git.freedesktop.org"
-            module="ccss"
-            tag="libccss-0.3.1" />
-  </autotools>
-
   <autotools id="gobject-introspection">
-    <branch repo="git.gnome.org"
-            module="gobject-introspection"
-            revision="master"/>
-  </autotools>
-
-  <autotools id="pango">
-    <branch repo="git.gnome.org"
-            module="pango"
-            revision="master"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-    <after>
-      <dep package="libXft"/>
-    </after>
   </autotools>
 
-  <autotools id="atk">
-    <branch repo="git.gnome.org"
-            module="atk"
-            revision="master"/>
+  <autotools id="gjs">
+    <branch/>
     <dependencies>
-      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="js185"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gdk-pixbuf">
-    <branch repo="git.gnome.org"
-            module="gdk-pixbuf"
+  <autotools id="UProf">
+    <branch repo="github.com/rib"
+            module="UProf"
             revision="master"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
   </autotools>
 
-  <autotools id="gtk+">
+  <autotools id="gobject-introspection">
     <branch repo="git.gnome.org"
-            module="gtk+"
+            module="gobject-introspection"
             revision="master"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="atk"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-    </dependencies>
   </autotools>
 
   <autotools id="gtk2">
@@ -204,15 +338,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gir-repository">
-    <branch repo="git.gnome.org"
-            module="gir-repository"
-            revision="master"/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="json-glib">
     <branch repo="git.gnome.org"
             module="json-glib"
@@ -223,73 +348,67 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cogl">
-    <branch repo="git.gnome.org"
-            module="cogl"
-            revision="master"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
+  <tarball id="liboil" version="0.3.17">
+    <pkg-config>liboil-0.3.pc</pkg-config>
+    <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz"
+            hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
+            md5sum="47dc734f82faeb2964d97771cfd2e701" size="912563"/>
+  </tarball>
 
-  <autotools id="clutter">
-    <branch repo="git.gnome.org"
-            module="clutter"
-            revision="master"/>
+  <!-- Temporary use fedora's server for gudev while kernel.org is down.
+       When kernel.org restored, revert to:
+         repo="kernel.org" module="utils/kernel/hotplug/udev-147.tar.bz2"
+    -->
+  <repository type="tarball" name="fedoraproject.org"
+      href="pkgs.fedoraproject.org/repo/pkgs/"/>
+  <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no"
+             autogen-sh="autogen.sh">
+    <pkg-config>gudev-1.0.pc</pkg-config>
+    <branch checkoutdir="gudev-147" repo="fedoraproject.org"
+            module="udev/udev-147.tar.bz2/aed0129c5a00e01d1be75ffda7d2e0f1/udev-147.tar.bz2" version="147">
+      <patch file="gudev-147.patch" strip="1"/>
+    </branch>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="cogl"/>
-      <dep package="atk"/>
       <dep package="gobject-introspection"/>
-      <dep package="json-glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+  <autotools id="gstreamer" autogenargs="-- --disable-tests" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-base" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+  <autotools id="gst-plugins-base" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <dep package="gtk2"/>
+      <dep package="gtk+"/>
       <dep package="liboil"/>
     </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
   </autotools>
 
-  <autotools id="clutter-gst">
-    <branch repo="git.gnome.org"
-            module="clutter-gst"
-            revision="master"/>
+  <autotools id="gst-plugins-good" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="clutter"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="clutter-gtk">
-    <branch repo="git.gnome.org"
-            module="clutter-gtk"
-            revision="master"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="clutter"/>
     </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
+    </suggests>
   </autotools>
 
   <autotools id="clutter-box2d">
-    <branch repo="github.com/clutter-project"
+    <branch repo="git.gnome.org"
             module="clutter-box2d"
             revision="master"/>
     <dependencies>
@@ -316,30 +435,6 @@
     </dependencies>
   </autotools>
 
-<!--
-  <autotools id="cally">
-    <branch repo="git.clutter-project.org"
-            module="cally"
-            revision="master"/>
-    <dependencies>
-      <dep package="atk"/>
-      <dep package="clutter"/>
-    </dependencies>
-  </autotools>
--->
-
-  <autotools id="cluttersmith">
-    <branch repo="git.clutter-project.org"
-            module="cluttersmith"
-            revision="master"/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="mx"/>
-      <dep package="gjs"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="pygobject">
     <branch repo="git.gnome.org"
             module="pygobject"
@@ -418,7 +513,6 @@
     <dependencies>
       <dep package="meta-clutter"/>
       <dep package="clutter-box2d"/>
-      <dep package="cally"/>
       <dep package="mx"/>
     </dependencies>
   </metamodule>
@@ -432,13 +526,4 @@
     </dependencies>
   </metamodule>
 
-  <autotools id="gjs">
-    <branch repo="git.gnome.org"
-            module="gjs"
-            revision="master"/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
 </moduleset>
-- 
2.7.4