From 6da31970c9b7df102b53e45838888285dabddcca Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae-supaero.fr>
Date: Fri, 29 May 2015 18:03:57 +0200
Subject: [PATCH] [wip/mrpt] Never build internal assimp but force use of
system one
Adapt PLIST
Bump PKGREVISION
---
mrpt/Makefile | 3 ++-
mrpt/PLIST | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mrpt/Makefile b/mrpt/Makefile
index 375949c4..f66c6de5 100644
--- a/mrpt/Makefile
+++ b/mrpt/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= wip
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mrpt/}
MASTER_REPOSITORY= https://github.com/jlblancoc/mrpt
-PKGREVISION= 1
+PKGREVISION= 2
MAINTAINER= arnaud.degroote@isae.fr
COMMENT= Mobile Robot Programming Toolkit
@@ -18,6 +18,7 @@ LICENSE= modified-bsd
DYNAMIC_PLIST_DIRS+= share/doc/mrpt-doc
include ../../archivers/zlib/depend.mk
+include ../../graphics/assimp/depend.mk
include ../../image/opencv/depend.mk
include ../../math/eigen3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
diff --git a/mrpt/PLIST b/mrpt/PLIST
index ad1fdf3c..6a819b28 100644
--- a/mrpt/PLIST
+++ b/mrpt/PLIST
@@ -655,9 +655,6 @@ include/mrpt/vision/include/mrpt/vision/pinhole.h
include/mrpt/vision/include/mrpt/vision/tracking.h
include/mrpt/vision/include/mrpt/vision/types.h
include/mrpt/vision/include/mrpt/vision/utils.h
-lib/libassimp-mrpt.so
-lib/libassimp-mrpt.so.3
-lib/libassimp-mrpt.so.3.1.1
lib/libmrpt-base.so
lib/libmrpt-base.so.1.2
lib/libmrpt-base.so.${PKGVERSION}
--
GitLab