diff options
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/pango')
5 files changed, 173 insertions, 184 deletions
diff --git a/yocto-poky/meta/recipes-graphics/pango/pango.inc b/yocto-poky/meta/recipes-graphics/pango/pango.inc deleted file mode 100644 index df0fdf679..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango.inc +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY = "Framework for layout and rendering of internationalized text" -DESCRIPTION = "Pango is a library for laying out and rendering of text, \ -with an emphasis on internationalization. Pango can be used anywhere \ -that text layout is needed, though most of the work on Pango so far has \ -been done in the context of the GTK+ widget toolkit. Pango forms the \ -core of text and font handling for GTK+-2.x." -HOMEPAGE = "http://www.pango.org/" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" -LICENSE = "LGPLv2.0+" - -X11DEPENDS = "virtual/libx11 libxft" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}" - -PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" -PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native" - -BBCLASSEXTEND = "native" -DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" - -PACKAGES_DYNAMIC += "^pango-module-.*" - -RRECOMMENDS_${PN} = "pango-module-basic-fc" - -inherit gnomebase gtk-doc qemu ptest - -# Create a pango-modules package -ALLOW_EMPTY_${BPN}-modules = "1" -PACKAGES += "${BPN}-modules" -RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}" - - -EXTRA_AUTORECONF = "" - -# seems to go wrong with default cflags -FULL_OPTIMIZATION_arm = "-O2" - -EXTRA_OECONF = "--disable-introspection \ - --enable-explicit-deps=no \ - --disable-debug \ - --with-mlprefix=${MLPREFIX}" - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" - -pango_postinst() { -if ! [ -e $D${sysconfdir}/pango ] ; then - mkdir -p $D${sysconfdir}/pango -fi - -if [ -n "$D" ]; then - ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ - $D${libdir}/pango/${LIBV}/modules/*.so \ - > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null - - [ $? -ne 0 ] && exit 1 - - sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules - - exit 0 -else - ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules -fi -} - -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend () { - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" 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 -} - -do_install_append () { - if [ "${MLPREFIX}" != "" ]; then - mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules - fi -} - - -python populate_packages_prepend () { - pango_postinst = d.getVar("pango_postinst", True) - - modules_root = d.expand('${libdir}/pango/${LIBV}/modules') - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst) -} - -FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -FILES_${PN}-ptest += "${libexecdir}/installed-tests/* \ - ${datadir}/installed-tests/pango" -FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug" - -RDEPENDS_${PN}-ptest += "gnome-desktop-testing liberation-fonts" diff --git a/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch new file mode 100644 index 000000000..812da21c5 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch @@ -0,0 +1,121 @@ +From 867a512eddbeb1899d3e7096df3da1dd0ce3e7b7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 23 Oct 2015 14:06:17 +0300 +Subject: [PATCH] Drop introspection macros from acinclude.m4 + +They take precendence over our customized macros, and so +introspection doesn't work correctly. + +Upstream-Status: Pending [review on oe-core list] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + acinclude.m4 | 96 ------------------------------------------------------------ + 1 file changed, 96 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8899c7c..48fd5d8 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -55,99 +55,3 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + ]) + + +-dnl REMOVE THIS WHEN introspection.m4 is widely available +-dnl +-dnl -*- mode: autoconf -*- +-dnl Copyright 2009 Johan Dahlin +-dnl +-dnl This file is free software; the author(s) gives unlimited +-dnl permission to copy and/or distribute it, with or without +-dnl modifications, as long as this notice is preserved. +-dnl +- +-# serial 1 +- +-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +-[ +- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +- +- dnl enable/disable introspection +- m4_if([$2], [require], +- [dnl +- enable_introspection=yes +- ],[dnl +- AC_ARG_ENABLE(introspection, +- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], +- [Enable introspection for this build]),, +- [enable_introspection=auto]) +- ])dnl +- +- AC_MSG_CHECKING([for gobject-introspection]) +- +- dnl presence/version checking +- AS_CASE([$enable_introspection], +- [no], [dnl +- found_introspection="no (disabled, use --enable-introspection to enable)" +- ],dnl +- [yes],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0],, +- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], +- found_introspection=yes, +- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) +- ],dnl +- [auto],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) +- ],dnl +- [dnl +- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) +- ])dnl +- +- AC_MSG_RESULT([$found_introspection]) +- +- INTROSPECTION_SCANNER= +- INTROSPECTION_COMPILER= +- INTROSPECTION_GENERATE= +- INTROSPECTION_GIRDIR= +- INTROSPECTION_TYPELIBDIR= +- if test "x$found_introspection" = "xyes"; then +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +- fi +- AC_SUBST(INTROSPECTION_SCANNER) +- AC_SUBST(INTROSPECTION_COMPILER) +- AC_SUBST(INTROSPECTION_GENERATE) +- AC_SUBST(INTROSPECTION_GIRDIR) +- AC_SUBST(INTROSPECTION_TYPELIBDIR) +- AC_SUBST(INTROSPECTION_CFLAGS) +- AC_SUBST(INTROSPECTION_LIBS) +- AC_SUBST(INTROSPECTION_MAKEFILE) +- +- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +-]) +- +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +- +-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +-]) +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) +- +- +-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +-]) +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch deleted file mode 100644 index ad414ddf3..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending - -Updated to apply to pango-1.32.5 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac ---- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200 -+++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200 -@@ -213,6 +213,11 @@ - - AC_SUBST(PANGO_DEBUG_FLAGS) - -+AC_ARG_WITH(mlprefix, -+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]), -+ mlprefix_str=$withval, mlprefix_str="") -+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.]) -+ - AC_ARG_ENABLE(rebuilds, - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, -diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c ---- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200 -+++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200 -@@ -555,11 +555,11 @@ - files = g_new (char *, 3); - - files[0] = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ MLPREFIX "pango.modules", - NULL); - files[1] = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, -- "modules.cache", -+ MLPREFIX "modules.cache", - NULL); - files[2] = NULL; - } -@@ -674,7 +674,8 @@ - if (!no_module_warning) - { - gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+/* For multilib case, keep multiple config file for different libs */ -+ MLPREFIX "pango.modules", - NULL); - g_critical ("No modules found:\n" - "No builtin or dynamically loaded modules were found.\n" -diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej ---- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200 -+++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200 -@@ -0,0 +1,12 @@ -+--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800 -++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800 -+@@ -529,7 +529,8 @@ -+ -+ if (!file_str) -+ file_str = g_build_filename (pango_get_sysconf_subdirectory (), -+- "pango.modules", -++/* For multilib case, keep multiple config file for different libs */ -++ MLPREFIX "pango.modules", -+ NULL); -+ -+ files = pango_split_file_list (file_str); -diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c ---- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300 -+++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200 -@@ -304,7 +304,7 @@ - - cache_file = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, -- "modules.cache", -+ MLPREFIX "modules.cache", - NULL); - err = NULL; - if (!g_file_set_contents (cache_file, contents->str, -1, &err)) diff --git a/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb b/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb deleted file mode 100644 index f4e425040..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pango.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -SRC_URI += "file://run-ptest \ - file://multilib-fix-clean.patch \ -" - -SRC_URI[archive.md5sum] = "217a9a753006275215fa9fa127760ece" -SRC_URI[archive.sha256sum] = "18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07" diff --git a/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb b/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb new file mode 100644 index 000000000..7fc65fd43 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" +LICENSE = "LGPLv2.0+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection + +SRC_URI += "file://run-ptest \ + file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ +" + +SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" +SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" + +DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" + +EXTRA_AUTORECONF = "" + +EXTRA_OECONF = " \ + --disable-debug \ + " + +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 ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + make CC="${BUILD_CC}" CFLAGS="" 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" + +RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" + +RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ + pango-module-basic-fc pango-module-arabic-lang" + +BBCLASSEXTEND = "native" |