Added DirectFB

diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files
index 2ecf1fdf5f5d4e8ddf4afae34b17968ac5042e8c..7c4b2946e675ceba9fd683cf04f21ad73dd20a98 100644 (file)
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -126,6 +126,8 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/compat_ioctl32.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videodev.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l1-compat.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko
+lib/modules/2.6.16.57-ipfire/drivers/char/fusion/fusion.ko
+lib/modules/2.6.16.57-ipfire-smp/drivers/char/fusion/fusion.ko
 etc/udev/dvb.sh
 etc/udev/rules.d/10-dvb.rules
 srv/web/ipfire/cgi-bin/services.cgi
@@ -138,3 +140,4 @@ srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 opt/pakfire/lib/functions.pl
 var/ipfire/langs
+etc/sysconfig/modules

diff --git a/config/rootfiles/core/12/update.sh b/config/rootfiles/core/12/update.sh
index 3e4c5db7887485ca2fb39b0e52c5ddb0688b3aa8..e6334cb15ba5a5593bdcb17d25eaa7c962052c28 100644 (file)
--- a/config/rootfiles/core/12/update.sh
+++ b/config/rootfiles/core/12/update.sh
@@ -4,3 +4,4 @@
 extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 depmod -a
+modprobe fusion

diff --git a/config/rootfiles/packages/DirectFB b/config/rootfiles/packages/DirectFB
new file mode 100644 (file)
index 0000000..3dccd78
--- /dev/null
+++ b/config/rootfiles/packages/DirectFB
@@ -0,0 +1,243 @@
+usr/bin/dfbdump
+usr/bin/dfbfx
+usr/bin/dfbg
+usr/bin/dfbinfo
+usr/bin/dfbinput
+usr/bin/dfblayer
+usr/bin/dfbpenmount
+usr/bin/dfbscreen
+usr/bin/directfb-config
+usr/bin/directfb-csource
+usr/bin/mkdfiff
+usr/bin/mkdgiff
+#usr/include/directfb
+#usr/include/directfb-internal
+#usr/include/directfb-internal/core
+#usr/include/directfb-internal/core/clipboard.h
+#usr/include/directfb-internal/core/colorhash.h
+#usr/include/directfb-internal/core/core.h
+#usr/include/directfb-internal/core/core_parts.h
+#usr/include/directfb-internal/core/core_system.h
+#usr/include/directfb-internal/core/coredefs.h
+#usr/include/directfb-internal/core/coretypes.h
+#usr/include/directfb-internal/core/fonts.h
+#usr/include/directfb-internal/core/gfxcard.h
+#usr/include/directfb-internal/core/graphics_driver.h
+#usr/include/directfb-internal/core/input.h
+#usr/include/directfb-internal/core/input_driver.h
+#usr/include/directfb-internal/core/layer_context.h
+#usr/include/directfb-internal/core/layer_control.h
+#usr/include/directfb-internal/core/layer_region.h
+#usr/include/directfb-internal/core/layers.h
+#usr/include/directfb-internal/core/layers_internal.h
+#usr/include/directfb-internal/core/palette.h
+#usr/include/directfb-internal/core/screen.h
+#usr/include/directfb-internal/core/screens.h
+#usr/include/directfb-internal/core/screens_internal.h
+#usr/include/directfb-internal/core/state.h
+#usr/include/directfb-internal/core/surface.h
+#usr/include/directfb-internal/core/surface_buffer.h
+#usr/include/directfb-internal/core/surface_pool.h
+#usr/include/directfb-internal/core/system.h
+#usr/include/directfb-internal/core/windows.h
+#usr/include/directfb-internal/core/windows_internal.h
+#usr/include/directfb-internal/core/windowstack.h
+#usr/include/directfb-internal/core/wm.h
+#usr/include/directfb-internal/core/wm_module.h
+#usr/include/directfb-internal/devmem
+#usr/include/directfb-internal/devmem/devmem.h
+#usr/include/directfb-internal/devmem/surfacemanager.h
+#usr/include/directfb-internal/display
+#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
+#usr/include/directfb-internal/display/idirectfbpalette.h
+#usr/include/directfb-internal/display/idirectfbscreen.h
+#usr/include/directfb-internal/display/idirectfbsurface.h
+#usr/include/directfb-internal/display/idirectfbsurface_layer.h
+#usr/include/directfb-internal/display/idirectfbsurface_window.h
+#usr/include/directfb-internal/fbdev
+#usr/include/directfb-internal/fbdev/agp.h
+#usr/include/directfb-internal/fbdev/fb.h
+#usr/include/directfb-internal/fbdev/fbdev.h
+#usr/include/directfb-internal/fbdev/surfacemanager.h
+#usr/include/directfb-internal/fbdev/vt.h
+#usr/include/directfb-internal/gfx
+#usr/include/directfb-internal/gfx/clip.h
+#usr/include/directfb-internal/gfx/convert.h
+#usr/include/directfb-internal/gfx/generic
+#usr/include/directfb-internal/gfx/generic/generic.h
+#usr/include/directfb-internal/gfx/util.h
+#usr/include/directfb-internal/idirectfb.h
+#usr/include/directfb-internal/input
+#usr/include/directfb-internal/input/idirectfbinputbuffer.h
+#usr/include/directfb-internal/input/idirectfbinputdevice.h
+#usr/include/directfb-internal/media
+#usr/include/directfb-internal/media/idirectfbdatabuffer.h
+#usr/include/directfb-internal/media/idirectfbfont.h
+#usr/include/directfb-internal/media/idirectfbimageprovider.h
+#usr/include/directfb-internal/media/idirectfbvideoprovider.h
+#usr/include/directfb-internal/misc
+#usr/include/directfb-internal/misc/conf.h
+#usr/include/directfb-internal/misc/gfx_util.h
+#usr/include/directfb-internal/misc/util.h
+#usr/include/directfb-internal/windows
+#usr/include/directfb-internal/windows/idirectfbwindow.h
+#usr/include/directfb/dfb_types.h
+#usr/include/directfb/dfiff.h
+#usr/include/directfb/dgiff.h
+#usr/include/directfb/direct
+#usr/include/directfb/direct/build.h
+#usr/include/directfb/direct/clock.h
+#usr/include/directfb/direct/conf.h
+#usr/include/directfb/direct/debug.h
+#usr/include/directfb/direct/direct.h
+#usr/include/directfb/direct/hash.h
+#usr/include/directfb/direct/interface.h
+#usr/include/directfb/direct/interface_implementation.h
+#usr/include/directfb/direct/list.h
+#usr/include/directfb/direct/log.h
+#usr/include/directfb/direct/mem.h
+#usr/include/directfb/direct/memcpy.h
+#usr/include/directfb/direct/messages.h
+#usr/include/directfb/direct/modules.h
+#usr/include/directfb/direct/serial.h
+#usr/include/directfb/direct/signals.h
+#usr/include/directfb/direct/stream.h
+#usr/include/directfb/direct/system.h
+#usr/include/directfb/direct/thread.h
+#usr/include/directfb/direct/trace.h
+#usr/include/directfb/direct/tree.h
+#usr/include/directfb/direct/types.h
+#usr/include/directfb/direct/utf8.h
+#usr/include/directfb/direct/util.h
+#usr/include/directfb/directfb.h
+#usr/include/directfb/directfb_keyboard.h
+#usr/include/directfb/directfb_keynames.h
+#usr/include/directfb/directfb_strings.h
+#usr/include/directfb/directfb_util.h
+#usr/include/directfb/directfb_version.h
+#usr/include/directfb/directfbgl.h
+#usr/include/directfb/fusion
+#usr/include/directfb/fusion/arena.h
+#usr/include/directfb/fusion/build.h
+#usr/include/directfb/fusion/call.h
+#usr/include/directfb/fusion/conf.h
+#usr/include/directfb/fusion/fusion.h
+#usr/include/directfb/fusion/fusion_internal.h
+#usr/include/directfb/fusion/hash.h
+#usr/include/directfb/fusion/lock.h
+#usr/include/directfb/fusion/object.h
+#usr/include/directfb/fusion/property.h
+#usr/include/directfb/fusion/protocol.h
+#usr/include/directfb/fusion/reactor.h
+#usr/include/directfb/fusion/ref.h
+#usr/include/directfb/fusion/shm
+#usr/include/directfb/fusion/shm/pool.h
+#usr/include/directfb/fusion/shm/shm.h
+#usr/include/directfb/fusion/shm/shm_internal.h
+#usr/include/directfb/fusion/shmalloc.h
+#usr/include/directfb/fusion/types.h
+#usr/include/directfb/fusion/vector.h
+#usr/lib/directfb-1.1-0
+#usr/lib/directfb-1.1-0/gfxdrivers
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_ati128.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_ati128.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cle266.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cle266.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cyber5k.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cyber5k.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i810.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i810.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i830.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i830.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_mach64.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_mach64.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_neomagic.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_neomagic.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nsc.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nsc.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nvidia.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nvidia.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_radeon.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_radeon.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_savage.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_savage.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sh7722.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sh7722.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sis315.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sis315.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_tdfx.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_tdfx.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_unichrome.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_unichrome.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_vmware.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_vmware.so
+#usr/lib/directfb-1.1-0/inputdrivers
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_joystick.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_joystick.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_keyboard.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_keyboard.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_linux_input.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_linux_input.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_lirc.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_lirc.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_mutouch.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_mutouch.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_penmount.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_penmount.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ps2mouse.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ps2mouse.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_serialmouse.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_serialmouse.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sonypi.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sonypi.so
+#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_wm97xx_ts.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_wm97xx_ts.so
+#usr/lib/directfb-1.1-0/interfaces
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBFont
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider
+#usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
+usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
+#usr/lib/directfb-1.1-0/systems
+#usr/lib/directfb-1.1-0/systems/libdirectfb_devmem.la
+usr/lib/directfb-1.1-0/systems/libdirectfb_devmem.so
+#usr/lib/directfb-1.1-0/systems/libdirectfb_fbdev.la
+usr/lib/directfb-1.1-0/systems/libdirectfb_fbdev.so
+#usr/lib/directfb-1.1-0/wm
+#usr/lib/directfb-1.1-0/wm/libdirectfbwm_default.la
+usr/lib/directfb-1.1-0/wm/libdirectfbwm_default.so
+usr/lib/libdirect-1.1.so.0
+usr/lib/libdirect-1.1.so.0.1.0
+#usr/lib/libdirect.la
+usr/lib/libdirect.so
+usr/lib/libdirectfb-1.1.so.0
+usr/lib/libdirectfb-1.1.so.0.1.0
+#usr/lib/libdirectfb.la
+usr/lib/libdirectfb.so
+usr/lib/libfusion-1.1.so.0
+usr/lib/libfusion-1.1.so.0.1.0
+#usr/lib/libfusion.la
+usr/lib/libfusion.so
+usr/lib/pkgconfig/direct.pc
+usr/lib/pkgconfig/directfb-internal.pc
+usr/lib/pkgconfig/directfb.pc
+usr/lib/pkgconfig/fusion.pc
+#usr/share/directfb-1.1.1
+usr/share/directfb-1.1.1/cursor.dat
+#usr/share/man/man1/dfbg.1
+#usr/share/man/man1/directfb-csource.1
+#usr/share/man/man5/directfbrc.5

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 442e487750f3419f2a13933b983fae379e0c2efc..4b45cc89f7867fe017f0c47e869041148645b285 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -8,6 +8,7 @@
 * Digest-1.08
 * Digest-HMAC-1.01
 * Digest-SHA1-2.10
