mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-21 04:06:46 +00:00
Upgrade to v.2.9.1.
This commit is contained in:
parent
33edb21802
commit
1f4bb95dd4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=538701
@ -3,8 +3,7 @@
|
||||
|
||||
PORTNAME= cimg
|
||||
DISTVERSIONPREFIX= v.
|
||||
DISTVERSION= 2.9.0
|
||||
PORTREVISION= 2
|
||||
DISTVERSION= 2.9.1
|
||||
PORTEPOCH= 3
|
||||
CATEGORIES= graphics devel
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1585571291
|
||||
SHA256 (dtschump-CImg-v.2.9.0_GH0.tar.gz) = 186b93f7bab29b4966213f61202f66e7d7c6948648c0cc5618191be1987c60f3
|
||||
SIZE (dtschump-CImg-v.2.9.0_GH0.tar.gz) = 11213143
|
||||
TIMESTAMP = 1592063248
|
||||
SHA256 (dtschump-CImg-v.2.9.1_GH0.tar.gz) = 3ad10cb8842e945af208a05b8ed36f4428317ef754c6e341e4ca6ac70b8a8540
|
||||
SIZE (dtschump-CImg-v.2.9.1_GH0.tar.gz) = 11215948
|
||||
|
20
graphics/cimg/files/patch-CImg.h
Normal file
20
graphics/cimg/files/patch-CImg.h
Normal file
@ -0,0 +1,20 @@
|
||||
--- CImg.h.orig 2020-06-10 08:03:38 UTC
|
||||
+++ CImg.h
|
||||
@@ -28530,7 +28530,7 @@ namespace cimg_library_suffixed {
|
||||
"solve(): LAPACK library function dgetrf_() returned error code %d.",
|
||||
cimg_instance,
|
||||
INFO);
|
||||
- if (!INFO) {
|
||||
+ else {
|
||||
cimg::getrs(TRANS,N,lapA,IPIV,lapB,INFO);
|
||||
if (INFO)
|
||||
cimg::warn(_cimg_instance
|
||||
@@ -28538,7 +28538,7 @@ namespace cimg_library_suffixed {
|
||||
cimg_instance,
|
||||
INFO);
|
||||
}
|
||||
- if (!INFO) cimg_forY(*this,j) (*this)(i,j) = (T)(lapB[j]); else cimg_forY(*this,i,j) (*this)(i,j) = (T)0;
|
||||
+ if (!INFO) cimg_forY(*this,j) (*this)(i,j) = (T)(lapB[j]); else cimg_forY(*this,j) (*this)(i,j) = (T)0;
|
||||
}
|
||||
delete[] IPIV; delete[] lapA; delete[] lapB; delete[] WORK;
|
||||
#else
|
@ -1,8 +1,8 @@
|
||||
--- examples/Makefile.orig 2019-03-10 13:46:23 UTC
|
||||
--- examples/Makefile.orig 2020-06-10 08:03:38 UTC
|
||||
+++ examples/Makefile
|
||||
@@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h | t
|
||||
VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1)
|
||||
SVERSION=$(VERSION1).$(VERSION2).$(VERSION3)
|
||||
SVERSION = $(VERSION1).$(VERSION2).$(VERSION3)
|
||||
|
||||
-X11PATH = /usr/X11R6
|
||||
+X11PATH = $(LOCALBASE)
|
||||
@ -18,7 +18,7 @@
|
||||
LIBS = -lm
|
||||
ifdef IS_GCC
|
||||
CXXVER = $(shell $(CXX) -v 2>&1 | tail -n 1)
|
||||
@@ -144,9 +144,9 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg_strict_warnin
|
||||
@@ -151,9 +151,9 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg_strict_warnin
|
||||
VT100_CFLAGS = -Dcimg_use_vt100
|
||||
|
||||
# Flags to enable code optimization by the compiler.
|
||||
@ -30,7 +30,7 @@
|
||||
endif
|
||||
ifdef IS_ICPC
|
||||
OPT_CFLAGS = -fast
|
||||
@@ -222,7 +222,7 @@ JPEG_LIBS = -ljpeg
|
||||
@@ -224,7 +224,7 @@ JPEG_LIBS = -ljpeg
|
||||
TIFF_DEFINE = -Dcimg_use_tiff
|
||||
TIFF_INCDIR =
|
||||
TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR)
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
# Flags to enable native support for MINC2 image files, using the MINC2 library.
|
||||
# ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
|
||||
@@ -234,16 +234,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -
|
||||
@@ -236,16 +236,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -
|
||||
# Flags to enable native support for EXR image files, using the OpenEXR library.
|
||||
# ( http://www.openexr.com/ )
|
||||
OPENEXR_DEFINE = -Dcimg_use_openexr
|
||||
@ -61,7 +61,7 @@
|
||||
|
||||
# Flags to enable native support for compressed .cimgz files, using the Zlib library.
|
||||
# ( http://www.zlib.net/ )
|
||||
@@ -279,15 +279,15 @@ endif
|
||||
@@ -281,15 +281,15 @@ endif
|
||||
|
||||
# Flags to enable the use of LAPACK routines for matrix computation
|
||||
# ( http://www.netlib.org/lapack/ )
|
||||
@ -81,7 +81,7 @@
|
||||
BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR)
|
||||
BOARD_LIBS = -lboard
|
||||
|
||||
@@ -366,6 +366,7 @@ $(X11_LIBS) \
|
||||
@@ -368,6 +368,7 @@ $(X11_LIBS) \
|
||||
$(TIFF_LIBS) \
|
||||
$(LAPACK_LIBS) \
|
||||
$(XSHM_LIBS)" \
|
||||
@ -89,7 +89,7 @@
|
||||
all $(EXTRA_FILES)
|
||||
|
||||
# Linux/BSD/Mac OSX targets, with X11 display.
|
||||
@@ -458,8 +459,11 @@ $(ZLIB_CFLAGS) \
|
||||
@@ -460,8 +461,11 @@ $(ZLIB_CFLAGS) \
|
||||
$(CURL_CFLAGS) \
|
||||
$(OPENCV_CFLAGS) \
|
||||
$(MAGICK_CFLAGS) \
|
||||
@ -101,7 +101,7 @@
|
||||
$(X11_LIBS) \
|
||||
$(XSHM_LIBS) \
|
||||
$(XRANDR_LIBS) \
|
||||
@@ -471,6 +475,8 @@ $(ZLIB_LIBS) \
|
||||
@@ -473,6 +477,8 @@ $(ZLIB_LIBS) \
|
||||
$(CURL_LIBS) \
|
||||
$(OPENCV_LIBS) \
|
||||
$(MAGICK_LIBS) \
|
||||
|
Loading…
Reference in New Issue
Block a user