science/dlib-cpp and science/py-dlib: Update to 19.22

Remove USE_GCC=yes as it seems to be implied by using blaslapack:openblas

5 files changed, 18 insertions, 14 deletions

diff --git a/science/dlib-cpp/Makefile b/science/dlib-cpp/Makefile
index 65233b66e29d..c5cbb29fc853 100644
--- a/science/dlib-cpp/Makefile
+++ b/science/dlib-cpp/Makefile
@@ -1,7 +1,6 @@
 
 PORTNAME=	dlib
-DISTVERSION=	19.21
-PORTREVISION=	1
+DISTVERSION=	19.22
 CATEGORIES=	science devel math
 MASTER_SITES=	http://dlib.net/files/
 PKGNAMESUFFIX=	-cpp
@@ -40,9 +39,7 @@ GIF_CMAKE_BOOL=		DLIB_GIF_SUPPORT
 SQLITE_USES=		sqlite
 SQLITE_CMAKE_BOOL=	DLIB_LINK_WITH_SQLITE3
 
-# uses gcc until https://reviews.freebsd.org/D11482 lands
-BLASLAPACK_USE=		gcc=yes
-BLASLAPACK_USES=	blaslapack:openblas fortran
+BLASLAPACK_USES=	blaslapack:openblas
 BLASLAPACK_CMAKE_OFF=	-DDLIB_USE_BLAS=0 -DDLIB_USE_LAPACK=0 -DDLIB_USE_MKL_FFT=0
 
 # for PYTHON_PKGNAMEPREFIX
diff --git a/science/dlib-cpp/distinfo b/science/dlib-cpp/distinfo
index 04ec9deb54e0..7c1404b8650b 100644
--- a/science/dlib-cpp/distinfo
+++ b/science/dlib-cpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597912638
-SHA256 (dlib-19.21.tar.bz2) = be728a03ae8c4dc8b48408d90392a3c28bc6642a6eb22f3885895b434d7df53c
-SIZE (dlib-19.21.tar.bz2) = 11486471
+TIMESTAMP = 1617049172
+SHA256 (dlib-19.22.tar.bz2) = 20b8aad5d65594a34e22f59abbf0bf89450cb4a2a6a8c3b9eb49c8308f51d572
+SIZE (dlib-19.22.tar.bz2) = 12013390
diff --git a/science/dlib-cpp/pkg-plist b/science/dlib-cpp/pkg-plist
index 87fe1ed3f5c4..efa4d4b08176 100644
--- a/science/dlib-cpp/pkg-plist
+++ b/science/dlib-cpp/pkg-plist
@@ -139,6 +139,8 @@ include/dlib/cuda/tensor.h
 include/dlib/cuda/tensor_abstract.h
 include/dlib/cuda/tensor_tools.h
 include/dlib/data_io.h
+include/dlib/data_io/cifar.h
+include/dlib/data_io/cifar_abstract.h
 include/dlib/data_io/image_dataset_metadata.h
 include/dlib/data_io/libsvm_io.h
 include/dlib/data_io/libsvm_io_abstract.h
@@ -173,6 +175,7 @@ include/dlib/dnn/layers.h
 include/dlib/dnn/layers_abstract.h
 include/dlib/dnn/loss.h
 include/dlib/dnn/loss_abstract.h
+include/dlib/dnn/misc.h
 include/dlib/dnn/solvers.h
 include/dlib/dnn/solvers_abstract.h
 include/dlib/dnn/trainer.h
@@ -539,6 +542,8 @@ include/dlib/matrix/lapack/pbtrf.h
 include/dlib/matrix/lapack/potrf.h
 include/dlib/matrix/lapack/syev.h
 include/dlib/matrix/lapack/syevr.h
+include/dlib/matrix/fft_size.h
+include/dlib/matrix/kiss_fft.h
 include/dlib/matrix/matrix.h
 include/dlib/matrix/matrix_abstract.h
 include/dlib/matrix/matrix_assign.h
@@ -574,6 +579,7 @@ include/dlib/matrix/matrix_subexp_abstract.h
 include/dlib/matrix/matrix_trsm.h
 include/dlib/matrix/matrix_utilities.h
 include/dlib/matrix/matrix_utilities_abstract.h
+include/dlib/matrix/mkl_fft.h
 include/dlib/matrix/symmetric_matrix_cache.h
 include/dlib/matrix/symmetric_matrix_cache_abstract.h
 include/dlib/md5.h
@@ -953,6 +959,7 @@ include/dlib/test/checkerboard.h
 include/dlib/test/cmd_line_parser.h
 include/dlib/test/conditioning_class.h
 include/dlib/test/create_iris_datafile.h
+include/dlib/test/fftr_good_data.h
 include/dlib/test/optimization_test_functions.h
 include/dlib/test/tester.h
 include/dlib/test_for_odr_violations.h
@@ -1029,7 +1036,7 @@ lib/cmake/dlib/dlib.cmake
 lib/cmake/dlib/dlibConfig.cmake
 lib/cmake/dlib/dlibConfigVersion.cmake
 lib/libdlib.so
-lib/libdlib.so.19.21.0
+lib/libdlib.so.19.22.0
 libdata/pkgconfig/dlib-1.pc
 @dir include/dlib/all
 @dir include/dlib/appveyor
diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
index 5f258c6befe0..549424c6f0ee 100644
--- a/science/py-dlib/Makefile
+++ b/science/py-dlib/Makefile
@@ -1,6 +1,6 @@
 
 PORTNAME=	dlib
-DISTVERSION=	19.21
+DISTVERSION=	19.22
 CATEGORIES=	science devel math python
 MASTER_SITES=	http://dlib.net/files/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -41,7 +41,7 @@ GIF_VARS_OFF=		gifargs="--no DLIB_GIF_SUPPORT"
 SQLITE_USES=		sqlite
 SQLITE_VARS_OFF=	sqliteargs="--no DLIB_LINK_WITH_SQLITE3"
 
-BLASLAPACK_USES=	blaslapack
+BLASLAPACK_USES=	blaslapack:openblas
 BLASLAPACK_VARS_OFF=	blaslapackargs="--no DLIB_USE_BLAS --no DLIB_USE_LAPACK --no DLIB_USE_MKL_FFT"
 
 AVX_VARS_OFF=		avxargs="--no USE_AVX_INSTRUCTIONS"
diff --git a/science/py-dlib/distinfo b/science/py-dlib/distinfo
index 3393285a7252..60f896e65eef 100644
--- a/science/py-dlib/distinfo
+++ b/science/py-dlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597913242
-SHA256 (dlib-19.21.tar.bz2) = be728a03ae8c4dc8b48408d90392a3c28bc6642a6eb22f3885895b434d7df53c
-SIZE (dlib-19.21.tar.bz2) = 11486471
+TIMESTAMP = 1617096170
+SHA256 (dlib-19.22.tar.bz2) = 20b8aad5d65594a34e22f59abbf0bf89450cb4a2a6a8c3b9eb49c8308f51d572
+SIZE (dlib-19.22.tar.bz2) = 12013390