Re: UPDATE: multimedia/assimp 4.0.1 => 4.1.0

[Brian Callahan]

On 12/15/17 22:27, Brian Callahan wrote:

Hi ports --

Attached is a small update to multimedia/assimp.
Some notes:
* Minor bump. Don't see anything that would require a major bump; just 
function additions to the shared library.
* I switched the COMPILER line around to put ports-gcc before 
ports-clang to give archs like macppc a non-zero chance of building this.
* I took the typedef unsigned long z_crc_t fixes (see the new patches) 
from here: https://github.com/nmoinvaz/minizip/pull/136/files


OK?

~Brian



Ping.

UPDATE: multimedia/assimp 4.0.1 => 4.1.0

[Brian Callahan]

Hi ports --

Attached is a small update to multimedia/assimp.
Some notes:
* Minor bump. Don't see anything that would require a major bump; just 
function additions to the shared library.
* I switched the COMPILER line around to put ports-gcc before 
ports-clang to give archs like macppc a non-zero chance of building this.
* I took the typedef unsigned long z_crc_t fixes (see the new patches) 
from here: https://github.com/nmoinvaz/minizip/pull/136/files


OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/multimedia/assimp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	14 Nov 2017 06:29:25 -	1.1.1.1
+++ Makefile	16 Dec 2017 03:22:54 -
@@ -3,11 +3,11 @@
 COMMENT =	open asset import library
 CATEGORIES =	multimedia
 
-SHARED_LIBS +=  assimp0.0 # 3.3
+SHARED_LIBS +=  assimp0.1 # 3.3
 
 GH_ACCOUNT =	assimp
 GH_PROJECT =	assimp
-GH_TAGNAME =	v4.0.1
+GH_TAGNAME =	v4.1.0
 
 HOMEPAGE =	http://www.assimp.org/
 MAINTAINER =	Brian Callahan 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} c m z
 
 # C++11
-COMPILER =	base-clang ports-clang ports-gcc
+COMPILER =	base-clang ports-gcc ports-clang
 
 MODULES =	devel/cmake
 
Index: distinfo
===
RCS file: /cvs/ports/multimedia/assimp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	14 Nov 2017 06:29:25 -	1.1.1.1
+++ distinfo	16 Dec 2017 03:22:54 -
@@ -1,2 +1,2 @@
-SHA256 (assimp-4.0.1.tar.gz) = YAgNirTaqrMJ9ls8/9mfGesa+NBWI//0abm2UoGOKG4=
-SIZE (assimp-4.0.1.tar.gz) = 44625148
+SHA256 (assimp-4.1.0.tar.gz) = NSCx6Xk7k6LKO3lxmeFvQNYXYmF+By8tUl+tcPlninE=
+SIZE (assimp-4.1.0.tar.gz) = 45417293
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/multimedia/assimp/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt	14 Nov 2017 06:29:25 -	1.1.1.1
+++ patches/patch-CMakeLists_txt	16 Dec 2017 03:22:54 -
@@ -1,30 +1,14 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2017/11/14 06:29:25 bentley Exp $
 
-Disable OpenMP (until it is imported).
 Disable Qt viewer (doesn't get installed by default anyway).
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -143,13 +143,6 @@ IF(ASSIMP_DOUBLE_PRECISION)
-   ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION)
- ENDIF(ASSIMP_DOUBLE_PRECISION)
- 
--# Check for OpenMP support
--find_package(OpenMP)
--if (OPENMP_FOUND)
--set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
--set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
--endif()
--
- configure_file(
-   ${CMAKE_CURRENT_LIST_DIR}/revision.h.in
-   ${CMAKE_CURRENT_BINARY_DIR}/revision.h
-@@ -363,32 +356,6 @@ IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
-   ENDIF ( WIN32 AND DirectX_D3DX9_LIBRARY )
+@@ -413,31 +413,6 @@ IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
  
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?
Index: patches/patch-code_D3MFOpcPackage_cpp
===
RCS file: patches/patch-code_D3MFOpcPackage_cpp
diff -N patches/patch-code_D3MFOpcPackage_cpp
--- patches/patch-code_D3MFOpcPackage_cpp	14 Nov 2017 06:29:25 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-code_D3MFOpcPackage_cpp,v 1.1.1.1 2017/11/14 06:29:25 bentley Exp $
-From upstream def42bf624c99df8747f3ab9d065374e995b2617.
-Index: code/D3MFOpcPackage.cpp
 code/D3MFOpcPackage.cpp.orig
-+++ code/D3MFOpcPackage.cpp
-@@ -49,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
- #include 
- #include 
- 
-+#include 
- #include 
- #include 
- #include 
Index: patches/patch-code_Q3BSPZipArchive_cpp
===
RCS file: patches/patch-code_Q3BSPZipArchive_cpp
diff -N patches/patch-code_Q3BSPZipArchive_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-code_Q3BSPZipArchive_cpp	16 Dec 2017 03:22:54 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Missing cstdlib
+
+Index: code/Q3BSPZipArchive.cpp
+--- code/Q3BSPZipArchive.cpp.orig
 code/Q3BSPZipArchive.cpp
+@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
+ #include "Q3BSPZipArchive.h"
+ #include 
+ #include 
++#include 
+ 
+ namespace Assimp {
+ namespace Q3BSP {
Index: patches/patch-contrib_unzip_crypt_h
===
RCS file: patches/patch-contrib_unzip_crypt_h
diff -N patches/patch-contrib_unzip_crypt_h
--- /dev/null	1 Jan 1970 00:00:00 -
+++