summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 93b3c6bc73..0000000000
--- a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 8f5de12cc75bfaa8400adf32f30c015d8f813540 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 22 Aug 2015 07:12:20 -0700
4Subject: [PATCH] psplash-fb: Convert psplash_fb_plot_pixel() to a static
5 inline
6
7This function is not used outside psplash-fb.c and by making it
8static inline we keep the performance and also make it portable across
9multiple compilers and gcc versions
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 psplash-fb.c | 2 +-
16 psplash-fb.h | 8 --------
17 2 files changed, 1 insertion(+), 9 deletions(-)
18
19diff --git a/psplash-fb.c b/psplash-fb.c
20index bd9cd9d..6d235db 100644
21--- a/psplash-fb.c
22+++ b/psplash-fb.c
23@@ -260,7 +260,7 @@ psplash_fb_new (int angle)
24
25 #define OFFSET(fb,x,y) (((y) * (fb)->stride) + ((x) * ((fb)->bpp >> 3)))
26
27-inline void
28+static inline void
29 psplash_fb_plot_pixel (PSplashFB *fb,
30 int x,
31 int y,
32diff --git a/psplash-fb.h b/psplash-fb.h
33index 42592ed..c6c3144 100644
34--- a/psplash-fb.h
35+++ b/psplash-fb.h
36@@ -57,14 +57,6 @@ psplash_fb_destroy (PSplashFB *fb);
37 PSplashFB*
38 psplash_fb_new (int angle);
39
40-inline void
41-psplash_fb_plot_pixel (PSplashFB *fb,
42- int x,
43- int y,
44- uint8 red,
45- uint8 green,
46- uint8 blue);
47-
48 void
49 psplash_fb_draw_rect (PSplashFB *fb,
50 int x,
51--
522.1.4
53
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index b3b64799ae..0537426513 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -5,12 +5,11 @@ SECTION = "base"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" 6LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6"
7 7
8SRCREV = "14c8f7b705de944beb4de3f296506d80871e410f" 8SRCREV = "88343ad23c90fa1dd8d79ac0d784a691aa0c6d2b"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10PR = "r15" 10PR = "r15"
11 11
12SRC_URI = "git://git.yoctoproject.org/${BPN} \ 12SRC_URI = "git://git.yoctoproject.org/${BPN} \
13 file://0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch \
14 file://psplash-init \ 13 file://psplash-init \
15 ${SPLASH_IMAGES}" 14 ${SPLASH_IMAGES}"
16 15