From 21a4ac272354b4133e82e5313d1b471ca0b2c8b2 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@laas.fr>
Date: Mon, 10 Jun 2013 18:38:58 +0200
Subject: [PATCH] [wip/jafar-rtslam] Fix the computing of pkg-config
requirements
It now includes the jafar module selected by options too.
Bump PKGREVISION (again).
---
jafar-rtslam/Makefile | 2 +-
jafar-rtslam/distinfo | 3 ++-
jafar-rtslam/patches/patch-aa | 8 +++-----
jafar-rtslam/patches/patch-ae | 10 ++++++++++
4 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 jafar-rtslam/patches/patch-ae
diff --git a/jafar-rtslam/Makefile b/jafar-rtslam/Makefile
index f8f2a611..681cbe70 100644
--- a/jafar-rtslam/Makefile
+++ b/jafar-rtslam/Makefile
@@ -3,7 +3,7 @@
#
JAFAR_PKG= rtslam-0.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= wip
JAFAR_COMMENT= Jafar module to do fast and generic EKF Slam.
diff --git a/jafar-rtslam/distinfo b/jafar-rtslam/distinfo
index 474f9615..d9dd8e1b 100644
--- a/jafar-rtslam/distinfo
+++ b/jafar-rtslam/distinfo
@@ -1,7 +1,8 @@
SHA1 (jafar-rtslam-0.2.tar.gz) = 1b4c9ef2fbc8c32259a48ef297a8baf6dd7d10f5
RMD160 (jafar-rtslam-0.2.tar.gz) = b6840c5170beef8b4c409c86da74ac3cf9841353
Size (jafar-rtslam-0.2.tar.gz) = 733290 bytes
-SHA1 (patch-aa) = f5e95671e0ded99b9f2207ac93764da44bffda3c
+SHA1 (patch-aa) = 6d390a243ce4c0ba960c089573e4124f2d3961f8
SHA1 (patch-ab) = fdaab1bc3511fdbb78b201782b8a0ffc76ed22ce
SHA1 (patch-ac) = e9bf8fe7288a956fa84e00c9449831e28bb50a00
SHA1 (patch-ad) = 4d0ae943a4ea8f97c65f31a056c5d0deaf5607f4
+SHA1 (patch-ae) = 7c1a788ca3c33430f5b6cb52ad10bdccd2f6a03a
diff --git a/jafar-rtslam/patches/patch-aa b/jafar-rtslam/patches/patch-aa
index 04dbc0e8..a5048815 100644
--- a/jafar-rtslam/patches/patch-aa
+++ b/jafar-rtslam/patches/patch-aa
@@ -1,13 +1,11 @@
-Fix syntax + naming of requirements
-
---- jafar-rtslam.pc.in.orig 2013-03-19 12:12:35.114904384 +0100
-+++ jafar-rtslam.pc.in 2013-03-19 12:12:57.694903817 +0100
+--- jafar-rtslam.pc.in.orig 2013-06-10 18:03:26.782750072 +0200
++++ jafar-rtslam.pc.in 2013-06-10 18:03:44.814749620 +0200
@@ -6,6 +6,6 @@
Name: jafar-rtslam
Description: Jafar module to do fast and generic EKF Slam.
Version: 0.2
-Requires: kernel;image;jmath;correl
-+Requires: jafar-kernel,jafar-image,jafar-jmath,jafar-correl
-Libs: -L${CMAKE_INSTALL_PREFIX} -ljafar-rtslam
++Requires: ${JAFAR_REQUIRES}
+Libs: -L${CMAKE_INSTALL_PREFIX}/lib -ljafar-rtslam
Cflags: -I${CMAKE_INSTALL_PREFIX}/include/jafar ${IMPORTED_HEADERS} ${EXTRA_COMPILE_FLAGS}
diff --git a/jafar-rtslam/patches/patch-ae b/jafar-rtslam/patches/patch-ae
new file mode 100644
index 00000000..d989ef78
--- /dev/null
+++ b/jafar-rtslam/patches/patch-ae
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2013-06-10 18:06:30.130745479 +0200
++++ CMakeLists.txt 2013-06-10 18:06:51.646744939 +0200
+@@ -65,6 +65,7 @@
+ string(TOUPPER "${module}" MODULE)
+ include(${CMAKE_INSTALL_PREFIX}/share/cmake/jafar/${module}.cmake)
+ set(LIBS "${LIBS};jafar-${module}")
++ set(JAFAR_REQUIRES "${JAFAR_REQUIRES},jafar-${module}")
+ include_directories(${JAFAR_${module}_IMPORTED_HEADERS})
+ set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DHAVE_MODULE_${MODULE}")
+ endmacro(link_jafar_module)
--
GitLab