ail: update recipe

* Update recipe.
* Rebase patch.
* Use Yocto cmake functions.

Change-Id: I9f5032efa193d1873157879218672679abdc7144
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-tizen/ail/ail-extraconf.inc b/recipes-tizen/ail/ail-extraconf.inc
index 26878a2..e0a93fe 100644 (file)
--- a/recipes-tizen/ail/ail-extraconf.inc
+++ b/recipes-tizen/ail/ail-extraconf.inc
@@ -1,4 +1,4 @@
-ail_files += "/usr/dbspace"
+inherit pkgconfig cmake
 
 SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch"
 
@@ -9,3 +9,31 @@ DEPENDS_class-target += "ail-native"
 DEPENDS_class-target += "libslp-db-util"
 DEPENDS_class-target += "xdgmime"
 DEPENDS_class-target += "vconf"
+
+EXTRA_OECMAKE += " \
+                    -DCMAKE_VERBOSE_MAKEFILE=ON \
+                    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+                    -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+                    -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+                    -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+                    -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+                    -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+                    -DCMAKE_SKIP_RPATH:BOOL=ON \
+                    -DBUILD_SHARED_LIBS:BOOL=ON \
+                    -DTZ_SYS_RW_DESKTOP_APP=${prefix}/share/applications \
+                    -DBUILD_PKGTYPE=rpm \
+                    -DSMACK=Off \
+                    "
+
+cmake_do_install_append() {
+
+    rm -f ${D}${infodir}/dir
+
+    find ${D} -regex ".*\.la$" | xargs rm -f --
+    find ${D} -regex ".*\.a$" | xargs rm -f --
+
+    mkdir -p ${D}${prefix}/dbspace/
+    mkdir -p ${D}${prefix}/share/applications/
+}
+
+ail_files += "/usr/dbspace"
\ No newline at end of file

diff --git a/recipes-tizen/ail/ail.inc b/recipes-tizen/ail/ail.inc
index 2874380..0bec457 100644 (file)
--- a/recipes-tizen/ail/ail.inc
+++ b/recipes-tizen/ail/ail.inc
@@ -30,12 +30,13 @@ RDEPENDS_${PN}-dev += "libail"
 
 DEPENDS = ""
 #DEPENDS of ail
-DEPENDS += "xdgmime"
+DEPENDS_append_class-native = " cmake-native"
+DEPENDS_append_class-target = " cmake-native"
 DEPENDS += "tizen-platform-config"
 DEPENDS += "dlog"
+DEPENDS += "smack"
 DEPENDS += "sqlite3"
-DEPENDS_append_class-native = " cmake-native"
-DEPENDS_append_class-target = " cmake-native"
+DEPENDS += "xdgmime"
 DEPENDS += "vconf"
 DEPENDS += "libslp-db-util"
 
@@ -75,8 +76,9 @@ do_compile() {
          -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} .  -DBUILD_PKGTYPE=rpm \
-           -DSMACK=Off
+         ${EXTRA_OECMAKE} .  -DTZ_SYS_RW_DESKTOP_APP=${prefix}/share/applications \
+           -DBUILD_PKGTYPE=rpm \
+                 -DSMACK=Off
  
  oe_runmake -j16
  
@@ -85,7 +87,7 @@ do_compile() {
 }
 
 do_install() {
- echo export RPM_BUILD_ROOT=${D}
+ export RPM_BUILD_ROOT=${D}
  cd ${S}
  LANG=C
  export LANG

diff --git a/recipes-tizen/ail/ail_git.bb b/recipes-tizen/ail/ail_git.bb
index ceeb394..673d3bd 100644 (file)
--- a/recipes-tizen/ail/ail_git.bb
+++ b/recipes-tizen/ail/ail_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=5eed9f957ba617aeb8b5977778a62fd13ddfedab;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=132f817dfa1b64127ba83bdab1d9c7fed898e6a5;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/ail/files/remove-dlog-for-native-build.patch b/recipes-tizen/ail/files/remove-dlog-for-native-build.patch
index 5cbf789..f2a731b 100644 (file)
--- a/recipes-tizen/ail/files/remove-dlog-for-native-build.patch
+++ b/recipes-tizen/ail/files/remove-dlog-for-native-build.patch
@@ -1,13 +1,25 @@
+From a89241fbcf9ce188e59b7e55f833cd377356b19d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
+Date: Tue, 26 Aug 2014 11:21:52 +0200
+Subject: [PATCH] Remove dlog for native build
+
+---
+ CMakeLists.txt        | 2 +-
+ initdb/CMakeLists.txt | 2 +-
+ src/ail_private.h     | 2 +-
+ tool/CMakeLists.txt   | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf9de2c..a03506e 100644
+index 2c3fafe..9adea33 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
  
  INCLUDE(FindPkgConfig)
  
--pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config)
-+pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 db-util xdgmime vconf libtzplatform-config)
+-pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config libsmack)
++pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 db-util xdgmime vconf libtzplatform-config libsmack)
  STRING(REPLACE ";" " " EXTRA_CFLAGS "${LPKGS_CFLAGS}")
  SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
  
@@ -25,7 +37,7 @@ index 73474d8..040a8cb 100755
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
  
 diff --git a/src/ail_private.h b/src/ail_private.h
-index efa2f66..867152b 100755
+index efa2f66..28ed80c 100755
 --- a/src/ail_private.h
 +++ b/src/ail_private.h
 @@ -36,7 +36,7 @@
@@ -33,12 +45,12 @@ index efa2f66..867152b 100755
  #define LOG_TAG "AIL"
  
 -#if 1
-+#if 0
++#if 0 
  #include <dlog.h>
  #define _E(fmt, arg...) LOGE("[%s,%d] "fmt,__FUNCTION__,__LINE__,##arg)
  #define _D(fmt, arg...) LOGD("[%s,%d] "fmt,__FUNCTION__,__LINE__,##arg)
 diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
-index e898c7e..be1bbfa 100755
+index e898c7e..e0dd903 100755
 --- a/tool/CMakeLists.txt
 +++ b/tool/CMakeLists.txt
 @@ -15,7 +15,7 @@ SET(FILTERSRCS src/ail_filter.c)
@@ -50,3 +62,13 @@ index e898c7e..be1bbfa 100755
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
  
+@@ -54,4 +54,4 @@ TARGET_LINK_LIBRARIES(${PKG} ${LIBNAME} ${INITDB_PKGS_LIBRARIES})
+ SET_TARGET_PROPERTIES(${PKG} PROPERTIES COMPILE_FLAGS "${EXTRA_CFLAGS}")
+ SET_TARGET_PROPERTIES(${PKG} PROPERTIES SKIP_BUILD_RPATH true)
+ 
+-INSTALL(TARGETS ${PKG} DESTINATION ${BINDIR})
+\ No newline at end of file
++INSTALL(TARGETS ${PKG} DESTINATION ${BINDIR})
+-- 
+1.8.1.4
+