summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-11-25 21:25:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:13 (GMT)
commit934e486af64bff391cec85e50668a9c6cf5a8372 (patch)
tree8572d57d9f31028a15de8fd4c33134e8031fc678
parentccb2a57ad25c98e77f81f8e3bf82e6a1da2d9cd2 (diff)
downloadpoky-contrib-934e486af64bff391cec85e50668a9c6cf5a8372.zip
poky-contrib-934e486af64bff391cec85e50668a9c6cf5a8372.tar.gz
poky-contrib-934e486af64bff391cec85e50668a9c6cf5a8372.tar.bz2
psplash: update to latest git version
Latest git version contains various changes, including fix for big endian RGB888 rendering. It also makes the patch: "0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch" unnecessary, as this patch has been upstreamed. [YOCTO#7236] (From OE-Core rev: f9450bf01a792e29bf83c820aae431483caff508) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch53
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb3
2 files changed, 1 insertions, 55 deletions
diff --git a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch b/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
deleted file mode 100644
index 93b3c6b..0000000
--- a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8f5de12cc75bfaa8400adf32f30c015d8f813540 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 22 Aug 2015 07:12:20 -0700
-Subject: [PATCH] psplash-fb: Convert psplash_fb_plot_pixel() to a static
- inline
-
-This function is not used outside psplash-fb.c and by making it
-static inline we keep the performance and also make it portable across
-multiple compilers and gcc versions
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- psplash-fb.c | 2 +-
- psplash-fb.h | 8 --------
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/psplash-fb.c b/psplash-fb.c
-index bd9cd9d..6d235db 100644
---- a/psplash-fb.c
-+++ b/psplash-fb.c
-@@ -260,7 +260,7 @@ psplash_fb_new (int angle)
-
- #define OFFSET(fb,x,y) (((y) * (fb)->stride) + ((x) * ((fb)->bpp >> 3)))
-
--inline void
-+static inline void
- psplash_fb_plot_pixel (PSplashFB *fb,
- int x,
- int y,
-diff --git a/psplash-fb.h b/psplash-fb.h
-index 42592ed..c6c3144 100644
---- a/psplash-fb.h
-+++ b/psplash-fb.h
-@@ -57,14 +57,6 @@ psplash_fb_destroy (PSplashFB *fb);
- PSplashFB*
- psplash_fb_new (int angle);
-
--inline void
--psplash_fb_plot_pixel (PSplashFB *fb,
-- int x,
-- int y,
-- uint8 red,
-- uint8 green,
-- uint8 blue);
--
- void
- psplash_fb_draw_rect (PSplashFB *fb,
- int x,
---
-2.1.4
-
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index b3b6479..0537426 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -5,12 +5,11 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6"
-SRCREV = "14c8f7b705de944beb4de3f296506d80871e410f"
+SRCREV = "88343ad23c90fa1dd8d79ac0d784a691aa0c6d2b"
PV = "0.1+git${SRCPV}"
PR = "r15"
SRC_URI = "git://git.yoctoproject.org/${BPN} \
- file://0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch \
file://psplash-init \
${SPLASH_IMAGES}"