Add DFB++; videolan and vdr-softdev may use directfb

diff --git a/config/rootfiles/packages/dfb++ b/config/rootfiles/packages/dfb++
new file mode 100644 (file)
index 0000000..04a323d
--- /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 3dccd7806445f603051757bb6bb7908b5c4a6c5b..56df1d46e7dec49335e6dd9d3e8a74518a4263ea 100644 (file)
--- 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 3b6270da306bc34552789f043f5d596b8b0960fa..de66a778ddfcb9f7af79dee7d2432968eceb51d2 100644 (file)
--- 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 7c570d314193d4845f75feb10512ed75bea31313..7c7d4372cc40bad662ffd626f50a4ee6a6ef6352 100644 (file)
--- 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 4b45cc89f7867fe017f0c47e869041148645b285..9660c776a3ba4200a72ac0b1a926a9345365f645 100644 (file)
--- 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 (file)
index 0000000..56c01d1
--- /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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# 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 ce00ee49549622c5656e882e88ddc4a327fb7b6f..bb803e58ea855cf51dcdc4f6d085bc021f65b1b6 100644 (file)
--- 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 765b38773c4f311be18a707eb76d87fb9a52f801..d00242dfb0bfa978a80644ff944990dbef391524 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       = "directfb ffmpeg alsa"
+DEPS       = "directfb dfb++ ffmpeg alsa"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/videolan b/lfs/videolan
index d3ab2098cee1be3db939c5c666b334e1e9f50191..6c1c937ac2fb4de0914007c63a05f36d9d4db355 100644 (file)
--- 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 f6016e698201447f270711c17e8a5cb4b8d226e6..82eb065ec73ed858a3f29f3e829dfd8860cc5a74 100755 (executable)
--- 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