devel/root: Update to 6.36/00

ChangeLog:	https://root.cern/doc/v636/release-notes.html
PR:		287835
This commit is contained in:
Erik Jensen 2025-06-28 18:24:21 +01:00 committed by Nuno Teixeira
parent 8e5bcd96a5
commit 2177b105df
5 changed files with 1466 additions and 1508 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= root
DISTVERSION= 6.34.06
DISTVERSION= 6.36.00
CATEGORIES= devel science math parallel python
MASTER_SITES= https://root.cern/download/
DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
@ -42,32 +42,35 @@ SHEBANG_FILES= main/python/rootbrowse.py \
etc/proof/utils/pps \
etc/proof/utils/proofctl.sh \
etc/proof/utils/proofinstall.sh \
etc/pdg_table_update.py
etc/pdg_table_update.py \
etc/runfirefox.sh
# add a port-specific shebang to be replaced
python_OLD_CMD+= "/usr/bin/env @python@"
# Flags and environment variables for building
CMAKE_ON= builtin_clang builtin_cling builtin_llvm builtin_openui5 fail-on-missing \
geom gnuinstall rpath shared soversion
CMAKE_ON= builtin_clang builtin_cling builtin_llvm builtin_openui5 \
fail-on-missing geom gnuinstall rpath shared soversion
CMAKE_OFF= arrow builtin_cfitsio builtin_cppzmq builtin_davix builtin_fftw3 \
builtin_freetype builtin_ftgl builtin_gl2ps builtin_glew builtin_gsl \
builtin_lz4 builtin_lzma builtin_nlohmannjson builtin_openssl builtin_pcre \
builtin_tbb builtin_unuran builtin_vc builtin_vdt builtin_veccore \
builtin_xxhash builtin_zeromq builtin_zlib builtin_zstd cefweb clad cocoa \
cuda cudnn daos dcache fcgi fftw3 geombuilder gviz libcxx llvm13_broken_tests \
macos_native memory_termination minuit2_mpi minuit2_omp mpi odbc proof pythia8 \
r roofit_multiprocess runtime_cxxmodules shadowpw test_distrdf_pyspark tmva-gpu \
tmva-rmva tmva-sofie unfold unuran uring vc vecgeom win_broken_tests winrtdebug
builtin_freetype builtin_ftgl builtin_gif builtin_gl2ps builtin_glew \
builtin_gsl builtin_jpeg builtin_lz4 builtin_lzma builtin_nlohmannjson \
builtin_openssl builtin_pcre builtin_png builtin_tbb builtin_unuran \
builtin_vc builtin_vdt builtin_veccore builtin_xrootd builtin_xxhash \
builtin_zeromq builtin_zlib builtin_zstd cefweb clad cocoa cuda cudnn daos \
dcache fcgi fftw3 geombuilder gviz html libcxx llvm13_broken_tests macos_native \
memory_termination minuit2_mpi minuit2_omp mpi odbc proof pythia8 r \
roofit_multiprocess runtime_cxxmodules shadowpw test_distrdf_pyspark \
tmva-gpu tmva-rmva tmva-sofie unfold unuran uring use_gsl_cblas vc vecgeom \
win_broken_tests winrtdebug
# See https://root.cern/install/build_from_source/#all-build-options
OPTIONS_DEFINE= DOCS ASIMAGE DATAFRAME DAVIX FITS FORTRAN GDML HTTP IMT MATHMORE \
MYSQL OPENGL PGSQL PYROOT QT5WEB QT6WEB ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP \
TMVAML VDT WEBGUI X11 XML XROOTD
OPTIONS_DEFAULT= ASIMAGE DATAFRAME DAVIX FITS GDML HTTP IMT MATHMORE OPENGL \
MYSQL OPENGL PGSQL PYROOT QT6WEB ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP TMVAML \
VDT WEBGUI X11 XML XROOTD
OPTIONS_DEFAULT= ASIMAGE CLAD DATAFRAME DAVIX FITS GDML HTTP IMT MATHMORE OPENGL \
PYROOT ROOFIT ROOT7 SPECTRUM SSL TMLP TMVAML VDT WEBGUI X11 XML XROOTD
OPTIONS_SUB= yes
ASIMAGE_CMAKE_BOOL= asimage
ASIMAGE_CMAKE_BOOL= asimage asimage_tiff
ASIMAGE_DESC= Enable support for image processing via libAfterImage
ASIMAGE_IMPLIES= X11
ASIMAGE_LIB_DEPENDS= libgif.so:graphics/giflib \
@ -78,8 +81,9 @@ ASIMAGE_USES= jpeg
# TODO: clad can only be included in ROOT's configure stage
# with network access, however, a port of clad is available -- patch
#CLAD_CMAKE_BOOL= clad
#CLAD_DESC= Build clad, the cling automatic differentiation plugin (requires network)
#CLAD_DESC= Build clad, the cling automatic differentiation plugin
#CLAD_LIB_DEPENDS= libclad.so:math/clad
#CLAD_CMAKE_ON= -DCLAD_SOURCE_DIR=
DATAFRAME_CMAKE_BOOL= dataframe
DATAFRAME_DESC= Enable ROOT RDataFrame
@ -120,7 +124,7 @@ MYSQL_USES= mysql ssl
OPENGL_CMAKE_BOOL= opengl
OPENGL_DESC= Enable support for OpenGL
OPENGL_IMPLIES= X11
OPENGL_IMPLIES= X11 ASIMAGE
OPENGL_LIB_DEPENDS= libftgl.so:graphics/ftgl \
libgl2ps.so:print/gl2ps
OPENGL_USES= gl
@ -137,16 +141,9 @@ PYROOT_BUILD_DEPENDS= ${PYNUMPY}
PYROOT_USES= python:3.9+,build,run
PYROOT_USES_OFF= python:3.9+,build
QT5WEB_CMAKE_BOOL= qt5web
QT5WEB_DESC= Enable support for Qt5 web-based display
QT5WEB_IMPLIES= WEBGUI
QT5WEB_USES= qt:5
QT5WEB_USE= qt=buildtools:build,qmake:build \
qt=core,declarative,gui,location,network,printsupport,webchannel,webengine,widgets
QT6WEB_CMAKE_BOOL= qt6web
QT6WEB_DESC= Enable support for Qt6 web-based display
QT6WEB_IMPLIES= WEBGUI
QT6WEB_IMPLIES= WEBGUI OPENGL
QT6WEB_USES= qt:6
QT6WEB_USE= qt=base,declarative,positioning,webchannel,webengine
@ -169,11 +166,12 @@ SSL_USES= ssl
TMLP_CMAKE_BOOL= mlp
TMLP_DESC= Enable support for TMultilayerPerceptron classes' federation
TMLP_IMPLIES= TMVAML
TMLP_IMPLIES= TMVAML MATHMORE
TMVAML_CMAKE_BOOL= tmva tmva-cpu
TMVAML_DESC= Build TMVA multi variate analysis library, including TMVA with CPU support for deep learning
TMVAML_IMPLIES= IMT
TMVAML_IMPLIES= IMT MATHMORE
TMVAML_LIB_DEPENDS= libopenblas.so:math/openblas
VDT_CMAKE_BOOL= vdt
VDT_DESC= Enable support for VDT (fast and vectorisable mathematical functions)

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1743342336
SHA256 (root_v6.34.06.source.tar.gz) = a799d632dae5bb1ec87eae6ebc046a12268c6849f2a8837921c118fc51b6cff3
SIZE (root_v6.34.06.source.tar.gz) = 199371788
TIMESTAMP = 1750873373
SHA256 (root_v6.36.00.source.tar.gz) = 94afc8def92842679a130a27521be66e2abdaa37620888e61d828a43fc4b01a2
SIZE (root_v6.36.00.source.tar.gz) = 204811286

