From 81dd9c5142c1481e36fd8a9f2622075ce155ad37 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 27 Sep 2012 14:46:23 +0200 Subject: [PATCH] mash: rebuild against cogl-1.12. --- srcpkgs/mash/mash-devel.template | 3 +-- srcpkgs/mash/mash.rshlibs | 3 +-- srcpkgs/mash/template | 12 +++++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/srcpkgs/mash/mash-devel.template b/srcpkgs/mash/mash-devel.template index 9bd2d07dc9d..6322165a95a 100644 --- a/srcpkgs/mash/mash-devel.template +++ b/srcpkgs/mash/mash-devel.template @@ -1,12 +1,11 @@ # Template file for 'mash-devel'. # -depends="clutter-devel mash>=0.2.0" +depends="clutter-devel>=1.12 mash>=${version}_${revision}" short_desc="${short_desc} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - noarch=yes do_install() { diff --git a/srcpkgs/mash/mash.rshlibs b/srcpkgs/mash/mash.rshlibs index f9e58218519..11505624167 100644 --- a/srcpkgs/mash/mash.rshlibs +++ b/srcpkgs/mash/mash.rshlibs @@ -6,7 +6,6 @@ libjson-glib-1.0.so.0 libXi.so.6 libcairo.so.2 libgdk_pixbuf-2.0.so.0 -libdrm.so.2 libX11.so.6 libXext.so.6 libXdamage.so.1 @@ -22,4 +21,4 @@ libm.so.6 libpthread.so.0 libc.so.6 libclutter-1.0.so.0 -libcogl.so.9 +libcogl.so.11 diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template index 98773f1dfac..7824cff08ac 100644 --- a/srcpkgs/mash/template +++ b/srcpkgs/mash/template @@ -1,21 +1,19 @@ # Template file for 'mash' pkgname=mash version=0.2.0 -distfiles="http://www.clutter-project.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" +revision=2 +subpackages="mash-devel" build_style=gnu-configure configure_args="--enable-introspection --disable-static" -makedepends="pkg-config intltool gobject-introspection clutter-devel" -revision=1 +makedepends="pkg-config intltool gobject-introspection clutter-devel>=1.12" short_desc="A small library for using 3D models within a Clutter scene" maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" -checksum=7a761e270ac15d2afdf4915a18f41d4855adde35c18ce3c75d294dae5056920a +distfiles="https://github.com/downloads/clutter-project/mash/mash-${version}.tar.xz" +checksum=fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc long_desc=" Mash is a small library for using real 3D models within a Clutter scene. Models can be exported from Blender or other 3D modelling software as PLY files and then used as actors. It also supports a lighting model with animatable lights." - -subpackages="mash-devel" -