[PATCH 1/4] x264: update to latest on stable branch

[PATCH 1/4] x264: update to latest on stable branch

[Anuj Mittal]

For changes, see:

https://github.com/mirror/x264/compare/e9a5903edf8ca59ef20e6f4894c196f135af735e...0a84d986e7020f8344f00752e3600b9769cc1e85

Remove the perlnative dependency that doesn't seem to be needed and
remove the unnecessary copying of autotool scripts.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/recipes-multimedia/x264/x264_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 842ea2547c..0d9d01d8a4 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -14,13 +14,13 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "e9a5903edf8ca59ef20e6f4894c196f135af735e"
+SRCREV = "0a84d986e7020f8344f00752e3600b9769cc1e85"
 
-PV = "r2854+git${SRCPV}"
+PV = "r2917+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit lib_package pkgconfig perlnative
+inherit lib_package pkgconfig
 
 X264_DISABLE_ASM = ""
 X264_DISABLE_ASM_x86 = "--disable-asm"
@@ -44,8 +44,6 @@ EXTRA_OECONF = '--prefix=${prefix} \
                '
 
 do_configure() {
-    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
-    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
     ./configure ${EXTRA_OECONF}
 }
 
-- 
2.17.1

[PATCH 2/4] harfbuzz: upgrade 2.2.0 -> 2.3.1

[Anuj Mittal]

For changes, see:

https://github.com/harfbuzz/harfbuzz/releases

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../harfbuzz/{harfbuzz_2.2.0.bb => harfbuzz_2.3.1.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.2.0.bb => harfbuzz_2.3.1.bb} (89%)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.2.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb
similarity index 89%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_2.2.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb
index b62082f53d..4b292d8ea9 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.2.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
 DEPENDS = "glib-2.0 cairo fontconfig freetype"
 
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
-SRC_URI[md5sum] = "d9b8b2bc4d0cdf7f0824f4f0631d264b"
-SRC_URI[sha256sum] = "b7ccfcbd56b970a709e8b9ea9fb46c922c606c2feef8f086fb6a8492e530f810"
+SRC_URI[md5sum] = "531de9df7c8a5405dd9c6a873fcee8c2"
+SRC_URI[sha256sum] = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"
 
 inherit autotools pkgconfig lib_package gtk-doc
 
-- 
2.17.1

[PATCH 3/4] pixman: upgrade 0.34.0 -> 0.38.0

[Anuj Mittal]

For changes, see:

https://cgit.freedesktop.org/pixman/log/?qt=range&q=pixman-0.38.0...pixman-0.34.0

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../xorg-lib/pixman/asm_include.patch         | 29 -------------------
 .../{pixman_0.34.0.bb => pixman_0.38.0.bb}    |  5 ++--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
 rename meta/recipes-graphics/xorg-lib/{pixman_0.34.0.bb => pixman_0.38.0.bb} (89%)

diff --git a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
deleted file mode 100644
index b52a5707d6..0000000000
--- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fixes errors like
-
-Assembler messages:
-Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory
-
-it works with glibc because it uses gcc fixed-headers but thats not right.
-
-We move the include under C block
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Index: pixman-0.32.6/pixman/pixman-private.h
-===================================================================
---- pixman-0.32.6.orig/pixman/pixman-private.h
-+++ pixman-0.32.6/pixman/pixman-private.h
-@@ -1,4 +1,3 @@
--#include <float.h>
- 
- #ifndef PIXMAN_PRIVATE_H
- #define PIXMAN_PRIVATE_H
-@@ -17,6 +16,8 @@
- 
- #ifndef __ASSEMBLER__
- 
-+#include <float.h>
-+
- #ifndef PACKAGE
- #  error config.h must be included before pixman-private.h
- #endif
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
similarity index 89%
rename from meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
index c290fa4614..49c3d62342 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
@@ -31,11 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk"
 
 SRC_URI += "\
             file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
-	    file://asm_include.patch \
 	    file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
 "
 
-SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59"
-SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
+SRC_URI[md5sum] = "04ecad28edcc14e7eb5f7ed6df29c7a0"
+SRC_URI[sha256sum] = "b768e3f7895ddebdc0f07478729d9cec4fe0a9d2201f828c900d67b0e5b436a8"
 
 REQUIRED_DISTRO_FEATURES = ""
-- 
2.17.1

[PATCH 4/4] cairo: upgrade 1.14.12 -> 1.16.0

[Anuj Mittal]

* For changes, see:

https://www.cairographics.org/releases/ChangeLog.cairo-1.16.0

* Remove the backported patch.

* libcairo-trace isn't a version lib anymore, fix the packaging and
include it in perf-utils.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../cairo/0001-cairo-Fix-CVE-2017-9814.patch  | 45 -------------------
 .../{cairo_1.14.12.bb => cairo_1.16.0.bb}     |  8 ++--
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch
 rename meta/recipes-graphics/cairo/{cairo_1.14.12.bb => cairo_1.16.0.bb} (92%)

diff --git a/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch b/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch
deleted file mode 100644
index 7d02ab9474..0000000000
--- a/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 042421e9e3d266ad0bb7805132041ef51ad3234d Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed, 16 Aug 2017 22:52:35 -0400
-Subject: [PATCH] cairo: Fix CVE-2017-9814
-
-The bug happens because in some scenarios the variable size can
-have a value of 0 at line 1288. And malloc(0) is not returning
-NULL as some people could expect:
-
-    https://stackoverflow.com/questions/1073157/zero-size-malloc
-
-malloc(0) returns the smallest chunk possible. So the line 1290
-with the return is not execute. And the execution continues with
-an invalid map.
-
-Since the size is 0 the variable map is not initialized correctly
-at load_trutype_table. So, later when the variable map is accessed
-previous values from a freed chunk are used. This could allows an
-attacker to control the variable map.
-
-This patch have not merge in upstream now.
-
-Upstream-Status: Backport [https://bugs.freedesktop.org/show_bug.cgi?id=101547]
-CVE: CVE-2017-9814
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- src/cairo-truetype-subset.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c
-index e3449a0..f77d11c 100644
---- a/src/cairo-truetype-subset.c
-+++ b/src/cairo-truetype-subset.c
-@@ -1285,7 +1285,7 @@ _cairo_truetype_reverse_cmap (cairo_scaled_font_t *scaled_font,
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
- 
-     size = be16_to_cpu (map->length);
--    map = malloc (size);
-+    map = _cairo_malloc (size);
-     if (unlikely (map == NULL))
- 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--- 
-2.8.1
-
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.12.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
similarity index 92%
rename from meta/recipes-graphics/cairo/cairo_1.14.12.bb
rename to meta/recipes-graphics/cairo/cairo_1.16.0.bb
index ad6745f60d..3e176930cc 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.12.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -24,11 +24,10 @@ DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
            file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ 
-           file://0001-cairo-Fix-CVE-2017-9814.patch \
           "
 
-SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165"
-SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16"
+SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552"
+SRC_URI[sha256sum] = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
 
 inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script
 
@@ -81,7 +80,6 @@ DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
 FILES_${PN} = "${libdir}/libcairo.so.*"
 FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
 FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
-FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*"
-FILES_${PN}-dev += "${libdir}/cairo/*.so"
+FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

Re: [PATCH 1/4] x264: update to latest on stable branch

[Burton, Ross]

On Thu, 14 Feb 2019 at 05:49, Anuj Mittal <anuj.mittal@intel.com> wrote:
>  do_configure() {
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
>      ./configure ${EXTRA_OECONF}
>  }

I wouldn't delete those copies, those files were last updated in 2015 upstream:

https://git.videolan.org/?p=x264.git;a=history;f=config.guess;h=375fa2a818f84ff8727cec0f516b9c8160ff5749;hb=HEAD

Up-to-date copies of these are required for building on new architectures.

Ross

Re: [PATCH 3/4] pixman: upgrade 0.34.0 -> 0.38.0

[Khem Raj]

On Wed, Feb 13, 2019 at 9:49 PM Anuj Mittal <anuj.mittal@intel.com> wrote:
>
> For changes, see:
>
> https://cgit.freedesktop.org/pixman/log/?qt=range&q=pixman-0.38.0...pixman-0.34.0
>
> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> ---
>  .../xorg-lib/pixman/asm_include.patch         | 29 -------------------
>  .../{pixman_0.34.0.bb => pixman_0.38.0.bb}    |  5 ++--
>  2 files changed, 2 insertions(+), 32 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
>  rename meta/recipes-graphics/xorg-lib/{pixman_0.34.0.bb => pixman_0.38.0.bb} (89%)
>
> diff --git a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
> deleted file mode 100644
> index b52a5707d6..0000000000
> --- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -Fixes errors like
> -
> -Assembler messages:
> -Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory
> -
> -it works with glibc because it uses gcc fixed-headers but thats not right.
> -
> -We move the include under C block
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Pending
> -Index: pixman-0.32.6/pixman/pixman-private.h
> -===================================================================
> ---- pixman-0.32.6.orig/pixman/pixman-private.h
> -+++ pixman-0.32.6/pixman/pixman-private.h
> -@@ -1,4 +1,3 @@
> --#include <float.h>
> -
> - #ifndef PIXMAN_PRIVATE_H
> - #define PIXMAN_PRIVATE_H
> -@@ -17,6 +16,8 @@
> -
> - #ifndef __ASSEMBLER__
> -
> -+#include <float.h>
> -+
> - #ifndef PACKAGE
> - #  error config.h must be included before pixman-private.h
> - #endif
> diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> similarity index 89%
> rename from meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> rename to meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> index c290fa4614..49c3d62342 100644
> --- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> +++ b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> @@ -31,11 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk"
>
>  SRC_URI += "\
>              file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
> -           file://asm_include.patch \

can you confirm you tested a build with musl/mips ?

>             file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
>  "
>
> -SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59"
> -SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
> +SRC_URI[md5sum] = "04ecad28edcc14e7eb5f7ed6df29c7a0"
> +SRC_URI[sha256sum] = "b768e3f7895ddebdc0f07478729d9cec4fe0a9d2201f828c900d67b0e5b436a8"
>
>  REQUIRED_DISTRO_FEATURES = ""
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 3/4] pixman: upgrade 0.34.0 -> 0.38.0

[Mittal, Anuj]

On Thu, 2019-02-14 at 07:58 -0800, Khem Raj wrote:
> On Wed, Feb 13, 2019 at 9:49 PM Anuj Mittal <anuj.mittal@intel.com>
> wrote:
> > 
> > For changes, see:
> > 
> > 
https://cgit.freedesktop.org/pixman/log/?qt=range&q=pixman-0.38.0...pixman-0.34.0
> > 
> > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> > ---
> >  .../xorg-lib/pixman/asm_include.patch         | 29 -------------
> > ------
> >  .../{pixman_0.34.0.bb => pixman_0.38.0.bb}    |  5 ++--
> >  2 files changed, 2 insertions(+), 32 deletions(-)
> >  delete mode 100644 meta/recipes-graphics/xorg-
> > lib/pixman/asm_include.patch
> >  rename meta/recipes-graphics/xorg-lib/{pixman_0.34.0.bb =>
> > pixman_0.38.0.bb} (89%)
> > 
> > diff --git a/meta/recipes-graphics/xorg-
> > lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-
> > lib/pixman/asm_include.patch
> > deleted file mode 100644
> > index b52a5707d6..0000000000
> > --- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -Fixes errors like
> > -
> > -Assembler messages:
> > -Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such
> > file or directory
> > -
> > -it works with glibc because it uses gcc fixed-headers but thats
> > not right.
> > -
> > -We move the include under C block
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > -Upstream-Status: Pending
> > -Index: pixman-0.32.6/pixman/pixman-private.h
> > -==================================================================
> > =
> > ---- pixman-0.32.6.orig/pixman/pixman-private.h
> > -+++ pixman-0.32.6/pixman/pixman-private.h
> > -@@ -1,4 +1,3 @@
> > --#include <float.h>
> > -
> > - #ifndef PIXMAN_PRIVATE_H
> > - #define PIXMAN_PRIVATE_H
> > -@@ -17,6 +16,8 @@
> > -
> > - #ifndef __ASSEMBLER__
> > -
> > -+#include <float.h>
> > -+
> > - #ifndef PACKAGE
> > - #  error config.h must be included before pixman-private.h
> > - #endif
> > diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> > b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> > similarity index 89%
> > rename from meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> > rename to meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> > index c290fa4614..49c3d62342 100644
> > --- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> > +++ b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> > @@ -31,11 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk"
> > 
> >  SRC_URI += "\
> >              file://0001-ARM-qemu-related-workarounds-in-cpu-
> > features-detecti.patch \
> > -           file://asm_include.patch \
> 
> can you confirm you tested a build with musl/mips ?

I tested with musl. The change is also present upstream now:


https://cgit.freedesktop.org/pixman/commit/?id=7c6066b700c7cdd4aeb8be426b14b3a5f0de4b6c

[PATCH v2] x264: update to latest on stable branch

[Anuj Mittal]

For changes, see:

https://github.com/mirror/x264/compare/e9a5903edf8ca59ef20e6f4894c196f135af735e...0a84d986e7020f8344f00752e3600b9769cc1e85

Remove the perlnative dependency that doesn't seem to be needed.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/recipes-multimedia/x264/x264_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 842ea2547c..34c7dc4f78 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -14,13 +14,13 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "e9a5903edf8ca59ef20e6f4894c196f135af735e"
+SRCREV = "0a84d986e7020f8344f00752e3600b9769cc1e85"
 
-PV = "r2854+git${SRCPV}"
+PV = "r2917+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit lib_package pkgconfig perlnative
+inherit lib_package pkgconfig
 
 X264_DISABLE_ASM = ""
 X264_DISABLE_ASM_x86 = "--disable-asm"
-- 
2.17.1

Re: [PATCH 3/4] pixman: upgrade 0.34.0 -> 0.38.0

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 3110 bytes --]

