Received: by mail.netbsd.org (Postfix, from userid 605) id E3C2784D29; Mon, 10 May 2021 08:18:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2B46B84D26 for ; Mon, 10 May 2021 08:18: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 diekwC0tBDXx for ; Mon, 10 May 2021 08:18:53 +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 982D584CD8 for ; Mon, 10 May 2021 08:18:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 91AAFFA95; Mon, 10 May 2021 08:18:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1620634733189740" MIME-Version: 1.0 Date: Mon, 10 May 2021 08:18:53 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/multimedia/assimp To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20210510081853.91AAFFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1620634733189740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Mon May 10 08:18:53 UTC 2021 Modified Files: pkgsrc/multimedia/assimp: Makefile distinfo Added Files: pkgsrc/multimedia/assimp/patches: patch-assimp.pc.in Log Message: Fix the assimp pkgconfig file Set the correct includedir in the assimp pkgconfig file. Add missing PKGCONFIG_OVERRIDE. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/assimp/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/assimp/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/assimp/patches/patch-assimp.pc.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1620634733189740 Content-Disposition: inline Content-Length: 2478 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.2 pkgsrc/multimedia/assimp/Makefile:1.3 --- pkgsrc/multimedia/assimp/Makefile:1.2 Tue Jan 5 04:50:53 2021 +++ pkgsrc/multimedia/assimp/Makefile Mon May 10 08:18:53 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2021/01/05 04:50:53 gutteridge Exp $ +# $NetBSD: Makefile,v 1.3 2021/05/10 08:18:53 nros Exp $ DISTNAME= assimp-5.0.1 PKGREVISION= 1 @@ -15,5 +15,7 @@ USE_CMAKE= yes USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ +PKGCONFIG_OVERRIDE= assimp.pc.in + .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/multimedia/assimp/distinfo diff -u pkgsrc/multimedia/assimp/distinfo:1.4 pkgsrc/multimedia/assimp/distinfo:1.5 --- pkgsrc/multimedia/assimp/distinfo:1.4 Sun Jan 10 05:20:00 2021 +++ pkgsrc/multimedia/assimp/distinfo Mon May 10 08:18:53 2021 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.4 2021/01/10 05:20:00 gutteridge Exp $ +$NetBSD: distinfo,v 1.5 2021/05/10 08:18:53 nros 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-assimp.pc.in) = 4c8bc0922ba046dfe37a007f5631254cf256101e SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa SHA1 (patch-contrib_zip_src_zip.h) = 824462e986010e705b3089f3055eecd23093cf7c Added files: Index: pkgsrc/multimedia/assimp/patches/patch-assimp.pc.in diff -u /dev/null pkgsrc/multimedia/assimp/patches/patch-assimp.pc.in:1.1 --- /dev/null Mon May 10 08:18:53 2021 +++ pkgsrc/multimedia/assimp/patches/patch-assimp.pc.in Mon May 10 08:18:53 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-assimp.pc.in,v 1.1 2021/05/10 08:18:53 nros Exp $ + +* set correct includedir + +--- assimp.pc.in.orig 2021-05-09 20:07:26.984559921 +0000 ++++ assimp.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@/ + libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ ++includedir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_INCLUDE_INSTALL_DIR@ + + Name: @CMAKE_PROJECT_NAME@ + Description: Import various well-known 3D model formats in an uniform manner. --_----------=_1620634733189740--