diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-08 21:49:58 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-08 21:49:58 +0200 |
| commit | 0fccab65a3006d67a1805f30ca7f1af41c98e14d (patch) | |
| tree | f21f1e9e44f1b6cc80f08c9c19f6c1eecee72695 | |
| parent | 41ea5c9ff3f317a6eacc9266ddc79899c1f90d1f (diff) | |
lite: unbreak build
lite breaks because of a conflict with 'stat'. Fix taken from LiTE git.
At the same time rename and fixup no-tests patch to apply.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/lite/lite-dfbspy-stat.patch | 53 | ||||
| -rw-r--r-- | package/lite/lite-no-tests.patch (renamed from package/lite/no_tests.patch) | 4 |
2 files changed, 55 insertions, 2 deletions
diff --git a/package/lite/lite-dfbspy-stat.patch b/package/lite/lite-dfbspy-stat.patch new file mode 100644 index 000000000..5ca73691e --- /dev/null +++ b/package/lite/lite-dfbspy-stat.patch @@ -0,0 +1,53 @@ +From upstream git (git://git.directfb.org/git/directfb/libs/LiTE.git) + +From ffe0ce78327a63ddb1265328ea9b5b03acdca019 Mon Sep 17 00:00:00 2001 +From: Denis Oliver Kropp <dok@directfb.org> +Date: Fri, 1 Apr 2011 20:20:26 +0200 +Subject: [PATCH] dfbspy: Build fix for dfbspy example. + +--- + examples/dfbspy.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/examples/dfbspy.c b/examples/dfbspy.c +index 5f36f0b..c7f9725 100644 +--- a/examples/dfbspy.c ++++ b/examples/dfbspy.c +@@ -89,9 +89,9 @@ read_stat( FusionStat *stat, int world ) + + /**************************************************************************************************/ + +-#define CALC(x) stat.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) ++#define CALC(x) stats.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) + +-static FusionStat last_stat, stat; ++static FusionStat last_stat, stats; + static long long last_millis; + + static int +@@ -145,14 +145,14 @@ static const struct { + void (*update)( LiteLabel *label, void *ctx ); + void *ctx; + } list[] = { +- { "lease/purchase", update_number, &stat.lease_purchase }, +- { "cede", update_number, &stat.cede }, +- { "attach", update_number, &stat.attach }, +- { "detach", update_number, &stat.detach }, +- { "ref up", update_number, &stat.ref_up }, +- { "ref down", update_number, &stat.ref_down }, +- { "prevail/swoop", update_number, &stat.prevail_swoop }, +- { "dismiss", update_number, &stat.dismiss } ++ { "lease/purchase", update_number, &stats.lease_purchase }, ++ { "cede", update_number, &stats.cede }, ++ { "attach", update_number, &stats.attach }, ++ { "detach", update_number, &stats.detach }, ++ { "ref up", update_number, &stats.ref_up }, ++ { "ref down", update_number, &stats.ref_down }, ++ { "prevail/swoop", update_number, &stats.prevail_swoop }, ++ { "dismiss", update_number, &stats.dismiss } + }; + + #define NUM_LIST (sizeof(list)/sizeof(list[0])) +-- +1.7.6.3 + diff --git a/package/lite/no_tests.patch b/package/lite/lite-no-tests.patch index c6e8092ff..3a4718651 100644 --- a/package/lite/no_tests.patch +++ b/package/lite/lite-no-tests.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2008-07-07 13:07:12.000000000 +0200 -+++ Makefile.in 2008-07-07 13:07:05.000000000 +0200 +--- a/Makefile.in.orig 2008-07-07 13:07:12.000000000 +0200 ++++ b/Makefile.in 2008-07-07 13:07:05.000000000 +0200 @@ -202,7 +202,7 @@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ |