[oe-commits] Eduardo Lima (Etrunko) : epdf: remove ewl/epsilon detection, fix build

[git version control]

Module: openembedded.git
Branch: master
Commit: 75301d3f6baa37a1e3b28ffe7ee142b6764c263a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=75301d3f6baa37a1e3b28ffe7ee142b6764c263a

Author: Eduardo Lima (Etrunko) <eblima at gmail.com>
Date:   Fri Oct 22 14:15:41 2010 +0000

epdf: remove ewl/epsilon detection, fix build

Signed-off-by: Eduardo Lima (Etrunko) <eblima at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/efl1/epdf/fix-plugin-path-check.patch |   24 -----------------------
 recipes/efl1/epdf_svn.bb                      |   26 ++++++++----------------
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/recipes/efl1/epdf/fix-plugin-path-check.patch b/recipes/efl1/epdf/fix-plugin-path-check.patch
deleted file mode 100644
index b218fff..0000000
--- a/recipes/efl1/epdf/fix-plugin-path-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: epdf/configure.in
-===================================================================
---- epdf.orig/configure.in
-+++ epdf/configure.in
-@@ -95,8 +95,8 @@
-      [
-       have_ewl="yes"
-       requirements="$requirements ewl"
--      EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
--      EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
-+      EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
-+      EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
-       AC_SUBST(EWL_TEST_LIBS_DIR)
-       AC_SUBST(EWL_TEST_SOURCE_DIR)
-      ],
-@@ -144,7 +144,7 @@
-   [
-    have_epsilon="yes"
-    requirements="$requirements epsilon imlib2"
--   EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
-+   EPSILON_PLUGINS_DIR="/usr/lib/epsilon/plugins/"
-    AC_SUBST(EPSILON_PLUGINS_DIR)
-   ],
-   [
diff --git a/recipes/efl1/epdf_svn.bb b/recipes/efl1/epdf_svn.bb
index eac8e87..6d880a3 100644
--- a/recipes/efl1/epdf_svn.bb
+++ b/recipes/efl1/epdf_svn.bb
@@ -2,27 +2,19 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 LICENSE = "MIT BSD"
 DEPENDS = "poppler evas ecore"
 PV = "0.1.0+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http"
-#           file://fix-plugin-path-check.patch;HACK=1"
-# FIXME This package is not really working correctly at the moment. It doesn't
-# recognize epsilon and doesn't build everything. The next one actually using
-# this package is welcome to fix it.
-
+EXTRA_OECONF = "\
+    --enable-poppler \
+    --disable-ewl \
+    --disable-mupdf \
+"
 
-# add ewl additions
-FILES_${PN}-dev += "${libdir}/ewl/tests/*.a ${libdir}/ewl/tests/*.la"
-FILES_${PN}-dbg += "${libdir}/ewl/tests/.debug"
-
-# add epsilon additions
-FILES_${PN}-dev += "${libdir}/epsilon/plugins/epdf_thumbnailer.a ${libdir}/epsilon/plugins/epdf_thumbnailer.la"
-FILES_${PN}-dbg += "${libdir}/epsilon/plugins/.debug"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http"
 
-PACKAGES += "${PN}-ewl-widget epsilon-plugin-${PN}"
-FILES_${PN}-ewl-widget = "${libdir}/ewl/tests/libewl_pdf*.so*"
-FILES_epsilon-plugin-${PN} = "${libdir}/epsilon/plugins/epdf_thumbnailer.so*"
+# Some upgrade path tweaking, as in evas
+AUTO_LIBNAME_PKGS = ""