[Pkg-cli-libs-commits] [SCM] clutter-sharp branch, master, updated. debian/1.0.0_alpha3_git20090817.r1.349dba6-7-3-g27a939e

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit f6407377a6a3b9d7bdbe7e5cb817ab4150c8d107
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat May 5 10:11:04 2012 +0800

    Fix clutter library name detection
    
    Closes: #670790

diff --git a/debian/patches/fix-clutter-backend.patch b/debian/patches/fix-clutter-backend.patch
index 1b0c66b..814fb70 100644
--- a/debian/patches/fix-clutter-backend.patch
+++ b/debian/patches/fix-clutter-backend.patch
@@ -1,17 +1,63 @@
 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 @@
+Date: Sat, 5 May 2012 08:42:56 +0800
+Subject: Fix clutter library name detection
+
+Bug-Debian: http://bugs.debian.org/670790
+---
+ clutter-gtk/clutter-gtk-sharp.dll.config.in |    2 +-
+ clutter/clutter-sharp.dll.config.in         |    2 +-
+ configure.ac                                |   13 +++++++++----
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/clutter-gtk/clutter-gtk-sharp.dll.config.in b/clutter-gtk/clutter-gtk-sharp.dll.config.in
+index ab6eb7c..85bb1bd 100644
+--- a/clutter-gtk/clutter-gtk-sharp.dll.config.in
++++ b/clutter-gtk/clutter-gtk-sharp.dll.config.in
+@@ -1,7 +1,7 @@
+ <configuration>
+   <dllmap 
+     dll="libclutter-gtk-win32-0.10-0.dll"
+-    target="libclutter-gtk- at CLUTTER_GTK_API_VERSION@.so.0"
++    target="@CLUTTER_LIBRARY@"
+   />
+   <dllmap 
+     dll="libclutter-win32-1.0-0.dll"
+diff --git a/clutter/clutter-sharp.dll.config.in b/clutter/clutter-sharp.dll.config.in
+index d1ec02a..1b2b52a 100644
+--- a/clutter/clutter-sharp.dll.config.in
++++ b/clutter/clutter-sharp.dll.config.in
+@@ -1,7 +1,7 @@
+ <configuration>
+   <dllmap 
+     dll="libclutter-win32-1.0-0.dll"
+-    target="libclutter- at CLUTTER_BACKEND@- at CLUTTER_API_VERSION@.so.0"
++    target="@CLUTTER_LIBRARY@"
+   />
+   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
+   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
+diff --git a/configure.ac b/configure.ac
+index 3d5ce4c..b13a505 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,11 +84,16 @@ PKG_CHECK_MODULES(CLUTTER_GTK, clutter-gtk-0.10 >= 0.10.3, enable_gtk=yes, enabl
  
- CLUTTER_API_VERSION=$(pkg-config --variable apiversion clutter-1.0)
- CLUTTER_GTK_API_VERSION=$(pkg-config --variable apiversion clutter-gtk-0.10)
+ AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
+ 
+-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/')
++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 --libs clutter-1.0 | egrep -o -- '-lclutter-[[^ ]]+' | sed -re 's/^-lclutter-//; s/-?'"$CLUTTER_API_VERSION"'$//;')
++if test -z "$CLUTTER_BACKEND"; then
++    CLUTTER_LIBRARY="libclutter-$CLUTTER_API_VERSION.so.0"
++else
++    CLUTTER_LIBRARY="libclutter-$CLUTTER_BACKEND-$CLUTTER_API_VERSION.so.0"
++fi
  AC_SUBST(CLUTTER_API_VERSION)
- AC_SUBST(CLUTTER_BACKEND)
+-AC_SUBST(CLUTTER_BACKEND)
++AC_SUBST(CLUTTER_LIBRARY)
  AC_SUBST(CLUTTER_GTK_API_VERSION)
+ 
+ dnl check for monodoc
+-- 

-- 
clutter-sharp