summaryrefslogtreecommitdiff
path: root/science/py-dlib
diff options
context:
space:
mode:
Diffstat (limited to 'science/py-dlib')
-rw-r--r--science/py-dlib/Makefile13
-rw-r--r--science/py-dlib/distinfo6
-rw-r--r--science/py-dlib/files/patch-dlib_serialize.h11
-rw-r--r--science/py-dlib/files/patch-dlib_unicode_unicode.h11
-rw-r--r--science/py-dlib/pkg-plist2
5 files changed, 11 insertions, 32 deletions
diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
index 520f5dc60851..18631607cec6 100644
--- a/science/py-dlib/Makefile
+++ b/science/py-dlib/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dlib
-DISTVERSION= 19.24.6
-PORTREVISION= 2
+DISTVERSION= 20.0.0
+PORTREVISION= 1
CATEGORIES= science devel math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,8 +16,8 @@ LIB_DEPENDS= ${PY_BOOST} \
libpng.so:graphics/png \
libgif.so:graphics/giflib
-USES= cmake:indirect compiler:c++11-lang pkgconfig python shebangfix \
- sqlite xorg
+USES= cmake:indirect compiler:c++11-lang jpeg pkgconfig python \
+ shebangfix sqlite xorg
USE_PYTHON= autoplist distutils
USE_XORG= ice sm x11 xext
SHEBANG_FILES= python_examples/*.py
@@ -29,7 +29,10 @@ BLASLAPACK_DESC= Use OpenBLAS for matrix operations
BLASLAPACK_USES= blaslapack:openblas
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}
+PYDISTUTILS_BUILDARGS= --set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${BLASLAPACKARGS}
+
+post-extract:
+ ${FIND} ${WRKSRC}/dlib/external -d 1 -not -name pybind11 -exec rm -rf {} +
# due to a build system bug the code gets recompiled twice during "build" and "stage"
do-build:
diff --git a/science/py-dlib/distinfo b/science/py-dlib/distinfo
index 93f2a9e4be33..fd5ff331d522 100644
--- a/science/py-dlib/distinfo
+++ b/science/py-dlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1729934493
-SHA256 (dlib-19.24.6.tar.gz) = 77e3c28ac2c66141514b07cbb74b7c7f80381c019ce5fec99007980bc6490d7d
-SIZE (dlib-19.24.6.tar.gz) = 3374495
+TIMESTAMP = 1748764373
+SHA256 (dlib-20.0.0.tar.gz) = 9ab6a6fe113cc36a20c3f611c57fa6a07f18d1169bd04efb85c32e21b23b7d2b
+SIZE (dlib-20.0.0.tar.gz) = 3310015
diff --git a/science/py-dlib/files/patch-dlib_serialize.h b/science/py-dlib/files/patch-dlib_serialize.h
deleted file mode 100644
index 94306df64159..000000000000
--- a/science/py-dlib/files/patch-dlib_serialize.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dlib/serialize.h.orig 2024-02-17 21:44:22 UTC
-+++ dlib/serialize.h
-@@ -639,6 +639,8 @@ namespace dlib
- USE_DEFAULT_INT_SERIALIZATION_FOR(wchar_t)
- #endif
-
-+ USE_DEFAULT_INT_SERIALIZATION_FOR(char32_t)
-+
- // ----------------------------------------------------------------------------------------
-
- inline void serialize(
diff --git a/science/py-dlib/files/patch-dlib_unicode_unicode.h b/science/py-dlib/files/patch-dlib_unicode_unicode.h
deleted file mode 100644
index 4527fdc054b0..000000000000
--- a/science/py-dlib/files/patch-dlib_unicode_unicode.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dlib/unicode/unicode.h.orig 2024-02-17 21:44:22 UTC
-+++ dlib/unicode/unicode.h
-@@ -16,7 +16,7 @@ namespace dlib
-
- // ----------------------------------------------------------------------------------------
-
-- using unichar = uint32;
-+ using unichar = char32_t;
- using ustring = std::basic_string<unichar>;
-
- // ----------------------------------------------------------------------------------------
diff --git a/science/py-dlib/pkg-plist b/science/py-dlib/pkg-plist
index 6dd59d547748..a63f7353953e 100644
--- a/science/py-dlib/pkg-plist
+++ b/science/py-dlib/pkg-plist
@@ -1,5 +1,3 @@
%%PYTHON_SITELIBDIR%%/dlib/__init__.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dlib/__init__.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dlib/__init__.pyo
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/dlib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/dlib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc