[PATCH 1/2] fribidi: add (from meta-oe)

[PATCH 1/2] fribidi: add (from meta-oe)

[Ross Burton]

Originally this was fribidi 0.19.7 from meta-oe, with the following changes:

- Upgrade to latest release (1.0.5)
- Drop GLib and PCRE build-dependencies (removed upstream)
- License is *or newer*
- Upstream has moved to Github
- Remove the historical PROVIDES (patches for meta-oe sent)

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-support/libfribidi/fribidi_1.0.5.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-support/libfribidi/fribidi_1.0.5.bb

diff --git a/meta/recipes-support/libfribidi/fribidi_1.0.5.bb b/meta/recipes-support/libfribidi/fribidi_1.0.5.bb
new file mode 100644
index 00000000000..303ccb71d0d
--- /dev/null
+++ b/meta/recipes-support/libfribidi/fribidi_1.0.5.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Free Implementation of the Unicode Bidirectional Algorithm"
+SECTION = "libs"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
+
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2"
+SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b"
+SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce"
+
+UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+
+inherit autotools lib_package pkgconfig
+
+# TODO use Meson instead of autotools when
+# https://github.com/fribidi/fribidi/issues/87 is solved
+
+CVE_PRODUCT = "gnu_fribidi"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.11.0

[PATCH 2/2] pango: upgrade

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...op-introspection-macros-from-acinclude.m4.patch | 120 ---------------------
 .../pango/{pango_1.40.14.bb => pango_1.42.4.bb}    |  11 +-
 2 files changed, 4 insertions(+), 127 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch
 rename meta/recipes-graphics/pango/{pango_1.40.14.bb => pango_1.42.4.bb} (85%)

diff --git a/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch
deleted file mode 100644
index 9e1626e9a0d..00000000000
--- a/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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: Backport [upstream 5ccfe0]
-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/meta/recipes-graphics/pango/pango_1.40.14.bb b/meta/recipes-graphics/pango/pango_1.42.4.bb
similarity index 85%
rename from meta/recipes-graphics/pango/pango_1.40.14.bb
rename to meta/recipes-graphics/pango/pango_1.42.4.bb
index 3bd9c647161..e73fd28dfda 100644
--- a/meta/recipes-graphics/pango/pango_1.40.14.bb
+++ b/meta/recipes-graphics/pango/pango_1.42.4.bb
@@ -14,20 +14,17 @@ 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 \
             file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \
 "
-SRC_URI[archive.md5sum] = "18d7eb8d52e7e445e733c109ddaa7b78"
-SRC_URI[archive.sha256sum] = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3"
+SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
+SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
 
-DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
+DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
 
-EXTRA_OECONF = " \
-	        --disable-debug \
-	        "
+EXTRA_OECONF = "--disable-debug"
 
 LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.8.0"
-- 
2.11.0

Re: [PATCH 1/2] fribidi: add (from meta-oe)

[Khem Raj]

On Fri, Aug 31, 2018 at 6:41 AM Ross Burton <ross.burton@intel.com> wrote:
>
> Originally this was fribidi 0.19.7 from meta-oe, with the following changes:
>
> - Upgrade to latest release (1.0.5)
> - Drop GLib and PCRE build-dependencies (removed upstream)
> - License is *or newer*
> - Upstream has moved to Github
> - Remove the historical PROVIDES (patches for meta-oe sent)
>

this use to be in oe-core and it was dropped and then used from meta-oe
what is rationale to move it ?

> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-support/libfribidi/fribidi_1.0.5.bb | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>  create mode 100644 meta/recipes-support/libfribidi/fribidi_1.0.5.bb
>
> diff --git a/meta/recipes-support/libfribidi/fribidi_1.0.5.bb b/meta/recipes-support/libfribidi/fribidi_1.0.5.bb
> new file mode 100644
> index 00000000000..303ccb71d0d
> --- /dev/null
> +++ b/meta/recipes-support/libfribidi/fribidi_1.0.5.bb
> @@ -0,0 +1,19 @@
> +SUMMARY = "Free Implementation of the Unicode Bidirectional Algorithm"
> +SECTION = "libs"
> +LICENSE = "LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
> +
> +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2"
> +SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b"
> +SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce"
> +
> +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
> +
> +inherit autotools lib_package pkgconfig
> +
> +# TODO use Meson instead of autotools when
> +# https://github.com/fribidi/fribidi/issues/87 is solved
> +
> +CVE_PRODUCT = "gnu_fribidi"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] fribidi: add (from meta-oe)

[Burton, Ross]

Sorry, should have mentioned this.

Hard build-requirement for the new Pango.

Ross

On 31 August 2018 at 17:25, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Aug 31, 2018 at 6:41 AM Ross Burton <ross.burton@intel.com> wrote:
>>
>> Originally this was fribidi 0.19.7 from meta-oe, with the following changes:
>>
>> - Upgrade to latest release (1.0.5)
>> - Drop GLib and PCRE build-dependencies (removed upstream)
>> - License is *or newer*
>> - Upstream has moved to Github
>> - Remove the historical PROVIDES (patches for meta-oe sent)
>>
>
> this use to be in oe-core and it was dropped and then used from meta-oe
> what is rationale to move it ?
>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  meta/recipes-support/libfribidi/fribidi_1.0.5.bb | 19 +++++++++++++++++++
>>  1 file changed, 19 insertions(+)
>>  create mode 100644 meta/recipes-support/libfribidi/fribidi_1.0.5.bb
>>
>> diff --git a/meta/recipes-support/libfribidi/fribidi_1.0.5.bb b/meta/recipes-support/libfribidi/fribidi_1.0.5.bb
>> new file mode 100644
>> index 00000000000..303ccb71d0d
>> --- /dev/null
>> +++ b/meta/recipes-support/libfribidi/fribidi_1.0.5.bb
>> @@ -0,0 +1,19 @@
>> +SUMMARY = "Free Implementation of the Unicode Bidirectional Algorithm"
>> +SECTION = "libs"
>> +LICENSE = "LGPLv2.1+"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
>> +
>> +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2"
>> +SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b"
>> +SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce"
>> +
>> +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
>> +
>> +inherit autotools lib_package pkgconfig
>> +
>> +# TODO use Meson instead of autotools when
>> +# https://github.com/fribidi/fribidi/issues/87 is solved
>> +
>> +CVE_PRODUCT = "gnu_fribidi"
>> +
>> +BBCLASSEXTEND = "native nativesdk"
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core