Thanks!


On Thu, Feb 14, 2019 at 11:53 AM Mittal, Anuj <anuj.mittal@intel.com> wrote:

> On Thu, 2019-02-14 at 07:58 -0800, Khem Raj wrote:
> > On Wed, Feb 13, 2019 at 9:49 PM Anuj Mittal <anuj.mittal@intel.com>
> > wrote:
> > >
> > > For changes, see:
> > >
> > >
>
> https://cgit.freedesktop.org/pixman/log/?qt=range&q=pixman-0.38.0...pixman-0.34.0
> > >
> > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> > > ---
> > >  .../xorg-lib/pixman/asm_include.patch         | 29 -------------
> > > ------
> > >  .../{pixman_0.34.0.bb => pixman_0.38.0.bb}    |  5 ++--
> > >  2 files changed, 2 insertions(+), 32 deletions(-)
> > >  delete mode 100644 meta/recipes-graphics/xorg-
> > > lib/pixman/asm_include.patch
> > >  rename meta/recipes-graphics/xorg-lib/{pixman_0.34.0.bb =>
> > > pixman_0.38.0.bb} (89%)
> > >
> > > diff --git a/meta/recipes-graphics/xorg-
> > > lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-
> > > lib/pixman/asm_include.patch
> > > deleted file mode 100644
> > > index b52a5707d6..0000000000
> > > --- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
> > > +++ /dev/null
> > > @@ -1,29 +0,0 @@
> > > -Fixes errors like
> > > -
> > > -Assembler messages:
> > > -Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such
> > > file or directory
> > > -
> > > -it works with glibc because it uses gcc fixed-headers but thats
> > > not right.
> > > -
> > > -We move the include under C block
> > > -
> > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > -Upstream-Status: Pending
> > > -Index: pixman-0.32.6/pixman/pixman-private.h
> > > -==================================================================
> > > =
> > > ---- pixman-0.32.6.orig/pixman/pixman-private.h
> > > -+++ pixman-0.32.6/pixman/pixman-private.h
> > > -@@ -1,4 +1,3 @@
> > > --#include <float.h>
> > > -
> > > - #ifndef PIXMAN_PRIVATE_H
> > > - #define PIXMAN_PRIVATE_H
> > > -@@ -17,6 +16,8 @@
> > > -
> > > - #ifndef __ASSEMBLER__
> > > -
> > > -+#include <float.h>
> > > -+
> > > - #ifndef PACKAGE
> > > - #  error config.h must be included before pixman-private.h
> > > - #endif
> > > diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> > > b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> > > similarity index 89%
> > > rename from meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> > > rename to meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> > > index c290fa4614..49c3d62342 100644
> > > --- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
> > > +++ b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb
> > > @@ -31,11 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk"
> > >
> > >  SRC_URI += "\
> > >              file://0001-ARM-qemu-related-workarounds-in-cpu-
> > > features-detecti.patch \
> > > -           file://asm_include.patch \
> >
> > can you confirm you tested a build with musl/mips ?
>
> I tested with musl. The change is also present upstream now:
>
>
>
> https://cgit.freedesktop.org/pixman/commit/?id=7c6066b700c7cdd4aeb8be426b14b3a5f0de4b6c
>

[-- Attachment #2: Type: text/html, Size: 5227 bytes --]