[oe-commits] Martin Jansa : evas-generic-loaders: upgrade to 1.8.1

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: f3ceb4a5e2e1117b53f738178a5606289f3537b9
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=f3ceb4a5e2e1117b53f738178a5606289f3537b9

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Jan 31 21:16:52 2014 +0100

evas-generic-loaders: upgrade to 1.8.1

* package generic pdf loaders as well

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-efl/recipes-efl/efl/evas-generic-loaders.inc  | 49 +++++++++++++++++++---
 .../recipes-efl/efl/evas-generic-loaders_1.7.9.bb  |  8 ----
 .../recipes-efl/efl/evas-generic-loaders_1.8.1.bb  |  8 ++++
 3 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
index 5b07557..904527c 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Evas generic loaders"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=06568fc31423f3c8ad84f375e061c342"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f86abf15f4d911ae87092e90222d0ef3"
 DEPENDS = "eina poppler librsvg cairo"
 
 inherit efl
@@ -15,17 +15,56 @@ EXTRA_OECONF = " \
     --disable-spectre \
 "
 
-python populate_packages_prepend () {
+PACKAGESPLITFUNCS_prepend = "split_evas_loader_packages "
+
+python split_evas_loader_packages () {
     bb.note( "splitting packages for evas generic loaders" )
     basedir = d.expand( '${libdir}/evas/utils')
 
-    do_split_packages(d, basedir, '^evas_image_loader\.(.*)$',
+    do_split_packages(d, basedir, 'evas_image_loader\.(.*)$',
     output_pattern = "evas-generic-loader-%s",
     description = 'Evas generic loaders - module %s',
     allow_dirs=True, recursive=False, extra_depends="" )
+
+    do_split_packages(d, basedir, 'evas_generic_pdf_loader\.(.*)$',
+    output_pattern = "evas-generic-pdf-loader-%s",
+    description = 'Evas generic pdf loaders - module %s',
+    allow_dirs=True, recursive=False, extra_depends="" )
 }
 
-FILES_evas-generic-loader-xcf += "${libdir}/evas/utils/*.xcf.gz"
+# add symlinks for different format (it doesn't make much sense to package them in separate packages)
+FILES_evas-generic-loader-xcf += " \
+    ${libdir}/evas/utils/evas_image_loader.xcf.gz \
+"
+FILES_evas-generic-loader-svg += " \
+    ${libdir}/evas/utils/evas_image_loader.svg.gz \
+    ${libdir}/evas/utils/evas_image_loader.svgz \
+"
+FILES_evas-generic-loader-pdf += " \
+    ${libdir}/evas/utils/evas_image_loader.doc \
+    ${libdir}/evas/utils/evas_image_loader.docx \
+    ${libdir}/evas/utils/evas_image_loader.odp \
+    ${libdir}/evas/utils/evas_image_loader.ods \
+    ${libdir}/evas/utils/evas_image_loader.odt \
+    ${libdir}/evas/utils/evas_image_loader.ppt \
+    ${libdir}/evas/utils/evas_image_loader.pptx \
+    ${libdir}/evas/utils/evas_image_loader.rtf \
+    ${libdir}/evas/utils/evas_image_loader.xls \
+    ${libdir}/evas/utils/evas_image_loader.xlsx \
+"
+FILES_evas-generic-pdf-loader-libreoffice += " \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.doc \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.docx \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.odp \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.ods \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.odt \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.ppt \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.pptx \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.rtf \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.xls \
+    ${libdir}/evas/utils/evas_generic_pdf_loader.xlsx \
+"
+
 FILES_${PN}-dbg += "${libdir}/evas/utils/.debug"
 
-PACKAGES_DYNAMIC += "^evas-generic-loader-.*"
+PACKAGES_DYNAMIC += "^evas-generic-loader-.* ^evas-generic-pdf-loader-.*"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb
deleted file mode 100644
index 45eea84..0000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI = "\
-    ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "01bb7cf2c97014f087bbba4de237b3e8"
-SRC_URI[sha256sum] = "e163a97db7311cbc8489572f201c404929a52099b3156e54a9af2181f8389824"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
new file mode 100644
index 0000000..21e57f9
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+    ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2f39de031a236e53d251beefb4f6fcfd"
+SRC_URI[sha256sum] = "fa5d40324367b2e126853ba70f6522552fff9e80f6dd91566b2dacc4b0ffebc0"