summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-11-05 22:54:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:08:12 +0000
commitc9b06f5c2c1b1e610beb968bca02b12e52691c65 (patch)
treed6a55f6fba42aae0a83fa26a169b633328466af9 /meta/recipes-graphics
parentced8d49955f5142f604a8e7e9bd6d1c70ae4a290 (diff)
downloadpoky-c9b06f5c2c1b1e610beb968bca02b12e52691c65.tar.gz
pango: Upgrade 1.36.8 -> 1.38.1
Pango is now a simple a simple library and no longer has - modules - engines - configuration Dropping all related things from the recipe. (From OE-Core rev: 9a86d2a876f5cce9c2825f8fd5bf5dc9aaf9d7a1) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/pango/pango.inc50
-rw-r--r--meta/recipes-graphics/pango/pango/multilib-fix-clean.patch75
-rw-r--r--meta/recipes-graphics/pango/pango_1.36.8.bb10
-rw-r--r--meta/recipes-graphics/pango/pango_1.38.1.bb9
4 files changed, 11 insertions, 133 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index df0fdf679a..c0109b2bc7 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -21,51 +21,20 @@ PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-
21BBCLASSEXTEND = "native" 21BBCLASSEXTEND = "native"
22DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" 22DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
23 23
24PACKAGES_DYNAMIC += "^pango-module-.*"
25
26RRECOMMENDS_${PN} = "pango-module-basic-fc"
27
28inherit gnomebase gtk-doc qemu ptest 24inherit gnomebase gtk-doc qemu ptest
29 25
30# Create a pango-modules package
31ALLOW_EMPTY_${BPN}-modules = "1"
32PACKAGES += "${BPN}-modules"
33RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}"
34
35
36EXTRA_AUTORECONF = "" 26EXTRA_AUTORECONF = ""
37 27
38# seems to go wrong with default cflags 28# seems to go wrong with default cflags
39FULL_OPTIMIZATION_arm = "-O2" 29FULL_OPTIMIZATION_arm = "-O2"
40 30
41EXTRA_OECONF = "--disable-introspection \ 31EXTRA_OECONF = "--disable-introspection \
42 --enable-explicit-deps=no \
43 --disable-debug \ 32 --disable-debug \
44 --with-mlprefix=${MLPREFIX}" 33 "
45 34
46LEAD_SONAME = "libpango-1.0*" 35LEAD_SONAME = "libpango-1.0*"
47LIBV = "1.8.0" 36LIBV = "1.8.0"
48 37
49pango_postinst() {
50if ! [ -e $D${sysconfdir}/pango ] ; then
51 mkdir -p $D${sysconfdir}/pango
52fi
53
54if [ -n "$D" ]; then
55 ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
56 $D${libdir}/pango/${LIBV}/modules/*.so \
57 > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null
58
59 [ $? -ne 0 ] && exit 1
60
61 sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules
62
63 exit 0
64else
65 ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules
66fi
67}
68
69# This binary needs to be compiled for the host architecture. This isn't pretty! 38# This binary needs to be compiled for the host architecture. This isn't pretty!
70do_compile_prepend () { 39do_compile_prepend () {
71 if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then 40 if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
@@ -73,22 +42,7 @@ do_compile_prepend () {
73 fi 42 fi
74} 43}
75 44
76do_install_append () { 45FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
77 if [ "${MLPREFIX}" != "" ]; then
78 mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules
79 fi
80}
81
82
83python populate_packages_prepend () {
84 pango_postinst = d.getVar("pango_postinst", True)
85
86 modules_root = d.expand('${libdir}/pango/${LIBV}/modules')
87
88 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst)
89}
90
91FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
92FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" 46FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
93FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" 47FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
94 48
diff --git a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
deleted file mode 100644
index ad414ddf36..0000000000
--- a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1Upstream-Status: Pending
2
3Updated to apply to pango-1.32.5
4
5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
6diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac
7--- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200
8+++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200
9@@ -213,6 +213,11 @@
10
11 AC_SUBST(PANGO_DEBUG_FLAGS)
12
13+AC_ARG_WITH(mlprefix,
14+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
15+ mlprefix_str=$withval, mlprefix_str="")
16+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
17+
18 AC_ARG_ENABLE(rebuilds,
19 [AC_HELP_STRING([--disable-rebuilds],
20 [disable all source autogeneration rules])],,
21diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c
22--- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200
23+++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200
24@@ -555,11 +555,11 @@
25 files = g_new (char *, 3);
26
27 files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
28- "pango.modules",
29+ MLPREFIX "pango.modules",
30 NULL);
31 files[1] = g_build_filename (pango_get_lib_subdirectory (),
32 MODULE_VERSION,
33- "modules.cache",
34+ MLPREFIX "modules.cache",
35 NULL);
36 files[2] = NULL;
37 }
38@@ -674,7 +674,8 @@
39 if (!no_module_warning)
40 {
41 gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
42- "pango.modules",
43+/* For multilib case, keep multiple config file for different libs */
44+ MLPREFIX "pango.modules",
45 NULL);
46 g_critical ("No modules found:\n"
47 "No builtin or dynamically loaded modules were found.\n"
48diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej
49--- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200
50+++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200
51@@ -0,0 +1,12 @@
52+--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800
53++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800
54+@@ -529,7 +529,8 @@
55+
56+ if (!file_str)
57+ file_str = g_build_filename (pango_get_sysconf_subdirectory (),
58+- "pango.modules",
59++/* For multilib case, keep multiple config file for different libs */
60++ MLPREFIX "pango.modules",
61+ NULL);
62+
63+ files = pango_split_file_list (file_str);
64diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c
65--- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300
66+++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200
67@@ -304,7 +304,7 @@
68
69 cache_file = g_build_filename (pango_get_lib_subdirectory (),
70 MODULE_VERSION,
71- "modules.cache",
72+ MLPREFIX "modules.cache",
73 NULL);
74 err = NULL;
75 if (!g_file_set_contents (cache_file, contents->str, -1, &err))
diff --git a/meta/recipes-graphics/pango/pango_1.36.8.bb b/meta/recipes-graphics/pango/pango_1.36.8.bb
deleted file mode 100644
index f4e4250409..0000000000
--- a/meta/recipes-graphics/pango/pango_1.36.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require pango.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4
5SRC_URI += "file://run-ptest \
6 file://multilib-fix-clean.patch \
7"
8
9SRC_URI[archive.md5sum] = "217a9a753006275215fa9fa127760ece"
10SRC_URI[archive.sha256sum] = "18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07"
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb
new file mode 100644
index 0000000000..d85c17bd25
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango_1.38.1.bb
@@ -0,0 +1,9 @@
1require pango.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4
5SRC_URI += "file://run-ptest \
6"
7
8SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d"
9SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7"