Hello community,
here is the log from the commit of package imlib2 for openSUSE:Factory checked
in at 2016-03-20 11:47:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/imlib2 (Old)
and /work/SRC/openSUSE:Factory/.imlib2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imlib2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/imlib2/imlib2.changes 2015-05-15
09:55:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.imlib2.new/imlib2.changes 2016-03-20
11:47:51.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Mar 15 11:52:25 UTC 2016 - sfl...@suse.de
+
+- Spec cleaner run
+
+-------------------------------------------------------------------
+Tue Mar 15 11:06:36 UTC 2016 - sfl...@suse.de
+
+- Update to 1.4.8
+ * Add a Farbfeld loader (FRIGN).
+ * Fix zlib and bz2 loader filename check.
+ * Miscellaneous maintenance.
+
+-------------------------------------------------------------------
Old:
----
imlib2-1.4.7.tar.bz2
New:
----
imlib2-1.4.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ imlib2.spec ++++++
--- /var/tmp/diff_new_pack.CAk1yB/_old 2016-03-20 11:47:52.000000000 +0100
+++ /var/tmp/diff_new_pack.CAk1yB/_new 2016-03-20 11:47:52.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package imlib2
#
-# 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
@@ -18,7 +18,7 @@
%define lname libImlib2-1
Name: imlib2
-Version: 1.4.7
+Version: 1.4.8
Release: 0
Summary: Image handling and conversion library
License: BSD-3-Clause
@@ -130,7 +130,6 @@
sed -i -e 's@-lfreetype@@g' -e 's@-lz@@g' -e 's@-lXext@@g' -e 's@-ldl@@g' -e
's@-lm@@g' %{buildroot}%{_bindir}/imlib2-config
%post -n %{lname} -p /sbin/ldconfig
-
%postun -n %{lname} -p /sbin/ldconfig
%files
++++++ imlib2-1.4.7.tar.bz2 -> imlib2-1.4.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/AUTHORS new/imlib2-1.4.8/AUTHORS
--- old/imlib2-1.4.7/AUTHORS 2013-03-16 11:29:15.000000000 +0100
+++ new/imlib2-1.4.8/AUTHORS 2016-02-07 08:01:40.000000000 +0100
@@ -30,3 +30,4 @@
Mike Castle <dalg...@ix.netcom.com>
R.Ramkumar <andyetitmo...@gmail.com>
Dmitry Antipov <dmanti...@yandex.ru>
+Laslo Hunhold <d...@frign.de>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/ChangeLog new/imlib2-1.4.8/ChangeLog
--- old/imlib2-1.4.7/ChangeLog 2015-04-04 20:08:38.000000000 +0200
+++ new/imlib2-1.4.8/ChangeLog 2016-03-12 08:50:05.000000000 +0100
@@ -1,5 +1,26 @@
***
+*** Version 1.4.8 ***
+***
+
+Chloe Kudryavtsev (1):
+ add time.h include to common.h for time_t
+
+FRIGN (1):
+ Add a Farbfeld loader
+
+Kim Woelders (4):
+ Remove redundant config.h.
+ Add compile to MAINTAINERCLEANFILES.
+ Indent.
+ 1.4.8.
+
+Quentin Rameau (2):
+ Fix bz2 loader filename check
+ Fix zlib loader filename check
+
+
+***
*** Version 1.4.7 ***
***
@@ -42,6 +63,7 @@
Enable visibility hiding by default.
Indent the remaining unindented files.
Generate a ChangeLog using git shortlog between existing tags.
+ 1.4.7.
Michał Górny (1):
fix -I flags to support building out-of-source
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/Makefile.am new/imlib2-1.4.8/Makefile.am
--- old/imlib2-1.4.7/Makefile.am 2014-12-20 17:19:20.000000000 +0100
+++ new/imlib2-1.4.8/Makefile.am 2016-02-09 17:53:53.000000000 +0100
@@ -4,9 +4,10 @@
SUBDIRS = src data doc
-MAINTAINERCLEANFILES = aclocal.m4 config.guess config.h.in \
- config.sub configure depcomp install-sh \
- ltmain.sh Makefile.in missing imlib2_docs.tar.gz
+MAINTAINERCLEANFILES = aclocal.m4 compile \
+ config.guess config.h.in config.sub configure \
+ depcomp install-sh ltmain.sh missing Makefile.in \
+ imlib2_docs.tar.gz
bin_SCRIPTS = imlib2-config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/Makefile.in new/imlib2-1.4.8/Makefile.in
--- old/imlib2-1.4.7/Makefile.in 2015-04-04 20:19:48.000000000 +0200
+++ new/imlib2-1.4.8/Makefile.in 2016-03-12 08:52:45.000000000 +0100
@@ -384,9 +384,10 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src data doc
-MAINTAINERCLEANFILES = aclocal.m4 config.guess config.h.in \
- config.sub configure depcomp install-sh \
- ltmain.sh Makefile.in missing imlib2_docs.tar.gz
+MAINTAINERCLEANFILES = aclocal.m4 compile \
+ config.guess config.h.in config.sub configure \
+ depcomp install-sh ltmain.sh missing Makefile.in \
+ imlib2_docs.tar.gz
bin_SCRIPTS = imlib2-config
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/README new/imlib2-1.4.8/README
--- old/imlib2-1.4.7/README 2015-04-04 20:20:09.000000000 +0200
+++ new/imlib2-1.4.8/README 2016-03-12 08:53:23.000000000 +0100
@@ -1,4 +1,4 @@
-Imlib2 1.4.7
+Imlib2 1.4.8
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
@@ -36,7 +36,7 @@
RPM: To build rpm packages:
- sudo rpm -ta imlib2-1.4.7.tar.gz
+ sudo rpm -ta imlib2-1.4.8.tar.gz
You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
@@ -44,11 +44,11 @@
DEB: To build deb packages:
- tar zvf imlib2-1.4.7.tar.gz
- cd imlib2-1.4.7
+ tar zvf imlib2-1.4.8.tar.gz
+ cd imlib2-1.4.8
dpkg-buildpackage -us -uc -rfakeroot
cd ..
- rm -rf imlib2-1.4.7
+ rm -rf imlib2-1.4.8
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/aclocal.m4 new/imlib2-1.4.8/aclocal.m4
--- old/imlib2-1.4.7/aclocal.m4 2015-04-04 20:19:45.000000000 +0200
+++ new/imlib2-1.4.8/aclocal.m4 2016-03-12 08:52:42.000000000 +0100
@@ -20,32 +20,63 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
'autoreconf'.])])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.li...@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running
autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but
]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
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)))?$])
@@ -67,18 +98,19 @@
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -88,8 +120,10 @@
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -101,10 +135,11 @@
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -112,19 +147,17 @@
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -178,16 +211,40 @@
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -198,16 +255,18 @@
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -218,13 +277,15 @@
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -233,7 +294,7 @@
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/configure new/imlib2-1.4.8/configure
--- old/imlib2-1.4.7/configure 2015-04-04 20:19:50.000000000 +0200
+++ new/imlib2-1.4.8/configure 2016-03-12 08:52:43.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for imlib2 1.4.7.
+# Generated by GNU Autoconf 2.69 for imlib2 1.4.8.
#
# Report bugs to <enlightenment-de...@lists.sourceforge.net>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='imlib2'
PACKAGE_TARNAME='imlib2'
-PACKAGE_VERSION='1.4.7'
-PACKAGE_STRING='imlib2 1.4.7'
+PACKAGE_VERSION='1.4.8'
+PACKAGE_STRING='imlib2 1.4.8'
PACKAGE_BUGREPORT='enlightenment-de...@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1383,7 +1383,7 @@
# 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 imlib2 1.4.7 to adapt to many kinds of systems.
+\`configure' configures imlib2 1.4.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of imlib2 1.4.7:";;
+ short | recursive ) echo "Configuration of imlib2 1.4.8:";;
esac
cat <<\_ACEOF
@@ -1596,7 +1596,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-imlib2 configure 1.4.7
+imlib2 configure 1.4.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1965,7 +1965,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by imlib2 $as_me 1.4.7, which was
+It was created by imlib2 $as_me 1.4.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2902,7 +2902,7 @@
# Define the identity of the package.
PACKAGE='imlib2'
- VERSION='1.4.7'
+ VERSION='1.4.8'
cat >>confdefs.h <<_ACEOF
@@ -13355,7 +13355,7 @@
VERSION_CUR=5
-VERSION_REV=7
+VERSION_REV=8
VERSION_AGE=4
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
@@ -16370,7 +16370,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by imlib2 $as_me 1.4.7, which was
+This file was extended by imlib2 $as_me 1.4.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16436,7 +16436,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-imlib2 config.status 1.4.7
+imlib2 config.status 1.4.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/configure.ac
new/imlib2-1.4.8/configure.ac
--- old/imlib2-1.4.7/configure.ac 2015-04-04 20:08:21.000000000 +0200
+++ new/imlib2-1.4.8/configure.ac 2016-03-12 08:48:30.000000000 +0100
@@ -1,7 +1,7 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT([imlib2], [1.4.7], [enlightenment-de...@lists.sourceforge.net])
+AC_INIT([imlib2], [1.4.8], [enlightenment-de...@lists.sourceforge.net])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_BUILD
@@ -23,7 +23,7 @@
LT_INIT
VERSION_CUR=5
-VERSION_REV=7
+VERSION_REV=8
VERSION_AGE=4
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
AC_SUBST(lt_version)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/data/Makefile.in
new/imlib2-1.4.8/data/Makefile.in
--- old/imlib2-1.4.7/data/Makefile.in 2015-04-04 20:19:48.000000000 +0200
+++ new/imlib2-1.4.8/data/Makefile.in 2016-03-12 08:52:45.000000000 +0100
@@ -338,9 +338,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/Makefile
+ $(AUTOMAKE) --gnu data/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/data/fonts/Makefile.in
new/imlib2-1.4.8/data/fonts/Makefile.in
--- old/imlib2-1.4.7/data/fonts/Makefile.in 2015-04-04 20:19:48.000000000
+0200
+++ new/imlib2-1.4.8/data/fonts/Makefile.in 2016-03-12 08:52:45.000000000
+0100
@@ -316,9 +316,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/fonts/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/fonts/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/fonts/Makefile
+ $(AUTOMAKE) --gnu data/fonts/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/data/images/Makefile.in
new/imlib2-1.4.8/data/images/Makefile.in
--- old/imlib2-1.4.7/data/images/Makefile.in 2015-04-04 20:19:48.000000000
+0200
+++ new/imlib2-1.4.8/data/images/Makefile.in 2016-03-12 08:52:46.000000000
+0100
@@ -330,9 +330,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/Makefile';
\
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/images/Makefile
+ $(AUTOMAKE) --gnu data/images/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/doc/Makefile.in
new/imlib2-1.4.8/doc/Makefile.in
--- old/imlib2-1.4.7/doc/Makefile.in 2015-04-04 20:19:48.000000000 +0200
+++ new/imlib2-1.4.8/doc/Makefile.in 2016-03-12 08:52:46.000000000 +0100
@@ -281,9 +281,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/Makefile
+ $(AUTOMAKE) --gnu doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/imlib2.spec new/imlib2-1.4.8/imlib2.spec
--- old/imlib2-1.4.7/imlib2.spec 2015-04-04 20:20:10.000000000 +0200
+++ new/imlib2-1.4.8/imlib2.spec 2016-03-12 08:53:23.000000000 +0100
@@ -1,6 +1,6 @@
Summary: Powerful image loading and rendering library
Name: imlib2
-Version: 1.4.7
+Version: 1.4.8
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
@@ -72,6 +72,12 @@
%description loader_bmp
BMP image loader/saver for Imlib2
+%package loader_ff
+Summary: Imlib2 Farbfeld loader
+Group: System Environment/Libraries
+%description loader_ff
+Farbfeld image loader/saver for Imlib2
+
%package loader_gif
Summary: Imlib2 GIF loader
Group: System Environment/Libraries
@@ -187,6 +193,9 @@
%files loader_bmp
%attr(755,root,root) %{_libdir}/imlib2/loaders/bmp.so
+%files loader_ff
+%attr(755,root,root) %{_libdir}/imlib2/loaders/ff.so
+
%files loader_gif
%attr(755,root,root) %{_libdir}/imlib2/loaders/gif.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/imlib2.spec.in
new/imlib2-1.4.8/imlib2.spec.in
--- old/imlib2-1.4.7/imlib2.spec.in 2014-12-20 17:19:20.000000000 +0100
+++ new/imlib2-1.4.8/imlib2.spec.in 2016-02-09 17:53:53.000000000 +0100
@@ -72,6 +72,12 @@
%description loader_bmp
BMP image loader/saver for Imlib2
+%package loader_ff
+Summary: Imlib2 Farbfeld loader
+Group: System Environment/Libraries
+%description loader_ff
+Farbfeld image loader/saver for Imlib2
+
%package loader_gif
Summary: Imlib2 GIF loader
Group: System Environment/Libraries
@@ -187,6 +193,9 @@
%files loader_bmp
%attr(755,root,root) %{_libdir}/imlib2/loaders/bmp.so
+%files loader_ff
+%attr(755,root,root) %{_libdir}/imlib2/loaders/ff.so
+
%files loader_gif
%attr(755,root,root) %{_libdir}/imlib2/loaders/gif.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/m4/ltsugar.m4
new/imlib2-1.4.8/m4/ltsugar.m4
--- old/imlib2-1.4.7/m4/ltsugar.m4 2015-04-04 18:21:16.000000000 +0200
+++ new/imlib2-1.4.8/m4/ltsugar.m4 2015-11-01 15:26:08.000000000 +0100
@@ -1,7 +1,6 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -34,7 +33,7 @@
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59, which quotes differently.
+# Autoconf-2.59 which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -45,7 +44,7 @@
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/m4/lt~obsolete.m4
new/imlib2-1.4.8/m4/lt~obsolete.m4
--- old/imlib2-1.4.7/m4/lt~obsolete.m4 2015-04-04 18:21:16.000000000 +0200
+++ new/imlib2-1.4.8/m4/lt~obsolete.m4 2015-11-01 15:26:08.000000000 +0100
@@ -1,7 +1,6 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -12,7 +11,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -26,7 +25,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/Makefile.in
new/imlib2-1.4.8/src/Makefile.in
--- old/imlib2-1.4.7/src/Makefile.in 2015-04-04 20:19:48.000000000 +0200
+++ new/imlib2-1.4.8/src/Makefile.in 2016-03-12 08:52:46.000000000 +0100
@@ -338,9 +338,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
+ $(AUTOMAKE) --gnu src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/bin/Makefile.in
new/imlib2-1.4.8/src/bin/Makefile.in
--- old/imlib2-1.4.7/src/bin/Makefile.in 2015-04-04 20:19:48.000000000
+0200
+++ new/imlib2-1.4.8/src/bin/Makefile.in 2016-03-12 08:52:46.000000000
+0100
@@ -383,9 +383,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/bin/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/bin/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/bin/Makefile
+ $(AUTOMAKE) --gnu src/bin/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/lib/Imlib2.h
new/imlib2-1.4.8/src/lib/Imlib2.h
--- old/imlib2-1.4.7/src/lib/Imlib2.h 2014-12-20 17:17:50.000000000 +0100
+++ new/imlib2-1.4.8/src/lib/Imlib2.h 2015-04-26 09:36:31.000000000 +0200
@@ -22,6 +22,8 @@
#endif
#endif
+
+
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/lib/common.h
new/imlib2-1.4.8/src/lib/common.h
--- old/imlib2-1.4.7/src/lib/common.h 2014-12-20 17:09:17.000000000 +0100
+++ new/imlib2-1.4.8/src/lib/common.h 2016-02-09 17:53:55.000000000 +0100
@@ -6,9 +6,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <config.h>
#include <string.h>
#include <math.h>
+#include <time.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/Makefile.in
new/imlib2-1.4.8/src/modules/Makefile.in
--- old/imlib2-1.4.7/src/modules/Makefile.in 2015-04-04 20:19:48.000000000
+0200
+++ new/imlib2-1.4.8/src/modules/Makefile.in 2016-03-12 08:52:46.000000000
+0100
@@ -338,9 +338,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/Makefile';
\
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/Makefile
+ $(AUTOMAKE) --gnu src/modules/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/filters/Makefile.in
new/imlib2-1.4.8/src/modules/filters/Makefile.in
--- old/imlib2-1.4.7/src/modules/filters/Makefile.in 2015-04-04
20:19:48.000000000 +0200
+++ new/imlib2-1.4.8/src/modules/filters/Makefile.in 2016-03-12
08:52:46.000000000 +0100
@@ -391,9 +391,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
src/modules/filters/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
src/modules/filters/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/filters/Makefile
+ $(AUTOMAKE) --gnu src/modules/filters/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/loaders/Makefile.am
new/imlib2-1.4.8/src/modules/loaders/Makefile.am
--- old/imlib2-1.4.7/src/modules/loaders/Makefile.am 2014-12-20
17:08:37.000000000 +0100
+++ new/imlib2-1.4.8/src/modules/loaders/Makefile.am 2016-02-07
08:01:40.000000000 +0100
@@ -31,6 +31,7 @@
$(JPEG_L) \
$(PNG_L) \
$(TIFF_L) \
+$(FF_L) \
$(GIF_L) \
$(ZLIB_L) \
$(BZ2_L) \
@@ -38,6 +39,7 @@
pnm.la \
argb.la \
bmp.la \
+ff.la \
xpm.la \
tga.la \
lbm.la
@@ -60,6 +62,11 @@
tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/lib/libImlib2.la
tiff_la_LIBTOOLFLAGS = --tag=disable-static
+ff_la_SOURCES = loader_ff.c
+ff_la_LDFLAGS = -module -avoid-version
+ff_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
+ff_la_LIBTOOLFLAGS = --tag=disable-static
+
gif_la_SOURCES = loader_gif.c
gif_la_LDFLAGS = -module -avoid-version
gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/lib/libImlib2.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/loaders/Makefile.in
new/imlib2-1.4.8/src/modules/loaders/Makefile.in
--- old/imlib2-1.4.7/src/modules/loaders/Makefile.in 2015-04-04
20:19:49.000000000 +0200
+++ new/imlib2-1.4.8/src/modules/loaders/Makefile.in 2016-03-12
08:52:46.000000000 +0100
@@ -154,6 +154,12 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(bz2_la_LDFLAGS) $(LDFLAGS) -o $@
@BUILD_BZ2_LOADER_TRUE@am_bz2_la_rpath = -rpath $(pkgdir)
+ff_la_DEPENDENCIES = $(top_builddir)/src/lib/libImlib2.la
+am_ff_la_OBJECTS = ff_la-loader_ff.lo
+ff_la_OBJECTS = $(am_ff_la_OBJECTS)
+ff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ff_la_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ff_la_LDFLAGS) $(LDFLAGS) -o $@
gif_la_DEPENDENCIES = $(top_builddir)/src/lib/libImlib2.la
am_gif_la_OBJECTS = gif_la-loader_gif.lo
gif_la_OBJECTS = $(am_gif_la_OBJECTS)
@@ -255,15 +261,15 @@
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(argb_la_SOURCES) $(bmp_la_SOURCES) $(bz2_la_SOURCES) \
- $(gif_la_SOURCES) $(id3_la_SOURCES) $(jpeg_la_SOURCES) \
- $(lbm_la_SOURCES) $(png_la_SOURCES) $(pnm_la_SOURCES) \
- $(tga_la_SOURCES) $(tiff_la_SOURCES) $(xpm_la_SOURCES) \
- $(zlib_la_SOURCES)
+ $(ff_la_SOURCES) $(gif_la_SOURCES) $(id3_la_SOURCES) \
+ $(jpeg_la_SOURCES) $(lbm_la_SOURCES) $(png_la_SOURCES) \
+ $(pnm_la_SOURCES) $(tga_la_SOURCES) $(tiff_la_SOURCES) \
+ $(xpm_la_SOURCES) $(zlib_la_SOURCES)
DIST_SOURCES = $(argb_la_SOURCES) $(bmp_la_SOURCES) $(bz2_la_SOURCES) \
- $(gif_la_SOURCES) $(id3_la_SOURCES) $(jpeg_la_SOURCES) \
- $(lbm_la_SOURCES) $(png_la_SOURCES) $(pnm_la_SOURCES) \
- $(tga_la_SOURCES) $(tiff_la_SOURCES) $(xpm_la_SOURCES) \
- $(zlib_la_SOURCES)
+ $(ff_la_SOURCES) $(gif_la_SOURCES) $(id3_la_SOURCES) \
+ $(jpeg_la_SOURCES) $(lbm_la_SOURCES) $(png_la_SOURCES) \
+ $(pnm_la_SOURCES) $(tga_la_SOURCES) $(tiff_la_SOURCES) \
+ $(xpm_la_SOURCES) $(zlib_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -446,6 +452,7 @@
$(JPEG_L) \
$(PNG_L) \
$(TIFF_L) \
+$(FF_L) \
$(GIF_L) \
$(ZLIB_L) \
$(BZ2_L) \
@@ -453,6 +460,7 @@
pnm.la \
argb.la \
bmp.la \
+ff.la \
xpm.la \
tga.la \
lbm.la
@@ -471,6 +479,10 @@
tiff_la_LDFLAGS = -module -avoid-version
tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/lib/libImlib2.la
tiff_la_LIBTOOLFLAGS = --tag=disable-static
+ff_la_SOURCES = loader_ff.c
+ff_la_LDFLAGS = -module -avoid-version
+ff_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
+ff_la_LIBTOOLFLAGS = --tag=disable-static
gif_la_SOURCES = loader_gif.c
gif_la_LDFLAGS = -module -avoid-version
gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/lib/libImlib2.la
@@ -524,9 +536,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
src/modules/loaders/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
src/modules/loaders/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/loaders/Makefile
+ $(AUTOMAKE) --gnu src/modules/loaders/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -589,6 +601,9 @@
bz2.la: $(bz2_la_OBJECTS) $(bz2_la_DEPENDENCIES) $(EXTRA_bz2_la_DEPENDENCIES)
$(AM_V_CCLD)$(bz2_la_LINK) $(am_bz2_la_rpath) $(bz2_la_OBJECTS)
$(bz2_la_LIBADD) $(LIBS)
+ff.la: $(ff_la_OBJECTS) $(ff_la_DEPENDENCIES) $(EXTRA_ff_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(ff_la_LINK) -rpath $(pkgdir) $(ff_la_OBJECTS)
$(ff_la_LIBADD) $(LIBS)
+
gif.la: $(gif_la_OBJECTS) $(gif_la_DEPENDENCIES) $(EXTRA_gif_la_DEPENDENCIES)
$(AM_V_CCLD)$(gif_la_LINK) $(am_gif_la_rpath) $(gif_la_OBJECTS)
$(gif_la_LIBADD) $(LIBS)
@@ -628,6 +643,7 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/argb_la-loader_argb.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/bmp_la-loader_bmp.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/bz2_la-loader_bz2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ff_la-loader_ff.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gif_la-loader_gif.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/id3_la-loader_id3.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/jpeg_la-loader_jpeg.Plo@am__quote@
@@ -681,6 +697,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(bz2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -c -o bz2_la-loader_bz2.lo `test -f 'loader_bz2.c' || echo
'$(srcdir)/'`loader_bz2.c
+ff_la-loader_ff.lo: loader_ff.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(ff_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -MT ff_la-loader_ff.lo -MD -MP -MF $(DEPDIR)/ff_la-loader_ff.Tpo -c
-o ff_la-loader_ff.lo `test -f 'loader_ff.c' || echo '$(srcdir)/'`loader_ff.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ff_la-loader_ff.Tpo
$(DEPDIR)/ff_la-loader_ff.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loader_ff.c'
object='ff_la-loader_ff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(ff_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -c -o ff_la-loader_ff.lo `test -f 'loader_ff.c' || echo
'$(srcdir)/'`loader_ff.c
+
gif_la-loader_gif.lo: loader_gif.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(gif_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -MT gif_la-loader_gif.lo -MD -MP -MF $(DEPDIR)/gif_la-loader_gif.Tpo
-c -o gif_la-loader_gif.lo `test -f 'loader_gif.c' || echo
'$(srcdir)/'`loader_gif.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gif_la-loader_gif.Tpo
$(DEPDIR)/gif_la-loader_gif.Plo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/loaders/loader_bz2.c
new/imlib2-1.4.8/src/modules/loaders/loader_bz2.c
--- old/imlib2-1.4.7/src/modules/loaders/loader_bz2.c 2014-12-20
17:39:11.000000000 +0100
+++ new/imlib2-1.4.8/src/modules/loaders/loader_bz2.c 2016-02-09
17:53:49.000000000 +0100
@@ -52,8 +52,8 @@
ImlibLoader *loader;
FILE *fp;
int dest, res;
- char *file, tmp[] = "/tmp/imlib2_loader_bz2-XXXXXX", *p;
- char real_ext[16];
+ char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_bz2-XXXXXX";
+ char *real_ext;
assert(im);
@@ -61,19 +61,8 @@
* (e.g. "foo.png.bz2"
*/
p = strrchr(im->real_file, '.');
- if (p && p != im->real_file)
- {
- if (strcasecmp(p + 1, "bz2"))
- return 0;
- }
- else
- return 0;
-
- strncpy(real_ext, p - sizeof(real_ext) + 1, sizeof(real_ext));
- real_ext[sizeof(real_ext) - 1] = '\0';
-
- /* abort if there's no dot in the "real" filename */
- if (!strrchr(real_ext, '.'))
+ q = strchr(im->real_file, '.');
+ if (!p || p == im->real_file || strcasecmp(p + 1, "bz2") || p == q)
return 0;
if (!(fp = fopen(im->real_file, "rb")))
@@ -97,8 +86,12 @@
return 0;
}
+ if (!(real_ext = strndup(im->real_file, p - im->real_file)))
+ return 0;
+
if (!(loader = __imlib_FindBestLoaderForFile(real_ext, 0)))
{
+ free(real_ext);
unlink(tmp);
return 0;
}
@@ -112,6 +105,7 @@
free(im->real_file);
im->real_file = file;
+ free(real_ext);
unlink(tmp);
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/loaders/loader_ff.c
new/imlib2-1.4.8/src/modules/loaders/loader_ff.c
--- old/imlib2-1.4.7/src/modules/loaders/loader_ff.c 1970-01-01
01:00:00.000000000 +0100
+++ new/imlib2-1.4.8/src/modules/loaders/loader_ff.c 2016-02-07
09:31:34.000000000 +0100
@@ -0,0 +1,181 @@
+/* Farbfeld (http://tools.suckless.org/farbfeld) */
+#include <arpa/inet.h>
+#include <stdint.h>
+
+#include "loader_common.h"
+
+#define LEN(x) (sizeof((x)) / sizeof(*(x)))
+
+char
+load(ImlibImage * im, ImlibProgressFunction progress,
+ char progress_granularity, char immediate_load)
+{
+ FILE *f;
+ size_t rowlen, i, j;
+ uint32_t hdr[2 + 1 + 1], w, h;
+ uint16_t *row;
+ uint8_t *dat;
+
+ /* open the file for reading */
+ if (!(f = fopen(im->real_file, "rb")))
+ {
+ return 0;
+ }
+
+ /* read and check the header */
+ if (!im->data)
+ {
+ if (fread(hdr, sizeof(uint32_t), LEN(hdr), f) != LEN(hdr) ||
+ memcmp("farbfeld", hdr, sizeof("farbfeld") - 1))
+ {
+ fclose(f);
+ return 0;
+ }
+ im->w = ntohl(hdr[2]);
+ im->h = ntohl(hdr[3]);
+ if (!IMAGE_DIMENSIONS_OK(im->w, im->h))
+ {
+ fclose(f);
+ return 0;
+ }
+
+ /* set format */
+ if (!im->loader)
+ {
+ if (!(im->format = strdup("ff")))
+ {
+ fclose(f);
+ return 0;
+ }
+ }
+ SET_FLAG(im->flags, F_HAS_ALPHA);
+ }
+
+ /* load the data */
+ if (im->loader || immediate_load || progress)
+ {
+ w = im->w;
+ h = im->h;
+ rowlen = w * (sizeof("RGBA") - 1);
+
+ free(im->data);
+ if (!(im->data = malloc(rowlen * h)) ||
+ !(row = malloc(rowlen * sizeof(uint16_t))))
+ {
+ free(im->data);
+ im->data = NULL;
+ free(row);
+ fclose(f);
+ return 0;
+ }
+
+ dat = (uint8_t *) im->data;
+ for (i = 0; i < h; i++, dat += rowlen)
+ {
+ if (fread(row, sizeof(uint16_t), rowlen, f) != rowlen)
+ {
+ free(im->data);
+ im->data = NULL;
+ free(row);
+ fclose(f);
+ return 0;
+ }
+ for (j = 0; j < rowlen; j += 4)
+ {
+ /*
+ * 16-Bit to 8-Bit (RGBA -> BGRA)
+ * 255 * 257 = 65535 = 2^16-1 = UINT16_MAX
+ */
+ dat[j + 2] = ntohs(row[j + 0]) / 257;
+ dat[j + 1] = ntohs(row[j + 1]) / 257;
+ dat[j + 0] = ntohs(row[j + 2]) / 257;
+ dat[j + 3] = ntohs(row[j + 3]) / 257;
+ }
+ }
+ if (progress)
+ {
+ progress(im, 100, 0, 0, im->w, im->h);
+ }
+
+ free(row);
+ }
+
+ fclose(f);
+ return 1;
+}
+
+char
+save(ImlibImage * im, ImlibProgressFunction progress, char progress_gran)
+{
+ FILE *f;
+ size_t rowlen, i, j;
+ uint32_t tmp32;
+ uint16_t *row;
+ uint8_t *dat;
+
+ /* open the file for writing */
+ if (!(f = fopen(im->real_file, "wb")))
+ {
+ return 0;
+ }
+
+ /* write header */
+ fputs("farbfeld", f);
+ tmp32 = htonl(im->w);
+ if (fwrite(&tmp32, sizeof(uint32_t), 1, f) != 1)
+ {
+ fclose(f);
+ return 0;
+ }
+ tmp32 = htonl(im->h);
+ if (fwrite(&tmp32, sizeof(uint32_t), 1, f) != 1)
+ {
+ fclose(f);
+ return 0;
+ }
+
+ /* write data */
+ rowlen = im->w * (sizeof("RGBA") - 1);
+ if (!(row = malloc(rowlen * sizeof(uint16_t))))
+ {
+ fclose(f);
+ return 0;
+ }
+ dat = (uint8_t *) im->data;
+ for (i = 0; i < (uint32_t) im->h; ++i, dat += rowlen)
+ {
+ for (j = 0; j < rowlen; j += 4)
+ {
+ /*
+ * 8-Bit to 16-Bit
+ * 255 * 257 = 65535 = 2^16-1 = UINT16_MAX
+ */
+ row[j + 0] = htons(dat[j + 2] * 257);
+ row[j + 1] = htons(dat[j + 1] * 257);
+ row[j + 2] = htons(dat[j + 0] * 257);
+ row[j + 3] = htons(dat[j + 3] * 257);
+ }
+ if (fwrite(row, sizeof(uint16_t), rowlen, f) != rowlen)
+ {
+ free(row);
+ fclose(f);
+ return 0;
+ }
+ }
+ if (progress)
+ {
+ progress(im, 100, 0, 0, im->w, im->h);
+ }
+
+ free(row);
+ fclose(f);
+ return 1;
+}
+
+void
+formats(ImlibLoader * l)
+{
+ l->num_formats = 1;
+ l->formats = malloc(sizeof(char *));
+ *(l->formats) = strdup("ff");
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.4.7/src/modules/loaders/loader_zlib.c
new/imlib2-1.4.8/src/modules/loaders/loader_zlib.c
--- old/imlib2-1.4.7/src/modules/loaders/loader_zlib.c 2014-12-20
17:39:11.000000000 +0100
+++ new/imlib2-1.4.8/src/modules/loaders/loader_zlib.c 2016-02-09
17:52:49.000000000 +0100
@@ -44,8 +44,8 @@
{
ImlibLoader *loader;
int src, dest, res;
- char *file, *p, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX";
- char real_ext[16];
+ char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX";
+ char *real_ext;
struct stat st;
assert(im);
@@ -54,19 +54,8 @@
* (e.g. "foo.png.gz"
*/
p = strrchr(im->real_file, '.');
- if (p && p != im->real_file)
- {
- if (strcasecmp(p + 1, "gz"))
- return 0;
- }
- else
- return 0;
-
- strncpy(real_ext, p - sizeof(real_ext) + 1, sizeof(real_ext));
- real_ext[sizeof(real_ext) - 1] = '\0';
-
- /* abort if there's no dot in the "real" filename */
- if (!strrchr(real_ext, '.'))
+ q = strchr(im->real_file, '.');
+ if (!p || p == im->real_file || strcasecmp(p + 1, "gz") || p == q)
return 0;
if (stat(im->real_file, &st) < 0)
@@ -93,8 +82,12 @@
return 0;
}
+ if (!(real_ext = strndup(im->real_file, p - im->real_file)))
+ return 0;
+
if (!(loader = __imlib_FindBestLoaderForFile(real_ext, 0)))
{
+ free(real_ext);
unlink(tmp);
return 0;
}
@@ -108,6 +101,7 @@
free(im->real_file);
im->real_file = file;
+ free(real_ext);
unlink(tmp);
return 1;
