[Pkg-cli-libs-commits] [SCM] clutter-sharp branch, master, updated. debian/1.0.0_alpha3_git20090817.r1.349dba6-4-5-g45ffe52

Chow Loong Jin hyperair at debian.org
Sun Jan 22 18:47:49 UTC 2012


The following commit has been merged in the master branch:
commit df7e6392a3444a4d0fbbdcd2f6aed2681ea0acab
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Jan 19 02:49:04 2012 +0800

    Fix clutter backend detection

diff --git a/debian/patches/fix-clutter-backend.patch b/debian/patches/fix-clutter-backend.patch
new file mode 100644
index 0000000..1b0c66b
--- /dev/null
+++ b/debian/patches/fix-clutter-backend.patch
@@ -0,0 +1,17 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Description: Fix CLUTTER_BACKEND detection. Debian's clutter-1.0.pc has
+ backend=cogl, but has a library named libclutter-glx-1.0, so parse the library
+ name out of the -l flags from pkg-config instead.
+Index: clutter-sharp/configure.ac
+===================================================================
+--- clutter-sharp.orig/configure.ac	2012-01-19 02:46:47.540773195 +0800
++++ clutter-sharp/configure.ac	2012-01-19 02:47:07.224272887 +0800
+@@ -86,7 +86,7 @@
+ 
+ CLUTTER_API_VERSION=$(pkg-config --variable apiversion clutter-1.0)
+ CLUTTER_GTK_API_VERSION=$(pkg-config --variable apiversion clutter-gtk-0.10)
+-CLUTTER_BACKEND=$(pkg-config --variable backend clutter-1.0)
++CLUTTER_BACKEND=$(pkg-config --libs clutter-1.0 | egrep -o -- '-lclutter-[[^ ]]+' | sed -re 's/^-lclutter-(.*)-'"$CLUTTER_API_VERSION"'$/\1/')
+ AC_SUBST(CLUTTER_API_VERSION)
+ AC_SUBST(CLUTTER_BACKEND)
+ AC_SUBST(CLUTTER_GTK_API_VERSION)
diff --git a/debian/patches/series b/debian/patches/series
index d0863ec..c0a27c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ dedup-pc-bundlefiles.patch
 dont-sign.patch
 use-unversioned-ilasm
 Fix-bashism-in-Makefile.patch
+fix-clutter-backend.patch

-- 
clutter-sharp



More information about the Pkg-cli-libs-commits mailing list