[SCM] toonloop/master: Import patch from Ubuntu to make this build with new libclutter.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ee8f15a64c4a845bd9ef73c575857dbfb5bc3a1
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 5 10:32:11 2011 +0200

    Import patch from Ubuntu to make this build with new libclutter.

diff --git a/debian/patches/0001-clutter_gst_1.0.patch b/debian/patches/0001-clutter_gst_1.0.patch
new file mode 100644
index 0000000..bfc4792
--- /dev/null
+++ b/debian/patches/0001-clutter_gst_1.0.patch
@@ -0,0 +1,93 @@
+Origin: Jean-Louis Dupond <jean-louis at dupond.be>
+Description: fix FTBFS due to clutter packaging
+Ubuntu-Bug: https://launchpad.net/bugs/775588
+
+--- toonloop-2.0.6.orig/configure.ac
++++ toonloop-2.0.6/configure.ac
+@@ -83,9 +83,9 @@ AC_SUBST([CLUTTERGTK_LIBS])
+ AC_SUBST([CLUTTERGTK_CFLAGS])
+ 
+ # Clutter-GST
+-PKG_CHECK_MODULES([CLUTTERGST], [clutter-gst-0.10 >= 0.10], have_clutter_gst=true, have_clutter_gst=false)
++PKG_CHECK_MODULES([CLUTTERGST], [clutter-gst-1.0 >= 0.10], have_clutter_gst=true, have_clutter_gst=false)
+ if test "x${have_clutter_gst}" = "xfalse" ; then
+-    AC_MSG_ERROR([missing package: libclutter-gst-0.10-dev])
++    AC_MSG_ERROR([missing package: libclutter-gst-dev])
+ fi
+ AC_SUBST([CLUTTERGST_LIBS])
+ AC_SUBST([CLUTTERGST_CFLAGS])
+--- toonloop-2.0.6.orig/configure
++++ toonloop-2.0.6/configure
+@@ -15593,12 +15593,12 @@ if test -n "$CLUTTERGST_CFLAGS"; then
+     pkg_cv_CLUTTERGST_CFLAGS="$CLUTTERGST_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-0.10 >= 0.10\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "clutter-gst-0.10 >= 0.10") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-1.0 >= 0.10\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "clutter-gst-1.0 >= 0.10") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CLUTTERGST_CFLAGS=`$PKG_CONFIG --cflags "clutter-gst-0.10 >= 0.10" 2>/dev/null`
++  pkg_cv_CLUTTERGST_CFLAGS=`$PKG_CONFIG --cflags "clutter-gst-1.0 >= 0.10" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -15609,12 +15609,12 @@ if test -n "$CLUTTERGST_LIBS"; then
+     pkg_cv_CLUTTERGST_LIBS="$CLUTTERGST_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-0.10 >= 0.10\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "clutter-gst-0.10 >= 0.10") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gst-1.0 >= 0.10\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "clutter-gst-1.0 >= 0.10") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CLUTTERGST_LIBS=`$PKG_CONFIG --libs "clutter-gst-0.10 >= 0.10" 2>/dev/null`
++  pkg_cv_CLUTTERGST_LIBS=`$PKG_CONFIG --libs "clutter-gst-1.0 >= 0.10" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -15634,9 +15634,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-gst-0.10 >= 0.10" 2>&1`
++	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-gst-1.0 >= 0.10" 2>&1`
+         else
+-	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-gst-0.10 >= 0.10" 2>&1`
++	        CLUTTERGST_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-gst-1.0 >= 0.10" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CLUTTERGST_PKG_ERRORS" >&5
+@@ -15654,7 +15654,7 @@ $as_echo "yes" >&6; }
+ 	have_clutter_gst=true
+ fi
+ if test "x${have_clutter_gst}" = "xfalse" ; then
+-    as_fn_error $? "missing package: libclutter-gst-0.10-dev" "$LINENO" 5
++    as_fn_error $? "missing package: libclutter-gst-dev" "$LINENO" 5
+ fi
+ 
+ 
+@@ -15721,7 +15721,7 @@ $as_echo_n "checking for boostlib >= $bo
+ 		for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+ 			if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+ 				BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+-				BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
++				BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include -DBOOST_FILESYSTEM_VERSION=2"
+ 				break;
+ 			fi
+ 		done
+--- toonloop-2.0.6.orig/README
++++ toonloop-2.0.6/README
+@@ -99,7 +99,7 @@ Here is the list of Debian package that
+  libboost-system-dev,
+  liblo-dev,
+  libclutter-1.0-dev,
+- libclutter-gst-0.10-dev,
++ libclutter-gst-dev,
+  libclutter-gtk-0.10-dev,
+  libglew1.5-dev,
+  libglib2.0-dev,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..40432b5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-clutter_gst_1.0.patch

-- 
toonloop packaging