summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-06-13 18:40:47 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-06-13 18:45:48 +0300
commit89770b09490d616883ab728cc628a844ca0e1150 (patch)
treea24e3c597afe31a84abbb2685bf10c8ba6c9af74 /meta-openembedded/meta-oe/recipes-graphics
parent4accb8864625d1bb909b299d5ddbc11df53c22d3 (diff)
downloadopenbmc-89770b09490d616883ab728cc628a844ca0e1150.tar.xz
meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f
Adam Miartus (3): meta-oe toybox-inittab: toybox inittab implementation meta-oe toybox-inittab: allow getty as a packageconfig feature meta-oe toybox: enable toybox init when selected as init manager Alex Kiernan (1): libgusb: Upgrade 0.3.0+ -> 0.3.4 Andreas Müller (48): gfbgraph: initial add 0.2.4 libgdata: Change PACKAGECONFIG defaults gnome-photos: initial add 3.34.2 dconf: upgrade 0.34.0 -> 0.36.0 dconf-editor: upgrade 3.34.2 -> 3.36.2 nautilus: upgrade 3.34.3 -> 3.36.3 evince: upgrade 3.34.2 -> 3.36.3 evolution-data-server: upgrade 3.34.4 -> 3.36.3 file-roller: upgrade 3.32.5 -> 3.36.2 amtk: initial add 5.1.1 uchardet: initial add 0.0.7 tepl: initial add 4.4.0 gedit: upgradde 3.34.1 -> 3.36.2 gdm: upgrade 3.34.1 -> 3.36.2 gnome-backgrounds: upgrade 3.34.0 -> 3.36.0 gnome-calculator: upgrade 3.34.1 -> 3.36.0 gnome-system-monitor: upgrade 3.32.1 -> 3.36.1 gvfs: upgrade 1.42.2 -> 1.44.1 gtksourceview4: upgrade 4.4.0 -> 4.6.0 gnome-desktop3; upgrade 3.34.5 -> 3.36.2 gnome-panel: upgrade 3.34.1 -> 3.36.1 gnome-flashback: upgrade 3.34.2 -> 3.36.3 gnome-keyring: upgrade 3.34.0 -> 3.36.0 gnome-menus3: upgrade 3.32.0 -> 3.36.0 gnome-online-accounts: upgrade 3.34.1 -> 3.36.0 gnome-session: upgrade 3.34.2 -> 3.36.0 gnome-settings-daemon: upgrade 3.34.2 -> 3.36.1 gnome-terminal: upgrade 3.34.2 -> 3.36.2 grilo: upgrade 0.3.10 -> 0.3.12 libgnomekbd: remove libgweather: upgrade 3.34.0 -> 3.36.0 libwnck3: upgrade 3.32.0 -> 3.36.0 metacity: upgrade 3.34.1 -> 3.36.1 graphene: initial add 1.10.0 yelp-xsl: upgrade 3.34.2 -> 3.36.0 yelp: upgrade 3.34.0 -> 3.36.0 sysprof: upgrade 3.34.1 -> 3.36.0 gnome-control-center: upgrade 3.34.5 -> 3.36.2 libblockdev: upgrade 2.23 -> 2.24 poppler: upgrade 0.88.0 -> 0.89.0 gtksourceview: remove forgotten files vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches vlc: upgrade 3.0.9.2 -> 3.0.10 babl: upgrade 0.1.74 -> 0.1.78 gegl: upgrade 0.4.22 -> 0.4.24 libmypaint: upgrade 1.4.0 -> 1.6.1 mypaint-brushes-1.0: upgrade 1.3.0 -> 1.3.1 gimp: upgrade 2.10.18 -> 2.10.20 Andrej Valek (1): thrift: drop unsupported features Bog999 (1): python3: Add python3-cryptography to RDEPENDS for python3-redis Changqing Li (3): packagegroup-xfce-base: add RDEPEND packagegroup-core-x11 python-django: add RDEPENDS python-m2crypto: Add RDEPENDS Chenxi Mao (1): geoclue: select avahi-daemon if nmea enabled Christian Eggers (4): graphviz: Extend for nativesdk ttf-dejavu: Extend for native and nativesdk gd: Extend for native and nativesdk mscgen: Extend for native and nativesdk Denys Dmytriyenko (1): serialcheck: switch to a fork and update to the latest Jacob Kroon (1): meta-oe: Don't inherit 'features_check' in recipes that don't utilize it Joris Offouga (1): c-periphery: add recipe Kai Kang (1): lvm2: remove service template from SYSTEMD_SERVICE Khem Raj (5): python3-zopeinterface: Upgrade to 5.1.0 multipath-tools: Fix build with json-c 0.14 and newer toybox-inittab: Get rid of bashism mpv: Drop unused features_check inherit evince: Drop unused features_check inherit Konrad Weihmann (3): mpd: fix PACKAGECONFIG assignment netkit-rsh: properly append PACKAGECONFIG zile: properly append PACKAGECONFIG Lei YU (1): httpfs2: mount a http url as a file based on FUSE Leon Anavi (57): python3-unidiff: Upgrade 0.5.5 -> 0.6.0 python3-tzlocal: Upgrade 2.0.0 -> 2.1 python3-serpent: Upgrade 1.28 -> 1.30.2 python3-python-vlc: Upgrade 3.0.7110 -> 3.0.9113 python3-gast: Upgrade 0.2.2 -> 0.3.3 python3-langtable: Upgrade 0.0.38 -> 0.0.51 python3-automat: Upgrade 0.8.0 -> 20.2.0 python3-humanize: Upgrade 0.5.1 -> 2.4.0 python-pyaudio: Consolidate in a single file python3-isort: Consolidate in a single file python3-editor: Consolidate in a single file python3-engineio: Upgrade 3.12.1 -> 3.13.0 python3-feedformatter: Consolidate in a single file python3-decorator: Consolidate in a single file python3-dateutil: Consolidate in a single file python3-dnspython: Consolidate in a single file python3-future: Consolidate in a single file python3-requests-futures: Upgrade 0.9.5 -> 1.0.0 python3-greenlet: Consolidate in a single file python3-html2text: Upgrade 2019.8.11 -> 2020.1.16 python3-jsonpatch: Consolidate in a single file python3-jsonschema: Consolidate in a single file python3-evdev: Consolidate in a single file python3-oauthlib: Consolidate in a single file python3-oauthlib: Upgrade 2.0.6 -> 3.1.0 python3-tornado: Consolidate in a single file python3-tornado: Upgrade 6.0.3 -> 6.0.4 python3-waitress: Upgrade 1.4.3 -> 1.4.4 python3-urllib3: Upgrade 1.25.7 -> 1.25.9 python3-ujson: Upgrade 2.0.3 -> 3.0.0 python3-wheel: Upgrade 0.33.6 -> 0.34.2 python3-wcwidth: Upgrade 0.1.8 -> 0.2.4 python3-twine: Upgrade 1.13.0 -> 3.1.1 python3-beautifulsoup4: Upgrade 4.8.2 -> 4.9.1 python3-bitarray: Upgrade 1.2.1 -> 1.2.2 python3-soupsieve: Upgrade 1.9.4 -> 2.0.1 python3-meld3: Consolidate in a single file python3-meld3: Upgrade 1.0.2 -> 2.0.1 python3-markupsafe: Consolidate in a single file python3-more-itertools: Consolidate in a single file python3-more-itertools: Upgrade 8.2.0 -> 8.3.0 python3-nmap: Upgrade 1.4.1 -> 1.4.7 python3-multidict: Upgrade 4.7.5 -> 4.7.6 python3-lxml: Consolidate in a single file python3-hyperlink: Consolidate in a single file python3-humanfriendly: Upgrade 4.18 -> 8.2 python3-html5lib: Consolidate in a single file python3-progress: Consolidate in a single file python3-prettytable: Consolidate in a single file python3-lxml: Upgrade 4.5.0 -> 4.5.1 python3-pika: Consolidate in a single file python3-pluggy: Consolidate in a single file python3-ply: Consolidate in a single file python3-pocketsphinx: Consolidate in a single file python3-pocketsphinx: 0.1.0 -> 0.1.15 python3-pint: Consolidate in a single file python3-pint: Upgrade 0.11 -> 0.12 Martin Jansa (1): meta-python: depend on core version 12 or higher Martin Kelly (4): mosquitto: add native, nativesdk support msgpack-c: add native, nativesdk support mosquitto: typo fix python3-paho-mqtt: add native,nativesdk support Mingli Yu (2): python3-webcolors: add the missing rdepends python3-m2crypto: add the missing rdepends Naveen Saini (2): ace: add new recipe ocl-icd_git.bb: Add recipe for OpenCL ICD loaders Peace Lee (1): guider: Upgrade to 3.9.7 Pierre-Jean Texier (14): zchunk: upgrade 1.1.5 -> 1.1.6 uriparser: upgrade 0.9.3 -> 0.9.4 dbus-brocker: upgrade 22 -> 23 jsoncpp: upgrade 1.9.2 -> 1.9.3 hwdata: upgrade 0.333 -> 0.336 libiio: upgrade 0.19 -> 0.20 libnfc: upgrade 1.7.1 -> 1.8.0 tcpreplay: fix upstream check URL tinyproxy: fix upstream check URL jpnevulator: upgrade 2.3.4 -> 2.3.5 libnftnl: upgrade 1.1.6 -> 1.1.7 nftables: upgrade 0.9.4 -> 0.9.5 libzip: upgrade 1.6.1 -> 1.7.0 haveged: upgrade 1.9.8 -> 1.9.9 Qi.Chen@windriver.com (1): python-django: set CVE_PRODUCT to be django Wang Mingyu (5): opensaf: upgrade 5.19.10 -> 5.20.05 dash: upgrade 0.5.10.2 -> 0.5.11 postgresql: 12.2 -> 12.3 python3-pycodestyle: upgrade 2.5.0 -> 2.6.0 python3-scapy: upgrade 0.25 -> 0.26 Yi Zhao (1): gpsd: add new init script Yongxin Liu (1): intel-speed-select: Add new recipe for the tool to validate Intel SST Zang Ruochen (7): proj: upgrade 7.0.0 -> 7.0.1 mksh: upgrade 58 -> 59 libvpx: upgrade 1.8.1 -> 1.8.2 mercurial: upgrade 5.2 -> 5.4 libcgi-perl: upgrade 4.47 -> 4.48 mm-common: upgrade 1.0..0 -> 1.0.1 cryptsetup: upgrade 2.3.2 -> 2.3.3 Zheng Ruoqin (2): nghttp2: upgrade 1.40.0 -> 1.41.0 python3-inflection: upgrade 0.3.1 -> 0.5.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics')
-rw-r--r--meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh6
-rw-r--r--meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb24
-rw-r--r--meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb6
3 files changed, 35 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh
new file mode 100644
index 000000000..df0be9e3e
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Setting up graphviz..."
+
+# Create /usr/lib/graphviz/config6
+$OECORE_NATIVE_SYSROOT/usr/bin/dot -c
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
index 12ecb9909..aa5c0c820 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
@@ -16,6 +16,7 @@ DEPENDS = " \
freetype \
"
DEPENDS_append_class-target = " ${BPN}-native"
+DEPENDS_append_class-nativesdk = " ${BPN}-native"
inherit autotools-brokensep pkgconfig gettext
@@ -33,6 +34,10 @@ 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[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072"
SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a"
@@ -47,7 +52,17 @@ EXTRA_OECONF_class-target = "\
--disable-r \
--disable-sharp \
"
+EXTRA_OECONF_class-nativesdk = "\
+ --with-expatincludedir=${STAGING_INCDIR} \
+ --with-expatlibdir=${STAGING_LIBDIR} \
+ --without-included-ltdl \
+ --disable-java \
+ --disable-tcl \
+ --disable-r \
+ --disable-sharp \
+ "
CFLAGS_append_class-target = " -D_typ_ssize_t=1 -D_long_double=1"
+CFLAGS_append_class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1"
do_configure_prepend() {
cd ${S}
# create version.m4 and ignore libtoolize errors
@@ -59,6 +74,13 @@ do_install_append_class-native() {
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
+ install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d
+}
+FILES_${PN}_class-nativesdk += "${SDKPATHNATIVE}"
+
PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo"
FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/"
@@ -74,4 +96,4 @@ INSANE_SKIP_${PN}-python = "dev-so"
FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
index f74e5ce6c..03f30bf4a 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
@@ -45,3 +45,9 @@ FILES_${PN}-common = "${sysconfdir}"
SRC_URI[md5sum] = "d0efec10b9f110a32e9b8f796e21782c"
SRC_URI[sha256sum] = "fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7"
+
+BBCLASSEXTEND = "native nativesdk"
+
+# Allow installation of fonts into recipe-sysroot-native
+SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts"
+