Update to the latest stable release

Changes in this update:
  Add the .pc file to the list of -dev files
  Move py3cairo header to -dev package
  Added a comment for why the .pc and .h file are re-installed

Verified native build and dependency builds (python3-pygobject and bootchart2)
Tested in qemux86-64 running core-image-minimal

Signed-off-by: Derek Straka <de...@asterius.io>
---
 ...ython3-pycairo_1.15.6.bb => python3-pycairo_1.16.3.bb} | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3-pycairo_1.15.6.bb => 
python3-pycairo_1.16.3.bb} (58%)

diff --git a/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb 
b/meta/recipes-devtools/python/python3-pycairo_1.16.3.bb
similarity index 58%
rename from meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
rename to meta/recipes-devtools/python/python3-pycairo_1.16.3.bb
index 5c3e1e6..85f3752 100644
--- a/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
+++ b/meta/recipes-devtools/python/python3-pycairo_1.16.3.bb
@@ -13,8 +13,8 @@ DEPENDS = "cairo"
 SRC_URI = 
"https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz";
 UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/";
 
-SRC_URI[md5sum] = "3ff210c34e7b052590e15fd0fb147766"
-SRC_URI[sha256sum] = 
"ad150ea637860836b66705e0513b8e59494538f0b80497ad3462051368755016"
+SRC_URI[md5sum] = "d2a115037ccd128219f43d5ed3df7926"
+SRC_URI[sha256sum] = 
"5bb321e5d4f8b3a51f56fc6a35c143f1b72ce0d748b43d8b623596e8215f01f7"
 
 S = "${WORKDIR}/pycairo-${PV}"
 
@@ -25,7 +25,14 @@ CFLAGS += "-fPIC"
 BBCLASSEXTEND = "native"
 
 do_install_append() {
-    install -d ${D}${includedir}/pycairo/
+    # setup.py uses --install-data which points to a non-standard datadir  to 
install the header and .pc files
+    # Fix the paths here to install in the standard locations as well
+    install -d ${D}${includedir}/pycairo/ -d ${D}${nonarch_libdir}/pkgconfig
     install -m 0644 ${D}${datadir}/include/pycairo/py3cairo.h 
${D}${includedir}/pycairo/
+    install -m 0644 ${D}${datadir}/lib/pkgconfig/py3cairo.pc 
${D}${nonarch_libdir}/pkgconfig/
 }
-FILES_${PN} += "${datadir}/include/pycairo/py3cairo.h"
+
+FILES_${PN}-dev += " \
+    ${datadir}/include/pycairo/py3cairo.h \
+    ${datadir}/lib/pkgconfig/py3cairo.pc \
+"
-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to