From a34fd057a38838a3c75c9df18cd1a3dd4b7f0afd Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@laas.fr>
Date: Thu, 13 Dec 2012 15:08:08 +0100
Subject: [PATCH] [wip/jafar-qdisplay] Upgrade to 0.2
Changes since 0.1:
- add a labeler class to manually label objects in image
- improve cmakelist
Changes in the package:
- use jafar/Makefile.common
- fix PLIST
---
jafar-qdisplay/Makefile | 26 ++--------------
jafar-qdisplay/PLIST | 11 ++-----
jafar-qdisplay/distinfo | 7 ++---
jafar-qdisplay/patches/patch-aa | 53 ---------------------------------
4 files changed, 9 insertions(+), 88 deletions(-)
delete mode 100644 jafar-qdisplay/patches/patch-aa
diff --git a/jafar-qdisplay/Makefile b/jafar-qdisplay/Makefile
index b414970e..3719d46a 100644
--- a/jafar-qdisplay/Makefile
+++ b/jafar-qdisplay/Makefile
@@ -2,40 +2,20 @@
# Created: Cyril Roussillon on Wed, 15 Jun 2011
#
-VERSION= 0.1
-DISTNAME= jafar-qdisplay-0.1
-PKGNAME= jafar-qdisplay-0.1
-PKGREVISION= 1
+JAFAR_PKG= qdisplay-0.2
CATEGORIES= wip
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=jafar-qdisplay/}
-MAINTAINER= jafar@laas.fr
-HOMEPAGE= https://intranet.laas.fr/intranet/robots/wiki/Jafar
-COMMENT= Jafar module to display objects of type jafar::image::JfrImage.
-LICENSE= isc
+JAFAR_COMMENT= Jafar module to display objects of type jafar::image::JfrImage.
-USE_LANGUAGES+= c c++ fortran
-USE_PKGLOCALEDIR= yes
-
-CPPFLAGS += -DJFR_NDEBUG
-CXXFLAGS += -pthread
+include ../../meta-pkgs/jafar/Makefile.common
DEPEND_ABI.qmake= qmake>=2
USE_QMAKE= no
-CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
-CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
-CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QMAKE}
-
include ../../devel/jafar-kernel/depend.mk
include ../../image/jafar-image/depend.mk
include ../../math/jafar-jmath/depend.mk
-include ../../devel/boost-headers/depend.mk
-include ../../devel/boost-libs/depend.mk
include ../../math/boost-numeric-bindings/depend.mk
include ../../pkgtools/libtool/depend.mk
-include ../../pkgtools/pkg-config/depend.mk
-include ../../mk/sysdep/cmake.mk
-include ../../mk/sysdep/qmake.mk
include ../../mk/sysdep/qt4-libs.mk
include ../../mk/robotpkg.mk
diff --git a/jafar-qdisplay/PLIST b/jafar-qdisplay/PLIST
index b00d9e43..1d657d6c 100644
--- a/jafar-qdisplay/PLIST
+++ b/jafar-qdisplay/PLIST
@@ -1,24 +1,19 @@
-@comment Wed Jun 15 20:26:47 CEST 2011
+@comment Thu Dec 13 15:06:44 CET 2012
include/jafar/qdisplay/AbstractEventHandler.hpp
include/jafar/qdisplay/Ellipsoid.hpp
include/jafar/qdisplay/ImageView.hpp
-include/jafar/qdisplay/ImageView.hpp~
include/jafar/qdisplay/Line.hpp
include/jafar/qdisplay/PolyLine.hpp
include/jafar/qdisplay/Shape.hpp
-include/jafar/qdisplay/Shape.hpp~
include/jafar/qdisplay/Viewer.hpp
-include/jafar/qdisplay/Viewer.hpp~
include/jafar/qdisplay/ViewerManager.hpp
include/jafar/qdisplay/imout.hpp
-include/jafar/qdisplay/imout.hpp~
include/jafar/qdisplay/init.hpp
-include/jafar/qdisplay/init.hpp~
-include/jafar/qdisplay/iout.hpp~
+include/jafar/qdisplay/labeler.hpp
include/jafar/qdisplay/qdisplayException.hpp
lib/libjafar-qdisplay.so
-lib/libjafar-qdisplay.so.${PKGVERSION}
lib/libjafar-qdisplay.so.0
+lib/libjafar-qdisplay.so.${PKGVERSION}
lib/pkgconfig/jafar-qdisplay.pc
share/cmake/jafar/qdisplay-headers.cmake
share/cmake/jafar/qdisplay-release.cmake
diff --git a/jafar-qdisplay/distinfo b/jafar-qdisplay/distinfo
index 6aee6d9c..3293cfef 100644
--- a/jafar-qdisplay/distinfo
+++ b/jafar-qdisplay/distinfo
@@ -1,4 +1,3 @@
-SHA1 (jafar-qdisplay-0.1.tar.gz) = b924f46513953a11d4d0aa4eb882cd665ce4bb33
-RMD160 (jafar-qdisplay-0.1.tar.gz) = 5cdc3f27b35ed0ea6362c137e8077104d6b089e7
-Size (jafar-qdisplay-0.1.tar.gz) = 57884 bytes
-SHA1 (patch-aa) = dd18a19d730f50c3f59afc21427154ef1a32430b
+SHA1 (jafar-qdisplay-0.2.tar.gz) = 4587d2f948f3b9142d65a0d4fd877a238911ad41
+RMD160 (jafar-qdisplay-0.2.tar.gz) = d6c93e9ef0341d4fadf7af3b64673cc3324b3900
+Size (jafar-qdisplay-0.2.tar.gz) = 135793 bytes
diff --git a/jafar-qdisplay/patches/patch-aa b/jafar-qdisplay/patches/patch-aa
deleted file mode 100644
index 7dc32329..00000000
--- a/jafar-qdisplay/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-Generate correctly with the right MOC and UI the preprocessed files for Qt
-
---- CMakeLists.txt.orig 2012-02-01 13:41:45.962204118 +0100
-+++ CMakeLists.txt 2012-02-01 13:47:36.974193113 +0100
-@@ -102,6 +102,48 @@
- set(Qt4_LIBS ${QT_LIBRARIES})
- endif(QT4_FOUND)
-
-+#------------------------------------------------------------------------------
-+# Regenerate Qt MOC and UI files
-+#------------------------------------------------------------------------------
-+
-+include(${QT_USE_FILE})
-+
-+string(TOUPPER "${JAFAR_MODULENAME}_WRAPPED_HEADERS" QTUI_H_SRC)
-+string(TOUPPER "${JAFAR_MODULENAME}_WRAPPED_CPPS" QT_MOC_SRCS)
-+
-+#generate headers from ui files
-+file(GLOB UI_FILES ${jafar-qdisplay_SOURCE_DIR}/src/*.ui)
-+# QT4_WRAP_UI(${QTUI_H_SRC} ${UI_FILES})
-+foreach(ui_file ${UI_FILES})
-+ get_filename_component(generated_header ${ui_file} NAME_WE)
-+ set(generated_header ${jafar-qdisplay_SOURCE_DIR}/src/${generated_header}.h)
-+execute_process(
-+ COMMAND ${QT_UIC_EXECUTABLE} ${ui_file} -o ${generated_header}
-+ OUTPUT_FILE ${generated_header}
-+ INPUT_FILE ${ui_file}
-+ )
-+ set(${QTUI_H_SRC} ${${QTUI_H_SRC}} ${generated_header})
-+endforeach(ui_file)
-+
-+# generate moc files from headers contining \"Q_OBJECT\"
-+file(GLOB HEADERS "${jafar-qdisplay_SOURCE_DIR}/include/qdisplay/*.hpp" "${jafar-qdisplay_SOURCE_DIR}/src/*.hpp")
-+foreach(header ${HEADERS})
-+file(STRINGS ${header} Q_OBJECT_STRING REGEX "Q_OBJECT")
-+if(NOT("${Q_OBJECT_STRING}" STREQUAL ""))
-+ get_filename_component(generated_moc ${header} NAME_WE)
-+ set(generated_moc ${jafar-qdisplay_SOURCE_DIR}/src/${generated_moc}.moc)
-+
-+ set(MYCPPFLAGS "${CPPFLAGS}")
-+ string(STRIP "${MYCPPFLAGS}" MYCPPFLAGS)
-+ string(REPLACE " " ";" MYCPPFLAGS "${MYCPPFLAGS}")
-+ execute_process(
-+ COMMAND ${QT_MOC_EXECUTABLE} ${MYCPPFLAGS} ${header} -o ${generated_moc}
-+ )
-+ set(${QT_MOC_SRCS} ${${QT_MOC_SRCS}} ${generated_moc})
-+# QT4_GENERATE_MOC(${header} ${jafar-qdisplay_SOURCE_DIR}/src/${HEADER_NAME}.moc)
-+endif(NOT("${Q_OBJECT_STRING}" STREQUAL ""))
-+endforeach(header)
-+
- #-----------------------------------------------------------------------------
- # Check for Boost
- #-----------------------------------------------------------------------------
--
GitLab