summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-20 21:10:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 12:35:59 +0000
commitf5eaa5861226c6af5fbb130603268c3d582f08a3 (patch)
tree3e10d73f25d2ff71119c6f9908697e988951bc00
parentc39f1d15072c152840af5dfa86f04490ee80053a (diff)
downloadpoky-f5eaa5861226c6af5fbb130603268c3d582f08a3.tar.gz
pango: convert from autotools to meson
Drop the autotools-specific patch. (From OE-Core rev: ebbd49f952ddab952b5e1b7596330401087343e3) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch147
-rw-r--r--meta/recipes-graphics/pango/pango_1.42.4.bb33
2 files changed, 24 insertions, 156 deletions
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 6784a105a5..0000000000
--- a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
+++ /dev/null
@@ -1,147 +0,0 @@
1From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 2 Sep 2016 14:00:24 +0300
4Subject: [PATCH] Enforce recreation of docs/pango.types; it is build
5 configuration-specific.
6
7In particular, it needs to exclude references to PangoXft if Xft is not available.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 docs/Makefile.am | 17 ++++--------
13 docs/pango.types | 80 --------------------------------------------------------
14 2 files changed, 5 insertions(+), 92 deletions(-)
15 delete mode 100644 docs/pango.types
16
17diff --git a/docs/Makefile.am b/docs/Makefile.am
18index f5f1317..8947a99 100644
19--- a/docs/Makefile.am
20+++ b/docs/Makefile.am
21@@ -49,6 +49,10 @@ IGNORE_HFILES= \
22 pangocoretext-private.h \
23 pangoatsui-private.h
24
25+if !HAVE_XFT
26+IGNORE_HFILES += pangoxft pangoxft-render.h
27+endif
28+
29 # CFLAGS and LDFLAGS for compiling scan program. Only needed
30 # if $(DOC_MODULE).types is non-empty.
31 INCLUDES = \
32@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make
33 # This line really belongs in gtk-doc.mk
34 $(REPORT_FILES): sgml-build.stamp
35
36-pango.types:
37- @echo "Rebuilding $@"
38- @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/') && \
39- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \
40- echo >> $@.tmp && \
41- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \
42- mv $@.tmp $@
43-
44-BUILT_SOURCES = pango.types
45-
46 ########################################################################
47
48 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
49@@ -120,8 +114,7 @@ EXTRA_DIST += \
50 layout.fig \
51 layout.eps \
52 version.xml.in \
53- check.docs \
54- pango.types
55+ check.docs
56
57 # force doc rebulid after configure
58 dist-hook-local: dist-local-check-no-cross-references all-local
59diff --git a/docs/pango.types b/docs/pango.types
60deleted file mode 100644
61index 7d93cda..0000000
62--- a/docs/pango.types
63+++ /dev/null
64@@ -1,80 +0,0 @@
65-#include <pango/pango-attributes.h>
66-#include <pango/pango-context.h>
67-#include <pango/pango-engine.h>
68-#include <pango/pango-enum-types.h>
69-#include <pango/pango-font.h>
70-#include <pango/pango-fontmap.h>
71-#include <pango/pango-fontset.h>
72-#include <pango/pango-glyph-item.h>
73-#include <pango/pango-glyph.h>
74-#include <pango/pango-item.h>
75-#include <pango/pango-language.h>
76-#include <pango/pango-layout.h>
77-#include <pango/pango-matrix.h>
78-#include <pango/pango-ot.h>
79-#include <pango/pango-renderer.h>
80-#include <pango/pango-tabs.h>
81-#include <pango/pangocairo-fc.h>
82-#include <pango/pangocairo.h>
83-#include <pango/pangofc-decoder.h>
84-#include <pango/pangofc-font.h>
85-#include <pango/pangofc-fontmap.h>
86-#include <pango/pangoft2.h>
87-#include <pango/pangoxft-render.h>
88-#include <pango/pangoxft.h>
89-
90-pango_alignment_get_type
91-pango_attr_list_get_type
92-pango_attr_type_get_type
93-pango_bidi_type_get_type
94-pango_cairo_fc_font_map_get_type
95-pango_cairo_font_get_type
96-pango_cairo_font_map_get_type
97-pango_color_get_type
98-pango_context_get_type
99-pango_coverage_level_get_type
100-pango_direction_get_type
101-pango_ellipsize_mode_get_type
102-pango_engine_get_type
103-pango_engine_lang_get_type
104-pango_engine_shape_get_type
105-pango_fc_decoder_get_type
106-pango_fc_font_get_type
107-pango_fc_font_map_get_type
108-pango_font_description_get_type
109-pango_font_face_get_type
110-pango_font_family_get_type
111-pango_font_get_type
112-pango_font_map_get_type
113-pango_font_mask_get_type
114-pango_font_metrics_get_type
115-pango_fontset_get_type
116-pango_fontset_simple_get_type
117-pango_ft2_font_map_get_type
118-pango_glyph_item_get_type
119-pango_glyph_item_iter_get_type
120-pango_glyph_string_get_type
121-pango_gravity_get_type
122-pango_gravity_hint_get_type
123-pango_item_get_type
124-pango_language_get_type
125-pango_layout_get_type
126-pango_layout_iter_get_type
127-pango_layout_line_get_type
128-pango_matrix_get_type
129-pango_ot_info_get_type
130-pango_ot_ruleset_get_type
131-pango_render_part_get_type
132-pango_renderer_get_type
133-pango_script_get_type
134-pango_stretch_get_type
135-pango_style_get_type
136-pango_tab_align_get_type
137-pango_tab_array_get_type
138-pango_underline_get_type
139-pango_variant_get_type
140-pango_weight_get_type
141-pango_wrap_mode_get_type
142-pango_xft_font_get_type
143-pango_xft_font_map_get_type
144-pango_xft_renderer_get_type
145--
1462.9.3
147
diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.42.4.bb
index a09f7a8e70..e181bcb500 100644
--- a/meta/recipes-graphics/pango/pango_1.42.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.42.4.bb
@@ -11,10 +11,11 @@ LICENSE = "LGPLv2.0+"
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 12LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
13 13
14GNOMEBASEBUILDCLASS = "meson"
15
14inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection 16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
15 17
16SRC_URI += "file://run-ptest \ 18SRC_URI += "file://run-ptest \
17 file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \
18" 19"
19SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" 20SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
20SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" 21SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
@@ -22,18 +23,25 @@ SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa76
22DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" 23DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
23 24
24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" 25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
25PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" 26PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
27
28GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
29GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
30
31GI_ENABLE_FLAG = "-Dgir=true"
32GI_DISABLE_FLAG = "-Dgir=false"
33
34EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
35
36EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
37 '${GI_DISABLE_FLAG}', d)} "
38
39EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
40 '${GTKDOC_DISABLE_FLAG}', d)} "
26 41
27LEAD_SONAME = "libpango-1.0*" 42LEAD_SONAME = "libpango-1.0*"
28LIBV = "1.8.0" 43LIBV = "1.8.0"
29 44
30# This binary needs to be compiled for the host architecture. This isn't pretty!
31do_compile_prepend_class-target () {
32 if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
33 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
34 fi
35}
36
37FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" 45FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
38FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" 46FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
39 47
@@ -43,3 +51,10 @@ RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
43 pango-module-basic-fc pango-module-arabic-lang" 51 pango-module-basic-fc pango-module-arabic-lang"
44 52
45BBCLASSEXTEND = "native nativesdk" 53BBCLASSEXTEND = "native nativesdk"
54
55do_install_append () {
56 if [ "${PTEST_ENABLED}" != "1" ]; then
57 rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests
58 rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir}
59 fi
60}