[freeimage] 42/47: Remove embedded libtiff (Closes: #735847, #735249)
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Sep 26 22:27:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository freeimage.
commit 7a1e9365ff50116eed7cfe09941af460400abdca
Author: Scott Howard <showard314 at gmail.com>
Date: Mon Jan 20 00:25:28 2014 -0500
Remove embedded libtiff (Closes: #735847, #735249)
---
debian/changelog | 5 +-
debian/control | 1 +
debian/patches/disable_embedded_libraries.patch | 85 +++++++++++++++----------
3 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e51913..8e6d692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
freeimage (3.15.4-3) UNRELEASED; urgency=low
+ * QA upload.
* disable_embedded_libraries.patch
- - Use system header <OpenEXR/half.h> in Source/FreeImage/PluginTIFF.cpp
- - Build Source/LibTIFF4 instead of Source/LibTIFF (Closes: #735847)
+ - Remove embedded libtiff (Closes: #735847, #735249)
+ Thanks to Sabayon from Gentoo for the tip
-- Scott Howard <showard at debian.org> Sun, 19 Jan 2014 21:44:52 -0500
diff --git a/debian/control b/debian/control
index b6469d0..9130fbb 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
libopenjpeg-dev,
libpng-dev,
libraw-dev,
+ libtiff-dev,
pkg-config,
tofrodos,
zlib1g-dev
diff --git a/debian/patches/disable_embedded_libraries.patch b/debian/patches/disable_embedded_libraries.patch
index d4faf03..760dea3 100644
--- a/debian/patches/disable_embedded_libraries.patch
+++ b/debian/patches/disable_embedded_libraries.patch
@@ -17,13 +17,13 @@ Last-Update: 2011-12-04
Index: freeimage/gensrclist.sh
===================================================================
---- freeimage.orig/gensrclist.sh 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/gensrclist.sh 2014-01-19 21:46:53.037910216 -0500
+--- freeimage.orig/gensrclist.sh 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/gensrclist.sh 2014-01-20 00:15:38.270122337 -0500
@@ -1,6 +1,6 @@
#!/bin/sh
-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF4"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
echo "VER_MAJOR = 3" > Makefile.srcs
echo "VER_MINOR = 15.4" >> Makefile.srcs
@@ -36,25 +36,25 @@ Index: freeimage/gensrclist.sh
echo -n "INCLS = " >> Makefile.srcs
-find . -name "*.h" -print | xargs echo >> Makefile.srcs
-+find . \( \( -name 'Lib*' -and -not -name 'LibTIFF' \) -or -name 'OpenEXR' -or -name 'ZLib' \) -prune -or -name '*.h' -print | sort | xargs echo -n >> Makefile.srcs
++find . \( -name 'Lib*' -or -name 'OpenEXR' -or -name 'ZLib' \) -prune -or -name '*.h' -print | sort | xargs echo -n >> Makefile.srcs
echo >> Makefile.srcs
echo -n "INCLUDE =" >> Makefile.srcs
for DIR in $DIRLIST; do
echo -n " -I$DIR" >> Makefile.srcs
done
-+echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng)' >> Makefile.srcs
++echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng libtiff-4)' >> Makefile.srcs
echo >> Makefile.srcs
Index: freeimage/genfipsrclist.sh
===================================================================
---- freeimage.orig/genfipsrclist.sh 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/genfipsrclist.sh 2014-01-19 21:46:40.989909929 -0500
+--- freeimage.orig/genfipsrclist.sh 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/genfipsrclist.sh 2014-01-20 00:15:38.270122337 -0500
@@ -1,6 +1,6 @@
#!/bin/sh
-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF4 Wrapper/FreeImagePlus"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Wrapper/FreeImagePlus"
echo "VER_MAJOR = 3" > fipMakefile.srcs
@@ -69,13 +69,13 @@ Index: freeimage/genfipsrclist.sh
for DIR in $DIRLIST; do
echo -n " -I$DIR" >> fipMakefile.srcs
done
-+echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng)' >> fipMakefile.srcs
++echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng libtiff-4)' >> fipMakefile.srcs
echo >> fipMakefile.srcs
Index: freeimage/Source/FreeImage/ZLibInterface.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/ZLibInterface.cpp 2014-01-19 21:46:40.989909929 -0500
+--- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/ZLibInterface.cpp 2014-01-20 00:15:38.270122337 -0500
@@ -19,10 +19,10 @@
// Use at your own risk!
// ==========================================================
@@ -100,8 +100,8 @@ Index: freeimage/Source/FreeImage/ZLibInterface.cpp
memcpy(target + 8 + dest_len, &source_size, 4);
Index: freeimage/Source/FreeImage/PluginJPEG.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJPEG.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginJPEG.cpp 2014-01-19 21:46:40.989909929 -0500
+--- freeimage.orig/Source/FreeImage/PluginJPEG.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginJPEG.cpp 2014-01-20 00:15:38.270122337 -0500
@@ -35,9 +35,10 @@
#undef FAR
#include <setjmp.h>
@@ -118,8 +118,8 @@ Index: freeimage/Source/FreeImage/PluginJPEG.cpp
#include "FreeImage.h"
Index: freeimage/Source/FreeImage/PluginEXR.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginEXR.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginEXR.cpp 2014-01-19 21:46:40.989909929 -0500
+--- freeimage.orig/Source/FreeImage/PluginEXR.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginEXR.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -22,16 +22,16 @@
#include "FreeImage.h"
@@ -149,8 +149,8 @@ Index: freeimage/Source/FreeImage/PluginEXR.cpp
// ==========================================================
Index: freeimage/Source/FreeImage/PluginJ2K.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJ2K.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginJ2K.cpp 2014-01-19 21:46:40.989909929 -0500
+--- freeimage.orig/Source/FreeImage/PluginJ2K.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginJ2K.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -162,8 +162,8 @@ Index: freeimage/Source/FreeImage/PluginJ2K.cpp
// Plugin Interface
Index: freeimage/Source/FreeImage/PluginPNG.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginPNG.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginPNG.cpp 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Source/FreeImage/PluginPNG.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginPNG.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -37,8 +37,7 @@
// ----------------------------------------------------------
@@ -248,8 +248,8 @@ Index: freeimage/Source/FreeImage/PluginPNG.cpp
// write metadata
Index: freeimage/Source/FreeImage/J2KHelper.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/J2KHelper.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/J2KHelper.cpp 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Source/FreeImage/J2KHelper.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/J2KHelper.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -261,8 +261,8 @@ Index: freeimage/Source/FreeImage/J2KHelper.cpp
Divide an integer by a power of 2 and round upwards
Index: freeimage/Source/FreeImage/PluginJP2.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJP2.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginJP2.cpp 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Source/FreeImage/PluginJP2.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginJP2.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -274,8 +274,8 @@ Index: freeimage/Source/FreeImage/PluginJP2.cpp
// Plugin Interface
Index: freeimage/Source/FreeImage/PluginRAW.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginRAW.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginRAW.cpp 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Source/FreeImage/PluginRAW.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginRAW.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -19,7 +19,7 @@
// Use at your own risk!
// ==========================================================
@@ -287,8 +287,8 @@ Index: freeimage/Source/FreeImage/PluginRAW.cpp
#include "Utilities.h"
Index: freeimage/Source/FreeImageToolkit/JPEGTransform.cpp
===================================================================
---- freeimage.orig/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -25,9 +25,10 @@
#undef FAR
#include <setjmp.h>
@@ -305,34 +305,34 @@ Index: freeimage/Source/FreeImageToolkit/JPEGTransform.cpp
Index: freeimage/Makefile.fip
===================================================================
---- freeimage.orig/Makefile.fip 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Makefile.fip 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Makefile.fip 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Makefile.fip 2014-01-20 00:15:38.274122337 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
-LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ -lmng -ljpeg -lopenjpeg $(shell pkg-config --libs zlib OpenEXR libraw libpng)
++LIBRARIES = -lstdc++ -lmng -ljpeg -lopenjpeg $(shell pkg-config --libs zlib OpenEXR libraw libpng libtiff-4)
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
Index: freeimage/Makefile.gnu
===================================================================
---- freeimage.orig/Makefile.gnu 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Makefile.gnu 2014-01-19 21:46:40.993909930 -0500
+--- freeimage.orig/Makefile.gnu 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Makefile.gnu 2014-01-20 00:15:38.274122337 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
-LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ -ljpeg -lmng -lopenjpeg $(shell pkg-config --libs zlib OpenEXR libraw libpng) -lm
++LIBRARIES = -lstdc++ -ljpeg -lmng -lopenjpeg $(shell pkg-config --libs zlib OpenEXR libraw libpng libtiff-4) -lm
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
Index: freeimage/Source/FreeImage/PluginTIFF.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginTIFF.cpp 2014-01-19 21:46:41.005909930 -0500
-+++ freeimage/Source/FreeImage/PluginTIFF.cpp 2014-01-19 21:46:40.997909930 -0500
+--- freeimage.orig/Source/FreeImage/PluginTIFF.cpp 2014-01-20 00:15:38.278122337 -0500
++++ freeimage/Source/FreeImage/PluginTIFF.cpp 2014-01-20 00:15:38.274122337 -0500
@@ -39,7 +39,7 @@
#include "Utilities.h"
#include "../LibTIFF4/tiffiop.h"
@@ -342,3 +342,18 @@ Index: freeimage/Source/FreeImage/PluginTIFF.cpp
#include "FreeImageIO.h"
#include "PSDParser.h"
+Index: freeimage/Source/LibTIFF4/tiffiop.h
+===================================================================
+--- freeimage.orig/Source/LibTIFF4/tiffiop.h 2014-01-20 00:15:19.530121892 -0500
++++ freeimage/Source/LibTIFF4/tiffiop.h 2014-01-20 00:17:42.314125285 -0500
+@@ -30,7 +30,9 @@
+ * ``Library-private'' definitions.
+ */
+
+-#include "tif_config.h"
++#include <tiffconf.h>
++#define HAVE_SEARCH_H
++#define HAVE_FCNTL_H
+
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git
More information about the debian-science-commits
mailing list