Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9

["Khem Raj" <raj.khem@gmail.com>]

On Sat, Sep 5, 2020 at 12:49 AM Gianfranco
<costamagna.gianfranco@gmail.com> wrote:
>
> cherry-pick upstream fix for pkg-config based detection failure
>
> Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ---
>  .../recipes-extended/brotli/brotli/838.patch  | 48 +++++++++++++++++++
>  .../{brotli_1.0.7.bb => brotli_1.0.9.bb}      |  7 +--
>  2 files changed, 52 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
>  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} (81%)
>
> diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch b/meta-oe/recipes-extended/brotli/brotli/838.patch
> new file mode 100644
> index 000000000..98b888760
> --- /dev/null
> +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> @@ -0,0 +1,48 @@
> +Upstream-Status: Backport [https://github.com/google/brotli/pull/838]

I ended up merging your V2, please rebase this on master and resend
just the delta

> +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> +From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
> +Date: Wed, 2 Sep 2020 10:49:49 +0200
> +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
> +
> +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> +---
> + scripts/libbrotlicommon.pc.in | 2 +-
> + scripts/libbrotlidec.pc.in    | 2 +-
> + scripts/libbrotlienc.pc.in    | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
> +index 10ca969e..2a8cf7a3 100644
> +--- a/scripts/libbrotlicommon.pc.in
> ++++ b/scripts/libbrotlicommon.pc.in
> +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> + URL: https://github.com/google/brotli
> + Description: Brotli common dictionary library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> ++Libs: -L${libdir} -lbrotlicommon
> + Cflags: -I${includedir}
> +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> +index e7c3124f..6f8ef2e4 100644
> +--- a/scripts/libbrotlidec.pc.in
> ++++ b/scripts/libbrotlidec.pc.in
> +@@ -7,6 +7,6 @@ Name: libbrotlidec
> + URL: https://github.com/google/brotli
> + Description: Brotli decoder library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> ++Libs: -L${libdir} -lbrotlidec
> + Requires.private: libbrotlicommon >= 1.0.2
> + Cflags: -I${includedir}
> +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> +index 4dd0811b..2098afe2 100644
> +--- a/scripts/libbrotlienc.pc.in
> ++++ b/scripts/libbrotlienc.pc.in
> +@@ -7,6 +7,6 @@ Name: libbrotlienc
> + URL: https://github.com/google/brotli
> + Description: Brotli encoder library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> ++Libs: -L${libdir} -lbrotlienc
> + Requires.private: libbrotlicommon >= 1.0.2
> + Cflags: -I${includedir}
> diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> similarity index 81%
> rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> index 32f855844..0038ba74d 100644
> --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
>
> -SRC_URI = "git://github.com/google/brotli.git"
> -# tag 1.0.7
> -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> +SRC_URI = "git://github.com/google/brotli.git \
> +           file://838.patch "
> +# tag 1.0.9
> +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
>  S = "${WORKDIR}/git"
>
>  inherit cmake lib_package
> --
> 2.17.1
>
>