View File

@ -1,22 +0,0 @@
--- cmake/modules/SearchInstalledSoftware.cmake.orig 2024-11-30 13:10:36 UTC
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -525,6 +525,9 @@ if(asimage)
if(builtin_zlib)
set(_after_cflags "${_after_cflags} -I${ZLIB_INCLUDE_DIR}")
endif()
+ if(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+ set(AFTERIMAGE_LIBRARIES ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE/libAfterImage${CMAKE_STATIC_LIBRARY_SUFFIX})
+ endif()
ExternalProject_Add(
AFTERIMAGE
DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/graf2d/asimage/src/libAfterImage AFTERIMAGE
@@ -541,6 +544,9 @@ if(asimage)
TIMEOUT 600
)
set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include/libAfterImage)
+ if(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+ set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE)
+ endif()
endif()
if(builtin_freetype)
add_dependencies(AFTERIMAGE FREETYPE)

View File

@ -1,20 +0,0 @@
--- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig 2024-11-30 13:04:19 UTC
+++ interpreter/cling/lib/Interpreter/Interpreter.cpp
@@ -458,8 +458,17 @@ namespace cling {
const char* Attr = LangOpts.CPlusPlus ? " throw () " : "";
#else
const char* LinkageCxx = Linkage;
+#ifdef __FreeBSD__
+// atexit-like commands need 'throw()' specifier on FreeBSD 15
+#if __FreeBSD_cc_version >= 1500000
+ const char* Attr = " throw () ";
+#else
const char* Attr = "";
#endif
+#else
+ const char* Attr = "";
+#endif // __FreeBSD__
+#endif // __GLIBC__
#if defined(__GLIBCXX__)
const char* cxa_atexit_is_noexcept = LangOpts.CPlusPlus ? " noexcept" : "";

File diff suppressed because it is too large Load Diff