git: b5cc0267ac75 - main - multimedia/assimp: update 5.4.3 → 6.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 03 Jun 2025 03:50:27 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b5cc0267ac75106030a9d6457bb4e6cf1cbf9e56
commit b5cc0267ac75106030a9d6457bb4e6cf1cbf9e56
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-06-03 02:39:20 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-06-03 03:50:15 +0000
multimedia/assimp: update 5.4.3 → 6.0.1
---
benchmarks/vkmark/Makefile | 1 +
games/doomsday/Makefile | 2 +-
games/lwjgl3/Makefile | 2 +-
games/pioneer/Makefile | 1 +
graphics/f3d/Makefile | 1 +
graphics/f3d/files/patch-external_dmon_dmon.h | 6 +++---
graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt | 11 +++++++++++
graphics/magnum-examples/Makefile | 2 +-
graphics/magnum-integration/Makefile | 2 +-
graphics/magnum-plugins/Makefile | 1 +
graphics/qt5-3d/Makefile | 2 +-
graphics/qt6-3d/Makefile | 1 +
math/manifold/Makefile | 1 +
misc/dartsim/Makefile | 2 +-
multimedia/assimp/Makefile | 6 ++++--
multimedia/assimp/distinfo | 6 +++---
.../assimp/files/patch-code_AssetLib_MDL_MDLFileData.h | 13 -------------
multimedia/assimp/pkg-plist | 10 +++++-----
x11-toolkits/qt5-quick3d/Makefile | 2 +-
x11-toolkits/qt6-quick3d/Makefile | 1 +
20 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/benchmarks/vkmark/Makefile b/benchmarks/vkmark/Makefile
index e71573cb326d..0cd13d5e72ec 100644
--- a/benchmarks/vkmark/Makefile
+++ b/benchmarks/vkmark/Makefile
@@ -1,5 +1,6 @@
PORTNAME= vkmark
DISTVERSION= 2025.01
+PORTREVISION= 1
CATEGORIES= benchmarks
MAINTAINER= jbeich@FreeBSD.org
diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile
index 38765485b14b..d18623a9fb03 100644
--- a/games/doomsday/Makefile
+++ b/games/doomsday/Makefile
@@ -1,6 +1,6 @@
PORTNAME= doomsday
PORTVERSION= 2.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION}
diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile
index 79047b8123e7..09a1386f309f 100644
--- a/games/lwjgl3/Makefile
+++ b/games/lwjgl3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= lwjgl
DISTVERSION= 3.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games java
MASTER_SITES= https://repo1.maven.org/:source1
PKGNAMESUFFIX= 3
diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 2d8adaa92378..6e7bc0d21379 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pioneer
DISTVERSION= 20250501
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
index 03f2bee25755..e4b924af27bc 100644
--- a/graphics/f3d/Makefile
+++ b/graphics/f3d/Makefile
@@ -1,6 +1,7 @@
PORTNAME= f3d
DISTVERSIONPREFIX= v
DISTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
diff --git a/graphics/f3d/files/patch-external_dmon_dmon.h b/graphics/f3d/files/patch-external_dmon_dmon.h
index d6239980cb57..a125e1d301a3 100644
--- a/graphics/f3d/files/patch-external_dmon_dmon.h
+++ b/graphics/f3d/files/patch-external_dmon_dmon.h
@@ -1,6 +1,6 @@
---- external/dmon/dmon.h.orig 2024-04-03 12:42:33 UTC
+--- external/dmon/dmon.h.orig 2025-04-16 06:15:03 UTC
+++ external/dmon/dmon.h
-@@ -137,7 +137,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id);
+@@ -142,7 +142,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id);
#if defined(_WIN32) || defined(_WIN64)
# undef DMON_OS_WINDOWS
# define DMON_OS_WINDOWS 1
@@ -9,7 +9,7 @@
# undef DMON_OS_LINUX
# define DMON_OS_LINUX 1
#elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
-@@ -167,7 +167,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id);
+@@ -172,7 +172,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id);
# include <dirent.h>
# include <errno.h>
# include <fcntl.h>
diff --git a/graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt b/graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt
new file mode 100644
index 000000000000..1119e588b41b
--- /dev/null
+++ b/graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- plugins/assimp/CMakeLists.txt.orig 2025-06-02 22:44:41 UTC
++++ plugins/assimp/CMakeLists.txt
+@@ -11,7 +11,7 @@ endif()
+ include(f3dPlugin)
+ endif()
+
+-find_package(assimp 5.4.0 REQUIRED)
++find_package(assimp REQUIRED)
+
+ set(F3D_ASSIMP_VERSION "${assimp_VERSION}" CACHE INTERNAL "")
+ message(STATUS "Plugin: assimp ${assimp_VERSION} found")
diff --git a/graphics/magnum-examples/Makefile b/graphics/magnum-examples/Makefile
index b3830d8a0b93..bfe662c0d518 100644
--- a/graphics/magnum-examples/Makefile
+++ b/graphics/magnum-examples/Makefile
@@ -2,7 +2,7 @@ PORTNAME= magnum-examples
DISTVERSIONPREFIX= v
DISTVERSION= 2020.06-265
DISTVERSIONSUFFIX= -gb843f07a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
diff --git a/graphics/magnum-integration/Makefile b/graphics/magnum-integration/Makefile
index fa1bdcd435c9..b2aa0c2f5b37 100644
--- a/graphics/magnum-integration/Makefile
+++ b/graphics/magnum-integration/Makefile
@@ -1,7 +1,7 @@
PORTNAME= magnum-integration
DISTVERSIONPREFIX= v
DISTVERSION= 2020.06-264
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= -g50ac4db
CATEGORIES= graphics
diff --git a/graphics/magnum-plugins/Makefile b/graphics/magnum-plugins/Makefile
index a8e28188c17f..67af2aec4c20 100644
--- a/graphics/magnum-plugins/Makefile
+++ b/graphics/magnum-plugins/Makefile
@@ -1,6 +1,7 @@
PORTNAME= magnum-plugins
DISTVERSIONPREFIX= v
DISTVERSION= 2020.06-1526
+PORTREVISION= 1
DISTVERSIONSUFFIX= -gffc92bcd
CATEGORIES= graphics
diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
index 0f7cf8beb18b..d20a52d9868c 100644
--- a/graphics/qt5-3d/Makefile
+++ b/graphics/qt5-3d/Makefile
@@ -1,6 +1,6 @@
PORTNAME= 3d
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-
diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile
index e94c04ce9f98..5e20512521b5 100644
--- a/graphics/qt6-3d/Makefile
+++ b/graphics/qt6-3d/Makefile
@@ -1,5 +1,6 @@
PORTNAME= 3d
DISTVERSION= ${QT6_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt6-
diff --git a/math/manifold/Makefile b/math/manifold/Makefile
index f15d9c8f5851..06140f02e20b 100644
--- a/math/manifold/Makefile
+++ b/math/manifold/Makefile
@@ -1,6 +1,7 @@
PORTNAME= manifold
DISTVERSIONPREFIX=v
DISTVERSION= 3.0.1
+PORTREVISION= 1
CATEGORIES= math cad
MAINTAINER= thierry@FreeBSD.org
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index 260ffc8d9202..ff9dd24fa7f8 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,7 +1,7 @@
PORTNAME= dartsim
DISTVERSIONPREFIX= v
DISTVERSION= 6.15.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index cf245a3dca95..6c91224e00ea 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= assimp
DISTVERSIONPREFIX= v
-DISTVERSION= 5.4.3
+DISTVERSION= 6.0.1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -21,8 +21,10 @@ CMAKE_ON= ASSIMP_BUILD_MINIZIP # workaround for https://github.com/assimp/assim
CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS
CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack to avoid target
-post-test: # 1 test fails, see https://github.com/assimp/assimp/issues/4751
+post-test:
@cd ${BUILD_WRKSRC} && \
${BUILD_WRKSRC}/bin/unit
+# tests as of 6.0.1: 591 tests from 117 test suites ran. (18189 ms total)
+
.include <bsd.port.mk>
diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo
index bf09c25327dd..3620e3a65508 100644
--- a/multimedia/assimp/distinfo
+++ b/multimedia/assimp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725080529
-SHA256 (assimp-assimp-v5.4.3_GH0.tar.gz) = 66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb
-SIZE (assimp-assimp-v5.4.3_GH0.tar.gz) = 53964510
+TIMESTAMP = 1748857404
+SHA256 (assimp-assimp-v6.0.1_GH0.tar.gz) = 0c6ec0e601cab4700019c1e60b5cd332cc6355e63e59c11344693623c08a7d38
+SIZE (assimp-assimp-v6.0.1_GH0.tar.gz) = 152221215
diff --git a/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h b/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h
deleted file mode 100644
index bbd40c65b773..000000000000
--- a/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h
+++ /dev/null
@@ -1,13 +0,0 @@
-- https://github.com/assimp/assimp/issues/4640
-
---- code/AssetLib/MDL/MDLFileData.h.orig 2023-10-16 03:31:18 UTC
-+++ code/AssetLib/MDL/MDLFileData.h
-@@ -603,7 +603,7 @@ struct Vertex_MDL7
- union {
- uint8_t norm162index;
- float norm[3];
-- };
-+ } PACK_STRUCT;
- } PACK_STRUCT;
-
- // -------------------------------------------------------------------------------------
diff --git a/multimedia/assimp/pkg-plist b/multimedia/assimp/pkg-plist
index 8752d2f1254c..a2d7aed1d325 100644
--- a/multimedia/assimp/pkg-plist
+++ b/multimedia/assimp/pkg-plist
@@ -87,11 +87,11 @@ include/assimp/vector2.inl
include/assimp/vector3.h
include/assimp/vector3.inl
include/assimp/version.h
-lib/cmake/assimp-5.4/assimpConfig.cmake
-lib/cmake/assimp-5.4/assimpConfigVersion.cmake
-lib/cmake/assimp-5.4/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/assimp-5.4/assimpTargets.cmake
+lib/cmake/assimp-6.0/assimpConfig.cmake
+lib/cmake/assimp-6.0/assimpConfigVersion.cmake
+lib/cmake/assimp-6.0/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/assimp-6.0/assimpTargets.cmake
lib/libassimp.so
lib/libassimp.so.5
-lib/libassimp.so.5.4.3
+lib/libassimp.so.6.0.1
libdata/pkgconfig/assimp.pc
diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile
index e0d742349b52..92dc1b5b62b6 100644
--- a/x11-toolkits/qt5-quick3d/Makefile
+++ b/x11-toolkits/qt5-quick3d/Makefile
@@ -1,6 +1,6 @@
PORTNAME= quick3d
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
diff --git a/x11-toolkits/qt6-quick3d/Makefile b/x11-toolkits/qt6-quick3d/Makefile
index e5975b14e6b3..870ebc54f6a1 100644
--- a/x11-toolkits/qt6-quick3d/Makefile
+++ b/x11-toolkits/qt6-quick3d/Makefile
@@ -1,5 +1,6 @@
PORTNAME= quick3d
DISTVERSION= ${QT6_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt6-