+* DirectFB-1.1.1
 * GD-2.35
 * GDGraph-1.4308
 * GDTextUtil-0.86
@@ -164,6 +165,7 @@
 * libxslt-1.1.17
 * linux-2.6.16.57
 * linux-atm-2.4.1
+* linux-fusion-7.0.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
 * logrotate-3.7.1

diff --git a/lfs/directfb b/lfs/directfb
new file mode 100644 (file)
index 0000000..7743c76
--- /dev/null
+++ b/lfs/directfb
@@ -0,0 +1,89 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.1.1
+
+THISAPP    = DirectFB-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = DirectFB
+PAK_VER    = 1
+
+DEPS       = ""
+
+
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = c75255049ca8d5c69afe4db58f603028
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i "s/checkfor_matrox=yes/checkfor_matrox=no/g" configure
+       cd $(DIR_APP) && sed -i "s/checkfor_cle266=no/checkfor_cle266=yes/g" configure
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-x11 \
+                                    --enable-video4linux2 --enable-multi 
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/linux-fusion b/lfs/linux-fusion
new file mode 100644 (file)
index 0000000..bde3c05
--- /dev/null
+++ b/lfs/linux-fusion
@@ -0,0 +1,90 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 7.0.1
+
+THISAPP    = linux-fusion-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+ifeq "$(SMP)" "1"
+       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
+else
+       TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 937028c98dbfd512f0c570c5ffe13769
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(SMP)" "1"
+       cd $(DIR_APP) && sed -i "s/\x24(shell uname -r)/$(KVER)-ipfire-smp/g" Makefile
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install 
+else
+       cd $(DIR_APP) && sed -i "s/\x24(shell uname -r)/$(KVER)-ipfire/g" Makefile
+       cd $(DIR_APP) && make 
+       cd $(DIR_APP) && make install 
+endif
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/sdl b/lfs/sdl
index f821b7f42532133b397ee2e4fe76bf0ccb9618c3..f7339e68591b9daeeaa560ac33a067069ebe5290 100644 (file)
--- a/lfs/sdl
+++ b/lfs/sdl
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sdl
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = ""
+DEPS       = "alsa directfb"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/vdr-softdevice b/lfs/vdr-softdevice
index a457ddca6859a1035dfd34e3d6a5a442308005a7..765b38773c4f311be18a707eb76d87fb9a52f801 100644 (file)
--- a/lfs/vdr-softdevice
+++ b/lfs/vdr-softdevice
@@ -31,7 +31,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = vdr-softdevice
 PAK_VER    = 1
 
