[freeimage] 41/47: Build Source/LibTIFF4 instead of Source/LibTIFF (Closes: #735847)
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Sep 26 22:27:34 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 a2fd2e27ef9e6214f0b10f0a075ca6a04de651b3
Author: Scott Howard <showard314 at gmail.com>
Date: Sun Jan 19 21:48:45 2014 -0500
Build Source/LibTIFF4 instead of Source/LibTIFF (Closes: #735847)
---
debian/changelog | 3 +-
debian/patches/disable_embedded_libraries.patch | 60 ++++++++++++-------------
2 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ab27e1..1e51913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ freeimage (3.15.4-3) UNRELEASED; urgency=low
* disable_embedded_libraries.patch
- Use system header <OpenEXR/half.h> in Source/FreeImage/PluginTIFF.cpp
+ - Build Source/LibTIFF4 instead of Source/LibTIFF (Closes: #735847)
- -- Scott Howard <showard at debian.org> Sun, 19 Jan 2014 19:48:30 -0500
+ -- Scott Howard <showard at debian.org> Sun, 19 Jan 2014 21:44:52 -0500
freeimage (3.15.4-2) unstable; urgency=low
diff --git a/debian/patches/disable_embedded_libraries.patch b/debian/patches/disable_embedded_libraries.patch
index 7b9f0da..d4faf03 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 19:46:56.009739168 -0500
-+++ freeimage/gensrclist.sh 2014-01-19 19:46:55.961739167 -0500
+--- freeimage.orig/gensrclist.sh 2014-01-19 21:46:41.005909930 -0500
++++ freeimage/gensrclist.sh 2014-01-19 21:46:53.037910216 -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/LibTIFF"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF4"
echo "VER_MAJOR = 3" > Makefile.srcs
echo "VER_MINOR = 15.4" >> Makefile.srcs
@@ -48,13 +48,13 @@ Index: freeimage/gensrclist.sh
Index: freeimage/genfipsrclist.sh
===================================================================
---- freeimage.orig/genfipsrclist.sh 2014-01-19 19:46:56.009739168 -0500
-+++ freeimage/genfipsrclist.sh 2014-01-19 19:46:55.961739167 -0500
+--- freeimage.orig/genfipsrclist.sh 2014-01-19 21:46:41.005909930 -0500
++++ freeimage/genfipsrclist.sh 2014-01-19 21:46:40.989909929 -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/LibTIFF Wrapper/FreeImagePlus"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF4 Wrapper/FreeImagePlus"
echo "VER_MAJOR = 3" > fipMakefile.srcs
@@ -74,8 +74,8 @@ Index: freeimage/genfipsrclist.sh
Index: freeimage/Source/FreeImage/ZLibInterface.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2014-01-19 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/ZLibInterface.cpp 2014-01-19 19:46:55.961739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/PluginJPEG.cpp 2014-01-19 19:46:55.965739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/PluginEXR.cpp 2014-01-19 19:46:55.965739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/PluginJ2K.cpp 2014-01-19 19:46:55.965739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/PluginPNG.cpp 2014-01-19 19:46:55.965739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/J2KHelper.cpp 2014-01-19 19:46:55.965739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/PluginJP2.cpp 2014-01-19 19:46:55.969739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImage/PluginRAW.cpp 2014-01-19 19:46:55.969739167 -0500
+--- 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
@@ -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 19:46:56.009739168 -0500
-+++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-19 19:46:55.969739167 -0500
+--- 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
@@ -25,9 +25,10 @@
#undef FAR
#include <setjmp.h>
@@ -305,8 +305,8 @@ Index: freeimage/Source/FreeImageToolkit/JPEGTransform.cpp
Index: freeimage/Makefile.fip
===================================================================
---- freeimage.orig/Makefile.fip 2014-01-19 19:46:56.009739168 -0500
-+++ freeimage/Makefile.fip 2014-01-19 19:46:55.969739167 -0500
+--- freeimage.orig/Makefile.fip 2014-01-19 21:46:41.005909930 -0500
++++ freeimage/Makefile.fip 2014-01-19 21:46:40.993909930 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
@@ -318,8 +318,8 @@ Index: freeimage/Makefile.fip
MODULES := $(MODULES:.cpp=.o)
Index: freeimage/Makefile.gnu
===================================================================
---- freeimage.orig/Makefile.gnu 2014-01-19 19:46:56.009739168 -0500
-+++ freeimage/Makefile.gnu 2014-01-19 19:46:55.969739167 -0500
+--- freeimage.orig/Makefile.gnu 2014-01-19 21:46:41.005909930 -0500
++++ freeimage/Makefile.gnu 2014-01-19 21:46:40.993909930 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
@@ -331,8 +331,8 @@ Index: freeimage/Makefile.gnu
MODULES := $(MODULES:.cpp=.o)
Index: freeimage/Source/FreeImage/PluginTIFF.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginTIFF.cpp 2014-01-19 18:49:00.753656573 -0500
-+++ freeimage/Source/FreeImage/PluginTIFF.cpp 2014-01-19 19:48:09.045740904 -0500
+--- 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
@@ -39,7 +39,7 @@
#include "Utilities.h"
#include "../LibTIFF4/tiffiop.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