Skip to contentSkip to conversation

psplash : update to latest SVN

PATCH New Eric Benard 1 participant 1 message Apr 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 psplash : update to latest SVN

- update to latest SVN
- update file names : psplash-hand-img.h -> psplash-poky-img.h
- fix comments
- fix psplash-18bpp.patch (missing break in the switch)

---
 .../{psplash-hand-img.h => psplash-poky-img.h}     |    0
 .../{psplash-hand-img.h => psplash-poky-img.h}     |    0
 .../{psplash-hand-img.h => psplash-poky-img.h}     |    0
 recipes/psplash/files/logo-math.patch              |   26 +++++---
 .../{psplash-hand-img.h => psplash-poky-img.h}     |    0
 recipes/psplash/files/psplash-18bpp.patch          |   73 +++++++++++--------
 .../{psplash-hand-img.h => psplash-poky-img.h}     |    0
 recipes/psplash/psplash-angstrom_svn.bb            |    8 +-
 recipes/psplash/psplash-omap3pandora_svn.bb        |    8 +-
 recipes/psplash/psplash-openmoko_svn.bb            |    8 +-
 recipes/psplash/psplash.inc                        |   12 ++--
 recipes/psplash/psplash_svn.bb                     |    2 +-
 12 files changed, 78 insertions(+), 59 deletions(-)
 rename recipes/psplash/files/angstrom/{psplash-hand-img.h => psplash-poky-img.h} (100%)
 rename recipes/psplash/files/boc01/{psplash-hand-img.h => psplash-poky-img.h} (100%)
 rename recipes/psplash/files/kaeilos/{psplash-hand-img.h => psplash-poky-img.h} (100%)
 rename recipes/psplash/files/openmoko/{psplash-hand-img.h => psplash-poky-img.h} (100%)
 rename recipes/psplash/files/{psplash-hand-img.h => psplash-poky-img.h} (100%)
recipes/psplash/files/angstrom/psplash-poky-img.h renamed from recipes/psplash/files/angstrom/psplash-hand-img.h +0 -0
similarity index 100%
rename from recipes/psplash/files/angstrom/psplash-hand-img.h
rename to recipes/psplash/files/angstrom/psplash-poky-img.h
recipes/psplash/files/boc01/psplash-poky-img.h renamed from recipes/psplash/files/boc01/psplash-hand-img.h +0 -0
similarity index 100%
rename from recipes/psplash/files/boc01/psplash-hand-img.h
rename to recipes/psplash/files/boc01/psplash-poky-img.h
recipes/psplash/files/kaeilos/psplash-poky-img.h renamed from recipes/psplash/files/kaeilos/psplash-hand-img.h +0 -0
similarity index 100%
rename from recipes/psplash/files/kaeilos/psplash-hand-img.h
rename to recipes/psplash/files/kaeilos/psplash-poky-img.h
recipes/psplash/files/logo-math.patch +17 -9
index 21467af..2ebfd7c 100644
@@ -1,15 +1,23 @@
 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(-)
 
---- psplash/psplash.c.org	2007-09-22 20:33:36.000000000 +0300
-+++ psplash/psplash.c	2007-12-01 21:27:08.000000000 +0200
-@@ -258,7 +258,7 @@
+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  - HAND_IMG_WIDTH)/2, 
--			 (fb->height - HAND_IMG_HEIGHT)/2, 
-+			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
- 			 HAND_IMG_WIDTH,
- 			 HAND_IMG_HEIGHT,
- 			 HAND_IMG_BYTES_PER_PIXEL,
+ 			 (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
+
recipes/psplash/files/openmoko/psplash-poky-img.h renamed from recipes/psplash/files/openmoko/psplash-hand-img.h +0 -0
similarity index 100%
rename from recipes/psplash/files/openmoko/psplash-hand-img.h
rename to recipes/psplash/files/openmoko/psplash-poky-img.h
recipes/psplash/files/psplash-18bpp.patch +42 -31

85 lines not on this page · raw message

recipes/psplash/files/psplash-poky-img.h renamed from recipes/psplash/files/psplash-hand-img.h +0 -0
similarity index 100%
rename from recipes/psplash/files/psplash-hand-img.h
rename to recipes/psplash/files/psplash-poky-img.h
recipes/psplash/psplash-angstrom_svn.bb +4 -4
index fc5e4c2..c610d87 100644
@@ -3,16 +3,16 @@ require psplash-ua.inc
 
 ALTERNATIVE_PRIORITY = "20"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
           file://psplash-18bpp.patch;patch=1 \
           file://logo-math.patch;patch=1 \
-          file://psplash-hand-img.h \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://splashfuncs \
recipes/psplash/psplash-omap3pandora_svn.bb +4 -4
index bc9e9f6..2e531ee 100644
@@ -4,15 +4,15 @@ require psplash-ua.inc
 ALTERNATIVE_PRIORITY = "30"
 ALTERNATIVE_PRIORITY_omap3pandora = "5"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
           file://logo-math.patch;patch=1 \
-          file://psplash-hand-img.h \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://splashfuncs \
recipes/psplash/psplash-openmoko_svn.bb +4 -4
index 1114645..bd04a02 100644
@@ -3,15 +3,15 @@ require psplash-ua.inc
 
 ALTERNATIVE_PRIORITY = "30"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
           file://logo-math.patch;patch=1 \
-          file://psplash-hand-img.h \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://psplash-init"
recipes/psplash/psplash.inc +6 -6
index 7319b96..2c6555a 100644
@@ -7,20 +7,20 @@ PROVIDES = "virtual/psplash"
 RPROVIDES_${PN} = "virtual-psplash"
 RCONFLICTS_${PN} = "exquisite"
 
-SRCREV = "249"
+SRCREV = "422"
 PV = "0.0+svnr${SRCPV}"
-PR = "r23"
+PR = "r25"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 inherit autotools pkgconfig update-rc.d
 
 do_configure_append() {
-	install -m 0644 ${WORKDIR}/psplash-hand-img.h ${S}/
+	install -m 0644 ${WORKDIR}/psplash-poky-img.h ${S}/
 	install -m 0644 ${WORKDIR}/psplash-bar-img.h ${S}/
 
 	if [ -e "${WORKDIR}/psplash.h" ]; then
recipes/psplash/psplash_svn.bb +1 -1
index 584822e..c214e53 100644
@@ -4,7 +4,7 @@ require psplash-ua.inc
 ALTERNATIVE_PRIORITY = "10"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-          file://psplash-hand-img.h \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://splashfuncs \
Signature · 1 line
1.6.3.3