-DEPS       = "ffmpeg alsa"
+DEPS       = "directfb ffmpeg alsa"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/videolan b/lfs/videolan
index 675ef0c37b149159d8979a94e361626425e96c3a..d3ab2098cee1be3db939c5c666b334e1e9f50191 100644 (file)
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
 PAK_VER    = 2
 
-DEPS       = "libshout libmpeg2 libmad ffmpeg"
+DEPS       = "libshout libmpeg2 libmad directfb ffmpeg"
 
 ###############################################################################
 # Top-level Rules
@@ -89,6 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                                                --enable-libdvbpsi --enable-faac --enable-mkv  \
                                                                --enable-x264 --enable-release \
                                                                --disable-nls
+                                                               --enable-directfb
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index 98fc8b6658be845153696a52cf8df3575bbe506c..f6016e698201447f270711c17e8a5cb4b8d226e6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -341,6 +341,7 @@ buildipfire() {
   ipfiremake dm9601                    SMP=1
   ipfiremake kqemu                     SMP=1
   ipfiremake sane              KMOD=1  SMP=1
+  ipfiremake linux-fusion              SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake zaptel
@@ -351,6 +352,7 @@ buildipfire() {
   ipfiremake dm9601
   ipfiremake kqemu
   ipfiremake sane              KMOD=1
+  ipfiremake linux-fusion
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -553,6 +555,7 @@ buildipfire() {
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
+  ipfiremake directfb
   ipfiremake sdl
   ipfiremake qemu
   ipfiremake sane

diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index 66d134e5fe2c6737f1adeea0315a01c0b519212d..11ae443210009772696cd895f7a35b9dad2d62a9 100644 (file)
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -30,4 +30,7 @@ video
 parport_pc
 lp
 
+### fusion
+fusion
+
 # End /etc/sysconfig/modules