diff --git a/graphics/diplib/Makefile b/graphics/diplib/Makefile index 48b0f06c640b..1ff92401c233 100644 --- a/graphics/diplib/Makefile +++ b/graphics/diplib/Makefile @@ -1,36 +1,37 @@ PORTNAME= diplib -DISTVERSION= 3.6.0 +DISTVERSION= 3.6.1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Library and development environment for quantitative image analysis WWW= https://diplib.org/ \ https://github.com/DIPlib/diplib LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libglfw.so:graphics/glfw TEST_DEPENDS= doctest>0:devel/doctest USES= cmake:testing compiler:c++14-lang gl USE_GL= gl glut USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= DIPlib CXXFLAGS_powerpc64= -mvsx -CMAKE_OFF= DIP_BUILD_PYDIP +CMAKE_OFF= DIP_BUILD_PYDIP \ + DIP_BUILD_EXAMPLES CMAKE_TESTING_ON= DIP_ENABLE_DOCTEST CMAKE_TESTING_TARGET= check # one test fails, see https://github.com/DIPlib/diplib/issues/120 CFLAGS_i386= -msse2 # fix build failure: error: always_inline function '_mm_setzero_si128' requires target feature 'sse2', but would be inlined into function 'defilter_sub4' that is compiled without support for 'sse2' CXXFLAGS_i386= -msse2 # tests as of 3.6.0: # [doctest] test cases: 104 | 104 passed | 0 failed | 0 skipped # [doctest] assertions: 3686 | 3686 passed | 0 failed | # [doctest] Status: SUCCESS! .include diff --git a/graphics/diplib/distinfo b/graphics/diplib/distinfo index c5f5a42784d2..09886d824ab7 100644 --- a/graphics/diplib/distinfo +++ b/graphics/diplib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1779809327 -SHA256 (DIPlib-diplib-3.6.0_GH0.tar.gz) = c9c5ef0c1590dbc428d7f198fecc008b1b3ea54853663a2c33d97e04022af456 -SIZE (DIPlib-diplib-3.6.0_GH0.tar.gz) = 6989402 +TIMESTAMP = 1784963924 +SHA256 (DIPlib-diplib-3.6.1_GH0.tar.gz) = 97b3a1e83d082b18d27539e0dc3c953dc4aeb4dc2e3de14d9fecec5aa34817c6 +SIZE (DIPlib-diplib-3.6.1_GH0.tar.gz) = 7314330 diff --git a/graphics/diplib/files/patch-CMakeLists.txt b/graphics/diplib/files/patch-CMakeLists.txt index 6a46cff97193..ba2c5980e136 100644 --- a/graphics/diplib/files/patch-CMakeLists.txt +++ b/graphics/diplib/files/patch-CMakeLists.txt @@ -1,11 +1,13 @@ ---- CMakeLists.txt.orig 2024-06-18 04:45:59 UTC +--- CMakeLists.txt.orig 2026-07-25 07:19:33 UTC +++ CMakeLists.txt -@@ -76,7 +76,7 @@ add_subdirectory(src) +@@ -182,7 +182,9 @@ add_subdirectory(doc) - ### DIPjavaio + ### Examples --find_package(Java COMPONENTS Development) -+#find_package(Java COMPONENTS Development) - unset(DIP_JAVAIO_INTERFACES) - if(JAVA_FOUND) - # Set JAVA_HOME so that the JNI found is from the same JDK as the Java package +-add_subdirectory(examples EXCLUDE_FROM_ALL) ++if(DIP_BUILD_EXAMPLES) ++ add_subdirectory(examples EXCLUDE_FROM_ALL) ++endif() + + + ### CMake import scripts diff --git a/graphics/py-diplib/Makefile b/graphics/py-diplib/Makefile index b186a7bf8a35..3ffec506df54 100644 --- a/graphics/py-diplib/Makefile +++ b/graphics/py-diplib/Makefile @@ -1,38 +1,38 @@ PORTNAME= diplib -DISTVERSION= 3.6.0 +DISTVERSION= 3.6.1 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library and development environment for quantitative image analysis WWW= https://diplib.org/ \ https://github.com/DIPlib/diplib LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/../LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libDIP.so:graphics/diplib USES= cmake compiler:c++14-lang python USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= DIPlib WRKSRC_SUBDIR= pydip ALL_TARGET= bdist_wheel do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @cd ${INSTALL_WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} \ -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/staging/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl # remove the file conficting with the C++ diplib package @${RM} ${STAGEDIR}${PREFIX}/bin/dipview .include diff --git a/graphics/py-diplib/distinfo b/graphics/py-diplib/distinfo index c1a5fc893046..2778c064d2f9 100644 --- a/graphics/py-diplib/distinfo +++ b/graphics/py-diplib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1781974209 -SHA256 (DIPlib-diplib-3.6.0_GH0.tar.gz) = c9c5ef0c1590dbc428d7f198fecc008b1b3ea54853663a2c33d97e04022af456 -SIZE (DIPlib-diplib-3.6.0_GH0.tar.gz) = 6989402 +TIMESTAMP = 1784963870 +SHA256 (DIPlib-diplib-3.6.1_GH0.tar.gz) = 97b3a1e83d082b18d27539e0dc3c953dc4aeb4dc2e3de14d9fecec5aa34817c6 +SIZE (DIPlib-diplib-3.6.1_GH0.tar.gz) = 7314330 diff --git a/graphics/py-diplib/files/patch-CMakeLists.txt b/graphics/py-diplib/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a24d795f7e1e --- /dev/null +++ b/graphics/py-diplib/files/patch-CMakeLists.txt @@ -0,0 +1,39 @@ +--- CMakeLists.txt.orig 2026-07-25 07:21:34 UTC ++++ CMakeLists.txt +@@ -142,15 +142,15 @@ file(GENERATE + file(GENERATE + OUTPUT "$/cmake_pip_install.cmake" + CONTENT "file(STRINGS $/wheel.txt PYDIP_WHEEL_NAME) +- execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --upgrade --force-reinstall \${PYDIP_WHEEL_NAME})" ++ execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --upgrade --force-reinstall \${PYDIP_WHEEL_NAME})" + ) + + add_custom_target(staging +- COMMAND ${PYTHON_EXECUTABLE} $/stage_wheel.py ++ COMMAND ${Python_EXECUTABLE} $/stage_wheel.py + DEPENDS PyDIP) + + add_custom_target(bdist_wheel +- COMMAND ${CMAKE_COMMAND} -E chdir $/staging ${PYTHON_EXECUTABLE} -m build --wheel --no-isolation ++ COMMAND ${CMAKE_COMMAND} -E chdir $/staging ${Python_EXECUTABLE} -m build --wheel --no-isolation + DEPENDS staging) + + add_custom_target(pip_install +@@ -158,7 +158,7 @@ add_custom_target(pip_uninstall + DEPENDS bdist_wheel) + + add_custom_target(pip_uninstall +- COMMAND ${PYTHON_EXECUTABLE} -m pip uninstall diplib) ++ COMMAND ${Python_EXECUTABLE} -m pip uninstall diplib) + + # PyDIP unit tests + # Resolve standard CMake variables +@@ -171,7 +171,7 @@ add_custom_target(PyDIP_check + ) + + add_custom_target(PyDIP_check +- COMMAND ${CMAKE_COMMAND} -E chdir $ ${PYTHON_EXECUTABLE} $/unit_tests.py ++ COMMAND ${CMAKE_COMMAND} -E chdir $ ${Python_EXECUTABLE} $/unit_tests.py + DEPENDS staging) + if(TARGET check) + add_dependencies(check PyDIP_check) diff --git a/graphics/py-diplib/files/patch-setup_setup.py.in b/graphics/py-diplib/files/patch-setup_setup.py.in new file mode 100644 index 000000000000..a3b27e8e7f70 --- /dev/null +++ b/graphics/py-diplib/files/patch-setup_setup.py.in @@ -0,0 +1,18 @@ +--- setup/setup.py.in.orig 2026-06-27 21:12:34 UTC ++++ setup/setup.py.in +@@ -1,7 +1,6 @@ import setuptools + import os + import sysconfig + import setuptools +-import setuptools.command.bdist_wheel + + + # https://stackoverflow.com/a/62351713 +@@ -67,7 +66,6 @@ setup_kwargs = dict( + options={ + "bdist_wheel": { + # For some reason, this is necessary now on Windows??? +- "plat_name": setuptools.command.bdist_wheel.get_platform(bdist_root), + }, + }, + ) diff --git a/graphics/py-diplib/pkg-plist b/graphics/py-diplib/pkg-plist index 5cdb48537194..b844721f6e31 100644 --- a/graphics/py-diplib/pkg-plist +++ b/graphics/py-diplib/pkg-plist @@ -1,32 +1,32 @@ -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/LICENSE.txt -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/README.md -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/RECORD -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/WHEEL -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/entry_points.txt -%%PYTHON_SITELIBDIR%%/diplib-3.6.0.dist-info/top_level.txt +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/LICENSE.txt +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/README.md +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/WHEEL +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/entry_points.txt +%%PYTHON_SITELIBDIR%%/diplib-3.6.1.dist-info/top_level.txt %%PYTHON_SITELIBDIR%%/diplib/PyDIP_bin%%PYTHON_TAG%%.so %%PYTHON_SITELIBDIR%%/diplib/PyDIP_py.py %%PYTHON_SITELIBDIR%%/diplib/__init__.py %%PYTHON_SITELIBDIR%%/diplib/__main__.py %%PYTHON_SITELIBDIR%%/diplib/__pycache__/PyDIP_py%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/PyDIP_py%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/__main__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/__main__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/dipview%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/dipview%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/documentation_urls%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/documentation_urls%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/javaio%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/javaio%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/loadjvm%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/loadjvm%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/viewer%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/diplib/__pycache__/viewer%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/diplib/dipview.py %%PYTHON_SITELIBDIR%%/diplib/documentation_urls.py %%PYTHON_SITELIBDIR%%/diplib/javaio.py %%PYTHON_SITELIBDIR%%/diplib/loadjvm.py %%PYTHON_SITELIBDIR%%/diplib/viewer.py