Hello community, here is the log from the commit of package imlib2 for openSUSE:Factory checked in at 2020-12-15 12:30:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imlib2 (Old) and /work/SRC/openSUSE:Factory/.imlib2.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imlib2" Tue Dec 15 12:30:31 2020 rev:43 rq:855718 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/imlib2/imlib2.changes 2020-08-21 18:59:43.088200261 +0200 +++ /work/SRC/openSUSE:Factory/.imlib2.new.2328/imlib2.changes 2020-12-15 12:32:48.088117157 +0100 @@ -1,0 +2,13 @@ +Mon Dec 14 07:43:47 UTC 2020 - Martin Pluskal <mplus...@suse.com> + +- Update to version 1.7.1: + * Fix big endian build + * rend.c: Fix __imlib_generic_render() when jump != 0 + * grab.c: Support 30bpp display in __imlib_GrabXImageToRGBA() + * WEBP loader: Add initial signature check + * XPM loader: Get transparency right when doing header-only loading + * Silence a couple of sign-compare warnings +- Enable support for webp +- Drop autotools build dependencies + +------------------------------------------------------------------- Old: ---- imlib2-1.7.0.tar.bz2 New: ---- imlib2-1.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.fGUg06/_old 2020-12-15 12:32:48.640117602 +0100 +++ /var/tmp/diff_new_pack.fGUg06/_new 2020-12-15 12:32:48.644117605 +0100 @@ -18,27 +18,26 @@ %define lname libImlib2-1 Name: imlib2 -Version: 1.7.0 +Version: 1.7.1 Release: 0 Summary: Image handling and conversion library License: BSD-3-Clause Group: Development/Libraries/X11 URL: https://sourceforge.net/projects/enlightenment/ Source: http://downloads.sourceforge.net/project/enlightenment/imlib2-src/%{version}/%{name}-%{version}.tar.bz2 -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: freetype2-devel BuildRequires: giflib-devel -BuildRequires: libid3tag-devel +BuildRequires: libICE-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel -BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(id3tag) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(zlib) Recommends: imlib2-loaders %description @@ -99,7 +98,6 @@ %setup -q %build -autoreconf -fiv %configure \ %ifarch %{ix86} --enable-mmx \ @@ -109,9 +107,6 @@ %ifarch x86_64 --enable-amd64 \ %endif - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ --enable-shared \ --enable-visibility-hiding \ --disable-static ++++++ imlib2-1.7.0.tar.bz2 -> imlib2-1.7.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/ChangeLog new/imlib2-1.7.1/ChangeLog --- old/imlib2-1.7.0/ChangeLog 2020-08-01 07:02:09.000000000 +0200 +++ new/imlib2-1.7.1/ChangeLog 2020-12-11 09:23:09.000000000 +0100 @@ -1,5 +1,21 @@ *** +*** Version 1.7.1 *** +*** + +Daniel Kolesa (1): + Fix big endian build + +Kim Woelders (6): + rend.c: Fix __imlib_generic_render() when jump != 0 + grab.c: Support 30bpp display in __imlib_GrabXImageToRGBA() + WEBP loader: Add initial signature check + XPM loader: Get transparency right when doing header-only loading + Silence a couple of sign-compare warnings + 1.7.1 + + +*** *** Version 1.7.0 *** *** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/Makefile.in new/imlib2-1.7.1/Makefile.in --- old/imlib2-1.7.0/Makefile.in 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -171,8 +171,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -716,6 +716,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -758,6 +762,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -939,19 +945,19 @@ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-pkgconfigDATA + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binSCRIPTS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binSCRIPTS uninstall-pkgconfigDATA .PRECIOUS: Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/README new/imlib2-1.7.1/README --- old/imlib2-1.7.0/README 2020-08-01 07:17:56.000000000 +0200 +++ new/imlib2-1.7.1/README 2020-12-11 09:28:16.000000000 +0100 @@ -1,4 +1,4 @@ -Imlib2 1.7.0 +Imlib2 1.7.1 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.7.0.tar.gz + sudo rpm -ta imlib2-1.7.1.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.7.0.tar.gz - cd imlib2-1.7.0 + tar zvf imlib2-1.7.1.tar.gz + cd imlib2-1.7.1 dpkg-buildpackage -us -uc -rfakeroot cd .. - rm -rf imlib2-1.7.0 + rm -rf imlib2-1.7.1 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.7.0/aclocal.m4 new/imlib2-1.7.1/aclocal.m4 --- old/imlib2-1.7.0/aclocal.m4 2020-08-01 07:16:51.000000000 +0200 +++ new/imlib2-1.7.1/aclocal.m4 2020-12-11 09:28:07.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +379,7 @@ [am__api_version='1.16' 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.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +395,14 @@ # 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.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -422,7 +422,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -474,7 +474,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -505,7 +505,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -696,7 +696,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -735,7 +735,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -762,7 +764,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -959,7 +961,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -980,7 +982,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1001,7 +1003,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1044,7 +1046,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1083,7 +1085,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1112,7 +1114,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1159,7 +1161,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1178,7 +1180,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1259,7 +1261,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1319,7 +1321,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1347,7 +1349,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1366,7 +1368,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/compile new/imlib2-1.7.1/compile --- old/imlib2-1.7.0/compile 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/compile 2020-12-11 09:28:09.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/configure new/imlib2-1.7.1/configure --- old/imlib2-1.7.0/configure 2020-08-01 07:16:51.000000000 +0200 +++ new/imlib2-1.7.1/configure 2020-12-11 09:28:08.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.7.0. +# Generated by GNU Autoconf 2.69 for imlib2 1.7.1. # # 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.7.0' -PACKAGE_STRING='imlib2 1.7.0' +PACKAGE_VERSION='1.7.1' +PACKAGE_STRING='imlib2 1.7.1' PACKAGE_BUGREPORT='enlightenment-de...@lists.sourceforge.net' PACKAGE_URL='' @@ -1395,7 +1395,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.7.0 to adapt to many kinds of systems. +\`configure' configures imlib2 1.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1469,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of imlib2 1.7.0:";; + short | recursive ) echo "Configuration of imlib2 1.7.1:";; esac cat <<\_ACEOF @@ -1616,7 +1616,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -imlib2 configure 1.7.0 +imlib2 configure 1.7.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1985,7 +1985,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.7.0, which was +It was created by imlib2 $as_me 1.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2922,7 +2922,7 @@ # Define the identity of the package. PACKAGE='imlib2' - VERSION='1.7.0' + VERSION='1.7.1' cat >>confdefs.h <<_ACEOF @@ -13375,7 +13375,7 @@ VERSION_CUR=8 -VERSION_REV=0 +VERSION_REV=1 VERSION_AGE=7 lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE} @@ -16599,7 +16599,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.7.0, which was +This file was extended by imlib2 $as_me 1.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16665,7 +16665,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.7.0 +imlib2 config.status 1.7.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17773,7 +17773,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/configure.ac new/imlib2-1.7.1/configure.ac --- old/imlib2-1.7.0/configure.ac 2020-08-01 06:42:01.000000000 +0200 +++ new/imlib2-1.7.1/configure.ac 2020-12-11 09:21:10.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([imlib2], [1.7.0], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([imlib2], [1.7.1], [enlightenment-de...@lists.sourceforge.net]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD @@ -20,7 +20,7 @@ LT_INIT VERSION_CUR=8 -VERSION_REV=0 +VERSION_REV=1 VERSION_AGE=7 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.7.0/data/Makefile.in new/imlib2-1.7.1/data/Makefile.in --- old/imlib2-1.7.0/data/Makefile.in 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/data/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/data/fonts/Makefile.in new/imlib2-1.7.1/data/fonts/Makefile.in --- old/imlib2-1.7.0/data/fonts/Makefile.in 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/data/fonts/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/data/images/Makefile.in new/imlib2-1.7.1/data/images/Makefile.in --- old/imlib2-1.7.0/data/images/Makefile.in 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/data/images/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/depcomp new/imlib2-1.7.1/depcomp --- old/imlib2-1.7.0/depcomp 2020-08-01 07:16:53.000000000 +0200 +++ new/imlib2-1.7.1/depcomp 2020-12-11 09:28:09.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/doc/Makefile.in new/imlib2-1.7.1/doc/Makefile.in --- old/imlib2-1.7.0/doc/Makefile.in 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/doc/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/imlib2.spec new/imlib2-1.7.1/imlib2.spec --- old/imlib2-1.7.0/imlib2.spec 2020-08-01 07:17:56.000000000 +0200 +++ new/imlib2-1.7.1/imlib2.spec 2020-12-11 09:28:16.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Powerful image loading and rendering library Name: imlib2 -Version: 1.7.0 +Version: 1.7.1 Release: 1.%(date '+%y%m%d') License: BSD Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/install-sh new/imlib2-1.7.1/install-sh --- old/imlib2-1.7.0/install-sh 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/install-sh 2020-12-11 09:28:09.000000000 +0100 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/missing new/imlib2-1.7.1/missing --- old/imlib2-1.7.0/missing 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/missing 2020-12-11 09:28:09.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/Makefile.in new/imlib2-1.7.1/src/Makefile.in --- old/imlib2-1.7.0/src/Makefile.in 2020-08-01 07:16:52.000000000 +0200 +++ new/imlib2-1.7.1/src/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/bin/Makefile.in new/imlib2-1.7.1/src/bin/Makefile.in --- old/imlib2-1.7.0/src/bin/Makefile.in 2020-08-01 07:16:53.000000000 +0200 +++ new/imlib2-1.7.1/src/bin/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/lib/Makefile.in new/imlib2-1.7.1/src/lib/Makefile.in --- old/imlib2-1.7.0/src/lib/Makefile.in 2020-08-01 07:16:53.000000000 +0200 +++ new/imlib2-1.7.1/src/lib/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/lib/grab.c new/imlib2-1.7.1/src/lib/grab.c --- old/imlib2-1.7.0/src/lib/grab.c 2020-07-28 21:38:02.000000000 +0200 +++ new/imlib2-1.7.1/src/lib/grab.c 2020-12-09 17:45:59.000000000 +0100 @@ -91,6 +91,7 @@ break; case 24: case 25: + case 30: case 32: for (y = 0; y < h; y++) { @@ -436,6 +437,82 @@ src++; } } + } + } + break; + case 30: + if (bgr) + { + if (mxim) + { + for (y = 0; y < h; y++) + { + src = (DATA32 *) (xim->data + (xim->bytes_per_line * y)); + ptr = data + ((y + iny) * ow) + inx; + for (x = 0; x < w; x++) + { + pixel = (((*src) & 0x000003ff) << 14 & 0x00ff0000) | + (((*src) & 0x000ffc00) >> 4 & 0x0000ff00) | + (((*src) & 0x3ff00000) >> 22 & 0x000000ff); + if (XGetPixel(mxim, x, y)) + pixel |= 0xff000000; + *ptr++ = pixel; + src++; + } + } + } + else + { + for (y = 0; y < h; y++) + { + src = (DATA32 *) (xim->data + (xim->bytes_per_line * y)); + ptr = data + ((y + iny) * ow) + inx; + for (x = 0; x < w; x++) + { + *ptr++ = 0xff000000 | + (((*src) & 0x000003ff) << 14 & 0x00ff0000) | + (((*src) & 0x000ffc00) >> 4 & 0x0000ff00) | + (((*src) & 0x3ff00000) >> 22 & 0x000000ff); + src++; + } + } + } + } + else + { + if (mxim) + { + for (y = 0; y < h; y++) + { + src = (DATA32 *) (xim->data + (xim->bytes_per_line * y)); + ptr = data + ((y + iny) * ow) + inx; + for (x = 0; x < w; x++) + { + pixel = (((*src) & 0x3ff00000) >> 6 & 0x00ff0000) | + (((*src) & 0x000ffc00) >> 4 & 0x0000ff00) | + (((*src) & 0x000003ff) >> 2 & 0x000000ff); + if (XGetPixel(mxim, x, y)) + pixel |= 0xff000000; + *ptr++ = pixel; + src++; + } + } + } + else + { + for (y = 0; y < h; y++) + { + src = (DATA32 *) (xim->data + (xim->bytes_per_line * y)); + ptr = data + ((y + iny) * ow) + inx; + for (x = 0; x < w; x++) + { + *ptr++ = 0xff000000 | + (((*src) & 0x3ff00000) >> 6 & 0x00ff0000) | + (((*src) & 0x000ffc00) >> 4 & 0x0000ff00) | + (((*src) & 0x000003ff) >> 2 & 0x000000ff); + src++; + } + } } } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/lib/rend.c new/imlib2-1.7.1/src/lib/rend.c --- old/imlib2-1.7.0/src/lib/rend.c 2020-07-28 21:27:21.000000000 +0200 +++ new/imlib2-1.7.1/src/lib/rend.c 2020-12-08 21:00:23.000000000 +0100 @@ -227,6 +227,7 @@ XPutPixel(xim, x, y, val); src++; } + src += jump; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/Makefile.in new/imlib2-1.7.1/src/modules/Makefile.in --- old/imlib2-1.7.0/src/modules/Makefile.in 2020-08-01 07:16:53.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/filters/Makefile.in new/imlib2-1.7.1/src/modules/filters/Makefile.in --- old/imlib2-1.7.0/src/modules/filters/Makefile.in 2020-08-01 07:16:53.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/filters/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/loaders/Makefile.in new/imlib2-1.7.1/src/modules/loaders/Makefile.in --- old/imlib2-1.7.0/src/modules/loaders/Makefile.in 2020-08-01 07:16:53.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/loaders/Makefile.in 2020-12-11 09:28:09.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/loaders/loader_argb.c new/imlib2-1.7.1/src/modules/loaders/loader_argb.c --- old/imlib2-1.7.0/src/modules/loaders/loader_argb.c 2020-07-28 20:13:51.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/loaders/loader_argb.c 2020-12-08 21:00:29.000000000 +0100 @@ -7,6 +7,9 @@ int w = 0, h = 0, alpha = 0; DATA32 *ptr; int y; +#ifdef WORDS_BIGENDIAN + int l; +#endif rc = LOAD_FAIL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/loaders/loader_bmp.c new/imlib2-1.7.1/src/modules/loaders/loader_bmp.c --- old/imlib2-1.7.0/src/modules/loaders/loader_bmp.c 2020-07-28 20:13:51.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/loaders/loader_bmp.c 2020-12-09 17:44:08.000000000 +0100 @@ -165,7 +165,7 @@ goto quit; size = statbuf.st_size; - if (size != statbuf.st_size) + if ((long)size != statbuf.st_size) goto quit; if (fread(&bfh, sizeof(bfh), 1, im->fp) != 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/loaders/loader_webp.c new/imlib2-1.7.1/src/modules/loaders/loader_webp.c --- old/imlib2-1.7.0/src/modules/loaders/loader_webp.c 2020-07-28 20:13:51.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/loaders/loader_webp.c 2020-12-09 17:44:08.000000000 +0100 @@ -40,6 +40,7 @@ int encoded_fd; WebPBitstreamFeatures features; VP8StatusCode vp8return; + unsigned int size; encoded_fd = fileno(im->fp); if (encoded_fd < 0) @@ -54,7 +55,20 @@ if (!encoded_data) goto quit; - if (read(encoded_fd, encoded_data, stats.st_size) < stats.st_size) + /* Check signature */ + size = 12; + if (read(encoded_fd, encoded_data, size) != (long)size) + goto quit; + if (memcmp(encoded_data + 0, "RIFF", 4) != 0 || + memcmp(encoded_data + 8, "WEBP", 4) != 0) + goto quit; + + size = stats.st_size; + if ((long)size != stats.st_size) + goto quit; + + size -= 12; + if (read(encoded_fd, encoded_data + 12, size) != (long)size) goto quit; if (WebPGetInfo(encoded_data, stats.st_size, &im->w, &im->h) == 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.7.0/src/modules/loaders/loader_xpm.c new/imlib2-1.7.1/src/modules/loaders/loader_xpm.c --- old/imlib2-1.7.0/src/modules/loaders/loader_xpm.c 2020-07-28 21:38:01.000000000 +0200 +++ new/imlib2-1.7.1/src/modules/loaders/loader_xpm.c 2020-12-09 17:45:58.000000000 +0100 @@ -234,15 +234,6 @@ if (!cmap) goto quit; - if (!load_data) - { - rc = LOAD_SUCCESS; - goto quit; - } - - ptr = __imlib_AllocateData(im); - if (!ptr) - goto quit; pixels = w * h; j = 0; @@ -344,6 +335,21 @@ else qsort(cmap, ncolors, sizeof(cmap_t), xpm_cmap_sort); context++; + + if (transp >= 0) + SET_FLAG(im->flags, F_HAS_ALPHA); + else + UNSET_FLAG(im->flags, F_HAS_ALPHA); + + if (!load_data) + { + rc = LOAD_SUCCESS; + goto quit; + } + + ptr = __imlib_AllocateData(im); + if (!ptr) + goto quit; } } else @@ -439,11 +445,6 @@ im->data[count] = cmap[0].pixel; } - if (transp >= 0) - SET_FLAG(im->flags, F_HAS_ALPHA); - else - UNSET_FLAG(im->flags, F_HAS_ALPHA); - rc = LOAD_SUCCESS; quit: _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
