Permalink
Browse files

psplash*: logo-math.patch has been applied upstream, remove it to fix…

… build

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
1 parent 06fcabc commit c46b3031e16767a298ecbdb320ec2b32dd9a2517 @koenkooi koenkooi committed Oct 9, 2011
@@ -1,23 +0,0 @@
-upstream: http://bugzilla.openedhand.com/show_bug.cgi?id=801
-comment:
-Do better math when showing logo vs progressbar.
----
- psplash.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/psplash.c b/psplash.c
-index 54a65cf..7a52e05 100644
---- a/psplash.c
-+++ b/psplash.c
-@@ -269,7 +269,7 @@ main (int argc, char** argv)
- /* Draw the OH logo */
- psplash_fb_draw_image (fb,
- (fb->width - POKY_IMG_WIDTH)/2,
-- (fb->height - POKY_IMG_HEIGHT)/2,
-+ ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2,
- POKY_IMG_WIDTH,
- POKY_IMG_HEIGHT,
- POKY_IMG_BYTES_PER_PIXEL,
---
-1.6.3.3
-
@@ -11,7 +11,6 @@ ALTERNATIVE_PRIORITY = "20"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://psplash-18bpp.patch \
- file://logo-math.patch \
file://psplash-poky-img.h \
file://psplash-bar-img.h \
file://psplash-default \
@@ -11,7 +11,6 @@ ALTERNATIVE_PRIORITY_omap3pandora = "5"
# You might also want to patch the colors (see patch)
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://logo-math.patch \
file://psplash-poky-img.h \
file://psplash-bar-img.h \
file://psplash-default \
@@ -11,7 +11,6 @@ ALTERNATIVE_PRIORITY = "20"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://psplash-18bpp.patch \
- file://logo-math.patch \
file://0001-configurability-for-rev-422.patch \
file://psplash-poky-img.h \
file://psplash-bar-img.h \
@@ -10,7 +10,7 @@ RCONFLICTS_${PN} = "exquisite"
SRCREV = "e05374aae945bcfc6d962ed0d7b2774b77987e1d"
PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
# You can create your own pslash-poky-img.h by doing
# ./make-image-header.sh <file>.png POKY
@@ -11,8 +11,3 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://psplash-init"
S = "${WORKDIR}/git"
-# This really should be default, but due yo openmoko hack below, can't be easily
-SRC_URI_append_angstrom = " file://logo-math.patch "
-SRC_URI_append_openmoko = " file://configurability.patch "
-SRC_URI_append_boc01 = " file://psplash_grayscale.patch "
-

0 comments on commit c46b303

Please sign in to comment.