Mon May 10 08:18:53 2021 UTC ()
Fix the assimp pkgconfig file

Set the correct includedir in the
assimp pkgconfig file.
Add missing PKGCONFIG_OVERRIDE.


(nros)
diff -r1.2 -r1.3 pkgsrc/multimedia/assimp/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/assimp/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/assimp/patches/patch-assimp.pc.in
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/assimp/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/Makefile 2021/01/05 04:50:53 1.2
+++ pkgsrc/multimedia/assimp/Makefile 2021/05/10 08:18:53 1.3
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Makefile,v 1.2 2021/01/05 04:50:53 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.3 2021/05/10 08:18:53 nros Exp $
2 2
3DISTNAME= assimp-5.0.1 3DISTNAME= assimp-5.0.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=assimp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=assimp/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= cfkoch@edgebsd.org 9MAINTAINER= cfkoch@edgebsd.org
10HOMEPAGE= http://www.assimp.org/ 10HOMEPAGE= http://www.assimp.org/
11COMMENT= Library to import various 3D model formats 11COMMENT= Library to import various 3D model formats
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17 17
 18PKGCONFIG_OVERRIDE= assimp.pc.in
 19
18.include "../../devel/zlib/buildlink3.mk" 20.include "../../devel/zlib/buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/assimp/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/distinfo 2021/01/10 05:20:00 1.4
+++ pkgsrc/multimedia/assimp/distinfo 2021/05/10 08:18:53 1.5
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.4 2021/01/10 05:20:00 gutteridge Exp $ 1$NetBSD: distinfo,v 1.5 2021/05/10 08:18:53 nros Exp $
2 2
3SHA1 (assimp-5.0.1.tar.gz) = f148ba31dc1e7e00e59cc09b25535af997dc1998 3SHA1 (assimp-5.0.1.tar.gz) = f148ba31dc1e7e00e59cc09b25535af997dc1998
4RMD160 (assimp-5.0.1.tar.gz) = 1c8311f5a1e2943f786c5385128a934274a4230d 4RMD160 (assimp-5.0.1.tar.gz) = 1c8311f5a1e2943f786c5385128a934274a4230d
5SHA512 (assimp-5.0.1.tar.gz) = 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0 5SHA512 (assimp-5.0.1.tar.gz) = 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
6Size (assimp-5.0.1.tar.gz) = 46607553 bytes 6Size (assimp-5.0.1.tar.gz) = 46607553 bytes
 7SHA1 (patch-assimp.pc.in) = 4c8bc0922ba046dfe37a007f5631254cf256101e
7SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa 8SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa
8SHA1 (patch-contrib_zip_src_zip.h) = 824462e986010e705b3089f3055eecd23093cf7c 9SHA1 (patch-contrib_zip_src_zip.h) = 824462e986010e705b3089f3055eecd23093cf7c
File Added: pkgsrc/multimedia/assimp/patches/Attic/patch-assimp.pc.in
$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.