From nobody Fri Apr 05 09:15:58 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9tBl1RJjz5G3T3; Fri, 5 Apr 2024 09:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9tBk5c0Fz4YtC; Fri, 5 Apr 2024 09:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712308558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wfbJUPAss0YpsZdtiUOZwKU4mGVhYWTCfB12tHJCIsw=; b=mYPIRUUb0TfV4B9JrPGLyEVRZ2QoaKcoDUCCnXmWCAY/WwpOXXIrx0HlFPW0hLi67pOx0p qS6adBHMvNSIUCRffJF6NxjE4sDRkjl//WcNR8uAl5MZiAgicT/pEinXvdbVvK/zS7dcOM pRZBT/G5J7EkbZoj0spM/Anj+pAZBmmJ74gsPb1dppv7Blpu6eC1G8zrLmjlKFPtQxfN8S HqguWyxgePwUHSumolP5sBSZbCtkmtZPAQzhI5cnUryG4QL6bizCTWeehgpHn7wyEM5fOA INtXn87hy8uqi7evXMnGfeNN1Ih7xbeXnNF8SSv0MphsQAf/bMKxXQguOypcsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712308558; a=rsa-sha256; cv=none; b=K8KDRQwvuED090DGDvJOJKN2Fnq6T4LmVOc3Sr+20KRFvIlc5qy3FSILnOSLLiTk1iEfCZ CePofPTp+0Qtwf1zfIwvEKi+VqBknsy77KMt1oaxDlG/6j6U3dFlsnGy/1X7pKpcSySPQ9 E+YK87RxVLI9+EL3ncJzSUG3Cfmo30RPS1fbyIbg0IsxaJPyMqrJpZ9+B0ne7xyvxSIzFl HYv6VNPcUJ3TkM46e7XCPNPN2Y20w5c+X1jkY8JA3lO4UHRB4h1BO/6JtKY+4/0CB4MXMY n32nIyIj+QUAXRyBPcs1YdHFBSSHamjobDB0dDv7RgsvnqfyXVErRSA4jAY8uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712308558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wfbJUPAss0YpsZdtiUOZwKU4mGVhYWTCfB12tHJCIsw=; b=eSfuJNE2JqteaMeTNgczxeqhcRMbipU5des3Y5e1op/LWbJFQzAU4KixjkmJyilpJzKYK4 zAlqqiEF+WxEAv78ciFEaiobly6tpGelFCI6od9I6MYk++89XR/KUtoPAFAxdzy2SeIIBl YfQWTPcYIrzt++QpNFPjKjOfR3nJL+QXQAFyE+UNXVaZ3OaiMFpUIWR67jBH6eEhJaA5NK X4I+KVB0/Pg6/uV3BBJMmC+ZgbiyMGO/mHYwuh8g7qc00BuPPco9cllzKUdmLOtvj0wBEY cpq4V3+VfrSyXQ4LwpCM4+Jhw9Ls4EMj1ar9D0OGfZjKQ4FmL5GY01odiVofTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9tBk5DW7zv0c; Fri, 5 Apr 2024 09:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4359Fw7l067335; Fri, 5 Apr 2024 09:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4359Fwu7067332; Fri, 5 Apr 2024 09:15:58 GMT (envelope-from git) Date: Fri, 5 Apr 2024 09:15:58 GMT Message-Id: <202404050915.4359Fwu7067332@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c6d1ece34a22 - main - graphics/libQGLViewer: update 2.7.2 =?utf-8?Q?=E2=86=92?= 2.9.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6d1ece34a22c51a3977fd0be9572c3d8201b589 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6d1ece34a22c51a3977fd0be9572c3d8201b589 commit c6d1ece34a22c51a3977fd0be9572c3d8201b589 Author: Yuri Victorovich AuthorDate: 2024-04-05 09:11:37 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-05 09:15:40 +0000 graphics/libQGLViewer: update 2.7.2 → 2.9.1 Will flavorize this port next. Reported by: portscout --- graphics/libQGLViewer/Makefile | 18 ++++++++++++------ graphics/libQGLViewer/distinfo | 6 +++--- graphics/libQGLViewer/files/patch-CMakeLists.txt | 18 ++++++++++++++++++ graphics/libQGLViewer/pkg-plist | 9 ++------- math/g2o/Makefile | 4 ++-- math/octomap/Makefile | 3 ++- 6 files changed, 39 insertions(+), 19 deletions(-) diff --git a/graphics/libQGLViewer/Makefile b/graphics/libQGLViewer/Makefile index e8662b18fe8e..dc36b262dec0 100644 --- a/graphics/libQGLViewer/Makefile +++ b/graphics/libQGLViewer/Makefile @@ -1,20 +1,26 @@ 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 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 @@ -8,12 +8,7 @@ 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,6 +1,6 @@ PORTNAME= g2o DISTVERSION= 20230806 -PORTREVISION= 9 +PORTREVISION= 10 DISTVERSIONSUFFIX= _git CATEGORIES= math @@ -17,7 +17,7 @@ LIB_DEPENDS= libamd.so:math/suitesparse-amd \ 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 diff --git a/math/octomap/Makefile b/math/octomap/Makefile index 7ad8273f53f0..312d15ca6833 100644 --- a/math/octomap/Makefile +++ b/math/octomap/Makefile @@ -1,6 +1,7 @@ PORTNAME= octomap DISTVERSIONPREFIX= v DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -12,7 +13,7 @@ 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