[freeimage] 39/47: Fix FTBFS from declaring UINT64 twice
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 86285a4340adaca79194f3d7cfe0df0f21b6df37
Author: Scott Howard <showard314 at gmail.com>
Date: Tue Jan 14 11:54:07 2014 -0500
Fix FTBFS from declaring UINT64 twice
---
debian/changelog | 13 +++++-
debian/patches/disable_embedded_libraries.patch | 62 ++++++++++++-------------
debian/patches/fix_ftbfs_amd64.patch | 19 +++++++-
3 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 89dd3ac..4eaa97c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,21 @@
-freeimage (3.15.4-1) UNRELEASED; urgency=low
+freeimage (3.15.4-2) unstable; urgency=low
+
+ * Fix FTBFS from declaring UINT64 twice
+ - updated debian/patches/fixes_ftbfs_amd64.patch
+
+ -- Scott Howard <showard at debian.org> Tue, 14 Jan 2014 11:51:54 -0500
+
+freeimage (3.15.4-1) unstable; urgency=low
* QA Upload
* New upstream minor release
- Includes fix to build on !linux (Closes: #650485)
* Refreshed patches (line endings had to change)
+ - Remove document-mode.patch (accepted upstream)
* Lintian fixes: S-V 3.9.5, DM-Upload-Allowed removed
+ * Remove document-mode.patch (accepted upstream)
- -- Scott Howard <showard at debian.org> Mon, 13 Jan 2014 17:10:33 -0500
+ -- Scott Howard <showard at debian.org> Mon, 13 Jan 2014 21:57:45 -0500
freeimage (3.15.1-2) unstable; urgency=low
diff --git a/debian/patches/disable_embedded_libraries.patch b/debian/patches/disable_embedded_libraries.patch
index 97bb76e..8774edb 100644
--- a/debian/patches/disable_embedded_libraries.patch
+++ b/debian/patches/disable_embedded_libraries.patch
@@ -17,18 +17,17 @@ Last-Update: 2011-12-04
Index: freeimage/gensrclist.sh
===================================================================
---- freeimage.orig/gensrclist.sh 2014-01-13 18:37:38.469158413 -0500
-+++ freeimage/gensrclist.sh 2014-01-13 18:37:38.453158412 -0500
-@@ -1,6 +1,7 @@
+--- freeimage.orig/gensrclist.sh 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/gensrclist.sh 2014-01-13 21:56:37.535435145 -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/LibTIFF"
echo "VER_MAJOR = 3" > Makefile.srcs
echo "VER_MINOR = 15.4" >> Makefile.srcs
-@@ -12,15 +13,17 @@
+@@ -12,15 +12,17 @@
egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' ' ' | tr -s ' ' >> Makefile.srcs
fi
done
@@ -49,18 +48,17 @@ Index: freeimage/gensrclist.sh
Index: freeimage/genfipsrclist.sh
===================================================================
---- freeimage.orig/genfipsrclist.sh 2014-01-13 18:37:38.469158413 -0500
-+++ freeimage/genfipsrclist.sh 2014-01-13 18:37:38.457158412 -0500
-@@ -1,6 +1,7 @@
+--- freeimage.orig/genfipsrclist.sh 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/genfipsrclist.sh 2014-01-13 21:56:38.731435139 -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/LibTIFF Wrapper/FreeImagePlus"
echo "VER_MAJOR = 3" > fipMakefile.srcs
-@@ -13,11 +14,13 @@
+@@ -13,11 +13,13 @@
egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' ' ' | tr -s ' ' >> fipMakefile.srcs
fi
done
@@ -76,8 +74,8 @@ Index: freeimage/genfipsrclist.sh
Index: freeimage/Source/FreeImage/ZLibInterface.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2014-01-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/ZLibInterface.cpp 2014-01-13 18:37:38.457158412 -0500
+--- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/ZLibInterface.cpp 2014-01-13 21:56:24.167435210 -0500
@@ -19,10 +19,10 @@
// Use at your own risk!
// ==========================================================
@@ -102,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/PluginJPEG.cpp 2014-01-13 18:37:38.457158412 -0500
+--- freeimage.orig/Source/FreeImage/PluginJPEG.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/PluginJPEG.cpp 2014-01-13 21:56:24.183435209 -0500
@@ -35,9 +35,10 @@
#undef FAR
#include <setjmp.h>
@@ -120,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/PluginEXR.cpp 2014-01-13 18:37:38.457158412 -0500
+--- freeimage.orig/Source/FreeImage/PluginEXR.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/PluginEXR.cpp 2014-01-13 21:56:24.207435209 -0500
@@ -22,16 +22,16 @@
#include "FreeImage.h"
@@ -151,8 +149,8 @@ Index: freeimage/Source/FreeImage/PluginEXR.cpp
// ==========================================================
Index: freeimage/Source/FreeImage/PluginJ2K.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJ2K.cpp 2014-01-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/PluginJ2K.cpp 2014-01-13 18:37:38.457158412 -0500
+--- freeimage.orig/Source/FreeImage/PluginJ2K.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/PluginJ2K.cpp 2014-01-13 21:56:24.207435209 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -164,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/PluginPNG.cpp 2014-01-13 18:38:55.445160242 -0500
+--- freeimage.orig/Source/FreeImage/PluginPNG.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/PluginPNG.cpp 2014-01-13 21:56:24.211435209 -0500
@@ -37,8 +37,7 @@
// ----------------------------------------------------------
@@ -250,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/J2KHelper.cpp 2014-01-13 18:37:38.461158412 -0500
+--- freeimage.orig/Source/FreeImage/J2KHelper.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/J2KHelper.cpp 2014-01-13 21:56:24.215435209 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -263,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/PluginJP2.cpp 2014-01-13 18:37:38.461158412 -0500
+--- freeimage.orig/Source/FreeImage/PluginJP2.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/PluginJP2.cpp 2014-01-13 21:56:24.215435209 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -276,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImage/PluginRAW.cpp 2014-01-13 18:37:38.461158412 -0500
+--- freeimage.orig/Source/FreeImage/PluginRAW.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImage/PluginRAW.cpp 2014-01-13 21:56:24.215435209 -0500
@@ -19,7 +19,7 @@
// Use at your own risk!
// ==========================================================
@@ -289,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-13 18:37:38.469158413 -0500
-+++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-13 18:37:38.461158412 -0500
+--- freeimage.orig/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-13 21:56:24.219435209 -0500
@@ -25,9 +25,10 @@
#undef FAR
#include <setjmp.h>
@@ -307,8 +305,8 @@ Index: freeimage/Source/FreeImageToolkit/JPEGTransform.cpp
Index: freeimage/Makefile.fip
===================================================================
---- freeimage.orig/Makefile.fip 2014-01-13 18:37:38.469158413 -0500
-+++ freeimage/Makefile.fip 2014-01-13 18:37:38.461158412 -0500
+--- freeimage.orig/Makefile.fip 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Makefile.fip 2014-01-13 21:56:24.219435209 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
@@ -320,8 +318,8 @@ Index: freeimage/Makefile.fip
MODULES := $(MODULES:.cpp=.o)
Index: freeimage/Makefile.gnu
===================================================================
---- freeimage.orig/Makefile.gnu 2014-01-13 18:37:38.469158413 -0500
-+++ freeimage/Makefile.gnu 2014-01-13 18:37:38.461158412 -0500
+--- freeimage.orig/Makefile.gnu 2014-01-13 21:56:24.227435209 -0500
++++ freeimage/Makefile.gnu 2014-01-13 21:56:24.219435209 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
diff --git a/debian/patches/fix_ftbfs_amd64.patch b/debian/patches/fix_ftbfs_amd64.patch
index 722c88a..463905e 100644
--- a/debian/patches/fix_ftbfs_amd64.patch
+++ b/debian/patches/fix_ftbfs_amd64.patch
@@ -2,8 +2,8 @@ Patch that fixes several problems for building on amd64. Thanks Fedora guys.
=====================================================================
Index: freeimage/Source/FreeImage/PluginBMP.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginBMP.cpp 2011-12-03 21:40:26.000000000 -0800
-+++ freeimage/Source/FreeImage/PluginBMP.cpp 2011-12-03 21:40:30.988882105 -0800
+--- freeimage.orig/Source/FreeImage/PluginBMP.cpp 2014-01-14 11:43:25.776431191 -0500
++++ freeimage/Source/FreeImage/PluginBMP.cpp 2014-01-14 11:43:25.768431191 -0500
@@ -192,6 +192,8 @@
return TRUE;
}
@@ -13,3 +13,18 @@ Index: freeimage/Source/FreeImage/PluginBMP.cpp
/**
Load image pixels for 4-bit RLE compressed dib
@param io FreeImage IO
+Index: freeimage/Source/FreeImage.h
+===================================================================
+--- freeimage.orig/Source/FreeImage.h 2014-01-13 17:15:32.449041339 -0500
++++ freeimage/Source/FreeImage.h 2014-01-14 11:51:29.864428839 -0500
+@@ -141,8 +141,10 @@
+ typedef uint16_t WORD;
+ typedef uint32_t DWORD;
+ typedef int32_t LONG;
++#ifndef _LIBRAW_TYPES_H
+ typedef int64_t INT64;
+ typedef uint64_t UINT64;
++#endif
+ #else
+ // MS is not C99 ISO compliant
+ typedef long BOOL;
--
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