summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordwheeler <dwheeler@88473608-6f18-0410-8b6c-91216bd3049c>2008-01-08 13:59:02 +0000
committerdwheeler <dwheeler@88473608-6f18-0410-8b6c-91216bd3049c>2008-01-08 13:59:02 +0000
commit4e2ffbf5bba6bc4f9f48a919653ecd4d140d8bf0 (patch)
tree7cc06fde0b10f7e83d86218bbc96776463a09126
parent586e271c1b403f9f3f5d4f3f58ddf3d08152dc56 (diff)
Add to README long explanation on how to install latest DirectFB
git-svn-id: svn+ssh://svn-nitpicker.cl.cam.ac.uk/linpicker/trunk@134 88473608-6f18-0410-8b6c-91216bd3049c
-rw-r--r--README64
-rw-r--r--nitpicker-common.c116
2 files changed, 114 insertions, 66 deletions
diff --git a/README b/README
index 776c171..57d06bd 100644
--- a/README
+++ b/README
@@ -105,31 +105,77 @@ if you know your card's maker.
====================
This depends on version 1.1 of directfb. directfb is easily installed
-on a Fedora system using "yum install directfb", but the correct
-version may not be (it is not at the time of this writing).
+on a Fedora system using "yum install directfb", but at the time of this
+writing, this directfb is too old.
+
To update to the latest version of directfb, follow these steps:
-sudo yum remove directfb # If previously installed by yum
+Remove directfb, if you have it installed:
+ sudo yum remove directfb # If previously installed by yum
+
+Make sure you have these installed:
+ autoconf
+ autoconf213
+
+You may want to install VNC development packages ahead-of-time, so it
+can use them.
+
+We will install in "/usr" instead of "/usr/local"; by default Fedora
+systems don't look at all the right /usr/local directories.
+
+# Download into a ~/directfb
+cd ~
mkdir directfb
cd directfb/
git clone git://git.directfb.org/git/directfb/core/DirectFB.git
git clone git://git.directfb.org/git/directfb/extras/DirectFB-extra.git
+# Compile and build DirectFB
cd DirectFB
+aclocal -I ./m4
+autoheader
+libtoolize --automake
+automake --copy --add-missing
+# Lots of warnings
autoconf
-./configure --prefix /usr
+
+./configure --prefix=/usr
make
-cd ..
+
+su
+make install
+# control-D to leave su mode
+
+
+cd .. # Done.
+
+
+
+# Compile and install DirectFB-extras.
+# Note: You MUST install "DirectFB" before trying to build and install
+# the DirectFB-extras.
cd DirectFB-extra
+
+# Note: NOT aclocal -I ./m4
+# because there's no "m4" subdirectory. If you "mkdir -p m4" first,
+# then you could use the same command sequence as above.
+aclocal
+autoheader
+libtoolize --automake
+automake --copy --add-missing
+# Lots of warnings
autoconf
-./configure --prefix /usr
+
+./configure --prefix=/usr
make
-cd ..
su
-(cd DirectFB ; make install)
-(cd DirectFB-extra ; make install)
+make install
+# control-D to leave su mode
+
+
+cd ..
diff --git a/nitpicker-common.c b/nitpicker-common.c
index 5ae97b2..97e254c 100644
--- a/nitpicker-common.c
+++ b/nitpicker-common.c
@@ -92,8 +92,8 @@ ORBIT_ALIGNOF_CORBA_CHAR,
,
(CORBA_TypeCode *)anon_subtypes_array1,
CORBA_OBJECT_NIL,
-"shared_buffer_info_t",
-"IDL:shared_buffer_info_t:1.0",
+(char *)"shared_buffer_info_t",
+(char *)"IDL:shared_buffer_info_t:1.0",
(char **)anon_subnames_array0,
NULL,
-1,
@@ -126,8 +126,8 @@ ORBIT_ALIGNOF_CORBA_POINTER,
,
NULL,
CORBA_OBJECT_NIL,
-"Nitevent",
-"IDL:Nitevent:1.0",
+(char *)"Nitevent",
+(char *)"IDL:Nitevent:1.0",
NULL,
NULL,
-1,
@@ -160,8 +160,8 @@ ORBIT_ALIGNOF_CORBA_POINTER,
,
NULL,
CORBA_OBJECT_NIL,
-"nitpicker",
-"IDL:nitpicker:1.0",
+(char *)"nitpicker",
+(char *)"IDL:nitpicker:1.0",
NULL,
NULL,
-1,
@@ -181,7 +181,7 @@ CORBA_unsigned_long nitpicker__classid = 0;
/* Interface type data */
static CORBA_string Nitevent__base_itypes[] = {
-"IDL:omg.org/CORBA/Object:1.0"
+(char *)"IDL:omg.org/CORBA/Object:1.0"
};
#ifdef ORBIT_IDL_C_IMODULE_nitpicker
static
@@ -192,63 +192,63 @@ TC_Nitevent,{0, 0, Nitevent__imethods, FALSE},
};
static ORBit_IArg nitpicker_donate_memory__arginfo [] = {
- { TC_shared_buffer_info_t, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "ds" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "max_views" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "max_buffers" }
+ { TC_shared_buffer_info_t, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"ds" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"max_views" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"max_buffers" }
};
static ORBit_IArg nitpicker_get_screen_info__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_OUT | ORBit_I_COMMON_FIXED_SIZE, "w" },
- { TC_CORBA_long, ORBit_I_ARG_OUT | ORBit_I_COMMON_FIXED_SIZE, "h" },
- { TC_CORBA_long, ORBit_I_ARG_OUT | ORBit_I_COMMON_FIXED_SIZE, "mode" }
+ { TC_CORBA_long, ORBit_I_ARG_OUT | ORBit_I_COMMON_FIXED_SIZE, (char *)"w" },
+ { TC_CORBA_long, ORBit_I_ARG_OUT | ORBit_I_COMMON_FIXED_SIZE, (char *)"h" },
+ { TC_CORBA_long, ORBit_I_ARG_OUT | ORBit_I_COMMON_FIXED_SIZE, (char *)"mode" }
};
static ORBit_IArg nitpicker_import_buffer__arginfo [] = {
- { TC_shared_buffer_info_t, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "ds" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "w" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "h" }
+ { TC_shared_buffer_info_t, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"ds" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"w" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"h" }
};
static ORBit_IArg nitpicker_remove_buffer__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "buf_id" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"buf_id" }
};
static ORBit_IArg nitpicker_refresh__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "buf_id" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "x" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "y" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "w" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "h" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"buf_id" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"x" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"y" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"w" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"h" }
};
static ORBit_IArg nitpicker_new_view__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "buf_id" },
- { TC_Nitevent, ORBit_I_ARG_IN , "listener" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"buf_id" },
+ { TC_Nitevent, ORBit_I_ARG_IN , (char *)"listener" }
};
static ORBit_IArg nitpicker_destroy_view__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "view_id" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"view_id" }
};
static ORBit_IArg nitpicker_set_view_port__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "view_id" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "buf_x" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "buf_y" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "x" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "y" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "w" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "h" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "do_redraw" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"view_id" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"buf_x" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"buf_y" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"x" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"y" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"w" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"h" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"do_redraw" }
};
static ORBit_IArg nitpicker_stack_view__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "view_id" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "neighbor_id" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "behind" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "do_redraw" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"view_id" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"neighbor_id" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"behind" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"do_redraw" }
};
static ORBit_IArg nitpicker_set_view_title__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "view_id" },
- { TC_CORBA_string, ORBit_I_ARG_IN , "title" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"view_id" },
+ { TC_CORBA_string, ORBit_I_ARG_IN , (char *)"title" }
};
static ORBit_IArg nitpicker_set_background__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "view_id" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"view_id" }
};
static ORBit_IArg nitpicker_set_mousemode__arginfo [] = {
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "view_id" },
- { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, "mode" }
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"view_id" },
+ { TC_CORBA_long, ORBit_I_ARG_IN | ORBit_I_COMMON_FIXED_SIZE, (char *)"mode" }
};
#ifdef ORBIT_IDL_C_IMODULE_nitpicker
@@ -259,95 +259,97 @@ ORBit_IMethod nitpicker__imethods [] = {
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "alive", 5,
+ TC_CORBA_long, (char *)"alive", 5,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 3, 3, nitpicker_donate_memory__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "donate_memory", 13,
+ TC_CORBA_long, (char *)"donate_memory", 13,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 3, 3, nitpicker_get_screen_info__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "get_screen_info", 15,
+ TC_CORBA_long, (char *)"get_screen_info", 15,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 3, 3, nitpicker_import_buffer__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "import_buffer", 13,
+ TC_CORBA_long, (char *)"import_buffer", 13,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 1, 1, nitpicker_remove_buffer__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
-TC_void, "remove_buffer", 13,
+TC_void, (char *)"remove_buffer", 13,
0
}
, {
{ 5, 5, nitpicker_refresh__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
-TC_void, "refresh", 7,
+TC_void, (char *)"refresh", 7,
0
}
, {
{ 2, 2, nitpicker_new_view__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "new_view", 8,
+ TC_CORBA_long, (char *)"new_view", 8,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 1, 1, nitpicker_destroy_view__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
-TC_void, "destroy_view", 12,
+TC_void, (char *)"destroy_view", 12,
0
}
, {
{ 8, 8, nitpicker_set_view_port__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "set_view_port", 13,
+ TC_CORBA_long, (char *)"set_view_port", 13,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 4, 4, nitpicker_stack_view__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "stack_view", 10,
+ TC_CORBA_long, (char *)"stack_view", 10,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 2, 2, nitpicker_set_view_title__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "set_view_title", 14,
+ TC_CORBA_long, (char *)"set_view_title", 14,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 1, 1, nitpicker_set_background__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "set_background", 14,
+ TC_CORBA_long, (char *)"set_background", 14,
0| ORBit_I_COMMON_FIXED_SIZE
}
, {
{ 2, 2, nitpicker_set_mousemode__arginfo, FALSE },
{ 0, 0, NULL, FALSE },
{ 0, 0, NULL, FALSE },
- TC_CORBA_long, "set_mousemode", 13,
+ TC_CORBA_long, (char *)"set_mousemode", 13,
0| ORBit_I_COMMON_FIXED_SIZE
}
-};static CORBA_string nitpicker__base_itypes[] = {
-"IDL:omg.org/CORBA/Object:1.0"
+};
+
+static CORBA_string nitpicker__base_itypes[] = {
+(char *)"IDL:omg.org/CORBA/Object:1.0"
};
#ifdef ORBIT_IDL_C_IMODULE_nitpicker
static