From: Rusty Lynch Date: Wed, 5 Jun 2013 22:14:02 +0000 (-0700) Subject: Imported Upstream version 1.7.7 X-Git-Tag: upstream/1.7.7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cb46e4816809235fef7d151cab9e15c4ced790c;p=platform%2Fupstream%2Fevas.git Imported Upstream version 1.7.7 --- diff --git a/ChangeLog b/ChangeLog index c12fce2..54da44a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1151,4 +1151,146 @@ * 1.7.5 release +2013-01-05 Joel Klinghed + * fribidi header include path fix. + +2013-01-07 Thomas Petazzoni + + * Fix build of Evas XCB backend. + +2013-01-09 Jiyoun Park (jypark) + + * Fix evas bmp loader code which deal with image size. + +2013-01-11 Cedric Bail + + * Fix not up to date clip cache for Evas_Object_Text. + +2013-01-11 Tom Hacohen (TAsn) + + * Static libs: Updated liblinebreak to libunibreak's latest version. + * Evas texblock: Fixed a bug with breaking after format items. + +2013-01-14 Tom Hacohen (TAsn) + + * Evas textblock: Fixed issue with line height when breaking on a + format. + +2013-01-15 ChunEon Park (Hermet) + + * Fix SIGFPE in evas map update if image size is 0. + +2013-01-15 Tom Hacohen (TAsn) + + * Evas texblock: Fixed issue and simplified cursor_geometry_get. + * Evas text: Fixed issue with horiz advance. + * Evas text utils: Fixed issue with no-harfbuzz bidi. + +2013-01-16 Carsten Haitzler (The Rasterman) + + * Fixed pixman image wrapping to handle allocated size instead + of image size (unless allocated is 0/wrong). + +2013-02-04 Raphael Kubo da Costa + + * Stop initializing and shutting Fontconfig down + +2013-02-08 Tom Hacohen (TAsn) + + * Evas textblock: Fixed a selection issue with different scripts and + bidi. + +2013-02-08 Daniel Willman + + * Fix memory usage spike when rotating with the software_x11 engine. + +2013-02-16 Cedric Bail + + * Fix bmp portability issue on some 64bits system. + * Fix textgrid portability issue on some 64bits system. + +2013-02-16 Paulo C. A. Cavalcanti Jr + + * Evas: add pixels_alpha_get to evas engine. + +2013-02-21 Tom Hacohen (TAsn) + + * Evas text: Fixed bug with the text object direction detection. + * Evas font: Fixed font run detection for specific cases with 2 + different fonts in the middle of a run. + +2013-02-23 ChunEon Park (Hermet) + + * Evas cache: remove the freed worker from the pthread worker list when it's failed to create a new thread so as not to access it if a thread is working newly. + +2013-03-28 Carsten Haitzler (The Rasterman) + + * Change evas_textblock_cursor_word_start() and + evas_textblock_cursor_word_end() to walk extra whitespaces when + moving up and down words that tends to look more like other + toolkits (gtk, qt). the docs dont specifically say the rules + on word finding, so being consistent is better i believe and + so we can assume the prior behavior is a bug. + +2013-03-04 Cedric Bail + + * Fix crash in Evas Buffer engine when using output without alpha channel. + +2013-04-04 Tom Hacohen + + * Evas font: If OS/2 table is available and the font is demi-bold, + don't do runtime emboldment. + +2013-04-04 Rafael Antognolli + + * 1.7.6 release + +2013-04-05 Cedric Bail + + * Fix over redrawing of Evas_Map when applied on smart object. + + +2013-04-04 Tom Hacohen + + * Evas font: Fix a bug with cluster size calculation with texts ending + with ligatures. + +2013-04-05 Rafael Antognolli + + Fix build, add missing FRIBIDI cflags. + +2013-04-09 Rafael Antognolli + + * 1.7.6.1 release + +2013-04-13 ChunEon Park + + * Evas: Don't be crashed even if the map image size is 0. + +2013-04-14 ChunEon Park + + * Evas: Don't update evas update area by the clipper if the image obj visible is changed. + +2013-04-15 Tom Hacohen + + * Evas textblock: Fixed a bug with deletion of ranges that end just + before a visual format. + +2013-04-15 ChunEon Park + * Evas: If an object goes to be hidden without replacing the cur/prev + state info, the object context can be corrupted at the next show time. + Now it replaces the cur/prev in that rare case. + +2013-04-22 Mike Blumenkrantz + + * Fix recursive proxy image rendering to just render black + +2013-04-25 Tom Hacohen + + * Evas textblock: Fixed line size calculation when using multiple fonts. + +2013-05-10 Tom Hacohen + + * Evas text: Fixed line size calculation when using multiple + fonts. diff --git a/Makefile.in b/Makefile.in index 9f7aa96..a159d36 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -145,6 +162,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -633,8 +655,11 @@ evas.spec: $(top_builddir)/config.status $(srcdir)/evas.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -674,8 +699,11 @@ distclean-libtool: -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -860,13 +888,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -952,7 +977,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/NEWS b/NEWS index 703f815..6188963 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,63 @@ -Evas 1.7.5 +Evas 1.7.7 + +Changes since Evas 1.7.6: +------------------------- + +Fixes: + * Fix over redrawing of Evas_Map when applied on smart object. + * Evas font: Fix a bug with cluster size calculation with texts ending + with ligatures. + * Evas map: don't be crashed even if image size is 0. + * Evas: Don't update evas update area by the clipper if the image obj visible is changed. + * Evas textblock: Fixed a bug with deletion of ranges that end just before a visual format. + * Evas: If an object goes to be hidden without replacing the cur/prev state info, the object context can be corrupted at the next show time. Now it replaces the cur/prev in that rare case. + * Fix recursive proxy image rendering to just render black + * Evas text: Fixed line size calculation when using multiple fonts. + +Evas 1.7.6 + * Fix SIGFPE in evas map update if image is 0. + * Evas textblock: Fixed issue and simplified cursor_geometry_get. + * Evas text: Fixed issue with horiz advance. + * Evas text utils: Fixed issue with no-harfbuzz bidi. + * Fixed pixman surface alloc where allocated and image size differ. + * Stop initializing and shutting Fontconfig down + * Evas textblock: Fixed a selection issue with different scripts and bidi. + * Fix memory usage spike when rotating with the software_x11 engine. + * Fix bmp portability issue on some 64bits system. + * Fix textgrid portability issue on some 64bits system. + * Evas text: Fixed bug with the text object direction detection. + * Evas font: Fixed font run detection for specific cases with 2 different fonts in the middle of a run. + * Evas cache: remove the freed worker from the pthread worker list when it's failed to create a new thread so as not to access it if a thread is working newly. + * Fix evas word start/end find in textblock to be consistent with other toolkit logic on the matter + * Fix crash in Evas Buffer engine when using output with no alpha. + * Evas textblock: Fixed line size calculation when using multiple fonts. + +Changes since Evas 1.7.5: +------------------------- + +Fixes: + * Fix SIGFPE in evas map update if image is 0. + * Evas textblock: Fixed issue and simplified cursor_geometry_get. + * Evas text: Fixed issue with horiz advance. + * Evas text utils: Fixed issue with no-harfbuzz bidi. + * Fixed pixman surface alloc where allocated and image size differ. + * Stop initializing and shutting Fontconfig down + * Evas textblock: Fixed a selection issue with different scripts and bidi. + * Fix memory usage spike when rotating with the software_x11 engine. + * Fix bmp portability issue on some 64bits system. + * Fix textgrid portability issue on some 64bits system. + * Evas text: Fixed bug with the text object direction detection. + * Evas font: Fixed font run detection for specific cases with 2 different fonts in the middle of a run. + * Evas cache: remove the freed worker from the pthread worker list when it's failed to create a new thread so as not to access it if a thread is working newly. + * Fix evas word start/end find in textblock to be consistent with other toolkit logic on the matter + * Fix crash in Evas Buffer engine when using output with no alpha. + * Evas font: If OS/2 table is available and the font is demi-bold, don't do runtime emboldment. + * Fix build of Evas XCB backend. + * Fix evas bmp loader code which deal with image size. + * Fix not up to date clip cache for Evas_Object_Text. + * Evas texblock: Fixed a bug with breaking after format items. + * Evas textblock: Fixed issue with line height when breaking on a format. + * Evas: add pixels_alpha_get to evas engine. Changes since Evas 1.7.4: ------------------------- diff --git a/aclocal.m4 b/aclocal.m4 index ff29fba..dd190a5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -48,8 +48,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -95,8 +94,7 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], [pkg_failed=yes]) else pkg_failed=untried @@ -144,9 +142,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -159,7 +157,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl +_PKG_TEXT]) ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -170,7 +168,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])[]dnl +To get pkg-config, see .]) ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -198,7 +196,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +212,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/configure b/configure index 9cb75dd..b3ca2ae 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for evas 1.7.5. +# Generated by GNU Autoconf 2.68 for evas 1.7.7. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='evas' PACKAGE_TARNAME='evas' -PACKAGE_VERSION='1.7.5' -PACKAGE_STRING='evas 1.7.5' +PACKAGE_VERSION='1.7.7' +PACKAGE_STRING='evas 1.7.7' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1808,7 +1808,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures evas 1.7.5 to adapt to many kinds of systems. +\`configure' configures evas 1.7.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1882,7 +1882,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evas 1.7.5:";; + short | recursive ) echo "Configuration of evas 1.7.7:";; esac cat <<\_ACEOF @@ -2253,7 +2253,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evas configure 1.7.5 +evas configure 1.7.7 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -3105,7 +3105,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evas $as_me 1.7.5, which was +It was created by evas $as_me 1.7.7, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3929,7 +3929,7 @@ fi # Define the identity of the package. PACKAGE='evas' - VERSION='1.7.5' + VERSION='1.7.7' cat >>confdefs.h <<_ACEOF @@ -6953,7 +6953,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -10081,9 +10081,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -10305,7 +10302,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10482,7 +10479,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10936,7 +10932,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11949,10 +11945,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11964,18 +11964,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -12963,7 +12951,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 5 +#define VMIC 7 _ACEOF @@ -12971,7 +12959,7 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="8:5:7" +version_info="8:7:7" release_info="" @@ -12990,7 +12978,7 @@ case "$host_os" in MODULE_ARCH="$host_os-$host_cpu" ;; *) - MODULE_ARCH="$host_os-$host_cpu-1.7.5" + MODULE_ARCH="$host_os-$host_cpu-1.7.7" ;; esac @@ -15947,7 +15935,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -16318,9 +16306,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs_CXX=no - ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -16931,10 +16916,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16946,18 +16935,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -17940,7 +17917,6 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -18244,7 +18220,6 @@ if test -n "$EVIL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil >= 1.0.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18261,7 +18236,6 @@ if test -n "$EVIL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil >= 1.0.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18281,9 +18255,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil >= 1.0.0" 2>&1` + EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1` else - EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil >= 1.0.0" 2>&1` + EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVIL_PKG_ERRORS" >&5 @@ -18298,6 +18272,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables EVIL_CFLAGS and EVIL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18313,6 +18288,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS EVIL_LIBS=$pkg_cv_EVIL_LIBS @@ -18344,7 +18320,6 @@ if test -n "$EXOTIC_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXOTIC_CFLAGS=`$PKG_CONFIG --cflags "exotic" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18361,7 +18336,6 @@ if test -n "$EXOTIC_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXOTIC_LIBS=`$PKG_CONFIG --libs "exotic" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18381,9 +18355,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "exotic" 2>&1` + EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exotic" 2>&1` else - EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "exotic" 2>&1` + EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors "exotic" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EXOTIC_PKG_ERRORS" >&5 @@ -18435,7 +18409,6 @@ if test -n "$EINA_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.6.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18452,7 +18425,6 @@ if test -n "$EINA_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.6.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18472,9 +18444,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina >= 1.6.0" 2>&1` + EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= 1.6.0" 2>&1` else - EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina >= 1.6.0" 2>&1` + EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= 1.6.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EINA_PKG_ERRORS" >&5 @@ -18489,6 +18461,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables EINA_CFLAGS and EINA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18504,6 +18477,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else EINA_CFLAGS=$pkg_cv_EINA_CFLAGS EINA_LIBS=$pkg_cv_EINA_LIBS @@ -18565,7 +18539,6 @@ if test -n "$FREETYPE_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 9.3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18582,7 +18555,6 @@ if test -n "$FREETYPE_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 9.3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18602,9 +18574,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 >= 9.3.0" 2>&1` + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2 >= 9.3.0" 2>&1` else - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 >= 9.3.0" 2>&1` + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2 >= 9.3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FREETYPE_PKG_ERRORS" >&5 @@ -18619,6 +18591,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables FREETYPE_CFLAGS and FREETYPE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18634,6 +18607,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS @@ -18677,7 +18651,6 @@ if test -n "$FONTCONFIG_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.5.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18694,7 +18667,6 @@ if test -n "$FONTCONFIG_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.5.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18714,9 +18686,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig >= 2.5.0" 2>&1` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= 2.5.0" 2>&1` else - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig >= 2.5.0" 2>&1` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= 2.5.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FONTCONFIG_PKG_ERRORS" >&5 @@ -18816,7 +18788,6 @@ if test -n "$FRIBIDI_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FRIBIDI_CFLAGS=`$PKG_CONFIG --cflags "fribidi >= 0.19.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18833,7 +18804,6 @@ if test -n "$FRIBIDI_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FRIBIDI_LIBS=`$PKG_CONFIG --libs "fribidi >= 0.19.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18853,9 +18823,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fribidi >= 0.19.2" 2>&1` + FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fribidi >= 0.19.2" 2>&1` else - FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fribidi >= 0.19.2" 2>&1` + FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors "fribidi >= 0.19.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FRIBIDI_PKG_ERRORS" >&5 @@ -18960,7 +18930,6 @@ if test -n "$HARFBUZZ_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "harfbuzz >= 0.9.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18977,7 +18946,6 @@ if test -n "$HARFBUZZ_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "harfbuzz >= 0.9.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18997,9 +18965,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz >= 0.9.0" 2>&1` + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "harfbuzz >= 0.9.0" 2>&1` else - HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz >= 0.9.0" 2>&1` + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors "harfbuzz >= 0.9.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$HARFBUZZ_PKG_ERRORS" >&5 @@ -19091,7 +19059,6 @@ if test -n "$PIXMAN_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19108,7 +19075,6 @@ if test -n "$PIXMAN_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PIXMAN_LIBS=`$PKG_CONFIG --libs "pixman-1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19128,9 +19094,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1" 2>&1` + PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pixman-1" 2>&1` else - PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 2>&1` + PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "pixman-1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PIXMAN_PKG_ERRORS" >&5 @@ -21715,7 +21681,6 @@ if test -n "$SDL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21732,7 +21697,6 @@ if test -n "$SDL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21752,9 +21716,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 @@ -21769,6 +21733,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables SDL_CFLAGS and SDL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -21784,6 +21749,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else SDL_CFLAGS=$pkg_cv_SDL_CFLAGS SDL_LIBS=$pkg_cv_SDL_LIBS @@ -22097,7 +22063,6 @@ if test -n "$GL_EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22114,7 +22079,6 @@ if test -n "$GL_EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22134,9 +22098,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` else - GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_EET_PKG_ERRORS" >&5 @@ -22382,7 +22346,6 @@ if test -n "$DIRECTFB_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.16" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22399,7 +22362,6 @@ if test -n "$DIRECTFB_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.16" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22419,9 +22381,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "directfb >= 0.9.16" 2>&1` + DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= 0.9.16" 2>&1` else - DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "directfb >= 0.9.16" 2>&1` + DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= 0.9.16" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DIRECTFB_PKG_ERRORS" >&5 @@ -22436,6 +22398,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DIRECTFB_CFLAGS and DIRECTFB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -22451,6 +22414,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS @@ -22586,7 +22550,6 @@ if test -n "$XCB_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22603,7 +22566,6 @@ if test -n "$XCB_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22623,9 +22585,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` else - XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XCB_PKG_ERRORS" >&5 @@ -23773,7 +23735,6 @@ if test -n "$SDL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -23790,7 +23751,6 @@ if test -n "$SDL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -23810,9 +23770,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 @@ -23827,6 +23787,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables SDL_CFLAGS and SDL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -23842,6 +23803,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else SDL_CFLAGS=$pkg_cv_SDL_CFLAGS SDL_LIBS=$pkg_cv_SDL_LIBS @@ -24080,7 +24042,6 @@ if test -n "$WAYLAND_EGL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -24097,7 +24058,6 @@ if test -n "$WAYLAND_EGL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -24117,9 +24077,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` + WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` else - WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` + WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WAYLAND_EGL_PKG_ERRORS" >&5 @@ -24164,7 +24124,6 @@ if test -n "$GL_EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -24181,7 +24140,6 @@ if test -n "$GL_EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -24201,9 +24159,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` else - GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_EET_PKG_ERRORS" >&5 @@ -24459,7 +24417,6 @@ if test -n "$XCB_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -24476,7 +24433,6 @@ if test -n "$XCB_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -24496,9 +24452,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` else - XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XCB_PKG_ERRORS" >&5 @@ -26534,7 +26490,6 @@ if test -n "$XCB_GL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_GL_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -26551,7 +26506,6 @@ if test -n "$XCB_GL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_GL_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -26571,9 +26525,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` + XCB_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` else - XCB_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` + XCB_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XCB_GL_PKG_ERRORS" >&5 @@ -26622,7 +26576,6 @@ if test -n "$GL_EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -26639,7 +26592,6 @@ if test -n "$GL_EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -26659,9 +26611,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` else - GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_EET_PKG_ERRORS" >&5 @@ -26768,7 +26720,6 @@ if test -n "$GL_EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -26785,7 +26736,6 @@ if test -n "$GL_EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -26805,9 +26755,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` else - GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_EET_PKG_ERRORS" >&5 @@ -27861,7 +27811,6 @@ if test -n "$GL_EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -27878,7 +27827,6 @@ if test -n "$GL_EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -27898,9 +27846,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` else - GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_EET_PKG_ERRORS" >&5 @@ -28012,7 +27960,6 @@ if test -n "$GL_EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28029,7 +27976,6 @@ if test -n "$GL_EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28049,9 +27995,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` else - GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_EET_PKG_ERRORS" >&5 @@ -28447,7 +28393,6 @@ if test -n "$EDB_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDB_CFLAGS=`$PKG_CONFIG --cflags "edb" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28464,7 +28409,6 @@ if test -n "$EDB_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDB_LIBS=`$PKG_CONFIG --libs "edb" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28484,9 +28428,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "edb" 2>&1` + EDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "edb" 2>&1` else - EDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "edb" 2>&1` + EDB_PKG_ERRORS=`$PKG_CONFIG --print-errors "edb" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDB_PKG_ERRORS" >&5 @@ -28631,7 +28575,6 @@ if test -n "$EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28648,7 +28591,6 @@ if test -n "$EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28668,9 +28610,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.0" 2>&1` else - EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EET_PKG_ERRORS" >&5 @@ -28793,7 +28735,6 @@ if test -n "$EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28810,7 +28751,6 @@ if test -n "$EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -28830,9 +28770,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.0" 2>&1` else - EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EET_PKG_ERRORS" >&5 @@ -29445,7 +29385,6 @@ if test -n "$PNG_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2.10" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29462,7 +29401,6 @@ if test -n "$PNG_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2.10" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29482,9 +29420,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2.10" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng >= 1.2.10" 2>&1` else - PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2.10" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng >= 1.2.10" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PNG_PKG_ERRORS" >&5 @@ -29518,7 +29456,6 @@ if test -n "$PNG_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng15" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29535,7 +29472,6 @@ if test -n "$PNG_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng15" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29555,9 +29491,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng15" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng15" 2>&1` else - PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng15" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng15" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PNG_PKG_ERRORS" >&5 @@ -29592,7 +29528,6 @@ if test -n "$PNG_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng14" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29609,7 +29544,6 @@ if test -n "$PNG_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng14" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29629,9 +29563,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng14" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng14" 2>&1` else - PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng14" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng14" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PNG_PKG_ERRORS" >&5 @@ -29666,7 +29600,6 @@ if test -n "$PNG_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12 >= 1.2.10" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29683,7 +29616,6 @@ if test -n "$PNG_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng12 >= 1.2.10" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29703,9 +29635,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng12 >= 1.2.10" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng12 >= 1.2.10" 2>&1` else - PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng12 >= 1.2.10" 2>&1` + PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng12 >= 1.2.10" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PNG_PKG_ERRORS" >&5 @@ -29852,7 +29784,6 @@ if test -n "$SVG_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVG_CFLAGS=`$PKG_CONFIG --cflags "esvg >= 0.0.16" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29869,7 +29800,6 @@ if test -n "$SVG_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVG_LIBS=`$PKG_CONFIG --libs "esvg >= 0.0.16" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -29889,9 +29819,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "esvg >= 0.0.16" 2>&1` + SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "esvg >= 0.0.16" 2>&1` else - SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "esvg >= 0.0.16" 2>&1` + SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "esvg >= 0.0.16" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SVG_PKG_ERRORS" >&5 @@ -32863,7 +32793,6 @@ if test -n "$VALGRIND_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind >= 2.4.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -32880,7 +32809,6 @@ if test -n "$VALGRIND_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind >= 2.4.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -32900,9 +32828,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind >= 2.4.0" 2>&1` + VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "valgrind >= 2.4.0" 2>&1` else - VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind >= 2.4.0" 2>&1` + VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors "valgrind >= 2.4.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$VALGRIND_PKG_ERRORS" >&5 @@ -32986,7 +32914,6 @@ if test -n "$ECORE_EVAS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ECORE_EVAS_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas ecore" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -33003,7 +32930,6 @@ if test -n "$ECORE_EVAS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ECORE_EVAS_LIBS=`$PKG_CONFIG --libs "ecore-evas ecore" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -33023,9 +32949,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-evas ecore" 2>&1` + ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas ecore" 2>&1` else - ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-evas ecore" 2>&1` + ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas ecore" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ECORE_EVAS_PKG_ERRORS" >&5 @@ -33057,7 +32983,6 @@ if test -n "$EDJE_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags "edje" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -33074,7 +32999,6 @@ if test -n "$EDJE_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs "edje" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -33094,9 +33018,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "edje" 2>&1` + EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "edje" 2>&1` else - EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "edje" 2>&1` + EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors "edje" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDJE_PKG_ERRORS" >&5 @@ -33173,7 +33097,6 @@ if test -n "$CHECK_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -33190,7 +33113,6 @@ if test -n "$CHECK_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -33210,9 +33132,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.5" 2>&1` + CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1` else - CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.5" 2>&1` + CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CHECK_PKG_ERRORS" >&5 @@ -34325,7 +34247,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evas $as_me 1.7.5, which was +This file was extended by evas $as_me 1.7.7, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34391,7 +34313,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -evas config.status 1.7.5 +evas config.status 1.7.7 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c429ba3..03adf7d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,8 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [5]) -m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) -m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) +m4_define([v_mic], [7]) +m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/data/Makefile.in b/data/Makefile.in index 028fda3..73bb9b9 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -65,6 +82,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -419,8 +441,11 @@ clean-libtool: -rm -rf .libs _libs install-filesDATA: $(files_DATA) @$(NORMAL_INSTALL) - test -z "$(filesdir)" || $(MKDIR_P) "$(DESTDIR)$(filesdir)" @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(filesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(filesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/depcomp b/depcomp index bd0ac08..25a39e6 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ EOF ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ gcc) ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ sgi) # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ sgi) rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ aix) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ aix) ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ icc) exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ hp2) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ hp2) tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ tru64) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ msvisualcpp) sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/doc/Makefile.in b/doc/Makefile.in index 62e3a40..9ea7c7d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -65,6 +82,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/evas.spec b/evas.spec index 3b10162..6256ac9 100644 --- a/evas.spec +++ b/evas.spec @@ -85,7 +85,7 @@ Summary: Multi-platform Canvas Library Name: evas -Version: 1.7.5 +Version: 1.7.7 Release: %{_rel} License: BSD Group: System Environment/Libraries diff --git a/ltmain.sh b/ltmain.sh index c2852d8..63ae69d 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION=2.4.2 TIMESTAMP="" package_revision=1.3337 @@ -6124,10 +6124,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6447,19 +6444,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -7352,9 +7349,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 828104c..56666f0 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2669,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2684,18 +2688,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3301,7 +3293,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4113,7 +4105,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4590,9 +4582,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4655,9 +4644,6 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4879,7 +4865,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5056,7 +5042,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5361,7 +5346,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff --git a/src/Makefile.in b/src/Makefile.in index 01d361a..9a6af0e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,6 +88,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -593,13 +615,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in index 4d9ee9b..183eaf6 100644 --- a/src/bin/Makefile.in +++ b/src/bin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -178,6 +195,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -625,8 +647,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -668,8 +693,11 @@ clean-binPROGRAMS: rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -951,13 +979,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/bin/loaders/Makefile.in b/src/bin/loaders/Makefile.in index 60cd8ff..0578657 100644 --- a/src/bin/loaders/Makefile.in +++ b/src/bin/loaders/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -82,6 +99,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -607,13 +629,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/bin/loaders/bmp/Makefile.in b/src/bin/loaders/bmp/Makefile.in index 945750c..b18f04d 100644 --- a/src/bin/loaders/bmp/Makefile.in +++ b/src/bin/loaders/bmp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -462,7 +484,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/eet/Makefile.in b/src/bin/loaders/eet/Makefile.in index b5ffadc..4c3cfb8 100644 --- a/src/bin/loaders/eet/Makefile.in +++ b/src/bin/loaders/eet/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -462,7 +484,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/ico/Makefile.in b/src/bin/loaders/ico/Makefile.in index 24562d5..0a02828 100644 --- a/src/bin/loaders/ico/Makefile.in +++ b/src/bin/loaders/ico/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -462,7 +484,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/jpeg/Makefile.in b/src/bin/loaders/jpeg/Makefile.in index d4c316f..77a2b8e 100644 --- a/src/bin/loaders/jpeg/Makefile.in +++ b/src/bin/loaders/jpeg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -463,7 +485,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -471,6 +492,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/pmaps/Makefile.in b/src/bin/loaders/pmaps/Makefile.in index fc2d9b3..13de029 100644 --- a/src/bin/loaders/pmaps/Makefile.in +++ b/src/bin/loaders/pmaps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -463,7 +485,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -471,6 +492,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/png/Makefile.in b/src/bin/loaders/png/Makefile.in index 51b0ca4..cd77c58 100644 --- a/src/bin/loaders/png/Makefile.in +++ b/src/bin/loaders/png/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -463,7 +485,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -471,6 +492,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/psd/Makefile.in b/src/bin/loaders/psd/Makefile.in index 07d84f1..3bf11ba 100644 --- a/src/bin/loaders/psd/Makefile.in +++ b/src/bin/loaders/psd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -462,7 +484,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/tga/Makefile.in b/src/bin/loaders/tga/Makefile.in index 217b7c8..cf0bfbe 100644 --- a/src/bin/loaders/tga/Makefile.in +++ b/src/bin/loaders/tga/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -462,7 +484,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/tiff/Makefile.in b/src/bin/loaders/tiff/Makefile.in index 0f7f116..6731598 100644 --- a/src/bin/loaders/tiff/Makefile.in +++ b/src/bin/loaders/tiff/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -463,7 +485,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -471,6 +492,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/wbmp/Makefile.in b/src/bin/loaders/wbmp/Makefile.in index 0e34953..525bd14 100644 --- a/src/bin/loaders/wbmp/Makefile.in +++ b/src/bin/loaders/wbmp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -462,7 +484,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/bin/loaders/xpm/Makefile.in b/src/bin/loaders/xpm/Makefile.in index eb5196c..9d75a86 100644 --- a/src/bin/loaders/xpm/Makefile.in +++ b/src/bin/loaders/xpm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(module_la_SOURCES) DIST_SOURCES = $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -463,7 +485,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -471,6 +492,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/examples/Makefile.in b/src/examples/Makefile.in index eea8918..c19ba16 100644 --- a/src/examples/Makefile.in +++ b/src/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -231,6 +248,11 @@ DIST_SOURCES = $(am__evas_aspect_hints_SOURCES_DIST) \ $(am__evas_smart_object_SOURCES_DIST) \ $(am__evas_stacking_SOURCES_DIST) \ $(am__evas_text_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -654,8 +676,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-examplesPROGRAMS: $(examples_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -791,8 +816,11 @@ clean-libtool: -rm -rf .libs _libs install-filesDATA: $(files_DATA) @$(NORMAL_INSTALL) - test -z "$(filesdir)" || $(MKDIR_P) "$(DESTDIR)$(filesdir)" @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(filesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(filesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/Evas.h b/src/lib/Evas.h index d48018b..db00b06 100644 --- a/src/lib/Evas.h +++ b/src/lib/Evas.h @@ -2088,7 +2088,7 @@ EAPI void evas_pointer_output_xy_get(const Evas *e, int *x, int *y) * Evas_Coord mouse_x, mouse_y; * * evas_pointer_output_xy_get(evas, &mouse_x, &mouse_y); - * printf("Mouse is at canvas position %f, %f\n", mouse_x, mouse_y); + * printf("Mouse is at canvas position %d, %d\n", mouse_x, mouse_y); * @endcode */ EAPI void evas_pointer_canvas_xy_get(const Evas *e, Evas_Coord *x, Evas_Coord *y) EINA_ARG_NONNULL(1); diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index a7db466..d95281e 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -268,6 +285,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -692,7 +714,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -700,6 +721,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -760,8 +783,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -944,13 +970,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/lib/cache/Makefile.in b/src/lib/cache/Makefile.in index 82e60f3..9d3e0d1 100644 --- a/src/lib/cache/Makefile.in +++ b/src/lib/cache/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -93,6 +110,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_cache_la_SOURCES) DIST_SOURCES = $(libevas_cache_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/cache/evas_preload.c b/src/lib/cache/evas_preload.c index 5eebaed..a8c2749 100644 --- a/src/lib/cache/evas_preload.c +++ b/src/lib/cache/evas_preload.c @@ -213,9 +213,10 @@ evas_preload_thread_run(void (*func_heavy) (void *data), LKL(_mutex); if (_threads_count == 0) { - LKU(_mutex); - if (work->func_cancel) work->func_cancel(work->data); - free(work); + _workers = EINA_INLIST_CONTAINER_GET(eina_inlist_remove(EINA_INLIST_GET(_workers), EINA_INLIST_GET(work)), Evas_Preload_Pthread_Worker); + LKU(_mutex); + if (work->func_cancel) work->func_cancel(work->data); + free(work); return NULL; } LKU(_mutex); diff --git a/src/lib/cache2/Makefile.in b/src/lib/cache2/Makefile.in index 18d9157..6fbe85c 100644 --- a/src/lib/cache2/Makefile.in +++ b/src/lib/cache2/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -94,6 +111,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_cache2_la_SOURCES) DIST_SOURCES = $(am__libevas_cache2_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/canvas/Makefile.in b/src/lib/canvas/Makefile.in index d6fc715..3bf6d44 100644 --- a/src/lib/canvas/Makefile.in +++ b/src/lib/canvas/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -108,6 +125,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_canvas_la_SOURCES) DIST_SOURCES = $(libevas_canvas_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/canvas/evas_font_dir.c b/src/lib/canvas/evas_font_dir.c index 4f53e5f..4e18315 100644 --- a/src/lib/canvas/evas_font_dir.c +++ b/src/lib/canvas/evas_font_dir.c @@ -50,10 +50,6 @@ static Evas_Font_Dir *object_text_font_cache_dir_add(char *dir); static void object_text_font_cache_dir_del(char *dir, Evas_Font_Dir *fd); static int evas_object_text_font_string_parse(char *buffer, char dest[14][256]); -#ifdef HAVE_FONTCONFIG -static int fc_init = 0; -#endif - void evas_font_dir_cache_free(void) { @@ -63,23 +59,6 @@ evas_font_dir_cache_free(void) eina_hash_free(font_dirs); font_dirs = NULL; } - -#ifdef HAVE_FONTCONFIG - if (fc_init > 0) - { - fc_init--; -/* this is bad i got a: - * fccache.c:512: FcCacheFini: Assertion fcCacheChains[i] == ((void *)0)' failed. - * - * all i can do for now is shut this puppy down. butthat breaks, so disable - * it as in reality - there is little reason to care about the memory not - * being freed etc. - * - * note 04/08/2012 - this doesnt seem to cause an issue anymore? - */ - if (fc_init == 0) FcFini(); - } -#endif } const char * @@ -218,22 +197,6 @@ evas_font_free(Evas *evas, void *font) } } -static void -evas_font_init(void) -{ - static int done = 0; - if (done) return; - done = 1; -#ifdef HAVE_FONTCONFIG - fc_init++; - if (fc_init == 1) - { - FcInit(); - FcConfigEnableHome(1); - } -#endif -} - #ifdef HAVE_FONTCONFIG static Evas_Font_Set * evas_load_fontconfig(Evas *evas, FcFontSet *set, int size, @@ -512,8 +475,6 @@ evas_font_load(Evas *evas, Evas_Font_Description *fdesc, const char *source, Eva if (fdesc->weight == EVAS_FONT_WEIGHT_BOLD) wanted_rend |= FONT_REND_WEIGHT; - evas_font_init(); - EINA_LIST_FOREACH(fonts_cache, l, fd) { if (!evas_font_desc_cmp(fdesc, fd->fdesc)) @@ -813,8 +774,6 @@ evas_font_dir_available_list(const Evas *evas) FcObjectSet *os; int i; - evas_font_init(); - p = FcPatternCreate(); os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, NULL); diff --git a/src/lib/canvas/evas_map.c b/src/lib/canvas/evas_map.c index 4876b00..ce04f63 100644 --- a/src/lib/canvas/evas_map.c +++ b/src/lib/canvas/evas_map.c @@ -1114,8 +1114,10 @@ evas_object_map_update(Evas_Object *obj, pt->fx = p->px; pt->fy = p->py; pt->fz = p->z; - pt->u = ((lround(p->u) * imagew) / uvw) * FP1; - pt->v = ((lround(p->v) * imageh) / uvh) * FP1; + if ((uvw == 0) || (imagew == 0)) pt->u = 0; + else pt->u = ((lround(p->u) * imagew) / uvw) * FP1; + if ((uvh == 0) || (imageh == 0)) pt->v = 0; + else pt->v = ((lround(p->v) * imageh) / uvh) * FP1; if (pt->u < 0) pt->u = 0; else if (pt->u > (imagew * FP1)) pt->u = (imagew * FP1); if (pt->v < 0) pt->v = 0; diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c index aeabd20..64b2daf 100644 --- a/src/lib/canvas/evas_object_image.c +++ b/src/lib/canvas/evas_object_image.c @@ -91,6 +91,7 @@ struct _Evas_Object_Image unsigned char video_surface : 1; unsigned char video_visible : 1; unsigned char created : 1; + unsigned char proxyerror : 1; }; /* private methods for image objects */ @@ -2244,6 +2245,7 @@ _proxy_unset(Evas_Object *proxy) evas_map_free(o->cur.defmap); o->cur.defmap = NULL; } + o->proxyerror = 0; } @@ -2261,6 +2263,7 @@ _proxy_set(Evas_Object *proxy, Evas_Object *src) src->proxy.proxies = eina_list_append(src->proxy.proxies, proxy); src->proxy.redraw = EINA_TRUE; + o->proxyerror = 0; } /* Some moron just set a proxy on a proxy. @@ -2271,16 +2274,14 @@ _proxy_error(Evas_Object *proxy, void *context, void *output, void *surface, int x, int y) { Evas_Func *func; - int r = rand() % 255; - int g = rand() % 255; - int b = rand() % 255; + Evas_Object_Image *o; - /* XXX: Eina log error or something I'm sure - * If it bugs you, just fix it. Don't tell me */ - if (VERBOSE_PROXY_ERROR) printf("Err: Argh! Recursive proxies.\n"); + o = proxy->object_data; + if (!o->proxyerror) printf("Err: Argh! Recursive proxies.\n"); + o->proxyerror = 1; func = proxy->layer->evas->engine.func; - func->context_color_set(output, context, r, g, b, 255); + func->context_color_set(output, context, 0, 0, 0, 255); func->context_multiplier_unset(output, context); func->context_render_op_set(output, context, proxy->cur.render_op); func->rectangle_draw(output, context, surface, proxy->cur.geometry.x + x, @@ -3252,7 +3253,8 @@ evas_object_image_render_pre(Evas_Object *obj) /* it's not visible - we accounted for it appearing or not so just abort */ if (!is_v) goto done; /* clipper changed this is in addition to anything else for obj */ - evas_object_render_pre_clipper_change(&e->clip_changes, obj); + if (is_v && was_v) + evas_object_render_pre_clipper_change(&e->clip_changes, obj); /* if we restacked (layer or just within a layer) and don't clip anyone */ if (obj->restack) { @@ -3631,83 +3633,13 @@ evas_object_image_was_opaque(Evas_Object *obj) return 1; } -static inline Eina_Bool -_pixel_alpha_get(RGBA_Image *im, int x, int y, DATA8 *alpha, - int src_region_x, int src_region_y, int src_region_w, int src_region_h, - int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h) -{ - int px, py, dx, dy, sx, sy, src_w, src_h; - double scale_w, scale_h; - - if ((dst_region_x > x) || (x >= (dst_region_x + dst_region_w)) || - (dst_region_y > y) || (y >= (dst_region_y + dst_region_h))) - { - *alpha = 0; - return EINA_FALSE; - } - - src_w = im->cache_entry.w; - src_h = im->cache_entry.h; - if ((src_w == 0) || (src_h == 0)) - { - *alpha = 0; - return EINA_TRUE; - } - - EINA_SAFETY_ON_TRUE_GOTO(src_region_x < 0, error_oob); - EINA_SAFETY_ON_TRUE_GOTO(src_region_y < 0, error_oob); - EINA_SAFETY_ON_TRUE_GOTO(src_region_x + src_region_w > src_w, error_oob); - EINA_SAFETY_ON_TRUE_GOTO(src_region_y + src_region_h > src_h, error_oob); - - scale_w = (double)dst_region_w / (double)src_region_w; - scale_h = (double)dst_region_h / (double)src_region_h; - - /* point at destination */ - dx = x - dst_region_x; - dy = y - dst_region_y; - - /* point at source */ - sx = dx / scale_w; - sy = dy / scale_h; - - /* pixel point (translated) */ - px = src_region_x + sx; - py = src_region_y + sy; - EINA_SAFETY_ON_TRUE_GOTO(px >= src_w, error_oob); - EINA_SAFETY_ON_TRUE_GOTO(py >= src_h, error_oob); - - switch (im->cache_entry.space) - { - case EVAS_COLORSPACE_ARGB8888: - { - DATA32 *pixel = im->image.data; - pixel += ((py * src_w) + px); - *alpha = ((*pixel) >> 24) & 0xff; - } - break; - - default: - ERR("Colorspace %d not supported.", im->cache_entry.space); - *alpha = 0; - } - - return EINA_TRUE; - - error_oob: - ERR("Invalid region src=(%d, %d, %d, %d), dst=(%d, %d, %d, %d), image=%dx%d", - src_region_x, src_region_y, src_region_w, src_region_h, - dst_region_x, dst_region_y, dst_region_w, dst_region_h, - src_w, src_h); - *alpha = 0; - return EINA_TRUE; -} - static int evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) { Evas_Object_Image *o; int imagew, imageh, uvw, uvh; void *pixels; + Evas_Func *eng = obj->layer->evas->engine.func; int is_inside = 0; /* the following code is similar to evas_object_image_render(), but doesn't @@ -3778,7 +3710,7 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) } else { - RGBA_Image *im; + void *im; DATA32 *data = NULL; int err = 0; @@ -3786,7 +3718,8 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) (obj->layer->evas->engine.data.output, pixels, 0, &data, &err); if ((!im) || (!data) || (err)) { - ERR("Couldn't get image pixels RGBA_Image %p: im=%p, data=%p, err=%d", pixels, im, data, err); + ERR("Couldn't get image pixels %p: im=%p, data=%p, err=%d", + pixels, im, data, err); goto end; } @@ -3834,7 +3767,13 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) */ { DATA8 alpha = 0; - if (_pixel_alpha_get(pixels, px, py, &alpha, 0, 0, imagew, imageh, obj->cur.geometry.x + ix, obj->cur.geometry.y + iy, iw, ih)) + + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + 0, 0, + imagew, imageh, + obj->cur.geometry.x + ix, + obj->cur.geometry.y + iy, + iw, ih)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3895,7 +3834,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = bl; inh = bt; outx = ox; outy = oy; outw = bsl; outh = bst; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3909,7 +3850,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = imw - bl - br; inh = bt; outx = ox + bsl; outy = oy; outw = iw - bsl - bsr; outh = bst; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3922,7 +3865,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = br; inh = bt; outx = ox + iw - bsr; outy = oy; outw = bsr; outh = bst; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3930,12 +3875,14 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) break; } // .-- - // # + // # inx = 0; iny = bt; inw = bl; inh = imh - bt - bb; outx = ox; outy = oy + bst; outw = bsl; outh = ih - bst - bsb; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3950,7 +3897,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = imw - bl - br; inh = imh - bt - bb; outx = ox + bsl; outy = oy + bst; outw = iw - bsl - bsr; outh = ih - bst - bsb; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3964,7 +3913,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = br; inh = imh - bt - bb; outx = ox + iw - bsr; outy = oy + bst; outw = bsr; outh = ih - bst - bsb; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3977,7 +3928,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = bl; inh = bb; outx = ox; outy = oy + ih - bsb; outw = bsl; outh = bsb; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -3985,12 +3938,14 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) break; } // | - // .## + // .## inx = bl; iny = imh - bb; inw = imw - bl - br; inh = bb; outx = ox + bsl; outy = oy + ih - bsb; outw = iw - bsl - bsr; outh = bsb; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; @@ -4003,7 +3958,9 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord px, Evas_Coord py) inw = br; inh = bb; outx = ox + iw - bsr; outy = oy + ih - bsb; outw = bsr; outh = bsb; - if (_pixel_alpha_get(pixels, px, py, &alpha, inx, iny, inw, inh, outx, outy, outw, outh)) + if (eng->pixel_alpha_get(pixels, px, py, &alpha, + inx, iny, inw, inh, + outx, outy, outw, outh)) { is_inside = alpha > 0; dobreak_h = 1; diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c index 2afc588..76aff68 100644 --- a/src/lib/canvas/evas_object_text.c +++ b/src/lib/canvas/evas_object_text.c @@ -37,6 +37,7 @@ struct _Evas_Object_Text Evas_Font_Set *font; + Evas_BiDi_Direction bidi_dir : 2; char changed : 1; }; @@ -238,7 +239,7 @@ static Evas_Coord _evas_object_text_horiz_advance_get(const Evas_Object *obj, const Evas_Object_Text *o) { - Evas_Object_Text_Item *it, *last_it = NULL; + Evas_Object_Text_Item *it; Evas_Coord adv; (void) obj; @@ -246,11 +247,8 @@ _evas_object_text_horiz_advance_get(const Evas_Object *obj, EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) { adv += it->adv; - last_it = it; } - if (last_it && (last_it->w > last_it->adv)) - adv += last_it->w - last_it->adv; return adv; } @@ -531,6 +529,10 @@ _evas_object_text_layout(Evas_Object *obj, Evas_Object_Text *o, const Eina_Unico EvasBiDiStrIndex *v_to_l = NULL; size_t pos, visual_pos; int len = eina_unicode_strlen(text); + if (text && *text) + o->bidi_dir = EVAS_BIDI_DIRECTION_LTR; + else + o->bidi_dir = EVAS_BIDI_DIRECTION_NEUTRAL; #ifdef BIDI_SUPPORT int par_len = len; int *segment_idxs = NULL; @@ -538,6 +540,10 @@ _evas_object_text_layout(Evas_Object *obj, Evas_Object_Text *o, const Eina_Unico segment_idxs = evas_bidi_segment_idxs_get(text, o->bidi_delimiters); evas_bidi_paragraph_props_unref(o->bidi_par_props); o->bidi_par_props = evas_bidi_paragraph_props_get(text, len, segment_idxs); + + if (o->bidi_par_props) + o->bidi_dir = EVAS_BIDI_PAR_TYPE_TO_DIRECTION(o->bidi_par_props->direction); + evas_bidi_props_reorder_line(NULL, 0, len, o->bidi_par_props, &v_to_l); if (segment_idxs) free(segment_idxs); #endif @@ -709,11 +715,8 @@ evas_object_text_direction_get(const Evas_Object *obj) MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT); return EVAS_BIDI_DIRECTION_NEUTRAL; MAGIC_CHECK_END(); - if (o->items) - { - return o->items->text_props.bidi.dir; - } - return EVAS_BIDI_DIRECTION_NEUTRAL; + + return o->bidi_dir; } EAPI Evas_Coord @@ -1913,6 +1916,38 @@ _evas_object_text_recalc(Evas_Object *obj) if (text) free(text); + /* Calc ascent/descent. */ + { + Evas_Object_Text_Item *item; + + for (item = o->items ; item ; + item = EINA_INLIST_CONTAINER_GET( + EINA_INLIST_GET(item)->next, Evas_Object_Text_Item)) + { + int asc = 0, desc = 0; + int max_asc = 0, max_desc = 0; + + /* Skip items without meaning full information. */ + if (!item->text_props.font_instance) + continue; + + asc = evas_common_font_instance_ascent_get(item->text_props.font_instance); + desc = evas_common_font_instance_descent_get(item->text_props.font_instance); + if (asc > o->ascent) + o->ascent = asc; + if (desc > o->descent) + o->descent = desc; + + max_asc = evas_common_font_instance_max_ascent_get(item->text_props.font_instance); + max_desc = evas_common_font_instance_max_descent_get(item->text_props.font_instance); + + if (max_asc > o->max_ascent) + o->max_ascent = max_asc; + if (max_desc > o->max_descent) + o->max_descent = max_desc; + } + } + if ((o->font) && (o->items)) { int w, h; @@ -1934,5 +1969,6 @@ _evas_object_text_recalc(Evas_Object *obj) obj->cur.geometry.h = o->max_ascent + o->max_descent + t + b; //// obj->cur.cache.geometry.validity = 0; } + evas_object_clip_dirty(obj); } diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index b757fa4..531fc2e 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -507,6 +507,7 @@ static void evas_object_textblock_render(Evas_Object *obj, void *output, void *c static void evas_object_textblock_free(Evas_Object *obj); static void evas_object_textblock_render_pre(Evas_Object *obj); static void evas_object_textblock_render_post(Evas_Object *obj); +static Evas_Object_Textblock_Node_Text *_evas_textblock_node_text_new(void); static unsigned int evas_object_textblock_id_get(Evas_Object *obj); static unsigned int evas_object_textblock_visual_id_get(Evas_Object *obj); @@ -3186,6 +3187,17 @@ _layout_line_finalize(Ctxt *c, Evas_Object_Textblock_Format *fmt) &c->maxdescent, &fi->y, &fi->parent.w, &fi->parent.h); fi->parent.adv = fi->parent.w; } + else + { + Evas_Coord asc = 0, desc = 0; + _layout_format_ascent_descent_adjust(c->obj, &asc, &desc, + it->format); + + if (asc > c->maxascent) + c->maxascent = asc; + if (desc > c->maxdescent) + c->maxdescent = desc; + } loop_advance: it->x = x; @@ -4064,7 +4076,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt, } - if ((wrap < len) && (wrap > line_start)) + if ((wrap < len) && (wrap >= line_start)) { MOVE_NEXT_UNTIL(len, wrap); return wrap; @@ -4320,6 +4332,7 @@ _layout_par(Ctxt *c) * inside the list and then walk them on the next iteration. */ for (i = c->par->logical_items ; i ; ) { + Evas_Coord prevdescent = 0, prevascent = 0; int adv_line = 0; int redo_item = 0; it = _ITEM(eina_list_data_get(i)); @@ -4341,6 +4354,8 @@ _layout_par(Ctxt *c) Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it); if (fi->formatme) { + prevdescent = c->maxdescent; + prevascent = c->maxascent; /* If there are no text items yet, calc ascent/descent * according to the current format. */ if (c->maxascent + c->maxdescent == 0) @@ -4477,9 +4492,11 @@ _layout_par(Ctxt *c) there's already no cut before*/ wrap = -1; } - } + } else - wrap -= it->text_pos; /* Cut here */ + { + wrap -= it->text_pos; /* Cut here */ + } } if (wrap > 0) @@ -4493,6 +4510,12 @@ _layout_par(Ctxt *c) else if (wrap == 0) { /* Should wrap before the item */ + + /* We didn't end up using the item, so revert the ascent + * and descent changes. */ + c->maxdescent = prevdescent; + c->maxascent = prevascent; + adv_line = 0; redo_item = 1; _layout_line_advance(c, it->format); @@ -5643,6 +5666,12 @@ evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text) o->markup_text = NULL; } _nodes_clear(obj); + + o->cursor->node = _evas_textblock_node_text_new(); + o->text_nodes = _NODE_TEXT(eina_inlist_append( + EINA_INLIST_GET(o->text_nodes), + EINA_INLIST_GET(o->cursor->node))); + if (!o->style && !o->style_user) { if (text != o->markup_text) @@ -5653,7 +5682,6 @@ evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text) } evas_textblock_cursor_paragraph_first(o->cursor); - evas_textblock_cursor_text_append(o->cursor, ""); evas_object_textblock_text_markup_prepend(o->cursor, text); /* Point all the cursors to the starrt */ @@ -6755,7 +6783,7 @@ evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur) } #endif - i = cur->pos; + for (i = cur->pos; (BREAK_AFTER(i)) && (i >= 0); i--); for ( ; i > 0 ; i--) { @@ -6796,7 +6824,7 @@ evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur) } #endif - i = cur->pos; + for (i = cur->pos; (BREAK_AFTER(i)) && (text[i]); i++); for ( ; text[i] ; i++) { @@ -7308,6 +7336,11 @@ _evas_textblock_node_text_adjust_offsets_to_start(Evas_Object_Textblock *o, last_node->offset -= delta; break; } + else if (use_end && itr && (pos + itr->offset >= (size_t) end) && + itr->visible) + { + break; + } delta = orig_end - pos; if (!first) @@ -8750,14 +8783,11 @@ EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype) { int ret = -1; - const Evas_Textblock_Cursor *dir_cur; - Evas_Textblock_Cursor cur2; Evas_Object_Textblock *o; if (!cur) return -1; o = (Evas_Object_Textblock *)(cur->obj->object_data); if (!o->formatted.valid) _relayout(cur->obj); - dir_cur = cur; if (ctype == EVAS_TEXTBLOCK_CURSOR_UNDER) { ret = evas_textblock_cursor_pen_geometry_get(cur, cx, cy, cw, ch); @@ -8767,142 +8797,30 @@ evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord /* In the case of a "before cursor", we should get the coordinates * of just after the previous char (which in bidi text may not be * just before the current char). */ - Evas_Coord x, y, h, w; - Evas_Object_Textblock_Node_Format *fmt; - - /* If it's at the end of the line, we want to get the position, not - * the position of the previous */ - if ((cur->pos > 0) && !_evas_textblock_cursor_is_at_the_end(cur)) - { -#ifdef BIDI_SUPPORT - Eina_Bool before_char = EINA_FALSE; -#endif - cur2.obj = cur->obj; - evas_textblock_cursor_copy(cur, &cur2); - evas_textblock_cursor_char_prev(&cur2); - - fmt = _evas_textblock_cursor_node_format_at_pos_get(&cur2); + Evas_Coord x, y, w, h; - if (!fmt || !_IS_LINE_SEPARATOR(fmt->format)) - { - dir_cur = &cur2; -#ifdef BIDI_SUPPORT - before_char = EINA_FALSE; -#endif - } -#ifdef BIDI_SUPPORT - else - { - before_char = EINA_TRUE; - } -#endif - ret = evas_textblock_cursor_pen_geometry_get( - dir_cur, &x, &y, &w, &h); -#ifdef BIDI_SUPPORT - /* Adjust if the char is an rtl char */ - if (ret >= 0) - { - Eina_Bool is_rtl = EINA_FALSE; - if (dir_cur->node->par->is_bidi) - { - Evas_Object_Textblock_Line *ln; - Evas_Object_Textblock_Item *it; - _find_layout_item_match(dir_cur, &ln, &it); - if ((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) && - (_ITEM_TEXT(it)->text_props.bidi.dir == - EVAS_BIDI_DIRECTION_RTL)) - is_rtl = EINA_TRUE; - else if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) && - (_ITEM_FORMAT(it)->bidi_dir == - EVAS_BIDI_DIRECTION_RTL)) - is_rtl = EINA_TRUE; - } + Evas_Object_Textblock_Line *ln; + Evas_Object_Textblock_Item *it; - if ((!before_char && is_rtl) || - (before_char && !is_rtl)) - { - /* Just don't advance the width */ - w = 0; - } - } -#endif - } - else if (cur->pos == 0) + ret = evas_textblock_cursor_pen_geometry_get(cur, &x, &y, &w, &h); + _find_layout_item_match(cur, &ln, &it); + if (ret >= 0) { - ret = evas_textblock_cursor_pen_geometry_get( - dir_cur, &x, &y, &w, &h); -#ifdef BIDI_SUPPORT - Eina_Bool is_rtl = EINA_FALSE; - if (dir_cur->node && dir_cur->node->par->is_bidi) + Evas_BiDi_Direction itdir = + (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? + _ITEM_TEXT(it)->text_props.bidi.dir : + _ITEM_FORMAT(it)->bidi_dir; + if (itdir == EVAS_BIDI_DIRECTION_RTL) { - Evas_Object_Textblock_Line *ln; - Evas_Object_Textblock_Item *it; - _find_layout_item_match(dir_cur, &ln, &it); - if ((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) && - (_ITEM_TEXT(it)->text_props.bidi.dir == - EVAS_BIDI_DIRECTION_RTL)) - is_rtl = EINA_TRUE; - else if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) && - (_ITEM_FORMAT(it)->bidi_dir == - EVAS_BIDI_DIRECTION_RTL)) - is_rtl = EINA_TRUE; + if (cx) *cx = x + w; } - - /* Adjust if the char is an rtl char */ - if ((ret >= 0) && (!is_rtl)) + else { - /* Just don't advance the width */ - w = 0; + if (cx) *cx = x; } -#endif - } - else - { - ret = evas_textblock_cursor_pen_geometry_get( - dir_cur, &x, &y, &w, &h); - } - if (ret >= 0) - { - if (cx) *cx = x + w; if (cy) *cy = y; - if (cw) *cw = 0; - if (ch) *ch = h; - } - } - - if (dir && dir_cur && dir_cur->node) - { -#ifdef BIDI_SUPPORT - Eina_Bool is_rtl = EINA_FALSE; - if (dir_cur->node->par->is_bidi) - { - Evas_Object_Textblock_Line *ln; - Evas_Object_Textblock_Item *it; - _find_layout_item_match(dir_cur, &ln, &it); - if ((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) && - (_ITEM_TEXT(it)->text_props.bidi.dir == - EVAS_BIDI_DIRECTION_RTL)) - is_rtl = EINA_TRUE; - else if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) && - (_ITEM_FORMAT(it)->bidi_dir == - EVAS_BIDI_DIRECTION_RTL)) - is_rtl = EINA_TRUE; - } - - if (_evas_textblock_cursor_is_at_the_end(dir_cur) && (dir_cur->pos > 0)) - { - *dir = (is_rtl) ? - EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR; - } - else if (dir_cur->pos > 0) - { - *dir = (is_rtl) ? - EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR; - } - else -#endif - { - *dir = EVAS_BIDI_DIRECTION_LTR; + if (cw) *cw = 0; if (ch) *ch = h; + if (dir) *dir = itdir; } } return ret; @@ -9526,7 +9444,10 @@ _evas_textblock_cursor_range_in_line_geometry_get( while (it && (it != it2)) { - max_x = it->x + it->adv; + if ((it1->text_pos <= it->text_pos) && (it->text_pos <= it2->text_pos)) + { + max_x = it->x + it->adv; + } it = (Evas_Object_Textblock_Item *) EINA_INLIST_GET(it)->next; } if (min_x != max_x) @@ -9781,11 +9702,16 @@ _size_native_calc_line_finalize(const Evas_Object *obj, Eina_List *items, if (it) { + Evas_Coord asc = 0, desc = 0; /* If there are no text items yet, calc ascent/descent * according to the current format. */ - if (*ascent + *descent == 0) - _layout_format_ascent_descent_adjust(obj, ascent, descent, - it->format); + _layout_format_ascent_descent_adjust(obj, &asc, &desc, + it->format); + + if (asc > *ascent) + *ascent = asc; + if (desc > *descent) + *descent = desc; /* Add margins. */ if (it->format) diff --git a/src/lib/canvas/evas_object_textgrid.c b/src/lib/canvas/evas_object_textgrid.c index 4e12b25..daf362a 100644 --- a/src/lib/canvas/evas_object_textgrid.c +++ b/src/lib/canvas/evas_object_textgrid.c @@ -320,7 +320,7 @@ evas_object_textgrid_textprop_unref(Evas_Object_Textgrid *o, unsigned int props_ { if (props->info->refcount == 1) eina_array_push(&o->glyphs_cleanup, - (void *)((unsigned long)props_index)); + (void *)((uintptr_t)props_index)); else { Evas_Glyph *glyphs = props->glyphs; diff --git a/src/lib/canvas/evas_render.c b/src/lib/canvas/evas_render.c index 1103c5b..1036285 100644 --- a/src/lib/canvas/evas_render.c +++ b/src/lib/canvas/evas_render.c @@ -383,17 +383,30 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, } else { - if ((is_active) && (!obj->clip.clipees) && - _evas_render_is_relevant(obj)) + if ((!obj->clip.clipees) && _evas_render_is_relevant(obj)) { - RDI(level); - RD(" relevant + active\n"); - if (obj->restack) - eina_array_push(restack_objects, obj); + if (is_active) + { + RDI(level); + RD(" relevant + active\n"); + if (obj->restack) + eina_array_push(restack_objects, obj); + else + { + eina_array_push(render_objects, obj); + obj->render_pre = EINA_TRUE; + } + } else { - eina_array_push(render_objects, obj); - obj->render_pre = EINA_TRUE; + /* It goes to be hidden. Prev caching should be replaced + by the current (hidden) state. */ + if (evas_object_is_visible(obj) != + evas_object_was_visible(obj)) + evas_object_cur_prev(obj); + + RDI(level); + RD(" skip - not smart, not active or clippees or not relevant\n"); } } else @@ -969,6 +982,7 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface, , level + 1 #endif ); + evas_object_change_reset(obj2); } } else diff --git a/src/lib/cserve/Makefile.in b/src/lib/cserve/Makefile.in index a46d198..7dee220 100644 --- a/src/lib/cserve/Makefile.in +++ b/src/lib/cserve/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -94,6 +111,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_cserve_la_SOURCES) DIST_SOURCES = $(libevas_cserve_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/cserve2/Makefile.in b/src/lib/cserve2/Makefile.in index 1aa818e..a30247d 100644 --- a/src/lib/cserve2/Makefile.in +++ b/src/lib/cserve2/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -107,6 +124,11 @@ SOURCES = $(libevas_cserve2_la_SOURCES) \ $(libevas_cserve2_utils_la_SOURCES) DIST_SOURCES = $(am__libevas_cserve2_la_SOURCES_DIST) \ $(am__libevas_cserve2_utils_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/engines/Makefile.in b/src/lib/engines/Makefile.in index 11688d1..ee77dcc 100644 --- a/src/lib/engines/Makefile.in +++ b/src/lib/engines/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -73,6 +90,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -595,13 +617,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/lib/engines/common/Makefile.in b/src/lib/engines/common/Makefile.in index d988cfb..4c77371 100644 --- a/src/lib/engines/common/Makefile.in +++ b/src/lib/engines/common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -119,6 +136,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -853,13 +875,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/lib/engines/common/evas_font.h b/src/lib/engines/common/evas_font.h index 5c7c1af..b95c4f2 100644 --- a/src/lib/engines/common/evas_font.h +++ b/src/lib/engines/common/evas_font.h @@ -14,6 +14,10 @@ EAPI int evas_common_font_ascent_get (RGBA_Font *fn); EAPI int evas_common_font_descent_get (RGBA_Font *fn); EAPI int evas_common_font_max_ascent_get (RGBA_Font *fn); EAPI int evas_common_font_max_descent_get (RGBA_Font *fn); +EAPI int evas_common_font_instance_ascent_get (RGBA_Font_Int *fi); +EAPI int evas_common_font_instance_descent_get (RGBA_Font_Int *fi); +EAPI int evas_common_font_instance_max_ascent_get (RGBA_Font_Int *fi); +EAPI int evas_common_font_instance_max_descent_get (RGBA_Font_Int *fi); EAPI int evas_common_font_get_line_advance (RGBA_Font *fn); /* draw */ diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c index 3e0cf1c..805eaf8 100644 --- a/src/lib/engines/common/evas_font_load.c +++ b/src/lib/engines/common/evas_font_load.c @@ -5,6 +5,7 @@ #include "evas_font_private.h" /* for Frame-Queuing support */ #include "evas_font_ot.h" +#include /* Freetype2 OS/2 font table. */ #ifdef EVAS_CSERVE2 # include "../../cserve2/evas_cs2_private.h" @@ -492,7 +493,13 @@ evas_common_font_int_load_complete(RGBA_Font_Int *fi) if ((fi->wanted_rend & FONT_REND_WEIGHT) && !(fi->src->ft.face->style_flags & FT_STYLE_FLAG_BOLD)) - fi->runtime_rend |= FONT_REND_WEIGHT; + { + TT_OS2 *tt_os2 = FT_Get_Sfnt_Table(fi->src->ft.face, ft_sfnt_os2); + if (!tt_os2 || (tt_os2->usWeightClass < 600)) + { + fi->runtime_rend |= FONT_REND_WEIGHT; + } + } return fi; } diff --git a/src/lib/engines/common/evas_font_main.c b/src/lib/engines/common/evas_font_main.c index d577d43..30c5f2c 100644 --- a/src/lib/engines/common/evas_font_main.c +++ b/src/lib/engines/common/evas_font_main.c @@ -69,36 +69,9 @@ evas_common_font_font_all_unload(void) } EAPI int -evas_common_font_ascent_get(RGBA_Font *fn) +evas_common_font_instance_ascent_get(RGBA_Font_Int *fi) { int val; - RGBA_Font_Int *fi; - -// evas_common_font_size_use(fn); -#if 0 - { - Eina_List *l; - - EINA_LIST_FOREACH(fn->fonts, l, fi) - { - if (!fi->src->ft.face) continue; - if (fi->src->current_size != fi->size) - { - FTLOCK(); - FT_Activate_Size(fi->ft.size); - FTUNLOCK(); - fi->src->current_size = fi->size; - } - val = (int)fi->src->ft.face->size->metrics.ascender; - if (fi->src->ft.face->units_per_EM == 0) - return val; - dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; - ret = (val * fi->src->ft.face->size->metrics.y_scale) / (dv * dv); - printf(" ==== %p: %i\n", fi, ret); - } - } -#endif - fi = fn->fonts->data; evas_common_font_int_reload(fi); if (fi->src->current_size != fi->size) { @@ -122,13 +95,9 @@ evas_common_font_ascent_get(RGBA_Font *fn) } EAPI int -evas_common_font_descent_get(RGBA_Font *fn) +evas_common_font_instance_descent_get(RGBA_Font_Int *fi) { int val; - RGBA_Font_Int *fi; - -// evas_common_font_size_use(fn); - fi = fn->fonts->data; evas_common_font_int_reload(fi); if (fi->src->current_size != fi->size) { @@ -147,14 +116,11 @@ evas_common_font_descent_get(RGBA_Font *fn) } EAPI int -evas_common_font_max_ascent_get(RGBA_Font *fn) +evas_common_font_instance_max_ascent_get(RGBA_Font_Int *fi) { int val, dv; int ret; - RGBA_Font_Int *fi; -// evas_common_font_size_use(fn); - fi = fn->fonts->data; evas_common_font_int_reload(fi); if (fi->src->current_size != fi->size) { @@ -177,14 +143,11 @@ evas_common_font_max_ascent_get(RGBA_Font *fn) } EAPI int -evas_common_font_max_descent_get(RGBA_Font *fn) +evas_common_font_instance_max_descent_get(RGBA_Font_Int *fi) { int val, dv; int ret; - RGBA_Font_Int *fi; -// evas_common_font_size_use(fn); - fi = fn->fonts->data; evas_common_font_int_reload(fi); if (fi->src->current_size != fi->size) { @@ -206,6 +169,34 @@ evas_common_font_max_descent_get(RGBA_Font *fn) return ret; } +EAPI int +evas_common_font_ascent_get(RGBA_Font *fn) +{ +// evas_common_font_size_use(fn); + return evas_common_font_instance_ascent_get(fn->fonts->data); +} + +EAPI int +evas_common_font_descent_get(RGBA_Font *fn) +{ +// evas_common_font_size_use(fn); + return evas_common_font_instance_descent_get(fn->fonts->data); +} + +EAPI int +evas_common_font_max_ascent_get(RGBA_Font *fn) +{ +// evas_common_font_size_use(fn); + return evas_common_font_instance_max_ascent_get(fn->fonts->data); +} + +EAPI int +evas_common_font_max_descent_get(RGBA_Font *fn) +{ +// evas_common_font_size_use(fn); + return evas_common_font_instance_max_descent_get(fn->fonts->data); +} + EAPI int evas_common_font_get_line_advance(RGBA_Font *fn) { diff --git a/src/lib/engines/common/evas_font_ot.c b/src/lib/engines/common/evas_font_ot.c index 9ed92c7..9fcf6bb 100644 --- a/src/lib/engines/common/evas_font_ot.c +++ b/src/lib/engines/common/evas_font_ot.c @@ -166,7 +166,7 @@ evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_i } else { - if (right_bound >= (int) (props->text_offset + props->text_len)) + if (right_bound >= (int) (props->start + props->len)) { items = props->text_offset + props->text_len - base_cluster; } diff --git a/src/lib/engines/common/evas_font_query.c b/src/lib/engines/common/evas_font_query.c index ddd6a5c..4c904d9 100644 --- a/src/lib/engines/common/evas_font_query.c +++ b/src/lib/engines/common/evas_font_query.c @@ -79,12 +79,10 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi continue; /* Break if either it's not in the font, or if it is in the * script's font. */ - if (fi == *script_fi) - { - if (!evas_common_get_char_index(fi, *itr)) - break; - } - else + if (!evas_common_get_char_index(fi, *itr)) + break; + + if (fi != *script_fi) { if (evas_common_get_char_index(*script_fi, *itr)) break; diff --git a/src/lib/engines/common/evas_image_main.c b/src/lib/engines/common/evas_image_main.c index b6735dc..7b0a854 100644 --- a/src/lib/engines/common/evas_image_main.c +++ b/src/lib/engines/common/evas_image_main.c @@ -347,8 +347,16 @@ _evas_common_rgba_image_post_surface(Image_Entry *ie) #ifdef HAVE_PIXMAN # ifdef PIXMAN_IMAGE RGBA_Image *im = (RGBA_Image *)ie; - + int w, h; + if (im->pixman.im) pixman_image_unref(im->pixman.im); + w = ie->allocated.w; + h = ie->allocated.h; + if ((w <= 0) || (h <= 0)) + { + w = im->cache_entry.w; + h = im->cache_entry.h; + } if (im->cache_entry.flags.alpha) { im->pixman.im = pixman_image_create_bits @@ -356,10 +364,7 @@ _evas_common_rgba_image_post_surface(Image_Entry *ie) // FIXME: endianess determines this PIXMAN_a8r8g8b8, // PIXMAN_b8g8r8a8, - im->cache_entry.w, im->cache_entry.h, - im->image.data, - im->cache_entry.w * 4 - ); + w, h, im->image.data, w * 4); } else { @@ -368,10 +373,7 @@ _evas_common_rgba_image_post_surface(Image_Entry *ie) // FIXME: endianess determines this PIXMAN_x8r8g8b8, // PIXMAN_b8g8r8x8, - im->cache_entry.w, im->cache_entry.h, - im->image.data, - im->cache_entry.w * 4 - ); + w, h, im->image.data, w * 4); } # else (void)ie; diff --git a/src/lib/engines/common/evas_op_add/Makefile.in b/src/lib/engines/common/evas_op_add/Makefile.in index b3f1d73..666973b 100644 --- a/src/lib/engines/common/evas_op_add/Makefile.in +++ b/src/lib/engines/common/evas_op_add/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/src/lib/engines/common/evas_op_blend/Makefile.in b/src/lib/engines/common/evas_op_blend/Makefile.in index e9f8db0..4ea1207 100644 --- a/src/lib/engines/common/evas_op_blend/Makefile.in +++ b/src/lib/engines/common/evas_op_blend/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -99,6 +116,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_common_op_blend_master_sse3_la_SOURCES) DIST_SOURCES = \ $(libevas_engine_common_op_blend_master_sse3_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/engines/common/evas_op_copy/Makefile.in b/src/lib/engines/common/evas_op_copy/Makefile.in index 87e9450..f4fd93b 100644 --- a/src/lib/engines/common/evas_op_copy/Makefile.in +++ b/src/lib/engines/common/evas_op_copy/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/src/lib/engines/common/evas_op_mask/Makefile.in b/src/lib/engines/common/evas_op_mask/Makefile.in index b4bbd2b..f3ea87b 100644 --- a/src/lib/engines/common/evas_op_mask/Makefile.in +++ b/src/lib/engines/common/evas_op_mask/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/src/lib/engines/common/evas_op_mul/Makefile.in b/src/lib/engines/common/evas_op_mul/Makefile.in index c200ae7..6d02eaf 100644 --- a/src/lib/engines/common/evas_op_mul/Makefile.in +++ b/src/lib/engines/common/evas_op_mul/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/src/lib/engines/common/evas_op_sub/Makefile.in b/src/lib/engines/common/evas_op_sub/Makefile.in index 09ea986..fc01abd 100644 --- a/src/lib/engines/common/evas_op_sub/Makefile.in +++ b/src/lib/engines/common/evas_op_sub/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/src/lib/engines/common/evas_text_utils.c b/src/lib/engines/common/evas_text_utils.c index 5dd3e13..58257c6 100644 --- a/src/lib/engines/common/evas_text_utils.c +++ b/src/lib/engines/common/evas_text_utils.c @@ -237,8 +237,14 @@ evas_common_text_props_index_find(const Evas_Text_Props *props, int _cutoff) return mid; #else - return _cutoff; - (void) props; + if (props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) + { + return props->len - _cutoff - 1; + } + else + { + return _cutoff; + } #endif } @@ -252,7 +258,6 @@ evas_common_text_props_split(Evas_Text_Props *base, size_t cutoff; /* Translate text cutoff pos to string object cutoff point */ -#ifdef OT_SUPPORT _cutoff = evas_common_text_props_index_find(base, _cutoff); if (_cutoff >= 0) @@ -264,9 +269,6 @@ evas_common_text_props_split(Evas_Text_Props *base, ERR("Couldn't find the cutoff position. Is it inside a cluster?"); return; } -#else - cutoff = (size_t) _cutoff; -#endif evas_common_text_props_content_copy_and_ref(ext, base); if (base->bidi.dir == EVAS_BIDI_DIRECTION_RTL) diff --git a/src/lib/engines/common/language/evas_bidi_utils.c b/src/lib/engines/common/language/evas_bidi_utils.c index c34f5d7..f05cc09 100644 --- a/src/lib/engines/common/language/evas_bidi_utils.c +++ b/src/lib/engines/common/language/evas_bidi_utils.c @@ -11,7 +11,7 @@ #include "evas_font_private.h" #ifdef BIDI_SUPPORT -#include +#include /** * @internal * @addtogroup Evas_Utils diff --git a/src/lib/engines/common/language/evas_bidi_utils.h b/src/lib/engines/common/language/evas_bidi_utils.h index f1a374b..37a4e65 100644 --- a/src/lib/engines/common/language/evas_bidi_utils.h +++ b/src/lib/engines/common/language/evas_bidi_utils.h @@ -28,7 +28,7 @@ #include #ifdef USE_FRIBIDI -# include +# include #endif /* abstract fribidi - we statically define sizes here because otherwise we would @@ -90,12 +90,36 @@ struct _Evas_BiDi_Props #define EVAS_BIDI_PARAGRAPH_WLTR FRIBIDI_PAR_WLTR #define EVAS_BIDI_PARAGRAPH_WRTL FRIBIDI_PAR_WRTL -#define EVAS_BIDI_PARAGRAPH_DIRECTION_IS_RTL(x) \ - (((x) && \ - ((x->direction == EVAS_BIDI_PARAGRAPH_RTL) || \ - (x->direction == EVAS_BIDI_PARAGRAPH_WRTL))) ? \ +#define EVAS_BIDI_DIRECTION_IS_RTL(x) \ + ((((x) == EVAS_BIDI_PARAGRAPH_RTL) || \ + ((x) == EVAS_BIDI_PARAGRAPH_WRTL)) ? \ EINA_TRUE : EINA_FALSE) +#define EVAS_BIDI_PARAGRAPH_DIRECTION_IS_RTL(x) \ + ((x) && EVAS_BIDI_DIRECTION_IS_RTL((x)->direction)) + +#define EVAS_BIDI_PAR_TYPE_TO_DIRECTION(x) \ + _evas_bidi_par_type_to_direction(x) + +static inline Evas_BiDi_Direction +_evas_bidi_par_type_to_direction(EvasBiDiParType par_type) +{ + switch (par_type) + { + case EVAS_BIDI_PARAGRAPH_LTR: + case EVAS_BIDI_PARAGRAPH_WLTR: + return EVAS_BIDI_DIRECTION_LTR; + break; + case EVAS_BIDI_PARAGRAPH_RTL: + case EVAS_BIDI_PARAGRAPH_WRTL: + return EVAS_BIDI_DIRECTION_RTL; + break; + case EVAS_BIDI_PARAGRAPH_NEUTRAL: + default: + return EVAS_BIDI_DIRECTION_NEUTRAL; + break; + } +} # define evas_bidi_position_visual_to_logical(list, position) \ (list) ? list[position] : position; diff --git a/src/lib/engines/common_16/Makefile.am b/src/lib/engines/common_16/Makefile.am index cfa1347..7f630a9 100644 --- a/src/lib/engines/common_16/Makefile.am +++ b/src/lib/engines/common_16/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ +@FRIBIDI_CFLAGS@ \ @VALGRIND_CFLAGS@ \ @EVAS_GENERAL_CFLAGS@ \ @EET_CFLAGS@ \ diff --git a/src/lib/engines/common_16/Makefile.in b/src/lib/engines/common_16/Makefile.in index b8e4d78..943dce4 100644 --- a/src/lib/engines/common_16/Makefile.in +++ b/src/lib/engines/common_16/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -97,6 +114,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_common_16_la_SOURCES) DIST_SOURCES = $(libevas_engine_common_16_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -386,6 +408,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ +@FRIBIDI_CFLAGS@ \ @VALGRIND_CFLAGS@ \ @EVAS_GENERAL_CFLAGS@ \ @EET_CFLAGS@ \ diff --git a/src/lib/engines/common_8/Makefile.in b/src/lib/engines/common_8/Makefile.in index a545d05..7aaa4cc 100644 --- a/src/lib/engines/common_8/Makefile.in +++ b/src/lib/engines/common_8/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -96,6 +113,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_common_8_la_SOURCES) DIST_SOURCES = $(libevas_engine_common_8_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/file/Makefile.in b/src/lib/file/Makefile.in index 1364750..678dd5e 100644 --- a/src/lib/file/Makefile.in +++ b/src/lib/file/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -92,6 +109,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_file_la_SOURCES) DIST_SOURCES = $(libevas_file_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/lib/include/Makefile.in b/src/lib/include/Makefile.in index 129e1e7..6422af9 100644 --- a/src/lib/include/Makefile.in +++ b/src/lib/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/src/lib/include/evas_private.h b/src/lib/include/evas_private.h index 9078587..aa5e2ac 100644 --- a/src/lib/include/evas_private.h +++ b/src/lib/include/evas_private.h @@ -896,6 +896,8 @@ struct _Evas_Func /* max size query */ void (*image_max_size_get) (void *data, int *maxw, int *maxh); + + Eina_Bool (*pixel_alpha_get) (void *image, int x, int y, DATA8 *alpha, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); }; struct _Evas_Image_Load_Func diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index af80096..d4b841d 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,6 +88,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -593,13 +615,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/modules/engines/Makefile.in b/src/modules/engines/Makefile.in index 934f64a..29dc771 100644 --- a/src/modules/engines/Makefile.in +++ b/src/modules/engines/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -92,6 +109,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -624,13 +646,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/modules/engines/buffer/Makefile.in b/src/modules/engines/buffer/Makefile.in index c79677f..40d2fa4 100644 --- a/src/modules/engines/buffer/Makefile.in +++ b/src/modules/engines/buffer/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -140,6 +157,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_buffer_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_buffer_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Buffer.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -496,7 +518,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -504,6 +525,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -583,8 +606,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/buffer/evas_outbuf.c b/src/modules/engines/buffer/evas_outbuf.c index fc1ffba..58ce0e6 100644 --- a/src/modules/engines/buffer/evas_outbuf.c +++ b/src/modules/engines/buffer/evas_outbuf.c @@ -121,13 +121,14 @@ evas_buffer_outbuf_buf_new_region_for_update(Outbuf *buf, int x, int y, int w, i ((buf->depth == OUTBUF_DEPTH_BGRA_32BPP_8888_8888))) { im->cache_entry.flags.alpha = 1; + } + #ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_size_set(&im->cache_entry, w, h); - else + if (evas_cserve2_use_get()) + evas_cache2_image_size_set(&im->cache_entry, w, h); + else #endif - im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry, w, h); - } + im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry, w, h); } } return im; diff --git a/src/modules/engines/direct3d/Makefile.in b/src/modules/engines/direct3d/Makefile.in index af624f3..ce2658a 100644 --- a/src/modules/engines/direct3d/Makefile.in +++ b/src/modules/engines/direct3d/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -193,6 +210,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_direct3d_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_direct3d_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Direct3D.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -578,7 +600,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -586,6 +607,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -785,8 +808,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp b/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp index aa44eb9..35e6472 100644 --- a/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp +++ b/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp @@ -243,8 +243,8 @@ bool D3DImageCache::RequestInsert(CacheEntry &entry, int w, int h) bool D3DImageCache::CreateEntry(D3DDevice *d3d, CacheEntry &entry, int w, int h, bool exact_size) { - int width = exact_size ? w : max(_max_width, w); - int height = exact_size ? h : max(_max_height, h); + int width = exact_size ? w : __max(_max_width, w); + int height = exact_size ? h : __max(_max_height, h); HRESULT hr; if (FAILED(hr = d3d->GetDevice()->CreateTexture(width, height, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &entry.texture, NULL))) @@ -321,7 +321,7 @@ bool D3DImageCache::RetrieveData(CacheEntry &entry, DWORD *data, int w, int h) void D3DImageCache::UpdateInsert(CacheEntry &entry, int w, int h) { - entry.cur_h = max(entry.cur_h, entry.cur_y + h + _margin); + entry.cur_h = __max(entry.cur_h, entry.cur_y + h + _margin); entry.cur_x += w + _margin; entry.users++; } diff --git a/src/modules/engines/direct3d/evas_direct3d_main.cpp b/src/modules/engines/direct3d/evas_direct3d_main.cpp index fe1e13f..79ebbc1 100644 --- a/src/modules/engines/direct3d/evas_direct3d_main.cpp +++ b/src/modules/engines/direct3d/evas_direct3d_main.cpp @@ -400,7 +400,7 @@ Direct3DImageHandler evas_direct3d_image_load(Direct3DDeviceHandler d3d, D3DDevice *device = dev_ptr->device; D3DScene *scene = dev_ptr->scene; - RGBA_Image *evas_image = evas_common_load_image_from_file(file, key, lo); + RGBA_Image *evas_image = evas_common_load_image_from_file(file, key, lo, error); if (evas_image == NULL) { WRN("Failed to load image from %s", file); diff --git a/src/modules/engines/direct3d/evas_direct3d_object_font.cpp b/src/modules/engines/direct3d/evas_direct3d_object_font.cpp index f072e87..97b9f98 100644 --- a/src/modules/engines/direct3d/evas_direct3d_object_font.cpp +++ b/src/modules/engines/direct3d/evas_direct3d_object_font.cpp @@ -224,7 +224,7 @@ void D3DObjectFont::PushForDraw(Glyph *glyph, int x, int y) dc.r = LERP(dc.r, sc.r, 1 - a, a); dc.g = LERP(dc.g, sc.g, 1 - a, a); dc.b = LERP(dc.b, sc.b, 1 - a, a); - dc.a = max(dc.a, BYTE(255.f * a)); + dc.a = __max(dc.a, BYTE(255.f * a)); *dst = dc.color; } } diff --git a/src/modules/engines/direct3d/evas_direct3d_object_image.cpp b/src/modules/engines/direct3d/evas_direct3d_object_image.cpp index 3bfbe1e..bcaf6b5 100644 --- a/src/modules/engines/direct3d/evas_direct3d_object_image.cpp +++ b/src/modules/engines/direct3d/evas_direct3d_object_image.cpp @@ -209,12 +209,12 @@ void D3DObjectImage::Setup(FLOAT x, FLOAT y, FLOAT w, FLOAT h, } else { - _x = min(_x, x); - _y = max(_y, y); + _x = __min(_x, x); + _y = __max(_y, y); _w += w / 3; _h += h / 3; - _sx = min(_sx, FLOAT(sx) / FLOAT(_width)); - _sy = min(_sy, FLOAT(sy) / FLOAT(_height)); + _sx = __min(_sx, FLOAT(sx) / FLOAT(_width)); + _sy = __min(_sy, FLOAT(sy) / FLOAT(_height)); _sw += FLOAT(sw) / (3.f * FLOAT(_width)); _sh += FLOAT(sh) / (3.f * FLOAT(_height)); } diff --git a/src/modules/engines/direct3d/evas_engine.h b/src/modules/engines/direct3d/evas_engine.h index da1ebff..abbdb43 100644 --- a/src/modules/engines/direct3d/evas_engine.h +++ b/src/modules/engines/direct3d/evas_engine.h @@ -14,6 +14,7 @@ extern "C" { #define EVAS_INLINE_ARRAY_H // We dont need that and it is buggy #include "evas_common.h" +#include "evas_private.h" #ifdef __cplusplus } diff --git a/src/modules/engines/directfb/Makefile.in b/src/modules/engines/directfb/Makefile.in index 747881a..1d77e64 100644 --- a/src/modules/engines/directfb/Makefile.in +++ b/src/modules/engines/directfb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -140,6 +157,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_directfb_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_directfb_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_DirectFB.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -495,7 +517,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -503,6 +524,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -582,8 +605,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/fb/Makefile.in b/src/modules/engines/fb/Makefile.in index 8eae98f..29b25a1 100644 --- a/src/modules/engines/fb/Makefile.in +++ b/src/modules/engines/fb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_fb_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_fb_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_FB.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -506,7 +528,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -514,6 +535,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -602,8 +625,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/gl_cocoa/Makefile.in b/src/modules/engines/gl_cocoa/Makefile.in index 926bdfd..6464b17 100644 --- a/src/modules/engines/gl_cocoa/Makefile.in +++ b/src/modules/engines/gl_cocoa/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -158,6 +175,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_gl_cocoa_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_gl_cocoa_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_GL_Cocoa.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -515,7 +537,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -523,6 +544,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -623,8 +646,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/gl_common/Makefile.in b/src/modules/engines/gl_common/Makefile.in index 04a0863..eb7dcc5 100644 --- a/src/modules/engines/gl_common/Makefile.in +++ b/src/modules/engines/gl_common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -141,6 +158,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_gl_common_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_gl_common_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/modules/engines/gl_common/evas_gl_common.h b/src/modules/engines/gl_common/evas_gl_common.h index 0097d79..7c6d91b 100644 --- a/src/modules/engines/gl_common/evas_gl_common.h +++ b/src/modules/engines/gl_common/evas_gl_common.h @@ -346,7 +346,7 @@ struct _Evas_Engine_GL_Context /* If this is set: Force drawing with a particular filter */ GLuint filter_prog; -#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) +#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined(BUILD_ENGINE_WAYLAND_EGL) // FIXME: hack. expose egl display to gl core for egl image sec extn. void *egldisp; #endif diff --git a/src/modules/engines/gl_sdl/Makefile.in b/src/modules/engines/gl_sdl/Makefile.in index ba8c952..0e8b818 100644 --- a/src/modules/engines/gl_sdl/Makefile.in +++ b/src/modules/engines/gl_sdl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -139,6 +156,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_gl_sdl_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_gl_sdl_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_GL_SDL.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -497,7 +519,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -505,6 +526,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -575,8 +598,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/gl_x11/Makefile.in b/src/modules/engines/gl_x11/Makefile.in index d7c69e5..34d8fb4 100644 --- a/src/modules/engines/gl_x11/Makefile.in +++ b/src/modules/engines/gl_x11/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -142,6 +159,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_gl_x11_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_gl_x11_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_GL_X11.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -501,7 +523,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -509,6 +530,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -588,8 +611,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c index 6b892be..9242c2c 100644 --- a/src/modules/engines/gl_x11/evas_engine.c +++ b/src/modules/engines/gl_x11/evas_engine.c @@ -4929,6 +4929,87 @@ eng_image_max_size_get(void *data, int *maxw, int *maxh) if (maxh) *maxh = re->win->gl_context->shared->info.max_texture_size; } +static Eina_Bool +eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h) +{ + Evas_GL_Image *im = image; + int px, py, dx, dy, sx, sy, src_w, src_h; + double scale_w, scale_h; + + if (!im) return EINA_FALSE; + + if ((dst_region_x > x) || (x >= (dst_region_x + dst_region_w)) || + (dst_region_y > y) || (y >= (dst_region_y + dst_region_h))) + { + *alpha = 0; + return EINA_FALSE; + } + + src_w = im->im->cache_entry.w; + src_h = im->im->cache_entry.h; + if ((src_w == 0) || (src_h == 0)) + { + *alpha = 0; + return EINA_TRUE; + } + + EINA_SAFETY_ON_TRUE_GOTO(src_region_x < 0, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(src_region_y < 0, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(src_region_x + src_region_w > src_w, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(src_region_y + src_region_h > src_h, error_oob); + + scale_w = (double)dst_region_w / (double)src_region_w; + scale_h = (double)dst_region_h / (double)src_region_h; + + /* point at destination */ + dx = x - dst_region_x; + dy = y - dst_region_y; + + /* point at source */ + sx = dx / scale_w; + sy = dy / scale_h; + + /* pixel point (translated) */ + px = src_region_x + sx; + py = src_region_y + sy; + EINA_SAFETY_ON_TRUE_GOTO(px >= src_w, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(py >= src_h, error_oob); + + switch (im->im->cache_entry.space) + { + case EVAS_COLORSPACE_ARGB8888: + { + DATA32 *pixel; + + evas_cache_image_load_data(&im->im->cache_entry); + if (!im->im->cache_entry.flags.loaded) + { + ERR("im %p has no pixels loaded yet", im); + return EINA_FALSE; + } + + pixel = im->im->image.data; + pixel += ((py * src_w) + px); + *alpha = ((*pixel) >> 24) & 0xff; + } + break; + + default: + ERR("Colorspace %d not supported.", im->im->cache_entry.space); + *alpha = 0; + } + + return EINA_TRUE; + + error_oob: + ERR("Invalid region src=(%d, %d, %d, %d), dst=(%d, %d, %d, %d), image=%dx%d", + src_region_x, src_region_y, src_region_w, src_region_h, + dst_region_x, dst_region_y, dst_region_w, dst_region_h, + src_w, src_h); + *alpha = 0; + return EINA_TRUE; +} + static int module_open(Evas_Module *em) { @@ -5061,6 +5142,8 @@ module_open(Evas_Module *em) ORD(image_max_size_get); + ORD(pixel_alpha_get); + /* now advertise out own api */ em->functions = (void *)(&func); return 1; diff --git a/src/modules/engines/psl1ght/Makefile.in b/src/modules/engines/psl1ght/Makefile.in index 608cc19..36efe13 100644 --- a/src/modules/engines/psl1ght/Makefile.in +++ b/src/modules/engines/psl1ght/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -140,6 +157,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_psl1ght_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_psl1ght_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_PSL1GHT.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -501,7 +523,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -509,6 +530,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -588,8 +611,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_16/Makefile.in b/src/modules/engines/software_16/Makefile.in index 6b6274a..9a9ddf4 100644 --- a/src/modules/engines/software_16/Makefile.in +++ b/src/modules/engines/software_16/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -137,6 +154,11 @@ SOURCES = $(libevas_engine_software_16_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_16_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -487,7 +509,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -495,6 +516,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/engines/software_16_sdl/Makefile.in b/src/modules/engines/software_16_sdl/Makefile.in index 04eb996..28dacf3 100644 --- a/src/modules/engines/software_16_sdl/Makefile.in +++ b/src/modules/engines/software_16_sdl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -138,6 +155,11 @@ SOURCES = $(libevas_engine_software_16_sdl_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_16_sdl_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_SDL_16.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -495,7 +517,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -503,6 +524,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -565,8 +588,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_16_wince/Makefile.in b/src/modules/engines/software_16_wince/Makefile.in index 11a43e8..14e7313 100644 --- a/src/modules/engines/software_16_wince/Makefile.in +++ b/src/modules/engines/software_16_wince/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -171,6 +188,11 @@ SOURCES = $(libevas_engine_software_16_wince_la_SOURCES) \ DIST_SOURCES = \ $(am__libevas_engine_software_16_wince_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Software_16_WinCE.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -534,7 +556,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -542,6 +563,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -669,8 +692,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_16_x11/Makefile.in b/src/modules/engines/software_16_x11/Makefile.in index 882e7b6..6c41304 100644 --- a/src/modules/engines/software_16_x11/Makefile.in +++ b/src/modules/engines/software_16_x11/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ SOURCES = $(libevas_engine_software_16_x11_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_16_x11_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Software_16_X11.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -503,7 +525,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -511,6 +532,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -590,8 +613,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_8/Makefile.in b/src/modules/engines/software_8/Makefile.in index 4cdbd54..53d25a6 100644 --- a/src/modules/engines/software_8/Makefile.in +++ b/src/modules/engines/software_8/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -136,6 +153,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_engine_software_8_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_8_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -486,7 +508,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -494,6 +515,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/engines/software_8_x11/Makefile.in b/src/modules/engines/software_8_x11/Makefile.in index f76c2af..49458a0 100644 --- a/src/modules/engines/software_8_x11/Makefile.in +++ b/src/modules/engines/software_8_x11/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ SOURCES = $(libevas_engine_software_8_x11_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_8_x11_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Software_8_X11.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -504,7 +526,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -512,6 +533,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -591,8 +614,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_ddraw/Makefile.in b/src/modules/engines/software_ddraw/Makefile.in index 85ea2e0..31656f0 100644 --- a/src/modules/engines/software_ddraw/Makefile.in +++ b/src/modules/engines/software_ddraw/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -166,6 +183,11 @@ SOURCES = $(libevas_engine_software_ddraw_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_ddraw_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Software_DDraw.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -527,7 +549,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -535,6 +556,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -653,8 +676,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_gdi/Makefile.in b/src/modules/engines/software_gdi/Makefile.in index 5b00ca6..5a20705 100644 --- a/src/modules/engines/software_gdi/Makefile.in +++ b/src/modules/engines/software_gdi/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -149,6 +166,11 @@ SOURCES = $(libevas_engine_software_gdi_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_gdi_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Software_Gdi.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -509,7 +531,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -517,6 +538,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -614,8 +637,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_generic/Makefile.in b/src/modules/engines/software_generic/Makefile.in index b08b291..983a65e 100644 --- a/src/modules/engines/software_generic/Makefile.in +++ b/src/modules/engines/software_generic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -138,6 +155,11 @@ SOURCES = $(libevas_engine_software_generic_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_generic_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -486,7 +508,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -494,6 +515,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/engines/software_generic/evas_engine.c b/src/modules/engines/software_generic/evas_engine.c index 722c9a3..73ef3e1 100644 --- a/src/modules/engines/software_generic/evas_engine.c +++ b/src/modules/engines/software_generic/evas_engine.c @@ -1122,6 +1122,93 @@ eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index return EINA_TRUE; } +static Eina_Bool +eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h) +{ + RGBA_Image *im = image; + int px, py, dx, dy, sx, sy, src_w, src_h; + double scale_w, scale_h; + + if (!im) return EINA_FALSE; + + if ((dst_region_x > x) || (x >= (dst_region_x + dst_region_w)) || + (dst_region_y > y) || (y >= (dst_region_y + dst_region_h))) + { + *alpha = 0; + return EINA_FALSE; + } + + src_w = im->cache_entry.w; + src_h = im->cache_entry.h; + if ((src_w == 0) || (src_h == 0)) + { + *alpha = 0; + return EINA_TRUE; + } + + EINA_SAFETY_ON_TRUE_GOTO(src_region_x < 0, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(src_region_y < 0, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(src_region_x + src_region_w > src_w, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(src_region_y + src_region_h > src_h, error_oob); + + scale_w = (double)dst_region_w / (double)src_region_w; + scale_h = (double)dst_region_h / (double)src_region_h; + + /* point at destination */ + dx = x - dst_region_x; + dy = y - dst_region_y; + + /* point at source */ + sx = dx / scale_w; + sy = dy / scale_h; + + /* pixel point (translated) */ + px = src_region_x + sx; + py = src_region_y + sy; + EINA_SAFETY_ON_TRUE_GOTO(px >= src_w, error_oob); + EINA_SAFETY_ON_TRUE_GOTO(py >= src_h, error_oob); + + switch (im->cache_entry.space) + { + case EVAS_COLORSPACE_ARGB8888: + { + DATA32 *pixel; + +#if EVAS_CSERVE2 + if (evas_cserve2_use_get()) + evas_cache2_image_load_data(&im->cache_entry); + else +#endif + evas_cache_image_load_data(&im->cache_entry); + + if (!im->cache_entry.flags.loaded) + { + ERR("im %p has no pixels loaded yet", im); + return EINA_FALSE; + } + + pixel = im->image.data; + pixel += ((py * src_w) + px); + *alpha = ((*pixel) >> 24) & 0xff; + } + break; + + default: + ERR("Colorspace %d not supported.", im->cache_entry.space); + *alpha = 0; + } + + return EINA_TRUE; + + error_oob: + ERR("Invalid region src=(%d, %d, %d, %d), dst=(%d, %d, %d, %d), image=%dx%d", + src_region_x, src_region_y, src_region_w, src_region_h, + dst_region_x, dst_region_y, dst_region_w, dst_region_h, + src_w, src_h); + *alpha = 0; + return EINA_TRUE; +} + static void eng_image_cache_flush(void *data __UNUSED__) { @@ -1879,7 +1966,8 @@ static Evas_Func func = eng_image_animated_loop_count_get, eng_image_animated_frame_duration_get, eng_image_animated_frame_set, - NULL + NULL, + eng_pixel_alpha_get, /* FUTURE software generic calls go here */ }; diff --git a/src/modules/engines/software_x11/Makefile.in b/src/modules/engines/software_x11/Makefile.in index 73c7d56..f993827 100644 --- a/src/modules/engines/software_x11/Makefile.in +++ b/src/modules/engines/software_x11/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -182,6 +199,11 @@ SOURCES = $(libevas_engine_software_x11_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_software_x11_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Software_X11.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -561,7 +583,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -569,6 +590,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -720,8 +743,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/software_x11/evas_xcb_outbuf.c b/src/modules/engines/software_x11/evas_xcb_outbuf.c index 6bf5481..7212932 100644 --- a/src/modules/engines/software_x11/evas_xcb_outbuf.c +++ b/src/modules/engines/software_x11/evas_xcb_outbuf.c @@ -871,7 +871,7 @@ evas_software_xcb_outbuf_push_updated_region(Outbuf *buf, RGBA_Image *update, in } else { - int pixelb = evas_software_xcb_output_buffer_depth(obr->xob) / 8; + int pixelb = evas_software_xcb_output_buffer_depth(obr->xcbob) / 8; int run; int dstjump; diff --git a/src/modules/engines/software_x11/evas_xlib_outbuf.c b/src/modules/engines/software_x11/evas_xlib_outbuf.c index e337e99..3cb1ea0 100644 --- a/src/modules/engines/software_x11/evas_xlib_outbuf.c +++ b/src/modules/engines/software_x11/evas_xlib_outbuf.c @@ -362,7 +362,7 @@ evas_software_xlib_outbuf_setup_x(int w, int h, int rot, Outbuf_Depth depth, RGBA_Image * evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) { - RGBA_Image *im; + RGBA_Image *im = NULL; Outbuf_Region *obr; int bpl = 0; int use_shm = 1; @@ -455,6 +455,11 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w } else { + /* FIXME: For the onebuf case we probably need to do the same thing we did below + * (try to get an existing image before we allocate a new one). This code path + * is not really used at the moment so no way to test (and that's why the change + * is not implemented here as well. + */ #ifdef EVAS_CSERVE2 if (evas_cserve2_use_get()) im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get()); @@ -608,26 +613,73 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w } else { + obr->xob = _find_xob(buf->priv.x11.xlib.disp, + buf->priv.x11.xlib.vis, + buf->priv.x11.xlib.depth, + w, h, + use_shm, + NULL); #ifdef EVAS_CSERVE2 if (evas_cserve2_use_get()) - im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get()); + { + if (obr->xob) + im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(), + w, h, + (DATA32 *) evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), + alpha, EVAS_COLORSPACE_ARGB8888); + + if (!im) + { + if (obr->xob) _unfind_xob(obr->xob, 0); + im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get()); + if (!im) + { + free(obr); + return NULL; + } + else + { + im->cache_entry.w = w; + im->cache_entry.h = h; + im->cache_entry.flags.alpha |= alpha ? 1 : 0; + evas_cache2_image_surface_alloc(&im->cache_entry, w, h); + } + } + } else #endif - im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); - if (!im) { - free(obr); - return NULL; + if (obr->xob) + im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), + w, h, + (DATA32 *) evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), + alpha, EVAS_COLORSPACE_ARGB8888); + + if (!im) + { + if (obr->xob) _unfind_xob(obr->xob, 0); + im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); + if (!im) + { + free(obr); + return NULL; + } + else + { + im->cache_entry.w = w; + im->cache_entry.h = h; + im->cache_entry.flags.alpha |= alpha ? 1 : 0; + evas_cache_image_surface_alloc(&im->cache_entry, w, h); + } + } } + + /* Need to update cache_entry w/h here because the render path expects them to be updated + * to the new geometry. */ im->cache_entry.w = w; im->cache_entry.h = h; im->cache_entry.flags.alpha |= alpha ? 1 : 0; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_surface_alloc(&im->cache_entry, w, h); - else -#endif - evas_cache_image_surface_alloc(&im->cache_entry, w, h); + im->extended_info = obr; if ((buf->rot == 0) || (buf->rot == 180)) { diff --git a/src/modules/engines/wayland_egl/Makefile.in b/src/modules/engines/wayland_egl/Makefile.in index 8272946..419889d 100644 --- a/src/modules/engines/wayland_egl/Makefile.in +++ b/src/modules/engines/wayland_egl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ SOURCES = $(libevas_engine_wayland_egl_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_wayland_egl_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Wayland_Egl.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -503,7 +525,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -511,6 +532,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -590,8 +613,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/engines/wayland_shm/Makefile.in b/src/modules/engines/wayland_shm/Makefile.in index 2397c77..be66ec2 100644 --- a/src/modules/engines/wayland_shm/Makefile.in +++ b/src/modules/engines/wayland_shm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ SOURCES = $(libevas_engine_wayland_shm_la_SOURCES) \ $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_engine_wayland_shm_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = Evas_Engine_Wayland_Shm.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -505,7 +527,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -513,6 +534,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } @@ -592,8 +615,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/modules/loaders/Makefile.in b/src/modules/loaders/Makefile.in index 68bff50..b2e0b62 100644 --- a/src/modules/loaders/Makefile.in +++ b/src/modules/loaders/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -86,6 +103,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -613,13 +635,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/modules/loaders/bmp/Makefile.in b/src/modules/loaders/bmp/Makefile.in index 0f082f2..5636e05 100644 --- a/src/modules/loaders/bmp/Makefile.in +++ b/src/modules/loaders/bmp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_bmp_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_bmp_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/bmp/evas_image_load_bmp.c b/src/modules/loaders/bmp/evas_image_load_bmp.c index 9453ceb..b5faea7 100644 --- a/src/modules/loaders/bmp/evas_image_load_bmp.c +++ b/src/modules/loaders/bmp/evas_image_load_bmp.c @@ -109,7 +109,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key char hasa = 0; int w = 0, h = 0, bit_count = 0, image_size = 0, comp = 0; unsigned int offset, head_size, amask = 0; - int fsize = 0; + size_t fsize; unsigned int bmpsize; unsigned short res1, res2; @@ -135,6 +135,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key if (!read_ushort(map, fsize, &position, &res2)) goto close_file; if (!read_uint(map, fsize, &position, &offset)) goto close_file; if (!read_uint(map, fsize, &position, &head_size)) goto close_file; + if (offset > fsize) goto close_file; if (head_size == 12) // OS/2 V1 + Windows 3.0 { short tmp; @@ -392,7 +393,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key rmask = 0, gmask = 0, bmask = 0, amask = 0; int right_way_up = 0; unsigned char r, g, b, a; - int fsize = 0; + size_t fsize; unsigned int bmpsize; unsigned short res1, res2; @@ -424,6 +425,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key if (!read_ushort(map, fsize, &position, &res2)) goto close_file; if (!read_uint(map, fsize, &position, &offset)) goto close_file; if (!read_uint(map, fsize, &position, &head_size)) goto close_file; + if (offset > fsize) goto close_file; image_size = fsize - offset; if (image_size < 1) goto close_file; @@ -456,7 +458,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key if (!read_int(map, fsize, &position, &tmp2)) goto close_file; comp = tmp2; // compression method if (!read_int(map, fsize, &position, &tmp2)) goto close_file; - image_size = tmp2; // bitmap data size + if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error if (!read_int(map, fsize, &position, &tmp2)) goto close_file; //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter if (!read_int(map, fsize, &position, &tmp2)) goto close_file; @@ -484,7 +486,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key if (!read_int(map, fsize, &position, &tmp2)) goto close_file; comp = tmp2; // compression method if (!read_int(map, fsize, &position, &tmp2)) goto close_file; - image_size = tmp2; // bitmap data size + if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error if (!read_int(map, fsize, &position, &tmp2)) goto close_file; //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter if (!read_int(map, fsize, &position, &tmp2)) goto close_file; @@ -512,7 +514,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key if (!read_int(map, fsize, &position, &tmp2)) goto close_file; comp = tmp2; // compression method if (!read_int(map, fsize, &position, &tmp2)) goto close_file; - image_size = tmp2; // bitmap data size + if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error if (!read_int(map, fsize, &position, &tmp2)) goto close_file; //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter if (!read_int(map, fsize, &position, &tmp2)) goto close_file; @@ -550,7 +552,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key if (!read_int(map, fsize, &position, &tmp2)) goto close_file; comp = tmp2; // compression method if (!read_int(map, fsize, &position, &tmp2)) goto close_file; - image_size = tmp2; // bitmap data size + if (tmp2 <= image_size) image_size = tmp2; // bitmap data size, GIMP can handle image size error if (!read_int(map, fsize, &position, &tmp2)) goto close_file; //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter if (!read_int(map, fsize, &position, &tmp2)) goto close_file; @@ -623,6 +625,8 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } row_size = ceil((double)(image_w * bit_count) / 32) * 4; + if (image_size != row_size * h) + image_size = row_size * h; if (bit_count < 16) { @@ -764,7 +768,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key else { if ((x & 0x7) != 0) p++; - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -819,7 +823,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key else { if ((x & 0x1) != 0) p++; - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1008,7 +1012,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1187,7 +1191,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1221,7 +1225,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1260,7 +1264,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1348,7 +1352,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1388,7 +1392,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } @@ -1426,7 +1430,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key } else { - fix = (int)(((unsigned long)p) & 0x3); + fix = (int)(((uintptr_t)p) & 0x3); if (fix > 0) p += 4 - fix; // align row read if (p >= buffer_end) break; } diff --git a/src/modules/loaders/edb/Makefile.in b/src/modules/loaders/edb/Makefile.in index d38b027..11ec82a 100644 --- a/src/modules/loaders/edb/Makefile.in +++ b/src/modules/loaders/edb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_edb_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_edb_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/eet/Makefile.in b/src/modules/loaders/eet/Makefile.in index 8807102..e2d7a2f 100644 --- a/src/modules/loaders/eet/Makefile.in +++ b/src/modules/loaders/eet/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_eet_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_eet_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/generic/Makefile.in b/src/modules/loaders/generic/Makefile.in index 4e44428..0ed223a 100644 --- a/src/modules/loaders/generic/Makefile.in +++ b/src/modules/loaders/generic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -134,6 +151,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_generic_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_generic_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -482,7 +504,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -490,6 +511,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/gif/Makefile.in b/src/modules/loaders/gif/Makefile.in index 1502104..c816289 100644 --- a/src/modules/loaders/gif/Makefile.in +++ b/src/modules/loaders/gif/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_gif_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_gif_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/ico/Makefile.in b/src/modules/loaders/ico/Makefile.in index 3ccff9f..2ab0ecf 100644 --- a/src/modules/loaders/ico/Makefile.in +++ b/src/modules/loaders/ico/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_ico_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_ico_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/jpeg/Makefile.in b/src/modules/loaders/jpeg/Makefile.in index cfe52b2..ea4e7da 100644 --- a/src/modules/loaders/jpeg/Makefile.in +++ b/src/modules/loaders/jpeg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_jpeg_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_jpeg_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -481,7 +503,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -489,6 +510,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/pmaps/Makefile.in b/src/modules/loaders/pmaps/Makefile.in index 3f0be4d..58ac693 100644 --- a/src/modules/loaders/pmaps/Makefile.in +++ b/src/modules/loaders/pmaps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_pmaps_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_pmaps_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -481,7 +503,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -489,6 +510,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/png/Makefile.in b/src/modules/loaders/png/Makefile.in index 4004626..bd37a2d 100644 --- a/src/modules/loaders/png/Makefile.in +++ b/src/modules/loaders/png/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_png_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_png_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -481,7 +503,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -489,6 +510,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/psd/Makefile.in b/src/modules/loaders/psd/Makefile.in index 00f7adb..0932435 100644 --- a/src/modules/loaders/psd/Makefile.in +++ b/src/modules/loaders/psd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_psd_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_psd_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/svg/Makefile.in b/src/modules/loaders/svg/Makefile.in index 6e0b3a7..0443f1e 100644 --- a/src/modules/loaders/svg/Makefile.in +++ b/src/modules/loaders/svg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_svg_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_svg_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/tga/Makefile.in b/src/modules/loaders/tga/Makefile.in index e96711c..3a4468f 100644 --- a/src/modules/loaders/tga/Makefile.in +++ b/src/modules/loaders/tga/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_tga_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_tga_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/tiff/Makefile.in b/src/modules/loaders/tiff/Makefile.in index 4eaf7f2..78710d7 100644 --- a/src/modules/loaders/tiff/Makefile.in +++ b/src/modules/loaders/tiff/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_tiff_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_tiff_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -481,7 +503,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -489,6 +510,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/wbmp/Makefile.in b/src/modules/loaders/wbmp/Makefile.in index 3f0944f..58e5024 100644 --- a/src/modules/loaders/wbmp/Makefile.in +++ b/src/modules/loaders/wbmp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_wbmp_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_wbmp_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/loaders/xpm/Makefile.in b/src/modules/loaders/xpm/Makefile.in index 3b6e1fa..d73bb91 100644 --- a/src/modules/loaders/xpm/Makefile.in +++ b/src/modules/loaders/xpm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_loader_xpm_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_loader_xpm_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -481,7 +503,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -489,6 +510,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/savers/Makefile.in b/src/modules/savers/Makefile.in index 2568652..f4b773c 100644 --- a/src/modules/savers/Makefile.in +++ b/src/modules/savers/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,6 +93,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -599,13 +621,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/modules/savers/edb/Makefile.in b/src/modules/savers/edb/Makefile.in index 229c69a..45d7a6f 100644 --- a/src/modules/savers/edb/Makefile.in +++ b/src/modules/savers/edb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_saver_edb_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_saver_edb_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -478,7 +500,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -486,6 +507,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/savers/eet/Makefile.in b/src/modules/savers/eet/Makefile.in index 7dd6c2b..42674ca 100644 --- a/src/modules/savers/eet/Makefile.in +++ b/src/modules/savers/eet/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_saver_eet_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_saver_eet_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/savers/jpeg/Makefile.in b/src/modules/savers/jpeg/Makefile.in index fa3c752..b0930f1 100644 --- a/src/modules/savers/jpeg/Makefile.in +++ b/src/modules/savers/jpeg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_saver_jpeg_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_saver_jpeg_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/savers/png/Makefile.in b/src/modules/savers/png/Makefile.in index a1b0321..bf7f592 100644 --- a/src/modules/savers/png/Makefile.in +++ b/src/modules/savers/png/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_saver_png_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_saver_png_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -481,7 +503,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -489,6 +510,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/modules/savers/tiff/Makefile.in b/src/modules/savers/tiff/Makefile.in index 5865484..c5d645e 100644 --- a/src/modules/savers/tiff/Makefile.in +++ b/src/modules/savers/tiff/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -133,6 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libevas_saver_tiff_la_SOURCES) $(module_la_SOURCES) DIST_SOURCES = $(am__libevas_saver_tiff_la_SOURCES_DIST) \ $(am__module_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -480,7 +502,6 @@ clean-noinstLTLIBRARIES: done install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +509,8 @@ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \ } diff --git a/src/static_deps/Makefile.in b/src/static_deps/Makefile.in index d23981f..9e21335 100644 --- a/src/static_deps/Makefile.in +++ b/src/static_deps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -72,6 +89,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -594,13 +616,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/static_deps/liblinebreak/Makefile.in b/src/static_deps/liblinebreak/Makefile.in index 4c150dc..17e1201 100644 --- a/src/static_deps/liblinebreak/Makefile.in +++ b/src/static_deps/liblinebreak/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -95,6 +112,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(liblinebreak_la_SOURCES) DIST_SOURCES = $(liblinebreak_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index f5ac879..a8d963c 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -99,6 +116,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(evas_suite_SOURCES) DIST_SOURCES = $(am__evas_suite_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/src/tests/evas_test_textblock.c b/src/tests/evas_test_textblock.c index e8498f9..fafa4d0 100644 --- a/src/tests/evas_test_textblock.c +++ b/src/tests/evas_test_textblock.c @@ -589,7 +589,7 @@ START_TEST(evas_textblock_cursor) evas_textblock_cursor_word_end(cur); fail_if(18 != evas_textblock_cursor_pos_get(cur)); evas_textblock_cursor_word_end(cur); - fail_if(18 != evas_textblock_cursor_pos_get(cur)); + fail_if(21 != evas_textblock_cursor_pos_get(cur)); /* Bug with 1 char word separators at paragraph start. */ evas_object_textblock_text_markup_set(tb, "=test"); @@ -598,6 +598,27 @@ START_TEST(evas_textblock_cursor) fail_if(1 != evas_textblock_cursor_pos_get(cur)); } + /* Make sure coords are correct for ligatures */ + { + evas_object_textblock_text_markup_set(tb, "fi
fii"); + + for (i = 0 ; i < 2 ; i++) + { + evas_textblock_cursor_pen_geometry_get(cur, NULL, NULL, &w, NULL); + ck_assert_int_eq(w, 3); + evas_textblock_cursor_char_next(cur); + } + + evas_textblock_cursor_char_next(cur); + + for (i = 0 ; i < 3 ; i++) + { + evas_textblock_cursor_pen_geometry_get(cur, NULL, NULL, &w, NULL); + ck_assert_int_eq(w, 3); + evas_textblock_cursor_char_next(cur); + } + } + END_TB_TEST(); } END_TEST @@ -829,6 +850,13 @@ START_TEST(evas_textblock_format_removal) fnode = evas_textblock_node_format_first_get(tb); fail_if (fnode); + /* Range delete with empty paragraphs. */ + evas_object_textblock_text_markup_set(tb, ""); + evas_textblock_cursor_pos_set(cur, 2); + evas_textblock_cursor_pos_set(main_cur, 3); + evas_textblock_cursor_range_delete(cur, main_cur); + ck_assert_str_eq(evas_object_textblock_text_markup_get(tb), ""); + /* Verify fmt position and REP_CHAR positions are the same */ evas_object_textblock_text_markup_set(tb, "This isan a."); @@ -1368,6 +1396,11 @@ START_TEST(evas_textblock_geometries) fail_if((tr->x != tr2->x) || (tr->y != tr2->y) || (tr->w != tr2->w) || (tr->h != tr2->h)); + EINA_LIST_FREE(rects, tr) + free(tr); + EINA_LIST_FREE(rects2, tr2) + free(tr2); + /* Multiline range */ evas_textblock_cursor_pos_set(cur, 0); evas_textblock_cursor_pos_set(main_cur, 14); @@ -1401,6 +1434,35 @@ START_TEST(evas_textblock_geometries) tr2 = eina_list_data_get(eina_list_next(rects)); fail_if(tr->y >= tr2->y); + EINA_LIST_FREE(rects, tr) + free(tr); + EINA_LIST_FREE(rects2, tr2) + free(tr2); + + /* Same run different scripts */ + evas_object_textblock_text_markup_set(tb, "עבריתenglishрусскийעברית"); + + evas_textblock_cursor_pos_set(cur, 3); + evas_textblock_cursor_pos_set(main_cur, 7); + rects = evas_textblock_cursor_range_geometry_get(cur, main_cur); + + fail_if(eina_list_count(rects) != 2); + + EINA_LIST_FREE(rects, tr) + free(tr); + + /* Same run different styles */ + evas_object_textblock_text_markup_set(tb, "testtest2test3"); + + evas_textblock_cursor_pos_set(cur, 3); + evas_textblock_cursor_pos_set(main_cur, 11); + rects = evas_textblock_cursor_range_geometry_get(cur, main_cur); + + fail_if(eina_list_count(rects) != 3); + + EINA_LIST_FREE(rects, tr) + free(tr); + END_TB_TEST(); } END_TEST