From e57dddf2a8953fa07a96e619e211b0ac86d3809a Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Thu, 21 Jan 2010 11:35:07 +0000
Subject: [PATCH] gnash hinzugefuegt

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5184 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/BuildCluster/Apps.dmk |  1 +
 SysBuild/multimedia/gnash      | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk
index ea35831..5010561 100644
--- a/SysBuild/BuildCluster/Apps.dmk
+++ b/SysBuild/BuildCluster/Apps.dmk
@@ -39,3 +39,4 @@
 0	tools/qemu-kvm
 0	tools/vice
 0	tools/wlan_intel_fw
+0	multimedia/gnash
diff --git a/SysBuild/multimedia/gnash b/SysBuild/multimedia/gnash
index d09a5ef..2cbb4c4 100644
--- a/SysBuild/multimedia/gnash
+++ b/SysBuild/multimedia/gnash
@@ -75,7 +75,9 @@ SRCPATH=MultiMedia/Apps
 
 
 premk() {
-	echo "Nothing to do for premk()"
+	cp /usr/include/boost/boost/dynamic_bitset/dynamic_bitset.hpp{,.orig}
+	sed -i "s/\(return.*Block(0),\)/\1NULL);/" /usr/include/boost/boost/dynamic_bitset/dynamic_bitset.hpp
+	sed -i "s/\(static_cast<value_to_type\)/\/\/\1/"  /usr/include/boost/boost/dynamic_bitset/dynamic_bitset.hpp
 }
 
 mk() {
@@ -95,15 +97,15 @@ mk() {
 		    --enable-ssl \
 		    --with-qt4-lib=/opt/qt-4/$LIBDIR \
 		    --with-qt4-incl=/opt/qt-4/include \
-		    --with-kde4-prefix=/opt/kde 
-	make -j $NUMCPU
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+		    --with-kde4-prefix=/opt/kde  \
+		    --with-plugins-install=system  \
+		    --with-npapi-plugindir=/opt/firefox/$LIBDIR/firefox/plugins
+	make -k -j $NUMCPU
+	make -k -j $NUMCPU DESTDIR=$TMPROOT install
+	make -k -j $NUMCPU DESTDIR=$TMPROOT install-plugin
 	CheckError "Make install process failed !" 1
 }
 
 postmk() {
-	PLUGINDIR=/opt/firefox/$LIBDIR/firefox/plugins
-	mkdir -p $TMPROOT$PLUGINDIR
-	mv $TMPROOT/root/.firefox/plugins/* $TMPROOT$PLUGINDIR/
-	rm -r $TMPROOT/root
+	mv /usr/include/boost/boost/dynamic_bitset/dynamic_bitset.hpp.orig /usr/include/boost/boost/dynamic_bitset/dynamic_bitset.hpp
 }