pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/assimp assimp: fix Darwin and FreeBSD builds



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f7dcb7fe8af
branches:  trunk
changeset: 444330:5f7dcb7fe8af
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Tue Jan 05 04:50:53 2021 +0000

description:
assimp: fix Darwin and FreeBSD builds

Make this package build a dependent library consistently on all pkgsrc
platforms, so we don't get PLIST mismatches.

diffstat:

 multimedia/assimp/Makefile                                    |   3 +-
 multimedia/assimp/PLIST                                       |   4 +-
 multimedia/assimp/distinfo                                    |   3 +-
 multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt |  20 +++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r c7b7fcc5799c -r 5f7dcb7fe8af multimedia/assimp/Makefile
--- a/multimedia/assimp/Makefile        Tue Jan 05 02:03:40 2021 +0000
+++ b/multimedia/assimp/Makefile        Tue Jan 05 04:50:53 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2021/01/02 07:35:44 pin Exp $
+# $NetBSD: Makefile,v 1.2 2021/01/05 04:50:53 gutteridge Exp $
 
 DISTNAME=      assimp-5.0.1
+PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=assimp/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
diff -r c7b7fcc5799c -r 5f7dcb7fe8af multimedia/assimp/PLIST
--- a/multimedia/assimp/PLIST   Tue Jan 05 02:03:40 2021 +0000
+++ b/multimedia/assimp/PLIST   Tue Jan 05 04:50:53 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/01/02 07:35:44 pin Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/01/05 04:50:53 gutteridge Exp $
 bin/assimp
 include/assimp/BaseImporter.h
 include/assimp/Bitmap.h
@@ -88,7 +88,7 @@
 lib/cmake/assimp-5.0/assimp-config.cmake
 lib/cmake/assimp-5.0/assimpTargets-release.cmake
 lib/cmake/assimp-5.0/assimpTargets.cmake
-lib/libIrrXML.a
+lib/libIrrXML.so
 lib/libassimp.so
 lib/libassimp.so.5
 lib/libassimp.so.5.0.0
diff -r c7b7fcc5799c -r 5f7dcb7fe8af multimedia/assimp/distinfo
--- a/multimedia/assimp/distinfo        Tue Jan 05 02:03:40 2021 +0000
+++ b/multimedia/assimp/distinfo        Tue Jan 05 04:50:53 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2021/01/02 07:35:44 pin Exp $
+$NetBSD: distinfo,v 1.2 2021/01/05 04:50:53 gutteridge Exp $
 
 SHA1 (assimp-5.0.1.tar.gz) = f148ba31dc1e7e00e59cc09b25535af997dc1998
 RMD160 (assimp-5.0.1.tar.gz) = 1c8311f5a1e2943f786c5385128a934274a4230d
 SHA512 (assimp-5.0.1.tar.gz) = 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
 Size (assimp-5.0.1.tar.gz) = 46607553 bytes
+SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa
diff -r c7b7fcc5799c -r 5f7dcb7fe8af multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt     Tue Jan 05 04:50:53 2021 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-contrib_irrXML_CMakeLists.txt,v 1.1 2021/01/05 04:50:53 gutteridge Exp $
+
+Build IrrXML library consistently across all pkgsrc platforms.
+
+--- contrib/irrXML/CMakeLists.txt.orig 2020-01-12 11:56:40.000000000 +0000
++++ contrib/irrXML/CMakeLists.txt
+@@ -13,10 +13,10 @@ if ( MSVC )
+   ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
+ endif ( MSVC )
+ 
+-IF(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
+-  add_library(IrrXML ${IrrXML_SRCS})
+-ELSE()
++IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+   add_library(IrrXML STATIC ${IrrXML_SRCS})
++ELSE()
++  add_library(IrrXML ${IrrXML_SRCS})
+ ENDIF()
+ set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )
+ set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )



Home | Main Index | Thread Index | Old Index