[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:55 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d2b9563
The following commit has been merged in the master branch:
commit d2b956397822d3ba5345ab0d2144759d42d1a89f
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Oct 20 15:23:41 2006 +0000
Improved handling of the CPPFLAGS compiler flag and some minor build env tweaks. Partly fixes bug #490 (the build env related part).
---
config/aclocal.m4 | 8 +++-----
config/config.mk.in | 22 ++++++++--------------
config/configure.ac | 3 ++-
config/exiv2.pc.in | 2 +-
src/Makefile | 11 +++--------
src/pngimage.cpp | 12 ++++++++++++
6 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/config/aclocal.m4 b/config/aclocal.m4
index 89b889f..ec21036 100644
--- a/config/aclocal.m4
+++ b/config/aclocal.m4
@@ -5972,13 +5972,12 @@ dnl #endif /* HAVE_LIBZ */
dnl
dnl @version $Id: aclocal.m4,v 1.7 2000/06/26 10:04:08 loic dead $
dnl @author Loic Dachary <loic at senga.org>
+dnl with modifications by Andreas Huggel <ahuggel at gmx.net>
dnl
-
AC_DEFUN([CHECK_ZLIB],
#
# Handle user hints
#
-
[AC_MSG_CHECKING(if zlib is wanted)
AC_ARG_WITH(zlib,
[ --with-zlib=DIR root directory path of zlib installation [defaults to
@@ -5997,14 +5996,13 @@ then
ZLIB_HOME=/usr
fi
])
-
#
# Locate zlib, if wanted
#
if test -n "${ZLIB_HOME}"
then
ZLIB_OLD_LDFLAGS=$LDFLAGS
- ZLIB_OLD_CPPFLAGS=$LDFLAGS
+ ZLIB_OLD_CPPFLAGS=$CPPFLAGS
#
# Adding /usr/lib or /usr/include to the flags/libs may
# hurt if using a compiler not installed in the standard
@@ -6018,7 +6016,7 @@ then
AC_LANG_SAVE
AC_LANG_C
AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])
- AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cvs_zlib_h=no])
+ AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
AC_LANG_RESTORE
if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes"
then
diff --git a/config/config.mk.in b/config/config.mk.in
index 672652f..63a8ef1 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -51,10 +51,11 @@ endif
CXXCPP = @CXXCPP@
# Preprocessor flags
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = -I. @CPPFLAGS@
-# Linker flags
+# Linker flags and libraries
LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
# Suffix of executables
EXEEXT := @EXEEXT@
@@ -70,9 +71,13 @@ ifeq ($(GCC),yes)
endif
# **********************************************************************
+# Libraries and Functions
+HAVE_LIBZ = @HAVE_LIBZ@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+
+# **********************************************************************
# Advanced auto-dependency generation
# http://make.paulandlesley.org/autodep.html
-
DEP_TRACKING = @DEP_TRACKING@
ifdef DEP_TRACKING
@@ -93,17 +98,6 @@ endif
endif
# **********************************************************************
-# Global includes, libraries and defines
-INCS = -I.
-LIBS = @LIBS@
-DEFS =
-
-# **********************************************************************
-# Libraries and Functions
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_TIMEGM = @HAVE_TIMEGM@
-
-# **********************************************************************
# Installation programs
INSTALL_EXE = @INSTALL@
INSTALL_PROGRAM = $(INSTALL_EXE)
diff --git a/config/configure.ac b/config/configure.ac
index 50c4bc7..1484581 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -21,7 +21,8 @@ AC_PROG_RANLIB
AC_PROG_LIBTOOL
# Checks for libraries.
-AC_CHECK_LIB(m, exp, , AC_MSG_ERROR([libm not found.]))
+AC_CHECK_LIBM()
+LIBS="$LIBS $LIBM"
CHECK_ZLIB()
AC_SUBST(HAVE_LIBZ,$HAVE_LIBZ)
diff --git a/config/exiv2.pc.in b/config/exiv2.pc.in
index 4dcce03..9570bd4 100644
--- a/config/exiv2.pc.in
+++ b/config/exiv2.pc.in
@@ -8,5 +8,5 @@ Description: Exif and IPTC metadata library and tools
Version: @PACKAGE_VERSION@
URL: http://www.exiv2.org
Libs: -L${libdir} -lexiv2
-Libs.private: @LIBS@
+Libs.private: @LDFLAGS@ @LIBS@
Cflags: -I${includedir}
diff --git a/src/Makefile b/src/Makefile
index d533d7e..d998167 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -137,11 +137,6 @@ MCSRC = utils.cpp
LIBRARY = libexiv2.la
# ******************************************************************************
-# Defines, Includes and Libraries
-CXXDEFS = $(DEFS)
-CXXINCS = $(INCS)
-
-# ******************************************************************************
# Initialisations
SHELL = /bin/sh
@@ -193,8 +188,8 @@ POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
endif
# Compilation shortcuts
-COMPILE.cc = $(CXX) $(CXXFLAGS) $(CXXDEFS) $(CXXINCS) -c
-COMPILE.c = $(CC) $(CFLAGS) $(DEFS) $(INCS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
# LINK.cc does not need $(LIBS), libtool's dark magic takes care of that
LINK.cc = $(CXX) $(CXXFLAGS) $(LIBRARY) $(LDFLAGS) -rpath $(libdir)
@@ -222,7 +217,7 @@ $(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
%.ii: %.cpp
set -e; \
- $(CXXCPP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< | sed '/^[ ]*$$/d' > $@
+ $(CXXCPP) $(CPPFLAGS) $< | sed '/^[ ]*$$/d' > $@
# ******************************************************************************
# Targets
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index a5d692e..029b5f9 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -135,6 +135,18 @@ namespace Exiv2 {
clearMetadata();
PngChunk::decode(this, io_->mmap(), io_->size());
+ /*
+ Todo:
+
+ - readMetadata implements the loop over the chunks in the image and
+ makes decisions what to do. It reads only one chunk at a time
+ instead of the whole file.
+
+ - new class PngChunk, initialized with the memory of one chunk and
+ has all the access methods required to determine the field, key,
+ to access and decompress data etc.
+ */
+
} // PngImage::readMetadata
void PngImage::writeMetadata()
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list