[wip/jafar-image] Upgrade to version 2.2

Changes since 2.1:
	- portability fix
	- support for opencv >= 2.3

Changes in the packages:
	- remove patch applied mainstream
	- add headings
	- remove now useless flags

jafar-image/Makefile

-VERSION=		2.1
-PKGREVISION=	2
-DISTNAME=		jafar-image-2.1
-PKGNAME=		jafar-image-2.1
+# robotpkg Makefile for:	image/jafar-image
+# Created:			Cyril Roussillon on Wed, 15 Jun 2011
+#
+
+VERSION=		2.2
+DISTNAME=		jafar-image-${VERSION}
 CATEGORIES=		image
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=jafar-image/}
 MAINTAINER=		jafar@laas.fr
@@ -12,9 +14,6 @@ LICENSE=		isc
 USE_LANGUAGES+=		c c++ fortran
 USE_PKGLOCALEDIR=	yes
 
-CPPFLAGS += -DJFR_NDEBUG
-CXXFLAGS += -pthread
-
 CMAKE_ARGS+=		-DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
 CMAKE_ARGS+=		-DBOOST_LIBDIR=${PREFIX.boost-libs}/include
 

jafar-image/depend.mk

+# robotpkg depend.mk for:	image/jafar-image
+# Created:			Cyril Roussillon on Wed, 15 Jun 2011
+#
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH}+
 jafar-image_DEPEND_MK:=	${jafar-image_DEPEND_MK}+

jafar-image/distinfo

-SHA1 (jafar-image-2.1.tar.gz) = ac650ba22f4d1004d1b8f0d6eac863f9e4bdbf11
-RMD160 (jafar-image-2.1.tar.gz) = 55112939abd8c40a195699d35c72271367323f05
-Size (jafar-image-2.1.tar.gz) = 148533 bytes
-SHA1 (patch-aa) = a73cb4873d12f264141b99116fbb412af0875e91
-SHA1 (patch-ab) = 9a132c8d6fb5dd969ab5eb21b1047435932bb98a
+SHA1 (jafar-image-2.2.tar.gz) = 32383ee97f50f53d33ba6f030b816040f90052cb
+RMD160 (jafar-image-2.2.tar.gz) = c9c7e6a8aa6c0d8833ad738690c9b521e70978f1
+Size (jafar-image-2.2.tar.gz) = 126346 bytes

jafar-image/patches/patch-aa

-diff --git a/include/image/Image.hpp b/include/image/Image.hpp
-nearbyint is not supported on NetBSD. Moreover, the lrint semantic is more
-correct in this case.
-
-index 53f32f3..c37d501 100644
---- include/image/Image.hpp
-+++ include/image/Image.hpp
-@@ -594,7 +594,7 @@ namespace jafar {
-       {
-         case JfrImage_INTERP_NEAREST:
-         {
--          return getPixelValue<channeltype>( (int)nearbyint( x_ ), (int)nearbyint( y_ ), channel_ );
-+          return getPixelValue<channeltype>( lrint( x_ ), lrint( y_ ), channel_ );
-         }
-         case JfrImage_INTERP_BILINEAR:
-         {

jafar-image/patches/patch-ab

-Improve pattern used to install module_headers (in particular, avoid installing
-.orig files or temporary emacs files)
-
---- CMakeLists.txt.orig	2011-12-28 14:20:11.679766922 +0100
-+++ CMakeLists.txt	2011-12-28 14:26:36.143776744 +0100
-@@ -110,7 +110,10 @@
- 
- 
- # add module headers
--file(GLOB module_headers ${jafar-image_SOURCE_DIR}/include/image/*.h*)
-+file(GLOB module_h ${jafar-image_SOURCE_DIR}/include/image/*.h)
-+file(GLOB module_hh ${jafar-image_SOURCE_DIR}/include/image/*.hh)
-+file(GLOB module_hpp ${jafar-image_SOURCE_DIR}/include/image/*.hpp)
-+set(module_headers "${module_h};${module_hh};${module_hpp}")
- # add sources
- file(GLOB module_sources ${jafar-image_SOURCE_DIR}/src/*.cpp)
- #remove jafarConfig.h from included headers