Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (832d0175ec00a52ba37d5f711555e4a5d52d3f87)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (832d0175ec00a52ba37d5f711555e4a5d52d3f87)
  • Date: Fri, 19 Oct 2007 09:16:35 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

display/directfb/BUILD | 19 ++++++++--
display/directfb/CONFIGURE | 73
+++++++++++++++++++++++++++++++++++++++---
display/directfb/DEPENDS | 11 ++++--
display/directfb/HISTORY | 8 ++++
display/directfb/inputdrivers | 16 +++++++++
5 files changed, 115 insertions(+), 12 deletions(-)

New commits:
commit 832d0175ec00a52ba37d5f711555e4a5d52d3f87
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

directfb: various fixes

diff --git a/display/directfb/BUILD b/display/directfb/BUILD
index fa9cd72..d12211a 100755
--- a/display/directfb/BUILD
+++ b/display/directfb/BUILD
@@ -1,11 +1,20 @@
-if [ -f /usr/include/linux/fusion.h ]; then
+if [[ -f /usr/include/linux/fusion.h ]]; then
OPTS="$OPTS --enable-multi"
fi &&

-OPTS="--enable-linux-input \
- --with-gfxdrivers=$gfxdrivers \
- $OPTS" &&
+OPTS="--with-inputdrivers=$inputdrivers \
+ --with-gfxdrivers=$gfxdrivers \
+ $DFB_DEBUG $DFB_NETWORK $DFB_VOODOO \
+ $DFB_UNIQUE $DFB_V4L $DFB_V4L2 $DFB_TESTS \
+ $OPTS" &&

-export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/" &&
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL libmpeg3; then
+ export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/"
+fi &&

default_build
diff --git a/display/directfb/CONFIGURE b/display/directfb/CONFIGURE
index fe88b36..383d476 100755
--- a/display/directfb/CONFIGURE
+++ b/display/directfb/CONFIGURE
@@ -12,12 +12,15 @@ make_gfxdrivers_checklist() {
add_status `cat $SCRIPT_DIRECTORY/gfxdrivers`
}

+make_inputdrivers_checklist() {
+ add_status `cat $SCRIPT_DIRECTORY/inputdrivers`
+}

-get_gfx() {

+get_gfx() {
BACKTITLE="DirectFB GFXDRIVER Configuration"
TITLE="Chipset Manufacturer selection"
- HELP="Choose the chiipset your card uses, don't bother with any
others if you don't have the
+ HELP="Choose the chipset your card uses, don't bother with any others
if you don't have the
hardware. If none are selected then all will be installed."

dialog --backtitle "$BACKTITLE" \
@@ -30,8 +33,22 @@ hardware. If none are selected then all will be installed."

}

+get_input() {
+ BACKTITLE="DirectFB INPUTDRIVER Configuration"
+ TITLE="Input device selection"
+ HELP="Choose the input devices your box uses, don't bother with any
others. If none are selected then all will be installed."
+ dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --separate-output \
+ --checklist "$HELP" \
+ 0 0 0 \
+ `make_inputdrivers_checklist`
+
+}
+
if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then
- if query "select gfxdrivers to compile ?" n
+ if query "select gfxdrivers to compile?" n
then
gfxdrivers=all
OLD_IFS=$IFS
@@ -42,4 +59,52 @@ if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then
export IFS=$OLD_IFS
else echo gfxdrivers=all >> $SPELL_CONFIG
fi
-fi
+fi &&
+
+if ! grep -q "inputdrivers" $SPELL_CONFIG ;then
+ if query "select inputdrivers to compile?" n
+ then
+ inputdrivers=all
+ OLD_IFS=$IFS
+ export IFS="
+"
+ inputdrivers=`get_input | tr '\n' ','`
+ echo "inputdrivers=$inputdrivers" >> $SPELL_CONFIG
+ export IFS=$OLD_IFS
+ else echo inputdrivers=all >> $SPELL_CONFIG
+ fi
+fi &&
+
+config_query_option DFB_DEBUG 'Compile in debug support? (This will slow DFB
down a lot)' \
+ 'n' \
+ '--enable-debug --enable-debug-support' \
+ '--disable-debug --disable-debug-support' &&
+
+config_query_option DFB_NETWORK 'Compile in networking support?' 'y' \
+ '--enable-network' \
+ '--disable-network' &&
+
+config_query_option DFB_VOODOO 'Compile in Voodoo support? (networking)' \
+ 'n' \
+ '--enable-voodoo' \
+ '--disable-voodoo' &&
+
+config_query_option DFB_UNIQUE 'Compile in Unique? (Window management
module)' \
+ 'n' \
+ '--enable-unique' \
+ '--disable-unique' &&
+
+config_query_option DFB_V4L 'Enable the v4l video provider?' \
+ 'y' \
+ '--enable-video4linux' \
+ '--disable-video4linux' &&
+
+config_query_option DFB_V4L2 'Enable the v4l2 support?' \
+ 'n' \
+ '--enable-video4linux2' \
+ '--disable-video4linux2' &&
+
+config_query_option DFB_TESTS 'Build test programs?' \
+ 'n' \
+ '--with-tests' \
+ '--with-tests'
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index 68acaf2..ffce9bb 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -28,8 +28,8 @@ optional_depends zlib \

optional_depends sdl \
'--enable-sdl' \
- '--enable-sdl=no' \
- 'build with SDL support' &&
+ '--disable-sdl' \
+ 'build with SDL support (Experimental, intended for DFB
devs)' &&

optional_depends X11-SERVER \
'--enable-x11' \
@@ -54,4 +54,9 @@ optional_depends gpm \
optional_depends sysfsutils \
'--enable-sysfs' \
'--disable-sysfs' \
- 'for Linux 2.6+ SysFS support'
+ 'for Linux 2.6+ SysFS support' &&
+
+optional_depends libvncserver \
+ '--enable-vnc' \
+ '--disable-vnc' \
+ 'for vnc support'
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index 1a95650..94a44d9 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,11 @@
+2007-09-23 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: fixed typo
+ * DEPENDS: added warning for SDL, added libvncserver
+ * CONFIGURE: added queries for debugging, networking,
+ tests, v4l, inputdrivers and unique
+ * inputdrivers: added
+ * BUILD: added DFB_x options to OPTS
+
2006-10-03 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.0.0-rc1
updated download url to match website
diff --git a/display/directfb/inputdrivers b/display/directfb/inputdrivers
new file mode 100644
index 0000000..79b7ec2
--- /dev/null
+++ b/display/directfb/inputdrivers
@@ -0,0 +1,16 @@
+dbox2remote Dreambox2 remote
+dreamboxremote Dreambox remote
+dynapro ?
+elo-input ?
+gunze ?
+h3600_ts ?
+joystick Joystick
+keyboard Keyboard
+linuxinput Linux input
+lirc Lirc infra-red
+mutouch Mutouch touch-screen
+penmount ?
+ps2mouse PS/2 mouse
+serialmouse Serial mouse
+sonypijogdial Sony jog dial
+wm97xx WM97xx touch-screen



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (832d0175ec00a52ba37d5f711555e4a5d52d3f87), Arjan Bouter, 10/19/2007

Archive powered by MHonArc 2.6.24.

Top of Page