summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-22 07:16:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:35:54 +0100
commit9d46958079f5c4df0694b5749b96582ab43830b6 (patch)
treec4192ed6fc4f1cbd952c216f62b3aa21c60a025d
parent99e67db3b9fe9f67572096286c1c11d86fb90103 (diff)
downloadpoky-9d46958079f5c4df0694b5749b96582ab43830b6.tar.gz
psplash: Turn psplash_fb_plot_pixel() into static inline
This function is not used anywhere except psplash-fb.c so make it static inline function which is portable across compilers Fixes issues like psplash-fb.o: In function `psplash_fb_draw_rect': | /mnt/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-glibc/work/i586-oe-linux/psplash/0.1+gitAUTOINC+14c8f7b705-r15/git/psplash-fb.c:363: undefined reference to `psplash_fb_plot_pixel' (From OE-Core rev: 2429932c2dc1f81bf04f4377911094e2c8a04a19) (From OE-Core rev: 443f9efa457ab57be8f79bccec8250678d4065c5) Signed-off-by: Khem Raj <raj.khem@gmail.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.bb1
2 files changed, 54 insertions, 0 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
new file mode 100644
index 0000000000..93b3c6bc73
--- /dev/null
+++ b/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
@@ -0,0 +1,53 @@
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 7f0dc7859f..b3b64799ae 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -10,6 +10,7 @@ PV = "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 \
13 file://psplash-init \ 14 file://psplash-init \
14 ${SPLASH_IMAGES}" 15 ${SPLASH_IMAGES}"
15 16