diff --git a/config/rootfiles/packages/dfb++ b/config/rootfiles/packages/dfb++ new file mode 100644 index 000000000..04a323d0b --- /dev/null +++ b/config/rootfiles/packages/dfb++ @@ -0,0 +1,22 @@ +usr/bin/dfb++-config +usr/bin/dfbshow +usr/bin/dfbswitch +#usr/include/dfb++ +#usr/include/dfb++/dfb++.h +#usr/include/dfb++/idirectfb.h +#usr/include/dfb++/idirectfbdatabuffer.h +#usr/include/dfb++/idirectfbdisplaylayer.h +#usr/include/dfb++/idirectfbeventbuffer.h +#usr/include/dfb++/idirectfbfont.h +#usr/include/dfb++/idirectfbimageprovider.h +#usr/include/dfb++/idirectfbinputdevice.h +#usr/include/dfb++/idirectfbpalette.h +#usr/include/dfb++/idirectfbscreen.h +#usr/include/dfb++/idirectfbsurface.h +#usr/include/dfb++/idirectfbvideoprovider.h +#usr/include/dfb++/idirectfbwindow.h +usr/lib/libdfb++-1.0.so.0 +usr/lib/libdfb++-1.0.so.0.0.0 +#usr/lib/libdfb++.la +usr/lib/libdfb++.so +#usr/lib/pkgconfig/dfb++.pc diff --git a/config/rootfiles/packages/directfb b/config/rootfiles/packages/directfb index 3dccd7806..56df1d46e 100644 --- a/config/rootfiles/packages/directfb +++ b/config/rootfiles/packages/directfb @@ -232,10 +232,10 @@ 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/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 diff --git a/config/rootfiles/packages/vdr-softdevice b/config/rootfiles/packages/vdr-softdevice index 3b6270da3..de66a778d 100644 --- a/config/rootfiles/packages/vdr-softdevice +++ b/config/rootfiles/packages/vdr-softdevice @@ -1,4 +1,5 @@ opt/vdr/bin/runvdr-soft +opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan index 7c570d314..7c7d4372c 100644 --- a/config/rootfiles/packages/videolan +++ b/config/rootfiles/packages/videolan @@ -220,6 +220,7 @@ usr/lib/vlc/video_filter/libtime_plugin.so usr/lib/vlc/video_filter/libtransform_plugin.so usr/lib/vlc/video_filter/libwall_plugin.so #usr/lib/vlc/video_output +usr/lib/vlc/video_output/libdirectfb_plugin.so usr/lib/vlc/video_output/libfb_plugin.so usr/lib/vlc/video_output/libimage_plugin.so usr/lib/vlc/video_output/libvout_sdl_plugin.so diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 4b45cc89f..9660c776a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -5,6 +5,7 @@ * Compress-Zlib-1.35 * Convert-TNEF-0.17 * Convert-UUlib-1.06 +* DFB++-1.0.0 * Digest-1.08 * Digest-HMAC-1.01 * Digest-SHA1-2.10 diff --git a/lfs/dfb++ b/lfs/dfb++ new file mode 100644 index 000000000..56c01d140 --- /dev/null +++ b/lfs/dfb++ @@ -0,0 +1,86 @@ +############################################################################### +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.0 + +THISAPP = DFB++-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = dfb++ +PAK_VER = 1 + +DEPS = "directfb" + + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c7d0b98bcc648a25ff11bfc74635f4ca + +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) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/directfb b/lfs/directfb index ce00ee495..bb803e58e 100644 --- a/lfs/directfb +++ b/lfs/directfb @@ -85,5 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-video4linux2 --enable-multi cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) + ln -s $(THISAPP) /usr/src/directfb +# @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vdr-softdevice b/lfs/vdr-softdevice index 765b38773..d00242dfb 100644 --- a/lfs/vdr-softdevice +++ b/lfs/vdr-softdevice @@ -31,7 +31,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = vdr-softdevice PAK_VER = 1 -DEPS = "directfb ffmpeg alsa" +DEPS = "directfb dfb++ ffmpeg alsa" ############################################################################### # Top-level Rules diff --git a/lfs/videolan b/lfs/videolan index d3ab2098c..6c1c937ac 100644 --- a/lfs/videolan +++ b/lfs/videolan @@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-mad \ --enable-libdvbpsi --enable-faac --enable-mkv \ --enable-x264 --enable-release \ - --disable-nls - --enable-directfb + --disable-nls \ + --enable-directfb --with-directfb=/usr/src/directfb cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index f6016e698..82eb065ec 100755 --- a/make.sh +++ b/make.sh @@ -556,6 +556,7 @@ buildipfire() { ipfiremake elinks ipfiremake igmpproxy ipfiremake directfb + ipfiremake dfb++ ipfiremake sdl ipfiremake qemu ipfiremake sane