diff options
| author |   Eduardo Lima (Etrunko) <eblima@gmail.com> | 2010-10-22 14:15:41 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-10-24 09:27:43 +0200 |
| commit | 75301d3f6baa37a1e3b28ffe7ee142b6764c263a (patch) | |
| tree | e01bca38e75127a237f1c36c4621878e0b18d53e /recipes/efl1 | |
| parent | ece04204e3b8f9d6944c1fb035e36388dc007b40 (diff) | |
| download | openembedded-75301d3f6baa37a1e3b28ffe7ee142b6764c263a.tar.gz | |
epdf: remove ewl/epsilon detection, fix build
Signed-off-by: Eduardo Lima (Etrunko) <eblima@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/efl1')
| -rw-r--r-- | recipes/efl1/epdf/fix-plugin-path-check.patch | 24 | ||||
| -rw-r--r-- | 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 b218fffb7a..0000000000 --- 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 eac8e87123..6d880a3048 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 = "" |