summaryrefslogtreecommitdiffstats
path: root/patches/DirectFB-examples-1.2.0
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2009-03-04 19:45:00 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2009-03-04 19:45:00 +0000
commita8264e37139846b965e9f55fb454648a4a80fbfb (patch)
treefeab262f3c032f02fd038cccb1e3ff040d79b59a /patches/DirectFB-examples-1.2.0
parentc60a8327dc8377a0561d3d00a4a1921df62a77b1 (diff)
downloadptxdist-a8264e37139846b965e9f55fb454648a4a80fbfb.tar.gz
ptxdist-a8264e37139846b965e9f55fb454648a4a80fbfb.tar.xz
* directfb-examples: update 1.0.0 -> 1.2.0
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9963 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/DirectFB-examples-1.2.0')
-rw-r--r--patches/DirectFB-examples-1.2.0/generic/ptx_logo_640_480.pngbin0 -> 21235 bytes
-rw-r--r--patches/DirectFB-examples-1.2.0/generic/selectable_default_penguin_population.diff45
-rw-r--r--patches/DirectFB-examples-1.2.0/generic/series2
-rw-r--r--patches/DirectFB-examples-1.2.0/generic/use_ptx_logo.diff17
4 files changed, 64 insertions, 0 deletions
diff --git a/patches/DirectFB-examples-1.2.0/generic/ptx_logo_640_480.png b/patches/DirectFB-examples-1.2.0/generic/ptx_logo_640_480.png
new file mode 100644
index 000000000..c70d4ea58
--- /dev/null
+++ b/patches/DirectFB-examples-1.2.0/generic/ptx_logo_640_480.png
Binary files differ
diff --git a/patches/DirectFB-examples-1.2.0/generic/selectable_default_penguin_population.diff b/patches/DirectFB-examples-1.2.0/generic/selectable_default_penguin_population.diff
new file mode 100644
index 000000000..87b3bc7dd
--- /dev/null
+++ b/patches/DirectFB-examples-1.2.0/generic/selectable_default_penguin_population.diff
@@ -0,0 +1,45 @@
+Subject: selectable default penguin population
+From: Luotao Fu <l.fu@pengutronix.de>
+
+ This one makes the default penguin population selectable though environment
+ variable "PENGUIN". This way we can start the control this on boards without
+ a keyboard.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+
+---
+ src/df_andi.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+Index: src/df_andi.c
+===================================================================
+--- src/df_andi.c.orig
++++ src/df_andi.c
+@@ -566,6 +566,7 @@ int main( int argc, char *argv[] )
+ FPSData fps;
+ int quit = 0;
+ int clipping = 0;
++ unsigned long int default_population = 200;
+
+ init_resources( argc, argv );
+
+@@ -573,7 +574,18 @@ int main( int argc, char *argv[] )
+
+ initialize_animation();
+
+- spawn_penguins( 200 );
++ if (getenv("PENGUINS"))
++ default_population = strtoul(getenv("PENGUINS"), NULL, 10);
++
++ if (default_population > 2000) {
++ fprintf(stderr, "ERR: %ld are more penguins than we can afford,",
++ default_population);
++ default_population = 200;
++ fprintf(stderr, " setting default population back to %ld\n",
++ default_population);
++ }
++
++ spawn_penguins( default_population );
+
+ primary->SetDrawingFlags( primary, DSDRAW_BLEND );
+
diff --git a/patches/DirectFB-examples-1.2.0/generic/series b/patches/DirectFB-examples-1.2.0/generic/series
new file mode 100644
index 000000000..55ccc47fd
--- /dev/null
+++ b/patches/DirectFB-examples-1.2.0/generic/series
@@ -0,0 +1,2 @@
+use_ptx_logo.diff -p0
+selectable_default_penguin_population.diff -p0
diff --git a/patches/DirectFB-examples-1.2.0/generic/use_ptx_logo.diff b/patches/DirectFB-examples-1.2.0/generic/use_ptx_logo.diff
new file mode 100644
index 000000000..c3c4bc2c4
--- /dev/null
+++ b/patches/DirectFB-examples-1.2.0/generic/use_ptx_logo.diff
@@ -0,0 +1,17 @@
+---
+ src/df_andi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: src/df_andi.c
+===================================================================
+--- src/df_andi.c.orig
++++ src/df_andi.c
+@@ -513,7 +513,7 @@ static void init_resources( int argc, ch
+ tuximage->SetSrcColorKey( tuximage, 0x00, 0xFF, 0x00 );
+
+ /* load the background image */
+- DFBCHECK(dfb->CreateImageProvider( dfb, DATADIR"/wood_andi.jpg",
++ DFBCHECK(dfb->CreateImageProvider( dfb, DATADIR"/ptx_logo_640_480.png",
+ &provider ));
+
+ DFBCHECK (provider->GetSurfaceDescription (provider, &dsc));