From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by mail.openembedded.org (Postfix) with ESMTP id 47AA47C87C for ; Mon, 18 Feb 2019 12:41:20 +0000 (UTC) Received: by mail-lj1-f175.google.com with SMTP id d14so3054292ljl.9 for ; Mon, 18 Feb 2019 04:41:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WTjpQGf6KrtoawQWqcL3480sS9FT1Qa+XF+sUSa+zmc=; b=MU603ul/3/4KYbY+/YHkEFmC7w9UEkzKZIXrS6QLoQkj172qDVpnHxiS+RovxGzI2S mz46cFVBxO+HM4ozGW7X8LxuCbz2xHaDTbkjYefgNgqSf+owG99qzBBy9qktKcERhKFN xLHwedLDH0zIPOxi/mL7Y7vUz1FT/bR1RvuA6IYSw4ANXzPuoz1W3t/IR5gvu1xiD4yK 8P5bJieFq4ZLjCYqSsm8CCHvgQIALBRFO39GCd6BXA0AmPP4xEr6jVIWBVCUoaQ9TfIh VDKA9Ti1bFbiugfGSIeuFurm1awFQY9+JefZYSvdkyKnTb0K/hTAVcawarsyMoskkOtv MDww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WTjpQGf6KrtoawQWqcL3480sS9FT1Qa+XF+sUSa+zmc=; b=KOPCvFX3oNGOWPUHWJK/+DDkU2JndMwtitmKoHnOrRqMAnK6jiSf7gpKK6essy+tXc cHRuzzkDMy7GZhuJNyz844Uzo4ecGxufEQGU865FcIiJ/ufg6Se+8hRf6FAtjYwFtbIq iMRRSZFXOrNOykVhY7X5hPbaLeWLIg5Kbdwynae6GeHgKOjlLAupsy3KrLwUSP76Wa0X jG5ma8vNz+zMbT7oVSJcphKHz+bHUPbv1wJTNdC0B6duF4h/z/pg5QS8QlNrxcYtr7nw CvuIlH8N+uBg5JW8EzuH5H+NaNbmgNv+XiivrXD+R7H5JR0ZYZ1LICFmY1payeqz9fd+ /6kg== X-Gm-Message-State: AHQUAuY9Ib4yoaRqVhiT3uLK0kX++YTsE1xnbEuMREJCMPlI37bqHyVV jhfJGks1msnhenjYl9h2I9UMbG7d X-Google-Smtp-Source: AHgI3IamKbGA2PFGTwDaBOTBFM9+8y8qEjL52lAgcSXN2VEt7qYoAMbrqbT0p//gDbgh88e1aS5C8Q== X-Received: by 2002:a2e:96c9:: with SMTP id d9mr13210467ljj.133.1550493680580; Mon, 18 Feb 2019 04:41:20 -0800 (PST) Received: from alexander-box.luxoft.com ([62.96.135.139]) by smtp.gmail.com with ESMTPSA id h3sm3733898lfj.25.2019.02.18.04.41.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 04:41:19 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Mon, 18 Feb 2019 13:41:06 +0100 Message-Id: <20190218124108.7846-6-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190218124108.7846-1-alex.kanavin@gmail.com> References: <20190218124108.7846-1-alex.kanavin@gmail.com> Subject: [PATCH 6/8] pango: convert from autotools to meson X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2019 12:41:21 -0000 libxft is a hard dependency now, accordingly drop the patch that was made for it being optional. Signed-off-by: Alexander Kanavin --- ...on-of-docs-pango.types-it-is-build-c.patch | 147 ------------------ meta/recipes-graphics/pango/pango_1.42.4.bb | 27 ++-- 2 files changed, 16 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch diff --git a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted file mode 100644 index 6784a105a55..00000000000 --- a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 2 Sep 2016 14:00:24 +0300 -Subject: [PATCH] Enforce recreation of docs/pango.types; it is build - configuration-specific. - -In particular, it needs to exclude references to PangoXft if Xft is not available. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - docs/Makefile.am | 17 ++++-------- - docs/pango.types | 80 -------------------------------------------------------- - 2 files changed, 5 insertions(+), 92 deletions(-) - delete mode 100644 docs/pango.types - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index f5f1317..8947a99 100644 ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -49,6 +49,10 @@ IGNORE_HFILES= \ - pangocoretext-private.h \ - pangoatsui-private.h - -+if !HAVE_XFT -+IGNORE_HFILES += pangoxft pangoxft-render.h -+endif -+ - # CFLAGS and LDFLAGS for compiling scan program. Only needed - # if $(DOC_MODULE).types is non-empty. - INCLUDES = \ -@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make - # This line really belongs in gtk-doc.mk - $(REPORT_FILES): sgml-build.stamp - --pango.types: -- @echo "Rebuilding $@" -- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \ -- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \ -- echo >> $@.tmp && \ -- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \ -- mv $@.tmp $@ -- --BUILT_SOURCES = pango.types -- - ######################################################################## - - MAINTAINERCLEANFILES = $(BUILT_SOURCES) -@@ -120,8 +114,7 @@ EXTRA_DIST += \ - layout.fig \ - layout.eps \ - version.xml.in \ -- check.docs \ -- pango.types -+ check.docs - - # force doc rebulid after configure - dist-hook-local: dist-local-check-no-cross-references all-local -diff --git a/docs/pango.types b/docs/pango.types -deleted file mode 100644 -index 7d93cda..0000000 ---- a/docs/pango.types -+++ /dev/null -@@ -1,80 +0,0 @@ --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -- --pango_alignment_get_type --pango_attr_list_get_type --pango_attr_type_get_type --pango_bidi_type_get_type --pango_cairo_fc_font_map_get_type --pango_cairo_font_get_type --pango_cairo_font_map_get_type --pango_color_get_type --pango_context_get_type --pango_coverage_level_get_type --pango_direction_get_type --pango_ellipsize_mode_get_type --pango_engine_get_type --pango_engine_lang_get_type --pango_engine_shape_get_type --pango_fc_decoder_get_type --pango_fc_font_get_type --pango_fc_font_map_get_type --pango_font_description_get_type --pango_font_face_get_type --pango_font_family_get_type --pango_font_get_type --pango_font_map_get_type --pango_font_mask_get_type --pango_font_metrics_get_type --pango_fontset_get_type --pango_fontset_simple_get_type --pango_ft2_font_map_get_type --pango_glyph_item_get_type --pango_glyph_item_iter_get_type --pango_glyph_string_get_type --pango_gravity_get_type --pango_gravity_hint_get_type --pango_item_get_type --pango_language_get_type --pango_layout_get_type --pango_layout_iter_get_type --pango_layout_line_get_type --pango_matrix_get_type --pango_ot_info_get_type --pango_ot_ruleset_get_type --pango_render_part_get_type --pango_renderer_get_type --pango_script_get_type --pango_stretch_get_type --pango_style_get_type --pango_tab_align_get_type --pango_tab_array_get_type --pango_underline_get_type --pango_variant_get_type --pango_weight_get_type --pango_wrap_mode_get_type --pango_xft_font_get_type --pango_xft_font_map_get_type --pango_xft_renderer_get_type --- -2.9.3 - diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.42.4.bb index a09f7a8e701..6116b733a1c 100644 --- a/meta/recipes-graphics/pango/pango_1.42.4.bb +++ b/meta/recipes-graphics/pango/pango_1.42.4.bb @@ -11,29 +11,34 @@ LICENSE = "LGPLv2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection SRC_URI += "file://run-ptest \ - file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ " SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" -DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" +DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi libxft" + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Dgir=true" +GI_DISABLE_FLAG = "-Dgir=false" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " LEAD_SONAME = "libpango-1.0*" LIBV = "1.8.0" -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend_class-target () { - if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="${BUILD_LDFLAGS}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode - fi -} - FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" -- 2.17.1