Hello community,
here is the log from the commit of package evas-generic-loaders for
openSUSE:Factory checked in at 2016-03-04 19:30:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evas-generic-loaders (Old)
and /work/SRC/openSUSE:Factory/.evas-generic-loaders.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evas-generic-loaders"
Changes:
--------
---
/work/SRC/openSUSE:Factory/evas-generic-loaders/evas-generic-loaders.changes
2016-01-09 23:13:27.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.evas-generic-loaders.new/evas-generic-loaders.changes
2016-03-04 19:30:19.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 3 04:14:33 UTC 2016 - [email protected]
+
+- Bump to 1.17.0 no functional change just keeping in line with
+ the rest of efl.
+
+-------------------------------------------------------------------
Old:
----
evas_generic_loaders-1.16.0.tar.xz
New:
----
evas_generic_loaders-1.17.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evas-generic-loaders.spec ++++++
--- /var/tmp/diff_new_pack.zpFdJZ/_old 2016-03-04 19:30:20.000000000 +0100
+++ /var/tmp/diff_new_pack.zpFdJZ/_new 2016-03-04 19:30:20.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package evas-generic-loaders
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: evas-generic-loaders
-Version: 1.16.0
+Version: 1.17.0
Release: 0
Summary: Set of generic loaders for Evas
License: GPL-2.0+
++++++ evas_generic_loaders-1.16.0.tar.xz -> evas_generic_loaders-1.17.0.tar.xz
++++++
++++ 11009 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/NEWS new/evas_generic_loaders-1.17.0/NEWS
--- old/evas_generic_loaders-1.16.0/NEWS 2015-11-09 11:06:45.000000000
+0100
+++ new/evas_generic_loaders-1.17.0/NEWS 2016-02-02 10:46:01.000000000
+0100
@@ -1,7 +1,12 @@
===========================
-Evas Generic Loaders 1.16.0
+Evas Generic Loaders 1.17.0
===========================
+Changes since 1.16.0:
+---------------------
+
+No significant changes in this release.
+
Changes since 1.15.0:
---------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/config.h.in
new/evas_generic_loaders-1.17.0/config.h.in
--- old/evas_generic_loaders-1.16.0/config.h.in 2015-11-09 11:06:50.000000000
+0100
+++ new/evas_generic_loaders-1.17.0/config.h.in 2016-02-02 10:46:07.000000000
+0100
@@ -78,18 +78,6 @@
/* Version number of package */
#undef VERSION
-/* Major version */
-#undef VMAJ
-
-/* Micro version */
-#undef VMIC
-
-/* Minor version */
-#undef VMIN
-
-/* Revison */
-#undef VREV
-
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/configure.ac
new/evas_generic_loaders-1.17.0/configure.ac
--- old/evas_generic_loaders-1.16.0/configure.ac 2015-11-09
11:06:30.000000000 +0100
+++ new/evas_generic_loaders-1.17.0/configure.ac 2016-02-02
10:45:50.000000000 +0100
@@ -1,23 +1,5 @@
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_define([v_maj], [1])
-m4_define([v_min], [16])
-m4_define([v_mic], [0])
-dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null ||
echo 0) | tr -d '\n']))
-##-- When released, remove the dnl on the below line
-dnl m4_undefine([v_rev])
-##-- When doing snapshots - change soname. remove dnl on below line
-m4_define([relname], [release])
-dnl m4_define([v_rel], [-release relname])
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])],
[m4_define([v_ver], [v_maj.v_min.v_mic])])
-m4_define([lt_cur], m4_eval(v_maj + v_min))
-m4_define([lt_rev], v_mic)
-m4_define([lt_age], v_min)
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-
-AC_INIT([evas_generic_loaders], [v_ver],
[[email protected]])
+EFL_VERSION([1], [17], [0], [release])
+AC_INIT([evas_generic_loaders], [efl_version],
[[email protected]])
AC_PREREQ([2.52])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
@@ -27,23 +9,6 @@
AM_INIT_AUTOMAKE([1.6 dist-xz])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
-m4_ifdef([v_rel], , [m4_define([v_rel], [])])
-AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version])
-AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version])
-AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
-AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
-version_info="lt_cur:lt_rev:lt_age"
-release_info="v_rel"
-AC_SUBST(version_info)
-AC_SUBST(release_info)
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-VMAJ=v_maj
-AC_SUBST(VMAJ)
-
### Needed information
AC_CANONICAL_BUILD
@@ -266,7 +231,7 @@
echo
echo
echo "------------------------------------------------------------------------"
-echo "$PACKAGE $VERSION"
+echo "$PACKAGE_NAME $PACKAGE_VERSION"
echo "------------------------------------------------------------------------"
echo
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/m4/efl.m4
new/evas_generic_loaders-1.17.0/m4/efl.m4
--- old/evas_generic_loaders-1.16.0/m4/efl.m4 1970-01-01 01:00:00.000000000
+0100
+++ new/evas_generic_loaders-1.17.0/m4/efl.m4 2015-11-09 16:00:01.000000000
+0100
@@ -0,0 +1,449 @@
+dnl file to manage modules in efl
+
+dnl EFL_VERSION(major, minor, micro, release)
+dnl This setup EFL version information and should be called BEFORE AC_INIT().
+dnl
+dnl release parameter is 'dev' to use from SVN or libtool -release field.
+dnl It may be empty if not dev (svn/live build) and no -release is to be used.
+dnl
+dnl Examples:
+dnl EFL_VERSION(1, 7, 99, dev)
+dnl EFL_VERSION(1, 7, 99, ver-1234)
+dnl This will define couple of m4 symbols:
+dnl v_maj = given major number (first parameter)
+dnl v_min = given minor number (second parameter)
+dnl v_mic = given micro number (third parameter)
+dnl v_rev = if release, it's 0, otherwise it's dev_version.
+dnl v_rel = if release, it's -release followed by fourth parameter,
+dnl otherwise it's empty. (mostly for libtool)
+dnl efl_version = if release, it's major.minor.micro, otherwise it's
+dnl major.minor.micro.dev_version
+dnl dev_version = development version (svn revision).
+dnl def_build_profile = dev or release based on 'dev' release parameter.
+AC_DEFUN([EFL_VERSION],
+[dnl
+m4_define([v_maj], [$1])dnl
+m4_define([v_min], [$2])dnl
+m4_define([v_mic], [$3])dnl
+m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null ||
echo 0) | tr -d '\n']))dnl
+m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
+m4_define([v_rel], [])dnl
+m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
+m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev],
[v_maj.v_min.v_mic]))dnl
+dnl m4_define([efl_version], [v_maj.v_min.v_mic])dnl
+])
+
+dnl EFL_COLOR
+dnl will check if terminal supports color and if color is wanted by user.
+dnl
+dnl Used Variables:
+dnl WANT_COLOR: if no, forces no color output.
+dnl TERM: used to check if color should be enabled.
+dnl
+dnl Defined Variables:
+dnl COLOR_YES: to be used in positive/yes conditions
+dnl COLOR_NO: to be used in negative/no conditions
+dnl COLOR_OTHER: to be used to highlight some other condition
+dnl COLOR_RESET: to reset color
+dnl want_color: yes or no
+AC_DEFUN([EFL_COLOR],
+[dnl
+case "$TERM" in
+
xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
+ want_color="${WANT_COLOR:-yes}"
+ ;;
+ *)
+ want_color="no"
+ ;;
+esac
+
+### echo compatibility
+
+## the BSD echo does not have the -e option (it is the default behaviour)
+echo_e=
+if test "`echo -e x`" = "x"; then
+ echo_e=-e
+fi
+AC_SUBST([ECHO_E], [${echo_e}])
+
+if test "${want_color}" = "yes"; then
+ COLOR_YES=`echo $echo_e "\033@<:@1;32m"`
+ COLOR_NO=`echo $echo_e "\033@<:@1;31m"`
+ COLOR_OTHER=`echo $echo_e "\033@<:@1;36m"`
+ COLOR_RESET=`echo $echo_e "\033@<:@0m"`
+else
+ COLOR_YES=""
+ COLOR_NO=""
+ COLOR_OTHER=""
+ COLOR_RESET=""
+fi
+])
+
+dnl EFL_INIT()
+dnl Will AC_DEFINE() the following:
+dnl VMAJ = v_maj
+dnl VMIN = v_min
+dnl VMIC = v_mic
+dnl VREV = v_rev
+dnl Will AC_SUBST() the following:
+dnl VMAJ = v_maj
+dnl VMIN = v_min
+dnl VMIC = v_mic
+dnl EFL_LTLIBRARY_FLAGS="-no-undefined -version-info ..."
+dnl EFL_LTMODULE_FLAGS="-no-undefined -avoid-version"
+dnl Will define the following m4:
+dnl lt_cur = libtool 'current' field of libtool's -version-info
+dnl lt_rev = libtool 'revision' field of libtool's -version-info
+dnl lt_age = libtool 'age' field of libtool's -version-info
+AC_DEFUN([EFL_INIT],
+[dnl
+AC_REQUIRE([EFL_COLOR])dnl
+AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])dnl
+AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])dnl
+AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])dnl
+AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison])dnl
+VMAJ=v_maj
+VMIN=v_min
+VMIC=v_mic
+AC_SUBST([VMAJ])dnl
+AC_SUBST([VMIN])dnl
+AC_SUBST([VMIC])dnl
+dnl
+dnl TODO: warning - lt_cur:
+dnl the previous code assumed v_maj + v_min, but this will be a problem when
+dnl we bump v_maj and reset v_min. 1 + 7 == 7 + 1, so if v_maj is bumped
+dnl we multiply it by 100.
+m4_define([lt_cur], m4_if(m4_cmp(v_maj, 1), 0, m4_eval(v_maj + v_min),
m4_eval(v_maj * 100 + v_min)))dnl
+m4_define([lt_rev], v_mic)dnl
+m4_define([lt_age], v_min)dnl
+dnl
+EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel"
+AC_SUBST(EFL_LTLIBRARY_FLAGS)dnl
+EFL_LTMODULE_FLAGS="-no-undefined -avoid-version"
+AC_SUBST([EFL_LTMODULE_FLAGS])dnl
+AC_MSG_NOTICE([Initialized AC_PACKAGE_NAME (AC_PACKAGE_VERSION)
development=dev_version v_rel])
+])
+
+dnl EFL_EVAL_PKGS(EFL)
+dnl does PKG_CHECK_MODULES() for given EFL
+AC_DEFUN([EFL_EVAL_PKGS],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+if test "x${requirements_pc_deps_[]m4_defn([DOWNEFL])}" != "x"; then
+ PKG_CHECK_MODULES([$1], [${requirements_pc_deps_[]m4_defn([DOWNEFL])}])
+fi
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl EFL_INTERNAL_DEPEND_PKG(EFL, OTHEREFL)
+dnl Adds a pkg-config dependency on another EFL.
+AC_DEFUN([EFL_INTERNAL_DEPEND_PKG],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([DOWNOTHER], m4_translit([$2], [-A-Z], [_a-z]))dnl
+dnl TODO: we need to fix the package config names for 2.0
+dnl TODO: and make them uniform in scheme.
+depname="$2"
+libdirname="m4_defn([DOWNOTHER])"
+libname="m4_defn([DOWNOTHER])"
+case "m4_defn([DOWNOTHER])" in
+ ethumb_client)
+ depname="ethumb_client"
+ ;;
+esac
+requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION}
${requirements_pc_[][]m4_defn([DOWNEFL])}"
+requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname}
-I\$(top_builddir)/src/lib/${libdirname}
${requirements_cflags_[][]m4_defn([DOWNEFL])}"
+requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la
${requirements_internal_libs_[][]m4_defn([DOWNEFL])}"
+requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_public_libs_[]m4_defn([DOWNOTHER])}
${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])}"
+m4_popdef([DOWNOTHER])dnl
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl EFL_PLATFORM_DEPEND(EFL, PLATFORM)
+dnl PLATFORM is one of: all, evil, escape, exotic
+AC_DEFUN([EFL_PLATFORM_DEPEND],
+[dnl
+m4_pushdef([DOWNOTHER], m4_translit([$2], [-A-Z], [_a-z]))dnl
+case "m4_defn([DOWNOTHER])" in
+ all)
+ if test "x${efl_lib_optional_evil}" = "xyes"; then
+ EFL_INTERNAL_DEPEND_PKG([$1], [evil])
+ elif test "x${efl_lib_optional_escape}" = "xyes"; then
+ EFL_INTERNAL_DEPEND_PKG([$1], [escape])
+ elif test "x${efl_lib_optional_exotic}" = "xyes"; then
+ EFL_INTERNAL_DEPEND_PKG([$1], [exotic])
+ fi
+ ;;
+ *)
+ if test "x${efl_lib_optional_[]m4_defn([DOWNOTHER])}" = "xyes"; then
+ EFL_INTERNAL_DEPEND_PKG([$1], [$2])
+ fi
+ ;;
+esac
+m4_popdef([DOWNOTHER])dnl
+])
+
+dnl EFL_CRYPTO_DEPEND(EFL)
+dnl the given EFL will use/depend on system crypto settings
+AC_DEFUN([EFL_CRYPTO_DEPEND],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto}
${requirements_pc_[][]m4_defn([DOWNEFL])}"
+requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto}
${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
+requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto}
${requirements_libs_[][]m4_defn([DOWNEFL])}"
+requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_crypto}
${requirements_cflags_[][]m4_defn([DOWNEFL])}"
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl EFL_DEPEND_PKG(EFL, NAME, PACKAGE, [ACTION-IF-FOUND],
[ACTION-IF-NOT-FOUND])
+dnl Adds a pkg-config dependency to an efl, AC_DEFINE() HAVE_NAME,
+dnl and inserts dependencies in proper variables
+AC_DEFUN([EFL_DEPEND_PKG],
+[dnl
+m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UPNAME], m4_translit([$2], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl
+
+ have_[]m4_defn([DOWNNAME])="no"
+
+ EFL_PKG_CHECK_STRICT([$3], [
+ AC_DEFINE([HAVE_]m4_defn([UPNAME]), [1], [Have `]m4_defn([DOWNNAME])['
pkg-config installed.])
+ requirements_pc_[]m4_defn([DOWNEFL])="$3
${requirements_pc_[][]m4_defn([DOWNEFL])}"
+ requirements_pc_deps_[]m4_defn([DOWNEFL])="$3
${requirements_pc_deps_[]m4_defn([DOWNEFL])}"
+ have_[]m4_defn([DOWNNAME])="yes"
+
+ $4
+
+ ], [$5])
+
+m4_popdef([DOWNNAME])
+m4_popdef([UPNAME])
+m4_popdef([DOWNEFL])
+m4_popdef([UPEFL])
+])
+
+dnl EFL_OPTIONAL_DEPEND_PKG(EFL, VARIABLE, NAME, PACKAGE, [ACTION-IF-FOUND],
[ACTION-IF-NOT-FOUND])
+AC_DEFUN([EFL_OPTIONAL_DEPEND_PKG],
+[dnl
+m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
+
+ have_[]m4_defn([DOWN])="no"
+ if test "x$2" = "xyes"; then
+ EFL_DEPEND_PKG([$1], [$3], [$4], [$5], [$6])
+ fi
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME)
+AC_DEFUN([EFL_OPTIONAL_INTERNAL_DEPEND_PKG],
+[dnl
+ if test "x$2" = "xyes"; then
+ EFL_INTERNAL_DEPEND_PKG([$1], [$3])
+ fi
+])
+
+dnl EFL_ADD_LIBS(PKG, LIBS)
+dnl Add libraries that the EFL library will depend on
+dnl See EFL_DEPEND_PKG() for pkg-config version.
+AC_DEFUN([EFL_ADD_LIBS],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_libs_[]m4_defn([DOWN])="${requirements_libs_[]m4_defn([DOWN])} $2"
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_ADD_PUBLIC_LIBS(PKG, PUBLIC_LIBS)
+dnl Add libraries that the EFL library will depend on when used.
+dnl
+dnl Unlike EFL_ADD_LIBS(), that is only used when generating PKG,
+dnl this one is used when linking PKG to other libraries or applications.
+dnl
+dnl For instance if you use some other library in your header that user
+dnl inclues.
+AC_DEFUN([EFL_ADD_PUBLIC_LIBS],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_public_libs_[]m4_defn([DOWN])="${requirements_public_libs_[]m4_defn([DOWN])}
$2"
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_ADD_CFLAGS(PKG, CFLAGS)
+dnl Add CFLAGS that the EFL library will use
+dnl See EFL_DEPEND_PKG() for pkg-config version.
+AC_DEFUN([EFL_ADD_CFLAGS],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_cflags_[]m4_defn([DOWN])="${requirements_cflags_[]m4_defn([DOWN])}
$2"
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_START(PKG)
+dnl start the setup of an EFL library, defines variables and prints a notice
+dnl
+dnl Exports (AC_SUBST)
+dnl PKG_CFLAGS: what to use for CFLAGS
+dnl
+dnl PKG_LDFLAGS: what to use for LDFLAGS
+dnl
+dnl PKG_LIBS: what to use in automake's _LIBADD or _LDADD. Includes
+dnl everything else.
+dnl
+dnl PKG_INTERNAL_LIBS: all other EFL as lib/name/libname.la that this
+dnl package depend. Used in automake's _DEPENDENCIES.
+dnl
+dnl USE_PKG_LIBS: what to use in automake's _LIBADD or _LDADD when using
+dnl this PKG (PKG_LIBS + libpkg.la)
+dnl
+dnl USE_PKG_INTERNAL_LIBS: extends PKG_INTERNAL_LIBS with lib/pkg/libpkg.la
+dnl
+dnl requirements_pc_pkg: all pkg-config (pc) files used by this pkg,
+dnl includes internal EFL (used in 'Requires.private' in pkg.pc)
+dnl
+dnl requirements_libs_pkg: external libraries this package needs when
+dnl linking (used in 'Libs.private' in pkg.pc)
+dnl
+dnl requirements_public_libs_pkg: external libraries other packages need
+dnl when using this (used in 'Libs' in pkg.pc)
+dnl
+dnl requirements_cflags_pkg: what to use for CFLAGS (same as PKG_CFLAGS).
+dnl
+dnl Variables:
+dnl requirements_pc_deps_pkg: external pkg-config (pc) files used by this
+dnl pkg (used in EFL_EVAL_PKGS())
+dnl
+dnl requirements_internal_libs_pkg: all other EFL as lib/name/libname.la
+dnl that this package depend.
+dnl
+dnl requirements_internal_deps_libs_pkg: external libraries that are public
+dnl dependencies (due internal libs).
+dnl
+AC_DEFUN([EFL_LIB_START],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+requirements_internal_libs_[]m4_defn([DOWN])=""
+requirements_internal_deps_libs_[]m4_defn([DOWN])=""
+requirements_libs_[]m4_defn([DOWN])=""
+requirements_public_libs_[]m4_defn([DOWN])=""
+requirements_cflags_[]m4_defn([DOWN])=""
+requirements_pc_[]m4_defn([DOWN])=""
+requirements_pc_deps_[]m4_defn([DOWN])=""
+
+m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}"
+m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS}"
+USE_[]m4_defn([UP])_LIBS="${USE_[]m4_defn([UP])_LIBS}"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${USE_[]m4_defn([UP])_INTERNAL_LIBS}"
+m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}"
+m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}"
+
+AC_SUBST([requirements_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_public_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_cflags_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_pc_]m4_defn([DOWN]))dnl
+AC_SUBST(m4_defn([UP])[_LIBS])dnl
+AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS])dnl
+AC_SUBST([USE_]m4_defn([UP])[_LIBS])dnl
+AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS])dnl
+AC_SUBST(m4_defn([UP])[_LDFLAGS])dnl
+AC_SUBST(m4_defn([UP])[_CFLAGS])dnl
+AC_MSG_NOTICE([Start $1 checks])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_END(PKG)
+dnl finishes the setup of an EFL library
+AC_DEFUN([EFL_LIB_END],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+libdirname="m4_defn([DOWN])"
+libname="m4_defn([DOWN])"
+
+m4_defn([UP])_LDFLAGS="${EFLALL_COV_LDFLAGS} ${EFLALL_LDFLAGS}
${m4_defn([UP])_LDFLAGS}"
+m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS}
${EFLALL_LIBS} ${m4_defn([UP])_LIBS}
${requirements_internal_libs_[]m4_defn([DOWN])}
${requirements_internal_deps_libs_[]m4_defn([DOWN])}
${requirements_public_libs_[]m4_defn([DOWN])}
${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_eflall} "
+m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS}
${requirements_internal_libs_[]m4_defn([DOWN])}"
+USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}
lib/${libdirname}/lib${libname}.la"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS}
lib/${libdirname}/lib${libname}.la"
+m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS}
${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname}
-I\$(top_builddir)/src/lib/${libdirname}
-I\$(top_srcdir)/src/bindings/${libdirname}
-I\$(top_builddir)/src/bindings/${libdirname}
${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall}
-DEFL_[]m4_defn([UP])_BUILD=1"
+requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])}
${requirements_pc_eflall}"
+requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])}
${requirements_pc_deps_eflall}"
+
+AC_MSG_NOTICE([Finished $1 checks])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_START_OPTIONAL(PKG, TEST)
+dnl test if library should be build and then EFL_LIB_START()
+dnl must call EFL_LIB_END_OPTIONAL() to close it.
+AC_DEFUN([EFL_LIB_START_OPTIONAL],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+if $2; then
+ efl_lib_optional_[]m4_defn([DOWN])="yes"
+else
+ efl_lib_optional_[]m4_defn([DOWN])="no"
+ AC_MSG_NOTICE([Skipping $1 checks (disabled)])
+fi
+
+if test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"; then
+ EFL_LIB_START([$1])
+ AC_DEFINE([HAVE_]m4_defn([UP]), [1], [optional EFL $1 is enabled])
+dnl closed at EFL_LIB_END_OPTIONAL()
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_END_OPTIONAL(PKG)
+dnl closes block started by EFL_LIB_START_OPTIONAL() and then
+dnl defines AM_CONDITIONAL([HAVE_PKG]) and AC_DEFINE([HAVE_PKG])
+AC_DEFUN([EFL_LIB_END_OPTIONAL],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+dnl close if started at EFL_LIB_START_OPTIONAL()
+ EFL_LIB_END([$1])
+fi
+
+AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test
"$efl_lib_optional_[]m4_defn([DOWN])" = "yes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_ADD_FEATURE(PKG, NAME, [VALUE])
+dnl if VALUE is not specified, will use ${have_name} instead.
+dnl
+dnl Defined Variables:
+dnl features_pkg
+AC_DEFUN([EFL_ADD_FEATURE],
+[dnl
+m4_pushdef([DOWNPKG], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl
+
+value="m4_if($3, ,
[${have_]m4_defn([DOWNNAME])[:-${want_]m4_defn([DOWNNAME])[}}], [$3])"
+case "${value}" in
+ yes)
+ tmp="${COLOR_YES}+$2${COLOR_RESET}"
+ ;;
+ no)
+ tmp="${COLOR_NO}-$2${COLOR_RESET}"
+ ;;
+ *)
+ tmp="${COLOR_OTHER}$2=${value}${COLOR_RESET}"
+ ;;
+esac
+if test -z "${features_[]m4_defn([DOWNPKG])}"; then
+ features_[]m4_defn([DOWNPKG])="${tmp}"
+else
+ features_[]m4_defn([DOWNPKG])="${features_[]m4_defn([DOWNPKG])} ${tmp}"
+fi
+m4_popdef([DOWNNAME])dnl
+m4_popdef([DOWNPKG])dnl
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/src/bin/common/shmfile.c
new/evas_generic_loaders-1.17.0/src/bin/common/shmfile.c
--- old/evas_generic_loaders-1.16.0/src/bin/common/shmfile.c 2014-11-03
10:49:02.000000000 +0100
+++ new/evas_generic_loaders-1.17.0/src/bin/common/shmfile.c 2015-11-10
15:51:30.000000000 +0100
@@ -20,7 +20,7 @@
#endif
int shm_fd = -1;
-int shm_size = 0;
+static int shm_size = 0;
void *shm_addr = NULL;
char *shmfile = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/src/bin/pdf/main.cpp
new/evas_generic_loaders-1.17.0/src/bin/pdf/main.cpp
--- old/evas_generic_loaders-1.16.0/src/bin/pdf/main.cpp 2015-08-12
09:20:56.000000000 +0200
+++ new/evas_generic_loaders-1.17.0/src/bin/pdf/main.cpp 2015-11-10
16:08:50.000000000 +0100
@@ -33,7 +33,6 @@
PDFDoc *pdfdoc;
bool locked = false;
-SplashOutputDev *output_dev;
::Page *page;
int width = 0, height = 0;
@@ -215,7 +214,7 @@
int i;
int size_w = 0, size_h = 0;
int head_only = 0;
- int page = 0;
+ int page_num = 0;
if (argc < 2) return -1;
// file is ALWAYS first arg, other options come after
@@ -228,7 +227,7 @@
else if (!strcmp(argv[i], "-key"))
{
i++;
- page = atoi(argv[i]);
+ page_num = atoi(argv[i]);
i++;
}
else if (!strcmp(argv[i], "-opt-scale-down-by"))
@@ -252,7 +251,7 @@
}
D("dpi....: %f\n", dpi);
- D("page...: %d\n", page);
+ D("page...: %d\n", page_num);
// This is a funny hack to call an external tool to generate a pdf that
will then be processed by poppler
extension = strrchr(file, '.');
@@ -307,7 +306,7 @@
// Now process the pdf (or the generated pdf)
D("poppler_file_init\n");
- if (!poppler_init(file, page, size_w, size_h))
+ if (!poppler_init(file, page_num, size_w, size_h))
return -1;
D("poppler_file_init done\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/src/bin/ps/main.c
new/evas_generic_loaders-1.17.0/src/bin/ps/main.c
--- old/evas_generic_loaders-1.16.0/src/bin/ps/main.c 2015-08-12
09:20:56.000000000 +0200
+++ new/evas_generic_loaders-1.17.0/src/bin/ps/main.c 2015-11-10
16:20:30.000000000 +0100
@@ -23,15 +23,15 @@
#endif
-SpectreDocument *psdoc;
-int page_count;
+static SpectreDocument *psdoc;
+static int page_count;
-SpectrePage *page;
+static SpectrePage *page;
-int width = 0;
-int height = 0;
-void *data = NULL;
-double dpi = -1.0;
+static int width = 0;
+static int height = 0;
+static void *data = NULL;
+static double dpi = -1.0;
#define DEF_DPI 72.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/src/bin/raw/main.c
new/evas_generic_loaders-1.17.0/src/bin/raw/main.c
--- old/evas_generic_loaders-1.16.0/src/bin/raw/main.c 2015-08-12
09:20:56.000000000 +0200
+++ new/evas_generic_loaders-1.17.0/src/bin/raw/main.c 2015-11-10
16:19:40.000000000 +0100
@@ -53,7 +53,7 @@
if (stat(file, &ss)) goto close_file;
seg_size = ss.st_size;
- seg = mmap(0, seg_size, PROT_READ, MAP_SHARED, fd, 0);
+ seg = mmap(NULL, seg_size, PROT_READ, MAP_SHARED, fd, 0);
if (seg == MAP_FAILED) goto close_file;
D("raw_init\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/src/bin/xcf/main.c
new/evas_generic_loaders-1.17.0/src/bin/xcf/main.c
--- old/evas_generic_loaders-1.16.0/src/bin/xcf/main.c 2015-08-12
09:20:56.000000000 +0200
+++ new/evas_generic_loaders-1.17.0/src/bin/xcf/main.c 2015-11-26
23:10:45.000000000 +0100
@@ -448,7 +448,7 @@
/*
----------------------------------------------------------------------------
globals ------------ */
/* This makes using the Gimp sources easier */
-struct _GimpImage * image = &_image;
+static struct _GimpImage * image = &_image;
/*
-------------------------------------------------------------------------------
code ------------ */
@@ -665,11 +665,11 @@
/* restore the saved position so we'll be ready to
* read the next offset. */
xcf_seek_pos (saved_pos);
- }
- /* If we were a Gimp we would now load the user-defined channels here ... */
- /* Flat-o-rama now :) */
- flatten_image();
- return;
+ }
+ /* If we were a Gimp we would now load the user-defined channels here ... */
+ /* Flat-o-rama now :) */
+ flatten_image();
+ return;
error:
if (num_successful_elements == 0) goto hard_error;
fprintf(stderr, "XCF: This file is corrupt! I have loaded as much\nof it
as I can, but it is incomplete.\n");
@@ -758,18 +758,18 @@
int type;
char *name;
- D("Loading one layer ...\n");
- /* read in the layer width, height and type */
- image->cp += xcf_read_int32(image->file, (DATA32 *)&width, 1);
- image->cp += xcf_read_int32(image->file, (DATA32 *)&height, 1);
- image->cp += xcf_read_int32(image->file, (DATA32 *)&type, 1);
- image->cp += xcf_read_string(image->file, &name, 1);
- /* ugly, I know */
- FREE(name);
-
- /* create a new layer */
- layer = new_layer(width, height, type, 255, NORMAL_MODE);
- if (!layer) return NULL;
+ D("Loading one layer ...\n");
+ /* read in the layer width, height and type */
+ image->cp += xcf_read_int32(image->file, (DATA32 *)&width, 1);
+ image->cp += xcf_read_int32(image->file, (DATA32 *)&height, 1);
+ image->cp += xcf_read_int32(image->file, (DATA32 *)&type, 1);
+ image->cp += xcf_read_string(image->file, &name, 1);
+ /* ugly, I know */
+ FREE(name);
+
+ /* create a new layer */
+ layer = new_layer(width, height, type, 255, NORMAL_MODE);
+ if (!layer) return NULL;
/* read in the layer properties */
if (!xcf_load_layer_props(layer)) goto error;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/evas_generic_loaders-1.16.0/src/bin/xcf/pixelfuncs.c
new/evas_generic_loaders-1.17.0/src/bin/xcf/pixelfuncs.c
--- old/evas_generic_loaders-1.16.0/src/bin/xcf/pixelfuncs.c 2014-11-03
10:49:02.000000000 +0100
+++ new/evas_generic_loaders-1.17.0/src/bin/xcf/pixelfuncs.c 2015-11-10
15:42:41.000000000 +0100
@@ -36,7 +36,7 @@
#define INT_MULT(a,b,t) ((t) = (a) * (b) + 0x80, ((((t) >> 8) + (t)) >> 8))
#define LINEAR(x,y,w) ((w*y + x)*4)
-void
+static void
rgb_to_hls (DATA8 *red, DATA8 *green, DATA8 *blue)
{
int r, g, b;
@@ -96,7 +96,7 @@
}
-DATA8
+static DATA8
gimp_hls_value (double n1, double n2, double hue)
{
double value;
@@ -118,7 +118,7 @@
}
-void
+static void
hls_to_rgb (DATA8 *hue, DATA8 *lightness, DATA8 *saturation)
{
double h, l, s;
@@ -152,7 +152,7 @@
}
-void
+static void
rgb_to_hsv (DATA8 *red, DATA8 *green, DATA8 *blue)
{
int r, g, b;
@@ -208,7 +208,7 @@
*blue = v;
}
-void
+static void
hsv_to_rgb (DATA8 *hue, DATA8 *saturation, DATA8 *value)
{
double h, s, v;
@@ -273,6 +273,7 @@
}
/* translate negative destinations */
+static
void _clip(int * src_tl_x, int * src_tl_y,
int * src_br_x, int * src_br_y,
int * dest_x, int * dest_y,
@@ -616,7 +617,7 @@
}
-void
+static void
combine_pixels_hsv (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w,
int dest_h, int dest_x, int dest_y, int mode)
{
int x, y, s_idx, d_idx;
