[meta-oe] graphviz: 2.44.1 -> 2.50.0

Message ID 20220317024754.34012-1-kai.kang@windriver.com
State Under Review
Headers show
Series [meta-oe] graphviz: 2.44.1 -> 2.50.0 | expand

Commit Message

Kai March 17, 2022, 2:47 a.m. UTC
From: Kai Kang <kai.kang@windriver.com>

Update graphviz from 2.44.1 to 2.50.0.

* update SRC_URI
* remove patches can not be applied
* mkdefs is not provided any longer, so remove installation for
  graphviz-native
* rrecommends on liberation-fonts that there will be tofos in outputed
  pictures without any font

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../{graphviz_2.44.1.bb => graphviz_2.50.0.bb}  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
 rename meta-oe/recipes-graphics/graphviz/{graphviz_2.44.1.bb => graphviz_2.50.0.bb} (86%)

Patch

diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb
similarity index 86%
rename from meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb
rename to meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb
index ff9939ebd..0eca7fdba 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb
@@ -19,19 +19,17 @@  DEPENDS:append:class-nativesdk = " ${BPN}-native"
 
 inherit autotools-brokensep pkgconfig gettext
 
-SRC_URI = "https://www2.graphviz.org/Packages/stable/portable_source/${BP}.tar.gz \
-           file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \
-"
+SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \
+           "
 # Use native mkdefs
 SRC_URI:append:class-target = "\
-           file://0001-Use-native-mkdefs.patch \
            file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
 "
 SRC_URI:append:class-nativesdk = "\
-           file://0001-Use-native-mkdefs.patch \
            file://graphviz-setup.sh \
 "
-SRC_URI[sha256sum] = "8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313"
+
+SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8"
 
 PACKAGECONFIG ??= "librsvg"
 PACKAGECONFIG:class-nativesdk ??= ""
@@ -65,11 +63,6 @@  do_configure:prepend() {
     ./autogen.sh NOCONFIG || true
 }
 
-do_install:append:class-native() {
-    # install mkdefs for target build
-    install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir}
-}
-
 do_install:append:class-nativesdk() {
     # graphviz-setup.sh must be executed at SDK installation
     install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
@@ -98,6 +91,8 @@  RDEPENDS:${PN}-perl += "perl"
 RDEPENDS:${PN}-python += "python3"
 RDEPENDS:${PN}-demo += "python3 perl"
 
+RRECOMMENDS:${PN} = "liberation-fonts"
+
 INSANE_SKIP:${PN}-perl = "dev-so"
 INSANE_SKIP:${PN}-python = "dev-so"