Commit 6014b71e authored by Markus Koschany's avatar Markus Koschany

New upstream version 1.5.0

parent 3551672c
***
*** Version 1.5.0 ***
***
Alexander Volkov (3):
put a check for shared memory inside __imlib_ShmGetXImage()
introduce __imlib_ShmDestroyXImage() instead of __imlib_ShmDetach()
Add support for MIT-SHM FD-passing
Kim Woelders (19):
XPM loader: Fix incorrect image invalidation.
Make some more functions static.
Introduce __imlib_LoadImageData()
Remove redundant CAST_IMAGE()
imlib2_grab: Always use imlib_create_scaled_image_from_drawable() to grab image
imlib_create_scaled_image_from_drawable(): speed up 1:1 case
imlib_create_scaled_image_from_drawable(): Drop shape handling if unshaped
Indent
Autofoo cosmetics
Strip trailing whitespace, cosmetics
Fix potential OOB memory access if border elements are negative
Fix potential OOB memory access if border sizes exceed image dimensions
Introduce IMLIB2_SHM_OPT to enable overriding/testing SHM modes
Add IMLIB2_XIMAGE_CACHE_COUNT to enable testing the ximage cache
Refactor the XImage cache
Add imlib_get_cache_used()
Expose XImage cache control functions
Drop -Waggregate-return
1.5.0.
***
*** Version 1.4.10 ***
***
Kim Woelders (2):
Kim Woelders (3):
PNM loader: Fix reading PNM bitmaps.
Fix missing break.
1.4.10.
Tobias Stoeckmann (3):
Avoid out of boundary operations while parsing xpm
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -324,6 +324,8 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
X_SHM_FD_CFLAGS = @X_SHM_FD_CFLAGS@
X_SHM_FD_LIBS = @X_SHM_FD_LIBS@
ZLIBLIBS = @ZLIBLIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......
Imlib2 1.4.10
Imlib2 1.5.0
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 @@ BUILDING PACKAGES:
RPM: To build rpm packages:
sudo rpm -ta imlib2-1.4.10.tar.gz
sudo rpm -ta imlib2-1.5.0.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 @@ for more details)
DEB: To build deb packages:
tar zvf imlib2-1.4.10.tar.gz
cd imlib2-1.4.10
tar zvf imlib2-1.5.0.tar.gz
cd imlib2-1.5.0
dpkg-buildpackage -us -uc -rfakeroot
cd ..
rm -rf imlib2-1.4.10
rm -rf imlib2-1.5.0
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
This diff is collapsed.
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
......@@ -46,6 +46,9 @@
declarations. */
#undef HAVE_VISIBILITY
/* enabling X11 MIT-SHM FD-passing support */
#undef HAVE_X11_SHM_FD
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2015-01-01'
timestamp='2017-04-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -33,7 +33,7 @@ timestamp='2015-01-01'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -53,8 +53,7 @@ timestamp='2015-01-01'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
......@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2015 Free Software Foundation, Inc.
Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
......@@ -255,15 +254,16 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
| i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
......@@ -301,11 +301,12 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
......@@ -314,6 +315,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -376,17 +378,18 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
......@@ -427,13 +430,15 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
......@@ -442,6 +447,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -518,6 +524,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
basic_machine=asmjs-unknown
;;
aux)
basic_machine=m68k-apple
os=-aux
......@@ -638,6 +647,14 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
e500v[12])
basic_machine=powerpc-unknown
os=$os"spe"
;;
e500v[12]-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
......@@ -933,6 +950,9 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
nsx-tandem)
basic_machine=nsx-tandem
;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
......@@ -1017,7 +1037,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
......@@ -1027,7 +1047,7 @@ case $basic_machine in
;;
ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
......@@ -1228,6 +1248,9 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
wasm32)
basic_machine=wasm32-unknown
;;
w65*)
basic_machine=w65-wdc
os=-none
......@@ -1373,18 +1396,18 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
......@@ -1393,7 +1416,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1525,6 +1549,8 @@ case $os in
;;
-nacl*)
;;
-ios)
;;
-none)
;;
*)
......@@ -1620,6 +1646,9 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
pru-*)
os=-elf
;;
*-be)
os=-beos
;;
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for imlib2 1.4.10.
# Generated by GNU Autoconf 2.69 for imlib2 1.5.0.
#
# Report bugs to <enlightenment-devel@lists.sourceforge.net>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='imlib2'
PACKAGE_TARNAME='imlib2'
PACKAGE_VERSION='1.4.10'
PACKAGE_STRING='imlib2 1.4.10'
PACKAGE_VERSION='1.5.0'
PACKAGE_STRING='imlib2 1.5.0'
PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
PACKAGE_URL=''
......@@ -664,6 +664,8 @@ BUILD_JPEG_LOADER_TRUE
DLOPEN_LIBS
BUILD_X11_FALSE
BUILD_X11_TRUE
X_SHM_FD_LIBS
X_SHM_FD_CFLAGS
X_EXTRA_LIBS
X_LIBS
X_PRE_LIBS
......@@ -813,6 +815,7 @@ enable_libtool_lock
enable_mmx
enable_amd64
with_x
with_x_shm_fd
with_jpeg
with_png
with_tiff
......@@ -841,6 +844,8 @@ PKG_CONFIG_LIBDIR
FREETYPE_CFLAGS
FREETYPE_LIBS
XMKMF
X_SHM_FD_CFLAGS
X_SHM_FD_LIBS
PNG_CFLAGS
PNG_LIBS'
......@@ -1383,7 +1388,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures imlib2 1.4.10 to adapt to many kinds of systems.
\`configure' configures imlib2 1.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1457,7 +1462,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of imlib2 1.4.10:";;
short | recursive ) echo "Configuration of imlib2 1.5.0:";;
esac
cat <<\_ACEOF
......@@ -1496,6 +1501,7 @@ Optional Packages:
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
--with-x use the X Window System
--without-x-shm-fd Disable X11 MIT-SHM FD-passing support
--without-jpeg Disable JPEG image loader
--without-png Disable PNG image loader
--without-tiff Disable TIFF image loader
......@@ -1527,6 +1533,10 @@ Some influential environment variables:
FREETYPE_LIBS
linker flags for FREETYPE, overriding pkg-config
XMKMF Path to xmkmf, Makefile generator for X Window System
X_SHM_FD_CFLAGS
C compiler flags for X_SHM_FD, overriding pkg-config
X_SHM_FD_LIBS
linker flags for X_SHM_FD, overriding pkg-config
PNG_CFLAGS C compiler flags for PNG, overriding pkg-config
PNG_LIBS linker flags for PNG, overriding pkg-config
......@@ -1596,7 +1606,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
imlib2 configure 1.4.10
imlib2 configure 1.5.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1965,7 +1975,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by imlib2 $as_me 1.4.10, which was
It was created by imlib2 $as_me 1.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2902,7 +2912,7 @@ fi
# Define the identity of the package.
PACKAGE='imlib2'
VERSION='1.4.10'
VERSION='1.5.0'
cat >>confdefs.h <<_ACEOF
......@@ -13350,9 +13360,9 @@ CC=$lt_save_CC
VERSION_CUR=5
VERSION_REV=10
VERSION_AGE=4
VERSION_CUR=6
VERSION_REV=0
VERSION_AGE=5
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
......@@ -14344,8 +14354,109 @@ if test "x$have_x" = "xyes"; then
$as_echo "#define BUILD_X11 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable X11 MIT-SHM FD-passing support" >&5
$as_echo_n "checking whether to enable X11 MIT-SHM FD-passing support... " >&6; }
# Check whether --with-x-shm-fd was given.
if test "${with_x_shm_fd+set}" = set; then :
withval=$with_x_shm_fd;
if test "$withval" = no ; then
x_shm_fd=no
else
x_shm_fd=yes
fi
else
x_shm_fd=auto
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $x_shm_fd" >&5
$as_echo "$x_shm_fd" >&6; }
if test "$x_shm_fd" != no ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X_SHM_FD" >&5
$as_echo_n "checking for X_SHM_FD... " >&6; }
if test -n "$X_SHM_FD_CFLAGS"; then
pkg_cv_X_SHM_FD_CFLAGS="$X_SHM_FD_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm >= 1.9\""; } >&5
($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm >= 1.9") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_X_SHM_FD_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb xcb-shm >= 1.9" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$X_SHM_FD_LIBS"; then
pkg_cv_X_SHM_FD_LIBS="$X_SHM_FD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm >= 1.9\""; } >&5
($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm >= 1.9") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_X_SHM_FD_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb xcb-shm >= 1.9" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
X_SHM_FD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb xcb xcb-shm >= 1.9" 2>&1`
else
X_SHM_FD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb xcb xcb-shm >= 1.9" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$X_SHM_FD_PKG_ERRORS" >&5
x_shm_fd="no"
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
x_shm_fd="no"
else
X_SHM_FD_CFLAGS=$pkg_cv_X_SHM_FD_CFLAGS
X_SHM_FD_LIBS=$pkg_cv_X_SHM_FD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
x_shm_fd="yes"
fi
else
x_shm_fd="no"
fi
if test "$x_shm_fd" = yes ; then
$as_echo "#define HAVE_X11_SHM_FD 1" >>confdefs.h
fi
else
have_x="no"
x_shm_fd="no"
fi
if test "x$have_x" = "xyes"; then
BUILD_X11_TRUE=
......@@ -15695,7 +15806,7 @@ fi
if test "x$GCC" = "xyes"; then
CFLAGS_WARNINGS="-W -Wall -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings"
CFLAGS_WARNINGS="-W -Wall -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings"
CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Wno-unused-parameter"
CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes"
......@@ -16366,7 +16477,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by imlib2 $as_me 1.4.10, which was
This file was extended by imlib2 $as_me 1.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -16432,7 +16543,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
imlib2 config.status 1.4.10
imlib2 config.status 1.5.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -18157,9 +18268,11 @@ echo " GIF.....................: $gif_ok"
echo " ZLIB....................: $zlib_ok"
echo " BZIP2...................: $bz2_ok"
echo " ID3.....................: $id3_ok"
echo " X.......................: $have_x"
echo
echo
echo "Build for X11.............: $have_x"
echo "Use X MIT-SHM FD-passing..: $x_shm_fd"
echo
echo "Use X86 MMX for speed.....: $mmx"
echo "Use AMD64 for speed.......: $amd64"
echo
......
# get rid of that stupid cache mechanism
rm -f config.cache
AC_INIT([imlib2], [1.4.10], [enlightenment-devel@lists.sourceforge.net])
AC_INIT([imlib2], [1.5.0], [enlightenment-devel@lists.sourceforge.net])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_BUILD
......@@ -22,9 +22,9 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
LT_INIT
VERSION_CUR=5
VERSION_REV=10
VERSION_AGE=4
VERSION_CUR=6
VERSION_REV=0
VERSION_AGE=5
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
AC_SUBST(lt_version)
......@@ -99,8 +99,31 @@ fi
if test "x$have_x" = "xyes"; then
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
AC_MSG_CHECKING(whether to enable X11 MIT-SHM FD-passing support)
AC_ARG_WITH([x-shm-fd],
[AS_HELP_STRING([--without-x-shm-fd], [Disable X11 MIT-SHM FD-passing support])],
[
if test "$withval" = no ; then
x_shm_fd=no
else
x_shm_fd=yes
fi
],
[ x_shm_fd=auto ]
)
AC_MSG_RESULT($x_shm_fd)
if test "$x_shm_fd" != no ; then
PKG_CHECK_MODULES(X_SHM_FD, x11-xcb xcb xcb-shm >= 1.9, [ x_shm_fd="yes" ], [ x_shm_fd="no"])
else
x_shm_fd="no"
fi
if test "$x_shm_fd" = yes ; then
AC_DEFINE(HAVE_X11_SHM_FD, 1, [enabling X11 MIT-SHM FD-passing support])
fi
else
have_x="no"
x_shm_fd="no"
fi
AM_CONDITIONAL(BUILD_X11, test "x$have_x" = "xyes")
......@@ -436,9 +459,11 @@ echo " GIF.....................: $gif_ok"
echo " ZLIB....................: $zlib_ok"
echo " BZIP2...................: $bz2_ok"
echo " ID3.....................: $id3_ok"
echo " X.......................: $have_x"
echo
echo
echo "Build for X11.............: $have_x"
echo "Use X MIT-SHM FD-passing..: $x_shm_fd"
echo
echo "Use X86 MMX for speed.....: $mmx"
echo "Use AMD64 for speed.......: $amd64"
echo
......
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 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
......@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -207,6 +207,8 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
X_SHM_FD_CFLAGS = @X_SHM_FD_CFLAGS@
X_SHM_FD_LIBS = @X_SHM_FD_LIBS@
ZLIBLIBS = @ZLIBLIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......
Summary: Powerful image loading and rendering library
Name: imlib2
Version: 1.4.10
Version: 1.5.0
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
......
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2013-12-25.23; # UTC
scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was