From patchwork Tue Sep 13 04:02:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 12690 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78FA4C6FA94 for ; Tue, 13 Sep 2022 04:02:56 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.933.1663041770122332712 for ; Mon, 12 Sep 2022 21:02:50 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 91D7240D4B for ; Tue, 13 Sep 2022 04:02:48 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qOmvxrGX6-HB for ; Tue, 13 Sep 2022 04:02:48 +0000 (UTC) Received: from mail.denix.org (pool-100-15-80-88.washdc.fios.verizon.net [100.15.80.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 8337D40D74 for ; Tue, 13 Sep 2022 04:02:47 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 21AA11749D4 for ; Tue, 13 Sep 2022 00:02:46 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 25/52] psplash: Update patches to match newer psplash version Date: Tue, 13 Sep 2022 04:02:19 +0000 Message-Id: <20220913040246.2365077-26-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220913040246.2365077-1-denis@denix.org> References: <20220913040246.2365077-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 04:02:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14012 From: Ryan Eatmon The headers files in psplash were updated for the SPDX and changed the line numbering in the files. This caused the patches to fail. Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../0001-psplash-Add-Arago-custom-color.patch | 19 +++++----- .../psplash/psplash/psplash-18bpp.patch | 37 +++++++++++-------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/meta-arago-distro/recipes-core/psplash/psplash/0001-psplash-Add-Arago-custom-color.patch b/meta-arago-distro/recipes-core/psplash/psplash/0001-psplash-Add-Arago-custom-color.patch index c13790e1..80ba58e5 100644 --- a/meta-arago-distro/recipes-core/psplash/psplash/0001-psplash-Add-Arago-custom-color.patch +++ b/meta-arago-distro/recipes-core/psplash/psplash/0001-psplash-Add-Arago-custom-color.patch @@ -1,20 +1,21 @@ -From be4eb4c5c3992deee2cfaa5da8913473623f728b Mon Sep 17 00:00:00 2001 -From: Franklin S. Cooper Jr -Date: Fri, 21 Sep 2012 15:18:24 -0500 -Subject: [PATCH] psplash: Add Arago custom color +From 02f63cdcff468e0b7e6dfe29cfb1e484497c38d6 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon +Date: Wed, 4 May 2022 13:55:44 -0500 +Subject: [PATCH 1/2] psplash: Add Arago custom color * Port custom colors used in psplash-ti from oe-classic. Signed-off-by: Franklin S. Cooper Jr +Signed-off-by: Ryan Eatmon --- - psplash-colors.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + psplash-colors.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/psplash-colors.h b/psplash-colors.h -index d701089..a6a5992 100644 +index 82a9893..427fff7 100644 --- a/psplash-colors.h +++ b/psplash-colors.h -@@ -20,15 +20,15 @@ +@@ -12,15 +12,15 @@ #define _HAVE_PSPLASH_COLORS_H /* This is the overall background color */ @@ -35,5 +36,5 @@ index d701089..a6a5992 100644 #endif -- -1.7.0.4 +2.17.1 diff --git a/meta-arago-distro/recipes-core/psplash/psplash/psplash-18bpp.patch b/meta-arago-distro/recipes-core/psplash/psplash/psplash-18bpp.patch index 36ab43bf..1001a196 100644 --- a/meta-arago-distro/recipes-core/psplash/psplash/psplash-18bpp.patch +++ b/meta-arago-distro/recipes-core/psplash/psplash/psplash-18bpp.patch @@ -1,15 +1,22 @@ -upstream: http://bugzilla.o-hand.com/show_bug.cgi?id=1764 +From c3f76ec5c4bc5867e30cbfaf6cc43cf847ae76f2 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon +Date: Wed, 4 May 2022 13:56:39 -0500 +Subject: [PATCH 2/2] upstream: http://bugzilla.o-hand.com/show_bug.cgi?id=1764 +This is a reworked patch to address a code update in psplash. +Original source is unknown. + +Signed-off-by: Ryan Eatmon --- - psplash-fb.c | 8 +++++++- - psplash-fb.h | 1 + - 2 files changed, 8 insertions(+), 1 deletions(-) + psplash-fb.c | 8 +++++++- + psplash-fb.h | 1 + + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/psplash-fb.c b/psplash-fb.c -index 71740cd..860c0c0 100644 +index 2babb5f..0aff9bd 100644 --- a/psplash-fb.c +++ b/psplash-fb.c -@@ -160,6 +160,7 @@ psplash_fb_new (int angle) +@@ -223,6 +223,7 @@ psplash_fb_new (int angle, int fbdev_id) fb->real_width = fb->width = fb_var.xres; fb->real_height = fb->height = fb_var.yres; fb->bpp = fb_var.bits_per_pixel; @@ -17,7 +24,7 @@ index 71740cd..860c0c0 100644 fb->stride = fb_fix.line_length; fb->type = fb_fix.type; fb->visual = fb_fix.visual; -@@ -308,7 +309,7 @@ psplash_fb_plot_pixel (PSplashFB *fb, +@@ -399,7 +400,7 @@ psplash_fb_plot_pixel (PSplashFB *fb, break; } } else if (fb->rgbmode == BGR565 || fb->rgbmode == BGR888) { @@ -25,10 +32,10 @@ index 71740cd..860c0c0 100644 + switch (fb->depth) { case 24: - case 32: -@@ -316,6 +317,11 @@ psplash_fb_plot_pixel (PSplashFB *fb, - *(fb->data + off + 1) = green; - *(fb->data + off + 2) = blue; + #if __BYTE_ORDER == __BIG_ENDIAN +@@ -416,6 +417,11 @@ psplash_fb_plot_pixel (PSplashFB *fb, + *(volatile uint32_t *) (fb->bdata + off) + = (blue << 16) | (green << 8) | (red); break; + case 18: + *(fb->data + off) = (red >> 2) | ((green & 0x0C) << 4); @@ -36,13 +43,13 @@ index 71740cd..860c0c0 100644 + *(fb->data + off + 2) = (blue & 0xC0) >> 6; + break; case 16: - *(volatile uint16_t *) (fb->data + off) + *(volatile uint16_t *) (fb->bdata + off) = ((blue >> 3) << 11) | ((green >> 2) << 5) | (red >> 3); diff --git a/psplash-fb.h b/psplash-fb.h -index ef5b39e..160cdeb 100644 +index 16e2b20..cf17f51 100644 --- a/psplash-fb.h +++ b/psplash-fb.h -@@ -34,6 +34,7 @@ typedef struct PSplashFB +@@ -27,6 +27,7 @@ typedef struct PSplashFB int visual; int width, height; int bpp; @@ -51,5 +58,5 @@ index ef5b39e..160cdeb 100644 char *data; char *base; -- -1.6.3.3 +2.17.1