Hi,
I am attaching an updated debdiff for this issue. The major change from the
previous version is that the new libraries and programs are now placed in their
own new binary packages (libcairo-script-interpreter2, cairo-perf-utils).
* debian/control:
+ Add libcairo-script-interpreter2 package.
+ Add cairo-perf-utils package.
* debian/libcairo-script-interpreter2.install,
debian/cairo-perf-utils.install:
+ Add installation file list for new binary packages.
* debian/libcairo-script-interpreter2.symbols:
+ Add new symbols for libcairo-script-interpreter.so library.
* debian/libcairo2-dev.install:
+ Install the libcairo-script-interpreter.so symbolic link.
* debian/rules:
+ Enable building of cairo-perf-* utilities.
+ Run dh_makeshlibs for the libcairo-script-interpreter2 package.
* debian/patches/01_build_perf_utils.patch,
debian/patches/99_autoreconf.patch:
+ Build cairo-perf-* utils as part of the normal build process.
Thanks,
Alexandros
diff -Nru cairo-1.9.14/debian/cairo-perf-utils.install
cairo-1.9.14/debian/cairo-perf-utils.install
--- cairo-1.9.14/debian/cairo-perf-utils.install 1970-01-01
02:00:00.000000000 +0200
+++ cairo-1.9.14/debian/cairo-perf-utils.install 2010-08-03
16:07:35.000000000 +0300
@@ -0,0 +1,3 @@
+debian/install/main/usr/bin/cairo-perf* /usr/bin
+debian/install/main/usr/bin/cairo-trace /usr/bin
+debian/install/main/usr/lib/cairo/libcairo-trace* /usr/lib/cairo
diff -Nru cairo-1.9.14/debian/cairo-perf-utils.README.Debian
cairo-1.9.14/debian/cairo-perf-utils.README.Debian
--- cairo-1.9.14/debian/cairo-perf-utils.README.Debian 1970-01-01
02:00:00.000000000 +0200
+++ cairo-1.9.14/debian/cairo-perf-utils.README.Debian 2010-08-03
16:50:16.000000000 +0300
@@ -0,0 +1,12 @@
+This package contains utilities to capture and replay cairo execution traces.
+
+A repository of such traces can be downloaded using:
+
+git://anongit.freedesktop.org/cairo-traces
+cd cairo-traces && make
+
+Then run:
+CAIRO_TRACE_DIR=<traces_dir> cairo-perf-trace
+
+The CAIRO_TEST_TARGET env. variable can be used to specify the target backend
+to use eg CAIRO_TEST_TARGET=xlib.
diff -Nru cairo-1.9.14/debian/changelog cairo-1.9.14/debian/changelog
--- cairo-1.9.14/debian/changelog 2010-07-26 16:10:03.000000000 +0300
+++ cairo-1.9.14/debian/changelog 2010-08-03 19:10:52.000000000 +0300
@@ -1,3 +1,24 @@
+cairo (1.9.14-2) experimental; urgency=low
+
+ * debian/control:
+ + Add libcairo-script-interpreter2 package.
+ + Add cairo-perf-utils package.
+ * debian/libcairo-script-interpreter2.install,
+ debian/cairo-perf-utils.install:
+ + Add installation file list for new binary packages.
+ * debian/libcairo-script-interpreter2.symbols:
+ + Add new symbols for libcairo-script-interpreter.so library.
+ * debian/libcairo2-dev.install:
+ + Install the libcairo-script-interpreter.so symbolic link.
+ * debian/rules:
+ + Enable building of cairo-perf-* utilities.
+ + Run dh_makeshlibs for the libcairo-script-interpreter2 package.
+ * debian/patches/01_build_perf_utils.patch,
+ debian/patches/99_autoreconf.patch:
+ + Build cairo-perf-* utils as part of the normal build process.
+
+ -- Alexandros Frantzis <alexandros.frant...@linaro.org> Tue, 03 Aug 2010
12:56:41 +0300
+
cairo (1.9.14-1) experimental; urgency=low
* New upstream development release:
diff -Nru cairo-1.9.14/debian/control cairo-1.9.14/debian/control
--- cairo-1.9.14/debian/control 2010-07-26 16:05:12.000000000 +0300
+++ cairo-1.9.14/debian/control 2010-08-03 19:40:59.000000000 +0300
@@ -30,6 +30,7 @@
Section: libdevel
Architecture: any
Depends: libcairo2 (= ${binary:Version}),
+ libcairo-script-interpreter2 (= ${binary:Version}),
libfontconfig1-dev (>= 2.2.95),
libfreetype6-dev (>= 2.1.10),
libx11-dev,
@@ -80,6 +81,8 @@
Priority: extra
Architecture: any
Depends: libcairo2 (= ${binary:Version}),
+ libcairo-script-interpreter2 (= ${binary:Version}),
+ cairo-perf-utils (= ${binary:Version}),
${misc:Depends}
Description: The Cairo 2D vector graphics library (debugging symbols)
Debugging symbols for the Cairo 2D vector graphics library. This is
@@ -109,3 +112,28 @@
This is version of cairo with only the Xlib backend, intended
primarily for use in the graphical Debian installer.
+Package: libcairo-script-interpreter2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: The Cairo 2D vector graphics library script interpreter
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends.
+ .
+ This package contains the script interpreter for executing and manipulating
+ cairo execution traces.
+
+Package: cairo-perf-utils
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: The Cairo 2D vector graphics library performance utilities
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends.
+ .
+ This package contains a set of utilities for capturing and replaying cairo
+ execution traces using various backends, in order to be able to measure the
+ performance of cairo for real-world applications in a reproducible way.
+
diff -Nru cairo-1.9.14/debian/libcairo2-dev.install
cairo-1.9.14/debian/libcairo2-dev.install
--- cairo-1.9.14/debian/libcairo2-dev.install 2010-07-26 16:05:12.000000000
+0300
+++ cairo-1.9.14/debian/libcairo2-dev.install 2010-08-03 13:28:20.000000000
+0300
@@ -1,5 +1,5 @@
debian/install/main/usr/include/cairo/*.h /usr/include/cairo
-debian/install/main/usr/lib/libcairo.so /usr/lib
+debian/install/main/usr/lib/libcairo*.so /usr/lib
debian/install/main/usr/lib/libcairo*.a /usr/lib
debian/install/main/usr/lib/libcairo*.la /usr/lib
debian/install/main/usr/lib/pkgconfig/cairo*.pc /usr/lib/pkgconfig
diff -Nru cairo-1.9.14/debian/libcairo-script-interpreter2.install
cairo-1.9.14/debian/libcairo-script-interpreter2.install
--- cairo-1.9.14/debian/libcairo-script-interpreter2.install 1970-01-01
02:00:00.000000000 +0200
+++ cairo-1.9.14/debian/libcairo-script-interpreter2.install 2010-08-03
13:20:15.000000000 +0300
@@ -0,0 +1 @@
+debian/install/main/usr/lib/libcairo-script-interpreter.so.* /usr/lib
diff -Nru cairo-1.9.14/debian/libcairo-script-interpreter2.symbols
cairo-1.9.14/debian/libcairo-script-interpreter2.symbols
--- cairo-1.9.14/debian/libcairo-script-interpreter2.symbols 1970-01-01
02:00:00.000000000 +0200
+++ cairo-1.9.14/debian/libcairo-script-interpreter2.symbols 2010-08-03
13:34:32.000000000 +0300
@@ -0,0 +1,11 @@
+libcairo-script-interpreter.so.2 libcairo-script-interpreter2 #MINVER#
+ cairo_script_interpreter_cre...@base 1.9.14
+ cairo_script_interpreter_dest...@base 1.9.14
+ cairo_script_interpreter_feed_str...@base 1.9.14
+ cairo_script_interpreter_feed_str...@base 1.9.14
+ cairo_script_interpreter_fin...@base 1.9.14
+ cairo_script_interpreter_get_line_num...@base 1.9.14
+ cairo_script_interpreter_install_ho...@base 1.9.14
+ cairo_script_interpreter_refere...@base 1.9.14
+ cairo_script_interpreter_...@base 1.9.14
+ cairo_script_interpreter_translate_str...@base 1.9.14
diff -Nru cairo-1.9.14/debian/patches/01_build_perf_utils.patch
cairo-1.9.14/debian/patches/01_build_perf_utils.patch
--- cairo-1.9.14/debian/patches/01_build_perf_utils.patch 1970-01-01
02:00:00.000000000 +0200
+++ cairo-1.9.14/debian/patches/01_build_perf_utils.patch 2010-08-03
12:44:51.000000000 +0300
@@ -0,0 +1,49 @@
+Description: Build cairo-perf-utils as part of then normal build process.
+Author: Alexandros Frantzis <alexandros.frant...@linaro.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=28865
+Last-Update: 2010-08-03
+--- a/configure.ac
++++ b/configure.ac
+@@ -782,6 +782,11 @@
+ PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no)
+ AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
+
++dnl
===========================================================================
++
++CAIRO_ENABLE(perf_utils, cairo-perf-utils, no, [use_perf_utils=yes])
++
++
+ AC_CONFIG_FILES([
+ Makefile
+ boilerplate/Makefile
+--- a/perf/Makefile.am
++++ b/perf/Makefile.am
+@@ -10,6 +10,18 @@
+
+ AM_LDFLAGS = $(CAIRO_LDFLAGS)
+
++if CAIRO_HAS_PERF_UTILS
++bin_PROGRAMS = cairo-perf-micro \
++ cairo-perf-trace \
++ cairo-perf-diff-files \
++ cairo-perf-print \
++ cairo-perf-chart \
++ cairo-perf-compare-backends
++if HAVE_GTK
++bin_PROGRAMS += cairo-perf-graph-files
++endif
++endif
++
+ EXTRA_PROGRAMS += cairo-perf-micro \
+ cairo-perf-trace \
+ cairo-perf-diff-files \
+--- a/build/configure.ac.features
++++ b/build/configure.ac.features
+@@ -404,6 +404,7 @@
+ echo "The following features and utilities:"
+ echo " cairo-trace: $use_trace"
+ echo " cairo-script-interpreter: $use_interpreter"
++ echo " cairo-perf-utils: $use_perf_utils"
+ echo ""
+ echo "And the following internal features:"
+ echo " pthread: $use_pthread"
diff -Nru cairo-1.9.14/debian/patches/99_autoreconf.patch
cairo-1.9.14/debian/patches/99_autoreconf.patch
--- cairo-1.9.14/debian/patches/99_autoreconf.patch 1970-01-01
02:00:00.000000000 +0200
+++ cairo-1.9.14/debian/patches/99_autoreconf.patch 2010-08-03
19:21:07.000000000 +0300
@@ -0,0 +1,603 @@
+--- a/config.h.in
++++ b/config.h.in
+@@ -23,6 +23,9 @@
+ /* Define to 1 to enable cairo's cairo-script-interpreter feature */
+ #undef CAIRO_HAS_INTERPRETER
+
++/* Define to 1 to enable cairo's cairo-perf-utils feature */
++#undef CAIRO_HAS_PERF_UTILS
++
+ /* Define to 1 to enable cairo's pthread feature */
+ #undef CAIRO_HAS_PTHREAD
+
+--- a/configure
++++ b/configure
+@@ -748,6 +748,8 @@
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
++CAIRO_HAS_PERF_UTILS_FALSE
++CAIRO_HAS_PERF_UTILS_TRUE
+ HAVE_GTK_FALSE
+ HAVE_GTK_TRUE
+ gtk_LIBS
+@@ -1134,6 +1136,7 @@
+ enable_interpreter
+ enable_symbol_lookup
+ enable_some_floating_point
++enable_perf_utils
+ '
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1944,6 +1947,8 @@
+ option can improve performance on systems without a
+ double precision floating-point unit, but might
+ degrade performance on those that do.
++ --enable-perf-utils=[no/auto/yes]
++ Enable cairo's cairo-perf-utils feature [default=no]
+
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+@@ -6039,13 +6044,13 @@
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6042: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6047: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6045: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6050: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6048: output\"" >&5)
++ (eval echo "\"\$as_me:6053: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -7247,7 +7252,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7250 "configure"' > conftest.$ac_ext
++ echo '#line 7255 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -8507,11 +8512,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8510: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8515: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8514: \$? = $ac_status" >&5
++ echo "$as_me:8519: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8846,11 +8851,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8849: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8854: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8853: \$? = $ac_status" >&5
++ echo "$as_me:8858: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8951,11 +8956,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8954: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8959: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8958: \$? = $ac_status" >&5
++ echo "$as_me:8963: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9006,11 +9011,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9009: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9014: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9013: \$? = $ac_status" >&5
++ echo "$as_me:9018: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11390,7 +11395,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11393 "configure"
++#line 11398 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11486,7 +11491,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11489 "configure"
++#line 11494 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -15571,11 +15576,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15574: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15579: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15578: \$? = $ac_status" >&5
++ echo "$as_me:15583: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -15670,11 +15675,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15673: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15678: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15677: \$? = $ac_status" >&5
++ echo "$as_me:15682: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -15722,11 +15727,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15725: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15730: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15729: \$? = $ac_status" >&5
++ echo "$as_me:15734: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -34147,6 +34152,215 @@
+ fi
+
+
++
++
# Check whether
--enable-perf-utils was given.
++if test "${enable_perf_utils+set}" = set; then :
++ enableval=$enable_perf_utils; enable_perf_utils=$enableval
++else
++ enable_perf_utils=no
++fi
++
++ case $enable_perf_utils in #(
++ no) :
++ use_perf_utils="no (disabled, use --enable-perf-utils to
enable)"
++ ;; #(
++ yes|auto) :
++
if test "x$cairo_cv_perf_utils_cache_version"
!= "x6" -o \
++ "x$cairo_cv_perf_utils_cache_commands_len" != "x18"
-o \
++ "x$cairo_cv_perf_utils_cache_vars" != "x BASE
REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then :
++ unset cairo_cv_perf_utils_use
++fi
++ if test "x$enable_perf_utils" = xyes -a
"x$cairo_cv_perf_utils_use" != xyes; then :
++ unset cairo_cv_perf_utils_use
++fi
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo's
cairo-perf-utils feature" >&5
++$as_echo_n "checking for cairo's cairo-perf-utils feature... " >&6; }
++if test "${cairo_cv_perf_utils_use+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ echo
++ use_perf_utils=yes
++ perf_utils_BASE="cairo"
++perf_utils_REQUIRES="$ac_env_perf_utils_REQUIRES_value"
++perf_utils_CFLAGS="$ac_env_perf_utils_CFLAGS_value"
++perf_utils_NONPKGCONFIG_CFLAGS="$ac_env_perf_utils_NONPKGCONFIG_CFLAGS_value"
++perf_utils_LIBS="$ac_env_perf_utils_LIBS_value"
++perf_utils_NONPKGCONFIG_LIBS="$ac_env_perf_utils_NONPKGCONFIG_LIBS_value"
++
++ use_perf_utils=yes
++ cairo_cv_perf_utils_use=$use_perf_utils
++ cairo_cv_perf_utils_cache_vars=" BASE REQUIRES CFLAGS
NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
++ cairo_cv_perf_utils_cache_commands_len="18"
++ cairo_cv_perf_utils_cache_version="6"
++ cairo_cv_perf_utils_BASE=$perf_utils_BASE
++cairo_cv_perf_utils_REQUIRES=$perf_utils_REQUIRES
++cairo_cv_perf_utils_CFLAGS=$perf_utils_CFLAGS
++cairo_cv_perf_utils_NONPKGCONFIG_CFLAGS=$perf_utils_NONPKGCONFIG_CFLAGS
++cairo_cv_perf_utils_LIBS=$perf_utils_LIBS
++cairo_cv_perf_utils_NONPKGCONFIG_LIBS=$perf_utils_NONPKGCONFIG_LIBS
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking
whether cairo's cairo-perf-utils feature could be enabled" >&5
++$as_echo_n "checking whether cairo's cairo-perf-utils feature could be
enabled... " >&6; }
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cairo_cv_perf_utils_use" >&5
++$as_echo "$cairo_cv_perf_utils_use" >&6; }
++ use_perf_utils=$cairo_cv_perf_utils_use
++
++ if test "x$enable_perf_utils" = "xyes" -a "x$use_perf_utils" !=
xyes; then :
++ as_fn_error " cairo-perf-utils feature could not be
enabled" "$LINENO" 5
++
++fi ;; #(
++ *) :
++ as_fn_error "invalid argument passed to
--enable-perf-utils: \`$use_perf_utils', should be one of [no/auto/yes]"
"$LINENO" 5
++ ;;
++esac
++ if test "x$use_perf_utils" = "xyes"; then :
++ perf_utils_BASE=$cairo_cv_perf_utils_BASE
++perf_utils_REQUIRES=$cairo_cv_perf_utils_REQUIRES
++perf_utils_CFLAGS=$cairo_cv_perf_utils_CFLAGS
++perf_utils_NONPKGCONFIG_CFLAGS=$cairo_cv_perf_utils_NONPKGCONFIG_CFLAGS
++perf_utils_LIBS=$cairo_cv_perf_utils_LIBS
++perf_utils_NONPKGCONFIG_LIBS=$cairo_cv_perf_utils_NONPKGCONFIG_LIBS
++
++
CAIRO_REQUIRES="$perf_utils_REQUIRES"" ${CAIRO_REQUIRES}"
++
++
CAIRO_CFLAGS="$perf_utils_CFLAGS"" ${CAIRO_CFLAGS}"
++
++
CAIRO_NONPKGCONFIG_CFLAGS="$perf_utils_NONPKGCONFIG_CFLAGS""
${CAIRO_NONPKGCONFIG_CFLAGS}"
++
++
CAIRO_LIBS="$perf_utils_LIBS"" ${CAIRO_LIBS}"
++
++
CAIRO_NONPKGCONFIG_LIBS="$perf_utils_NONPKGCONFIG_LIBS""
${CAIRO_NONPKGCONFIG_LIBS}"
++
++
++else
++
perf_utils_BASE=$cairo_cv_perf_utils_BASE
++perf_utils_REQUIRES=$cairo_cv_perf_utils_REQUIRES
++perf_utils_CFLAGS=$cairo_cv_perf_utils_CFLAGS
++perf_utils_NONPKGCONFIG_CFLAGS=$cairo_cv_perf_utils_NONPKGCONFIG_CFLAGS
++perf_utils_LIBS=$cairo_cv_perf_utils_LIBS
++perf_utils_NONPKGCONFIG_LIBS=$cairo_cv_perf_utils_NONPKGCONFIG_LIBS
++
++
++fi
++
++ if test
"x$use_perf_utils" = xyes; then
++ CAIRO_HAS_PERF_UTILS_TRUE=
++ CAIRO_HAS_PERF_UTILS_FALSE='#'
++else
++ CAIRO_HAS_PERF_UTILS_TRUE='#'
++ CAIRO_HAS_PERF_UTILS_FALSE=
++fi
++
++
++
cr_make_tmp='CAIRO_HAS_PERF_UTILS=0'
++
CAIRO_MAKEFILE___WIN32="${CAIRO_MAKEFILE___WIN32}
++""$cr_make_tmp"
++
++
++
cr_make_tmp=''
++
CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
++""$cr_make_tmp"
++
++
CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
++""$cr_make_tmp"
++
cr_make_tmp=''
++
CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
++""$cr_make_tmp"
++
++
CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
++""$cr_make_tmp"
++
++
++
++
++
++
++
cr_make_tmp='all_cairo_private += $(cairo_perf_utils_private)
$(cairo_perf_utils_headers)
++all_cairo_cxx_sources += $(cairo_perf_utils_cxx_sources)
++all_cairo_sources += $(cairo_perf_utils_sources)'
++
CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
++""$cr_make_tmp"
++
++
CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
++""$cr_make_tmp"
++
cr_make_tmp='all_cairo_boilerplate_private +=
$(cairo_boilerplate_perf_utils_private) $(cairo_boilerplate_perf_utils_headers)
++all_cairo_boilerplate_cxx_sources +=
$(cairo_boilerplate_perf_utils_cxx_sources)
++all_cairo_boilerplate_sources += $(cairo_boilerplate_perf_utils_sources)'
++
CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
++""$cr_make_tmp"
++
++
CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
++""$cr_make_tmp"
++
++
++
cr_make_tmp='enabled_cairo_private += $(cairo_perf_utils_private)
$(cairo_perf_utils_headers)
++enabled_cairo_cxx_sources += $(cairo_perf_utils_cxx_sources)
++enabled_cairo_sources += $(cairo_perf_utils_sources)'
++
CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
++"'if CAIRO_HAS_PERF_UTILS'
++
CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
++""$cr_make_tmp"
++
CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
++"'endif'
++
++
CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
++"'ifeq ($(CAIRO_HAS_PERF_UTILS),1)'
++
CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
++""$cr_make_tmp"
++
CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
++"'endif'
++
cr_make_tmp='enabled_cairo_boilerplate_private +=
$(cairo_boilerplate_perf_utils_private) $(cairo_boilerplate_perf_utils_headers)
++enabled_cairo_boilerplate_cxx_sources +=
$(cairo_boilerplate_perf_utils_cxx_sources)
++enabled_cairo_boilerplate_sources += $(cairo_boilerplate_perf_utils_sources)'
++
CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
++"'if CAIRO_HAS_PERF_UTILS'
++
CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
++""$cr_make_tmp"
++
CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
++"'endif'
++
++
CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
++"'ifeq ($(CAIRO_HAS_PERF_UTILS),1)'
++
CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
++""$cr_make_tmp"
++
CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
++"'endif'
++
++
++
++
++
++
++
++
++
++ if test "x$use_perf_utils" = xyes; then
:
++ :
++
++$as_echo "#define CAIRO_HAS_PERF_UTILS 1" >>confdefs.h
++
++
++
++fi
++
cr_make_tmp=' @echo "#define CAIRO_HAS_PERF_UTILS 1" >> src/cairo-features.h'
++
CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32}
++"'ifeq ($(CAIRO_HAS_PERF_UTILS),1)'
++
CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32}
++""$cr_make_tmp"
++
CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32}
++"'endif'
++
++
++
++
++
++
++
++
++
+ ac_config_files="$ac_config_files Makefile boilerplate/Makefile src/Makefile
test/Makefile test/pdiff/Makefile perf/Makefile util/Makefile
util/cairo-fdr/Makefile util/cairo-script/Makefile
util/cairo-script/examples/Makefile util/cairo-sphinx/Makefile
util/cairo-trace/Makefile util/cairo-trace/cairo-trace doc/Makefile
doc/public/Makefile"
+
+
+@@ -34544,6 +34758,10 @@
+ as_fn_error "conditional \"HAVE_GTK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${CAIRO_HAS_PERF_UTILS_TRUE}" && test -z
"${CAIRO_HAS_PERF_UTILS_FALSE}"; then
++ as_fn_error "conditional \"CAIRO_HAS_PERF_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+
+ : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+@@ -37986,6 +38204,7 @@
+ echo "The following features and utilities:"
+ echo " cairo-trace: $use_trace"
+ echo " cairo-script-interpreter: $use_interpreter"
++ echo " cairo-perf-utils: $use_perf_utils"
+ echo ""
+ echo "And the following internal features:"
+ echo " pthread: $use_pthread"
+--- a/perf/Makefile.in
++++ b/perf/Makefile.in
+@@ -14,6 +14,7 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -41,12 +42,20 @@
+ cairo-perf-graph-files$(EXEEXT)
+ TESTS =
+ check_PROGRAMS =
+...@cairo_has_win32_surface_true@am__append_1 = cairo-perf-win32.c
+...@cairo_has_os2_surface_true@@cairo_has_win32_surface_fa...@am__append_2 =
cairo-perf-os2.c
+...@cairo_has_os2_surface_false@@cairo_has_win32_surface_fa...@am__append_3 =
cairo-perf-posix.c
+...@cairo_has_win32_surface_true@am__append_4 = cairo-perf-win32.c
+...@cairo_has_os2_surface_true@@cairo_has_win32_surface_fa...@am__append_5 =
cairo-perf-os2.c
+...@cairo_has_os2_surface_false@@cairo_has_win32_surface_fa...@am__append_6 =
cairo-perf-posix.c
+...@cairo_has_perf_utils_true@bin_PROGRAMS = cairo-perf-micro$(EXEEXT) \
+...@cairo_has_perf_utils_true@ cairo-perf-trace$(EXEEXT) \
+...@cairo_has_perf_utils_true@ cairo-perf-diff-files$(EXEEXT) \
+...@cairo_has_perf_utils_true@ cairo-perf-print$(EXEEXT) \
+...@cairo_has_perf_utils_true@ cairo-perf-chart$(EXEEXT) \
+...@cairo_has_perf_utils_true@ cairo-perf-compare-backends$(EXEEXT) \
+...@cairo_has_perf_utils_true@ $(am__EXEEXT_1)
+...@cairo_has_perf_utils_true@@have_gtk_t...@am__append_1 =
cairo-perf-graph-files
+...@cairo_has_win32_surface_true@am__append_2 = cairo-perf-win32.c
+...@cairo_has_os2_surface_true@@cairo_has_win32_surface_fa...@am__append_3 =
cairo-perf-os2.c
+...@cairo_has_os2_surface_false@@cairo_has_win32_surface_fa...@am__append_4 =
cairo-perf-posix.c
+...@cairo_has_win32_surface_true@am__append_5 = cairo-perf-win32.c
+...@cairo_has_os2_surface_true@@cairo_has_win32_surface_fa...@am__append_6 =
cairo-perf-os2.c
+...@cairo_has_os2_surface_false@@cairo_has_win32_surface_fa...@am__append_7 =
cairo-perf-posix.c
+ subdir = perf
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
+@@ -83,6 +92,9 @@
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
+...@cairo_has_perf_utils_true@@have_gtk_t...@am__exeext_1 =
cairo-perf-graph-files$(EXEEXT)
++am__installdirs = "$(DESTDIR)$(bindir)"
++PROGRAMS = $(bin_PROGRAMS)
+ am_cairo_perf_chart_OBJECTS = cairo-perf-chart.$(OBJEXT)
+ cairo_perf_chart_OBJECTS = $(am_cairo_perf_chart_OBJECTS)
+ cairo_perf_chart_LDADD = $(LDADD)
+@@ -446,7 +458,7 @@
+ micro/world-map.c micro/world-map.h micro/zrusin.c \
+ micro/zrusin-another.h micro/long-dashed-lines.c \
+ micro/dragon.c micro/pythagoras-tree.c micro/intersections.c \
+- micro/spiral.c $(am__append_1) $(am__append_2) $(am__append_3)
++ micro/spiral.c $(am__append_2) $(am__append_3) $(am__append_4)
+ cairo_perf_micro_LDADD = $(LDADD)
+ cairo_perf_micro_DEPENDENCIES = \
+ $(top_builddir)/boilerplate/libcairoboilerplate.la \
+@@ -459,7 +471,7 @@
+ cairo-stats.h
+
+ cairo_perf_trace_SOURCES = cairo-perf-trace.c ../src/cairo-hash.c \
+- $(am__append_4) $(am__append_5) $(am__append_6)
++ $(am__append_5) $(am__append_6) $(am__append_7)
+ cairo_perf_trace_LDADD = \
+ $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
+ $(LDADD)
+@@ -543,6 +555,49 @@
+ $(am__aclocal_m4_deps):
+ libcairoperf.la: $(libcairoperf_la_OBJECTS) $(libcairoperf_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(LINK) $(libcairoperf_la_OBJECTS)
$(libcairoperf_la_LIBADD) $(LIBS)
++install-binPROGRAMS: $(bin_PROGRAMS)
++ @$(NORMAL_INSTALL)
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed 's/$(EXEEXT)$$//' | \
++ while read p p1; do if test -f $$p || test -f $$p1; \
++ then echo "$$p"; echo "$$p"; else :; fi; \
++ done | \
++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
++ sed 'N;N;N;s,\n, ,g' | \
++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
++ if ($$2 == $$4) files[d] = files[d] " " $$1; \
++ else { print "f", $$3 "/" $$4, $$1; } } \
++ END { for (d in files) print "f", d, files[d] }' | \
++ while read type dir files; do \
++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
++ test -z "$$files" || { \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(bindir)$$dir'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(bindir)$$dir" || exit $$?; \
++ } \
++ ; done
++
++uninstall-binPROGRAMS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ files=`for p in $$list; do echo "$$p"; done | \
++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
++ -e 's/$$/$(EXEEXT)/' `; \
++ test -n "$$list" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(bindir)" && rm -f $$files
++
++clean-binPROGRAMS:
++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
++ echo " rm -f" $$list; \
++ rm -f $$list || exit $$?; \
++ test -n "$(EXEEXT)" || exit 0; \
++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f" $$list; \
++ rm -f $$list
+
+ clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+@@ -1294,8 +1349,11 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+-all-am: Makefile
++all-am: Makefile $(PROGRAMS)
+ installdirs:
++ for dir in "$(DESTDIR)$(bindir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+ install-exec: install-exec-am
+@@ -1328,8 +1386,8 @@
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ clean: clean-am
+
+-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+- mostlyclean-am
++clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
++ clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+@@ -1355,7 +1413,7 @@
+
+ install-dvi-am:
+
+-install-exec-am:
++install-exec-am: install-binPROGRAMS
+
+ install-html: install-html-am
+
+@@ -1395,23 +1453,24 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-binPROGRAMS
+
+ .MAKE: all check check-am install install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+- clean-checkPROGRAMS clean-generic clean-libtool ctags \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am html-local info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am
++ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
++ clean-libtool ctags distclean distclean-compile \
++ distclean-generic distclean-libtool distclean-tags distdir dvi \
++ dvi-am html html-am html-local info info-am install install-am \
++ install-binPROGRAMS install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-binPROGRAMS
+
+
+ # Install rules to rebuild the libraries and add explicit dependencies
diff -Nru cairo-1.9.14/debian/patches/series cairo-1.9.14/debian/patches/series
--- cairo-1.9.14/debian/patches/series 2010-07-26 16:07:25.000000000 +0300
+++ cairo-1.9.14/debian/patches/series 2010-08-03 19:21:07.000000000 +0300
@@ -1 +1,3 @@
+01_build_perf_utils.patch
+99_autoreconf.patch
99_ltmain_as-needed.patch
diff -Nru cairo-1.9.14/debian/rules cairo-1.9.14/debian/rules
--- cairo-1.9.14/debian/rules 2010-07-26 16:10:22.000000000 +0300
+++ cairo-1.9.14/debian/rules 2010-08-03 15:58:22.000000000 +0300
@@ -52,7 +52,7 @@
main_configure_flags += \
$(configure_flags) \
--enable-xlib --enable-svg \
---enable-xcb
+--enable-xcb --enable-perf-utils
udeb_configure_flags += \
$(configure_flags) \
@@ -151,6 +151,7 @@
dh_compress -s
dh_fixperms -s
dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>=
1.9.14)' -- -c4
+ dh_makeshlibs -plibcairo-script-interpreter2 -V
'libcairo-script-interpreter2 (>= 1.9.14)' -- -c4
dh_installdeb -s
dh_shlibdeps -s
dh_perl -s
