diff --git a/graphics/libQGLViewer/Makefile b/graphics/libQGLViewer/Makefile index e8662b18fe8e..dc36b262dec0 100644 --- a/graphics/libQGLViewer/Makefile +++ b/graphics/libQGLViewer/Makefile @@ -1,25 +1,31 @@ PORTNAME= libQGLViewer -DISTVERSION= 2.7.2 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 2.9.1 CATEGORIES= graphics devel -MASTER_SITES= http://www.libqglviewer.com/src/ MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library based on Qt5 that eases the creation of OpenGL 3D viewers -WWW= http://libqglviewer.com/index.html +WWW= https://github.com/GillesDebunne/libQGLViewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENCE -USES= compiler:c++11-lang gl qmake qt:5 +USES= cmake compiler:c++17-lang gl qt:5 USE_GL= gl glu -USE_QT= core designer gui opengl widgets xml buildtools:build +USE_QT= core designer gui opengl widgets xml \ + buildtools:build qmake:build USE_LDCONFIG= yes + +USE_GITHUB= yes +GH_ACCOUNT= GillesDebunne + +CMAKE_OFF= USE_QT6 + PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:C/\.[0-9]$//} SHL1=${DISTVERSION:C/\.[0-9]\.[0-9]$//} OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/QGLViewer PORTDOCS= * .include diff --git a/graphics/libQGLViewer/distinfo b/graphics/libQGLViewer/distinfo index 3dd1e20e973e..632c9a7f995d 100644 --- a/graphics/libQGLViewer/distinfo +++ b/graphics/libQGLViewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579081853 -SHA256 (libQGLViewer-2.7.2.tar.gz) = e2d2799dec5cff74548e951556a1fa06a11d9bcde2ce6593f9c27a17543b7c08 -SIZE (libQGLViewer-2.7.2.tar.gz) = 3135146 +TIMESTAMP = 1712301434 +SHA256 (GillesDebunne-libQGLViewer-v2.9.1_GH0.tar.gz) = ea4f9ac627c136a6851ffd3763b154f21c87a58bcec4e5d5b2d07e65a403096b +SIZE (GillesDebunne-libQGLViewer-v2.9.1_GH0.tar.gz) = 2499763 diff --git a/graphics/libQGLViewer/files/patch-CMakeLists.txt b/graphics/libQGLViewer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..8686c4f3eb41 --- /dev/null +++ b/graphics/libQGLViewer/files/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +--- CMakeLists.txt.orig 2024-04-05 07:42:05 UTC ++++ CMakeLists.txt +@@ -17,11 +17,13 @@ set(CMAKE_AUTOUIC ON) + set(CMAKE_AUTOUIC ON) + + # This will find the Qt files. ++if (USE_QT6) + find_package(Qt6 COMPONENTS Core Widgets Xml OpenGL OpenGLWidgets) + if (Qt6_FOUND) + message("Building with Qt6") +- set(QtLibs Qt::Core Qt::Widgets Qt::Xml Qt::OpenGL Qt::OpenGLWidgets) +-else() ++ set(QtLibs Qt::Core Qt::Widgets Qt::Xml Qt::OpenGL Qt::OpenGLWidgets) ++endif(Qt6_FOUND) ++else(USE_QT6) + find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets Xml OpenGL) + message("Building with Qt5") + set(QtLibs Qt::Core Qt::Widgets Qt::Xml Qt::OpenGL) diff --git a/graphics/libQGLViewer/pkg-plist b/graphics/libQGLViewer/pkg-plist index 29d64671a919..340a63317d35 100644 --- a/graphics/libQGLViewer/pkg-plist +++ b/graphics/libQGLViewer/pkg-plist @@ -1,19 +1,14 @@ include/QGLViewer/camera.h include/QGLViewer/config.h include/QGLViewer/constraint.h include/QGLViewer/domUtils.h include/QGLViewer/frame.h include/QGLViewer/keyFrameInterpolator.h include/QGLViewer/manipulatedCameraFrame.h include/QGLViewer/manipulatedFrame.h include/QGLViewer/mouseGrabber.h include/QGLViewer/qglviewer.h -include/QGLViewer/qglviewer_fr.qm include/QGLViewer/quaternion.h include/QGLViewer/vec.h -lib/libQGLViewer-qt5.prl -lib/libQGLViewer-qt5.so -lib/libQGLViewer-qt5.so.%%SHL1%% -lib/libQGLViewer-qt5.so.%%SHL2%% -lib/libQGLViewer-qt5.so.%%SHL3%% -lib/qt5/plugins/designer/libqglviewerplugin.so +lib/libQGLViewer.so +libdata/pkgconfig/libQGLViewer.pc diff --git a/math/g2o/Makefile b/math/g2o/Makefile index e61c62a4f6e3..8dc49a0a9ddd 100644 --- a/math/g2o/Makefile +++ b/math/g2o/Makefile @@ -1,74 +1,74 @@ PORTNAME= g2o DISTVERSION= 20230806 -PORTREVISION= 9 +PORTREVISION= 10 DISTVERSIONSUFFIX= _git CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= General framework for graph optimization WWW= https://openslam-org.github.io/g2o.html LICENSE= LGPL3 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libamd.so:math/suitesparse-amd \ libcamd.so:math/suitesparse-camd \ libccolamd.so:math/suitesparse-ccolamd \ libcholmod.so:math/suitesparse-cholmod \ libcolamd.so:math/suitesparse-colamd \ libcxsparse.so:math/suitesparse-cxsparse \ - libQGLViewer-qt5.so:graphics/libQGLViewer \ + libQGLViewer.so:graphics/libQGLViewer \ libmetis.so:math/metis \ libopenblas.so:math/openblas \ libsuitesparseconfig.so:math/suitesparse-config TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++14-lang gl eigen:3 blaslapack:netlib localbase qt:5 USE_GL= gl glu USE_QT= core gui opengl xml widgets buildtools:build qmake:build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= RainerKuemmerle CMAKE_OFF= DO_SSE_AUTODETECT CMAKE_TESTING_ON= BUILD_UNITTESTS OPTIONS_DEFINE= FAST_MATH OPTIONS_SINGLE= SIMD_${ARCH:tu} OPTIONS_SINGLE_SIMD_AMD64= NOSSE SSE2 SSE3 SSE41 SSE42 SSE4A OPTIONS_SINGLE_SIMD_I386= ${OPTIONS_SINGLE_SIMD_AMD64} OPTIONS_DEFAULT_amd64= SSE2 OPTIONS_DEFAULT_i386= SSE2 SIMD_AMD64_DESC= Use SSE SIMD optimizations SIMD_I386_DESC= ${SIMD_AMD64_DESC} FAST_MATH_DESC= Enable fast math operations NOSSE_DESC= Do not use SIMD optimization SSE2_DESC= SSE2 optimization SSE3_DESC= SSE3 optimization SSE41_DESC= SSE41 optimization SSE42_DESC= SSE42 optimization SSE4A_DESC= SSE4a optimization FAST_MATH_CMAKE_BOOL= G2O_FAST_MATH NOSSE_CMAKE_ON= -DDISABLE_SSE2:BOOL=ON -DDISABLE_SSE3:BOOL=ON -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON SSE2_CMAKE_ON= -DDISABLE_SSE3:BOOL=ON -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON SSE3_CMAKE_ON= -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON SSE41_CMAKE_ON= -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON SSE42_CMAKE_ON= -DDISABLE_SSE4_A:BOOL=ON SSE4A_CMAKE_ON= # empty to make portlint happy .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DDISABLE_SSE2:BOOL=ON -DDISABLE_SSE3:BOOL=ON -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \ ${WRKSRC}/cmake_modules/*.cmake # tests fail to compile, see https://github.com/RainerKuemmerle/g2o/issues/711 .include diff --git a/math/octomap/Makefile b/math/octomap/Makefile index 7ad8273f53f0..312d15ca6833 100644 --- a/math/octomap/Makefile +++ b/math/octomap/Makefile @@ -1,29 +1,30 @@ PORTNAME= octomap DISTVERSIONPREFIX= v DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Efficient probabilistic 3D mapping framework based on octrees WWW= https://octomap.github.io/ LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/octomap/LICENSE.txt LICENSE_FILE_GPLv2= ${WRKSRC}/octovis/LICENSE.txt -LIB_DEPENDS= libQGLViewer-qt5.so:graphics/libQGLViewer +LIB_DEPENDS= libQGLViewer.so:graphics/libQGLViewer USES= cmake:testing compiler:c++11-lang localbase:ldflags gl qt:5 USE_QT= core gui opengl xml widgets buildtools:build qmake:build USE_GL= gl glu USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= OctoMap # libQGLViewer detection is broken: https://github.com/OctoMap/octomap/issues/225 CMAKE_ON= OCTOVIS_QT5 CMAKE_ARGS= -DQGLVIEWER_BASE_DIR:PATH=${LOCALBASE}/include/QGLViewer #-DQGLViewer_LIBRARY_DIR_OTHER:PATH=${LOCALBASE}/lib .include