Update to assimp-5.0.0

Its one consumer (games/pioneer) is build and runtime happy with this. Note the major bump due to loss of some symbol in the shlib.
2019-11-24 19:48:08 +00:00 · 2019-11-24 19:48:08 +00:00 · 9ea7f7a1dc
commit 9ea7f7a1dc
parent b37c140635
6 changed files with 52 additions and 68 deletions
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2019/07/12 20:47:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2019/11/24 19:48:08 bcallah Exp $

 COMMENT =	open asset import library
 CATEGORIES =	multimedia

-SHARED_LIBS +=  assimp                    0.1 # 3.4
+SHARED_LIBS +=	assimp                    1.0 # 5.0

 GH_ACCOUNT =	assimp
 GH_PROJECT =	assimp
-GH_TAGNAME =	v4.1.0
+GH_TAGNAME =	v5.0.0

 HOMEPAGE =	http://www.assimp.org/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@ -18,7 +18,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += ${COMPILER_LIBCXX} c m z

 # C++11
-COMPILER =	base-clang ports-clang ports-gcc
+COMPILER =	base-clang ports-gcc

 MODULES =	devel/cmake

--- a/multimedia/assimp/distinfo
+++ b/multimedia/assimp/distinfo
@ -1,2 +1,2 @@
-SHA256 (assimp-4.1.0.tar.gz) = NSCx6Xk7k6LKO3lxmeFvQNYXYmF+By8tUl+tcPlninE=
-SIZE (assimp-4.1.0.tar.gz) = 45417293
+SHA256 (assimp-5.0.0.tar.gz) = sBEKkWUNa7QADj1cIYW/d7D/Ci56KEvCxK+BszmItjw=
+SIZE (assimp-5.0.0.tar.gz) = 46604597
--- a/multimedia/assimp/patches/patch-CMakeLists_txt
+++ b/multimedia/assimp/patches/patch-CMakeLists_txt
@ -1,40 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/04/23 23:07:24 bcallah Exp $
-
-Disable Qt viewer (doesn't get installed by default anyway).
-
-Index: CMakeLists.txt
--- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -412,32 +412,6 @@ IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
-   ENDIF ( WIN32 AND DirectX_D3DX9_LIBRARY )
- 
-   ADD_SUBDIRECTORY( tools/assimp_cmd/ )
-
-  # Check dependencies for assimp_qt_viewer.
-  # Why here? Maybe user do not want Qt viewer and have no Qt.
-  # Why assimp_qt_viewer/CMakeLists.txt still contain similar check?
-  # Because viewer can be build independently of Assimp.
-  FIND_PACKAGE(Qt5Widgets QUIET)
-  FIND_PACKAGE(DevIL QUIET)
-  FIND_PACKAGE(OpenGL QUIET)
-  IF ( Qt5Widgets_FOUND AND IL_FOUND AND OPENGL_FOUND)
-    ADD_SUBDIRECTORY( tools/assimp_qt_viewer/ )
-  ELSE()
-    SET ( ASSIMP_QT_VIEWER_DEPENDENCIES "")
-    IF (NOT Qt5_FOUND)
-      SET ( ASSIMP_QT_VIEWER_DEPENDENCIES "${ASSIMP_QT_VIEWER_DEPENDENCIES} Qt5")
-    ENDIF (NOT Qt5_FOUND)
-
-    IF (NOT IL_FOUND)
-      SET ( ASSIMP_QT_VIEWER_DEPENDENCIES "${ASSIMP_QT_VIEWER_DEPENDENCIES} DevIL")
-    ENDIF (NOT IL_FOUND)
-
-    IF (NOT OPENGL_FOUND)
-      SET ( ASSIMP_QT_VIEWER_DEPENDENCIES "${ASSIMP_QT_VIEWER_DEPENDENCIES} OpengGL")
-    ENDIF (NOT OPENGL_FOUND)
-
-    MESSAGE (WARNING "Build of assimp_qt_viewer is disabled. Unsatisfied dendencies: ${ASSIMP_QT_VIEWER_DEPENDENCIES}")
-  ENDIF ( Qt5Widgets_FOUND AND IL_FOUND AND OPENGL_FOUND)
- ENDIF ( ASSIMP_BUILD_ASSIMP_TOOLS )
- 
- IF ( ASSIMP_BUILD_SAMPLES)
--- a/multimedia/assimp/patches/patch-code_Q3BSPZipArchive_cpp
+++ b/multimedia/assimp/patches/patch-code_Q3BSPZipArchive_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-code_Q3BSPZipArchive_cpp,v 1.1 2018/04/23 23:07:24 bcallah Exp $
-
-Need cstdlib for malloc and free (sent upstream)
-
-Index: code/Q3BSPZipArchive.cpp
--- code/Q3BSPZipArchive.cpp.orig
-+++ code/Q3BSPZipArchive.cpp
-@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
- 
- #include "Q3BSPZipArchive.h"
- #include <cassert>
-+#include <cstdlib>
- #include <assimp/ai_assert.h>
- 
- namespace Assimp {
--- a/multimedia/assimp/patches/patch-contrib_unzip_unzip_c
+++ b/multimedia/assimp/patches/patch-contrib_unzip_unzip_c
@ -1,11 +1,11 @@
-$OpenBSD: patch-contrib_unzip_unzip_c,v 1.1 2018/04/23 23:07:24 bcallah Exp $
+$OpenBSD: patch-contrib_unzip_unzip_c,v 1.2 2019/11/24 19:48:08 bcallah Exp $

 This is missing from our zlib.

 Index: contrib/unzip/unzip.c
 --- contrib/unzip/unzip.c.orig
 +++ contrib/unzip/unzip.c
-@@ -122,6 +122,7 @@ typedef struct
+@@ -126,6 +126,7 @@ typedef struct
     int   raw;
 } file_in_zip_read_info_s;
 
--- a/multimedia/assimp/pkg/PLIST
+++ b/multimedia/assimp/pkg/PLIST
@ -1,23 +1,56 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/04/23 23:07:24 bcallah Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/11/24 19:48:08 bcallah Exp $
@bin bin/assimp
 include/assimp/
+include/assimp/BaseImporter.h
+include/assimp/Bitmap.h
+include/assimp/BlobIOSystem.h
+include/assimp/ByteSwapper.h
 include/assimp/Compiler/
 include/assimp/Compiler/poppack1.h
 include/assimp/Compiler/pstdint.h
 include/assimp/Compiler/pushpack1.h
+include/assimp/CreateAnimMesh.h
 include/assimp/DefaultIOStream.h
 include/assimp/DefaultIOSystem.h
 include/assimp/DefaultLogger.hpp
 include/assimp/Defines.h
+include/assimp/Exceptional.h
 include/assimp/Exporter.hpp
+include/assimp/GenericProperty.h
+include/assimp/Hash.h
 include/assimp/IOStream.hpp
+include/assimp/IOStreamBuffer.h
 include/assimp/IOSystem.hpp
 include/assimp/Importer.hpp
+include/assimp/LineSplitter.h
+include/assimp/LogAux.h
 include/assimp/LogStream.hpp
 include/assimp/Logger.hpp
+include/assimp/Macros.h
+include/assimp/MathFunctions.h
+include/assimp/MemoryIOWrapper.h
 include/assimp/NullLogger.hpp
+include/assimp/ParsingUtils.h
+include/assimp/Profiler.h
 include/assimp/ProgressHandler.hpp
+include/assimp/RemoveComments.h
+include/assimp/SGSpatialSort.h
 include/assimp/SceneCombiner.h
+include/assimp/SkeletonMeshBuilder.h
+include/assimp/SmoothingGroups.h
+include/assimp/SmoothingGroups.inl
+include/assimp/SpatialSort.h
+include/assimp/StandardShapes.h
+include/assimp/StreamReader.h
+include/assimp/StreamWriter.h
+include/assimp/StringComparison.h
+include/assimp/StringUtils.h
+include/assimp/Subdivision.h
+include/assimp/TinyFormatter.h
+include/assimp/Vertex.h
+include/assimp/XMLTools.h
+include/assimp/ZipArchiveIOSystem.h
+include/assimp/aabb.h
 include/assimp/ai_assert.h
 include/assimp/anim.h
 include/assimp/camera.h
@ -28,7 +61,9 @@ include/assimp/color4.h
 include/assimp/color4.inl
 include/assimp/config.h
 include/assimp/defs.h
+include/assimp/fast_atof.h
 include/assimp/importerdesc.h
+include/assimp/irrXMLWrapper.h
 include/assimp/light.h
 include/assimp/material.h
 include/assimp/material.inl
@ -38,7 +73,9 @@ include/assimp/matrix4x4.h
 include/assimp/matrix4x4.inl
 include/assimp/mesh.h
 include/assimp/metadata.h
+include/assimp/pbrmaterial.h
 include/assimp/postprocess.h
+include/assimp/qnan.h
 include/assimp/quaternion.h
 include/assimp/quaternion.inl
 include/assimp/scene.h
@ -50,9 +87,11 @@ include/assimp/vector3.h
 include/assimp/vector3.inl
 include/assimp/version.h
 lib/cmake/
-lib/cmake/assimp-4.1/
-lib/cmake/assimp-4.1/assimp-config-version.cmake
-lib/cmake/assimp-4.1/assimp-config.cmake
-lib/libIrrXML.a
+lib/cmake/assimp-5.0/
+lib/cmake/assimp-5.0/assimp-config-version.cmake
+lib/cmake/assimp-5.0/assimp-config.cmake
+lib/cmake/assimp-5.0/assimpTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/assimp-5.0/assimpTargets.cmake
+@static-lib lib/libIrrXML.a
@lib lib/libassimp.so.${LIBassimp_VERSION}
 lib/pkgconfig/assimp.pc