From c81d5a7b841641b088ea818b6dfcd1bdbcf15018 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 22 Mar 2012 11:51:09 +0100
Subject: [PATCH] cogl: update to 1.10.0.

---
 common/shlibs                    |  2 +-
 srcpkgs/cogl/cogl-devel.template | 16 ++++++++--------
 srcpkgs/cogl/cogl.rshlibs        |  1 -
 srcpkgs/cogl/depends             |  2 +-
 srcpkgs/cogl/template            |  8 +++-----
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6dd89347e7..71710d50bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -782,7 +782,7 @@ libmx-gtk-1.0.so.0		mx			mx-devel
 libcheese.so.3			libcheese		cheese-devel
 libcheese-gtk.so.21		libcheese		cheese-devel
 libjson.so.0			json-c			json-c-devel
-libcogl.so.5			cogl			cogl-devel
+libcogl.so.9			cogl			cogl-devel
 libcogl-pango.so.0		cogl			cogl-devel
 libp11-kit.so.0			p11-kit			p11-kit-devel
 librest-0.7.so.0		rest			rest-devel
diff --git a/srcpkgs/cogl/cogl-devel.template b/srcpkgs/cogl/cogl-devel.template
index 3fcd72356f..28e790aa7d 100644
--- a/srcpkgs/cogl/cogl-devel.template
+++ b/srcpkgs/cogl/cogl-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'cogl-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -10,12 +10,12 @@ Add_dependency run libXcomposite-devel
 Add_dependency run libXdamage-devel
 Add_dependency run gdk-pixbuf-devel
 Add_dependency run glib-devel
-Add_dependency run cogl
+Add_dependency run cogl ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
+noarch=yes
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
 }
diff --git a/srcpkgs/cogl/cogl.rshlibs b/srcpkgs/cogl/cogl.rshlibs
index 46aa71879a..321eb75313 100644
--- a/srcpkgs/cogl/cogl.rshlibs
+++ b/srcpkgs/cogl/cogl.rshlibs
@@ -7,7 +7,6 @@ libXdamage.so.1
 libXfixes.so.3
 libXcomposite.so.1
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libgmodule-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
diff --git a/srcpkgs/cogl/depends b/srcpkgs/cogl/depends
index e6315a0425..485a7a5596 100644
--- a/srcpkgs/cogl/depends
+++ b/srcpkgs/cogl/depends
@@ -1,2 +1,2 @@
-abi_depends=">=1.8.0"
+abi_depends=">=1.10.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template
index 51b77c13b1..08936c33ee 100644
--- a/srcpkgs/cogl/template
+++ b/srcpkgs/cogl/template
@@ -1,15 +1,14 @@
 # Template file for 'cogl'
 pkgname=cogl
-version=1.8.2
-distfiles="${GNOME_SITE}/$pkgname/1.8/$pkgname-$version.tar.xz"
+version=1.10.0
+distfiles="${GNOME_SITE}/$pkgname/1.10/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection"
-revision=1
 short_desc="Library for using 3D graphics hardware for rendering"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
 license="LGPL-2.1"
-checksum=ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7
+checksum=544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d
 long_desc="
  cogl is a small open source library for using 3D graphics hardware for
  rendering. The API departs from the flat state machine style of OpenGL and is
@@ -29,7 +28,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gobject-introspection