git: 249f65e1d4a6 - main - multimedia/assimp: Update 5.1.5 -> 5.2.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 20 Jul 2022 19:34:02 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=249f65e1d4a6484dfd743da56509352f0940cc5c
commit 249f65e1d4a6484dfd743da56509352f0940cc5c
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-07-20 19:32:40 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-07-20 19:34:00 +0000
multimedia/assimp: Update 5.1.5 -> 5.2.4
Also:
* simplify test-related code
* add workaround for minizip-related build breakage in new versions
---
benchmarks/vkmark/Makefile | 1 +
games/doomsday/Makefile | 2 +-
games/pioneer/Makefile | 1 +
graphics/qt5-3d/Makefile | 1 +
misc/dartsim/Makefile | 2 +-
multimedia/assimp/Makefile | 10 +++++-----
multimedia/assimp/distinfo | 6 +++---
multimedia/assimp/pkg-plist | 12 +++++++-----
x11-toolkits/qt5-quick3d/Makefile | 1 +
9 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/benchmarks/vkmark/Makefile b/benchmarks/vkmark/Makefile
index ae04059e4a97..869865bde059 100644
--- a/benchmarks/vkmark/Makefile
+++ b/benchmarks/vkmark/Makefile
@@ -1,5 +1,6 @@
PORTNAME= vkmark
DISTVERSION= 2017.08-29
+PORTREVISION= 1
DISTVERSIONSUFFIX= -gd872846
CATEGORIES= benchmarks wayland
diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile
index 394f555882db..a2231ec9957a 100644
--- a/games/doomsday/Makefile
+++ b/games/doomsday/Makefile
@@ -1,6 +1,6 @@
PORTNAME= doomsday
PORTVERSION= 2.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION}
diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 630f567296cb..b1853b03c60c 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pioneer
DISTVERSION= 20220203
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
index 84dcf5ff7e6f..0a09c659616b 100644
--- a/graphics/qt5-3d/Makefile
+++ b/graphics/qt5-3d/Makefile
@@ -1,5 +1,6 @@
PORTNAME= 3d
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index 4faed0ed1146..6f43ce237833 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,7 +1,7 @@
PORTNAME= dartsim
DISTVERSIONPREFIX= v
DISTVERSION= 6.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 05cdcef34719..1c3007e0f2a9 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= assimp
DISTVERSIONPREFIX= v
-DISTVERSION= 5.1.5
+DISTVERSION= 5.2.4
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -11,18 +11,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_armv6= field within 'Assimp::MDL::Vertex_MDL7' is less aligned than 'Assimp::MDL::Vertex_MDL7::..., see https://github.com/assimp/assimp/issues/4640
-USES= cmake:testing compiler:c++11-lib cpe localbase:ldflags minizip pkgconfig
+USES= cmake:testing compiler:c++11-lib cpe localbase:ldflags pkgconfig # minizip is disabled for https://github.com/assimp/assimp/issues/4374
USE_GITHUB= yes
USE_LDCONFIG= yes
CMAKE_OFF= ASSIMP_BUILD_TESTS
+CMAKE_ON= ASSIMP_BUILD_MINIZIP # workaround for https://github.com/assimp/assimp/issues/4374
CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS
+CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack to avoid target
-do-test:
+post-test:
@cd ${BUILD_WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -D${CMAKE_TESTING_ON}=ON ${CMAKE_SOURCE_PATH} && \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} ${CMAKE_TESTING_TARGET} && \
${BUILD_WRKSRC}/bin/unit
.include <bsd.port.mk>
diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo
index 35891dad0fcd..6c7fdb6254e9 100644
--- a/multimedia/assimp/distinfo
+++ b/multimedia/assimp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641403619
-SHA256 (assimp-assimp-v5.1.5_GH0.tar.gz) = d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced
-SIZE (assimp-assimp-v5.1.5_GH0.tar.gz) = 48972912
+TIMESTAMP = 1658288612
+SHA256 (assimp-assimp-v5.2.4_GH0.tar.gz) = 6a4ff75dc727821f75ef529cea1c4fc0a7b5fc2e0a0b2ff2f6b7993fe6cb54ba
+SIZE (assimp-assimp-v5.2.4_GH0.tar.gz) = 49613683
diff --git a/multimedia/assimp/pkg-plist b/multimedia/assimp/pkg-plist
index 5b8b43774fcb..394aba6d8ab7 100644
--- a/multimedia/assimp/pkg-plist
+++ b/multimedia/assimp/pkg-plist
@@ -1,4 +1,5 @@
bin/assimp
+include/assimp/Base64.hpp
include/assimp/BaseImporter.h
include/assimp/Bitmap.h
include/assimp/BlobIOSystem.h
@@ -27,6 +28,7 @@ include/assimp/Logger.hpp
include/assimp/MathFunctions.h
include/assimp/MemoryIOWrapper.h
include/assimp/NullLogger.hpp
+include/assimp/ObjMaterial.h
include/assimp/ParsingUtils.h
include/assimp/Profiler.h
include/assimp/ProgressHandler.hpp
@@ -85,11 +87,11 @@ include/assimp/vector2.inl
include/assimp/vector3.h
include/assimp/vector3.inl
include/assimp/version.h
-lib/cmake/assimp-5.1/assimpConfig.cmake
-lib/cmake/assimp-5.1/assimpConfigVersion.cmake
-lib/cmake/assimp-5.1/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/assimp-5.1/assimpTargets.cmake
+lib/cmake/assimp-5.2/assimpConfig.cmake
+lib/cmake/assimp-5.2/assimpConfigVersion.cmake
+lib/cmake/assimp-5.2/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/assimp-5.2/assimpTargets.cmake
lib/libassimp.so
lib/libassimp.so.5
-lib/libassimp.so.5.1.4
+lib/libassimp.so.5.2.0
libdata/pkgconfig/assimp.pc
diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile
index 8cde6a481c6b..4d7d9cc85c7a 100644
--- a/x11-toolkits/qt5-quick3d/Makefile
+++ b/x11-toolkits/qt5-quick3d/Makefile
@@ -1,5 +1,6 @@
PORTNAME= quick3d
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-