Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id BBD441A9217 for ; Tue, 5 Jan 2021 04:50:55 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5F0CC84D9F; Tue, 5 Jan 2021 04:50:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 96FA584D5D for ; Tue, 5 Jan 2021 04:50:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id t-XZ42Hdh64w for ; Tue, 5 Jan 2021 04:50:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EC47084CE7 for ; Tue, 5 Jan 2021 04:50:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D95FAFA9D; Tue, 5 Jan 2021 04:50:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1609822253173550" MIME-Version: 1.0 Date: Tue, 5 Jan 2021 04:50:53 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/multimedia/assimp To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20210105045053.D95FAFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1609822253173550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Tue Jan 5 04:50:53 UTC 2021 Modified Files: pkgsrc/multimedia/assimp: Makefile PLIST distinfo Added Files: pkgsrc/multimedia/assimp/patches: patch-contrib_irrXML_CMakeLists.txt Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/assimp/Makefile \ pkgsrc/multimedia/assimp/PLIST pkgsrc/multimedia/assimp/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1609822253173550 Content-Disposition: inline Content-Length: 3222 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/assimp/Makefile diff -u pkgsrc/multimedia/assimp/Makefile:1.1 pkgsrc/multimedia/assimp/Makefile:1.2 --- pkgsrc/multimedia/assimp/Makefile:1.1 Sat Jan 2 07:35:44 2021 +++ pkgsrc/multimedia/assimp/Makefile Tue Jan 5 04:50:53 2021 @@ -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} Index: pkgsrc/multimedia/assimp/PLIST diff -u pkgsrc/multimedia/assimp/PLIST:1.1 pkgsrc/multimedia/assimp/PLIST:1.2 --- pkgsrc/multimedia/assimp/PLIST:1.1 Sat Jan 2 07:35:44 2021 +++ pkgsrc/multimedia/assimp/PLIST Tue Jan 5 04:50:53 2021 @@ -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-versi 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 Index: pkgsrc/multimedia/assimp/distinfo diff -u pkgsrc/multimedia/assimp/distinfo:1.1 pkgsrc/multimedia/assimp/distinfo:1.2 --- pkgsrc/multimedia/assimp/distinfo:1.1 Sat Jan 2 07:35:44 2021 +++ pkgsrc/multimedia/assimp/distinfo Tue Jan 5 04:50:53 2021 @@ -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 Added files: Index: pkgsrc/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt diff -u /dev/null pkgsrc/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt:1.1 --- /dev/null Tue Jan 5 04:50:53 2021 +++ pkgsrc/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt Tue Jan 5 04:50:53 2021 @@ -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" ) --_----------=_1609822253173550--