git: 89a55fbe54db - main - science/py-dlib: Update to 19.24.6

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sat, 26 Oct 2024 12:30:38 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=89a55fbe54dbfe50e9faec408b7dbd83f2875816

commit 89a55fbe54dbfe50e9faec408b7dbd83f2875816
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-10-26 09:51:59 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-10-26 12:30:19 +0000

    science/py-dlib: Update to 19.24.6
---
 science/py-dlib/Makefile | 38 ++++++++++++--------------------------
 science/py-dlib/distinfo |  6 +++---
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
index aa3922ad7b3c..fbc3efcfd18e 100644
--- a/science/py-dlib/Makefile
+++ b/science/py-dlib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dlib
-DISTVERSION=	19.24.2
+DISTVERSION=	19.24.6
 CATEGORIES=	science devel math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,40 +12,26 @@ LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/dlib/LICENSE.txt
 
 LIB_DEPENDS=		${PY_BOOST} \
-			libpng.so:graphics/png
+			libpng.so:graphics/png \
+			libgif.so:graphics/giflib
 
-USES=			cmake:indirect compiler:c++11-lang pkgconfig python shebangfix
+USES=			cmake:indirect compiler:c++11-lang pkgconfig python shebangfix \
+			sqlite
 USE_PYTHON=		autoplist distutils
+USE_XORG=		ice sm x11 xext
 SHEBANG_FILES=		python_examples/*.py
 
-OPTIONS_DEFINE=		X11 JPEG GIF SQLITE BLASLAPACK AVX
-OPTIONS_DEFAULT=	X11 JPEG GIF SQLITE
+OPTIONS_DEFINE=		BLASLAPACK
 
-BLASLAPACK_DESC=	Use Blas and Lapack libraries from ports
-AVX_DESC=		Use AVX instructions if supported by CPU
-
-X11_USES=		xorg
-X11_USE=		xorg=x11
-
-JPEG_USES=		jpeg
-JPEG_VARS_OFF=		jpegargs="--no DLIB_JPEG_SUPPORT"
-
-PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_VARS_OFF=		pngargs="--no DLIB_PNG_SUPPORT"
-
-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
-GIF_VARS_OFF=		gifargs="--no DLIB_GIF_SUPPORT"
-
-SQLITE_USES=		sqlite
-SQLITE_VARS_OFF=	sqliteargs="--no DLIB_LINK_WITH_SQLITE3"
+BLASLAPACK_DESC=	Use OpenBLAS for matrix operations
 
 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"
+BLASLAPACK_VARS_OFF=	blaslapackargs="--no DLIB_USE_BLAS --no DLIB_USE_LAPACK"
 
 PYDISTUTILS_BUILDARGS=	--set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS} ${BLASLAPACK}
 
-PLIST_SUB=		PYTHON2="@comment " PYTHON3=""
+# due to a build system bug the code gets recompiled twice during "build" and "stage"
+do-build:
+	@${DO_NADA}
 
 .include <bsd.port.mk>
diff --git a/science/py-dlib/distinfo b/science/py-dlib/distinfo
index 5f2ddaf8bdf1..93f2a9e4be33 100644
--- a/science/py-dlib/distinfo
+++ b/science/py-dlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702946751
-SHA256 (dlib-19.24.2.tar.gz) = 2d4f618073bc6b297aa01ce05595a2d32b5b37e69cafd99f796e77346f6dcfb5
-SIZE (dlib-19.24.2.tar.gz) = 11767533
+TIMESTAMP = 1729934493
+SHA256 (dlib-19.24.6.tar.gz) = 77e3c28ac2c66141514b07cbb74b7c7f80381c019ce5fec99007980bc6490d7d
+SIZE (dlib-19.24.6.tar.gz) = 3374495