svn commit: r479150 - in head/graphics/freeimage: . files
Steve Wills
swills at FreeBSD.org
Thu Sep 6 19:39:47 UTC 2018
Author: swills
Date: Thu Sep 6 19:39:45 2018
New Revision: 479150
URL: https://svnweb.freebsd.org/changeset/ports/479150
Log:
graphics/freeimage: Upgrade to 3.18.0
PR: 231165
Submitted by: Nathan <ndowens at yahoo.com>
Added:
head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp (contents, props changed)
head/graphics/freeimage/files/patch-Source_OpenEXR_IlmImf_ImfFastHuf.cpp (contents, props changed)
Deleted:
head/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp
head/graphics/freeimage/files/patch-Source-OpenEXR-IlmImf_ImfAutoArray.h
head/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp
head/graphics/freeimage/files/patch-integer_overflow
head/graphics/freeimage/files/patch-integer_overflow_ljpeg_start
Modified:
head/graphics/freeimage/Makefile (contents, props changed)
head/graphics/freeimage/distinfo (contents, props changed)
Modified: head/graphics/freeimage/Makefile
==============================================================================
--- head/graphics/freeimage/Makefile Thu Sep 6 19:31:08 2018 (r479149)
+++ head/graphics/freeimage/Makefile Thu Sep 6 19:39:45 2018 (r479150)
@@ -2,11 +2,7 @@
# $FreeBSD$
PORTNAME= freeimage
-PORTVERSION= 3.16.0
-PORTREVISION= 6
-# Version 3.17.0 is available, but does not build on i386 (and probably
-# other 32-bit arches) without some not-quite-trivial patching. If one
-# decides to update the port, please make sure 32-bit builds are tested!
+PORTVERSION= 3.18.0
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
DISTNAME= FreeImage${PORTVERSION:S/.//g}
@@ -14,22 +10,28 @@ DISTNAME= FreeImage${PORTVERSION:S/.//g}
MAINTAINER= ports at FreeBSD.org
COMMENT= Simple C/C++ bitmap graphics library
-BROKEN_mips= fails to compile: opcode not supported on this processor: mips3 (mips3) `madd $16,$6'
+LICENSE= FIPL GPLv2 GPLv3
+LICENSE_COMB= multi
+LICENSE_NAME_FIPL= FreeImage Public License
+LICENSE_FILE_FIPL= ${WRKSRC}/license-fi.txt
+LICENSE_FILE_GPLv2= ${WRKSRC}/license-gplv2.txt
+LICENSE_FILE_GPLv3= ${WRKSRC}/license-gplv3.txt
+LICENSE_PERMS_FIPL= dist-mirror pkg-mirror auto-accept
+
+BROKEN_mips= fails to compile: section referenced in discarded section
BROKEN_mips64= fails to compile: opcode not supported on this processor: mips3 (mips3) 'madd $4,$5'
USES= dos2unix gmake zip
+USE_LDCONFIG= yes
DOS2UNIX_FILES= Source/LibOpenJPEG/opj_malloc.h \
Source/LibRawLite/dcraw/dcraw.c \
Source/LibRawLite/internal/dcraw_common.cpp
-USE_LDCONFIG= yes
+
WRKSRC= ${WRKDIR}/FreeImage
MAKE_ARGS= CC="${CC}" CPP="${CPP}" CXX="${CXX}"
+CFLAGS+= -DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden -fPIC
+CXXFLAGS+= -DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden -fPIC
-CFLAGS+= -DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden
-CFLAGS_aarch64= -fPIC
-CFLAGS_amd64= -fPIC
-CFLAGS_armv7= -fPIC
-
PLIST_FILES= include/FreeImage.h \
include/FreeImagePlus.h \
lib/libfreeimage.a \
@@ -41,15 +43,9 @@ PLIST_FILES= include/FreeImage.h \
lib/libfreeimageplus.so.3 \
lib/libfreeimageplus.so
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == amd64 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == sparc64
-USES+= compiler:c++0x
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-o root -g root ||' \
- ${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
+ @${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-o root -g root || ; \
+ /^-fPIC/d' ${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
post-build:
${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${_MAKE_JOBS} \
Modified: head/graphics/freeimage/distinfo
==============================================================================
--- head/graphics/freeimage/distinfo Thu Sep 6 19:31:08 2018 (r479149)
+++ head/graphics/freeimage/distinfo Thu Sep 6 19:39:45 2018 (r479150)
@@ -1,2 +1,3 @@
-SHA256 (FreeImage3160.zip) = 03af32dd60140d07515ddfe7b4f467baa3b888a72ea78828811aded7adb42f60
-SIZE (FreeImage3160.zip) = 5669228
+TIMESTAMP = 1536092886
+SHA256 (FreeImage3180.zip) = f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd
+SIZE (FreeImage3180.zip) = 7415716
Added: head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp Thu Sep 6 19:39:45 2018 (r479150)
@@ -0,0 +1,11 @@
+--- Source/FreeImage/PluginPSD.cpp.orig 2018-09-04 20:32:27 UTC
++++ Source/FreeImage/PluginPSD.cpp
+@@ -127,7 +127,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int
+ static BOOL DLL_CALLCONV
+ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
+ if(!handle) {
+- return NULL;
++ //return NULL;
+ }
+ try {
+ psdParser parser;
Added: head/graphics/freeimage/files/patch-Source_OpenEXR_IlmImf_ImfFastHuf.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/freeimage/files/patch-Source_OpenEXR_IlmImf_ImfFastHuf.cpp Thu Sep 6 19:39:45 2018 (r479150)
@@ -0,0 +1,47 @@
+--- Source/OpenEXR/IlmImf/ImfFastHuf.cpp.orig 2018-09-05 19:41:01 UTC
++++ Source/OpenEXR/IlmImf/ImfFastHuf.cpp
+@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
+ for (int i = 0; i <= MAX_CODE_LEN; ++i)
+ {
+ codeCount[i] = 0;
+- base[i] = 0xffffffffffffffffL;
++ base[i] = 0xffffffffffffffffULL;
+ offset[i] = 0;
+ }
+
+@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offse
+
+ for (int i = 0; i <= MAX_CODE_LEN; ++i)
+ {
+- if (base[i] != 0xffffffffffffffffL)
++ if (base[i] != 0xffffffffffffffffULL)
+ {
+ _ljBase[i] = base[i] << (64 - i);
+ }
+@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offse
+ // Unused code length - insert dummy values
+ //
+
+- _ljBase[i] = 0xffffffffffffffffL;
++ _ljBase[i] = 0xffffffffffffffffULL;
+ }
+ }
+
+@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offse
+
+ int minIdx = TABLE_LOOKUP_BITS;
+
+- while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
++ while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
+ minIdx--;
+
+ if (minIdx < 0)
+@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offse
+ // Set the min value such that the table is never tested.
+ //
+
+- _tableMin = 0xffffffffffffffffL;
++ _tableMin = 0xffffffffffffffffULL;
+ }
+ else
+ {
More information about the svn-ports-head
mailing list