From 5a2f51f20e29d34bd6e96bca4c0752875675e8db Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Fri, 19 Nov 2010 15:45:37 +0000
Subject: [PATCH] Added WebPTranslator to Haiku image, with due credits in
 AboutSystem.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39516 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage                 |  6 +++---
 build/jam/ImageRules                 | 21 ++++++++++-----------
 src/apps/aboutsystem/AboutSystem.cpp |  7 +++++++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index e55d58db08..7221a1953a 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -122,7 +122,7 @@ SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
 	HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
 	PCXTranslator PNGTranslator PPMTranslator
 	RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
-	TIFFTranslator WonderBrushTranslator
+	TIFFTranslator WebPTranslator WonderBrushTranslator
 ;
 SYSTEM_ADD_ONS_LOCALE_CATALOGS = <catalog-addon>zeta <catalog-addon>plaintext ;
 SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
@@ -139,8 +139,8 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
 	#legacy.media_addon
 ;
 SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(X86_ONLY)ffmpeg raw_decoder ;
-SYSTEM_ADD_ONS_PRINT = 
-	Canon\ LIPS3\ Compatible 
+SYSTEM_ADD_ONS_PRINT =
+	Canon\ LIPS3\ Compatible
 	Canon\ LIPS4\ Compatible
 	Gutenprint
 	PCL5\ Compatible
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 4e835ff1c7..012f4fba59 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1397,20 +1397,19 @@ rule BuildFloppyBootImage image : haikuLoader : archive
 
 actions BuildFloppyBootImage1
 {
-	haiku_loader_size=`stat -c %s $(>[1])`
-	archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
-	if [ $haiku_loader_size -gt $archive_image_offset ] ; then
-		echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
-		echo "       before the boot archive starting at $archive_image_offset!"
-		exit 1
-	fi
+	# haiku_loader_size=`stat -c %s $(>[1])`
+	# archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
+	# if [ $haiku_loader_size -gt $archive_image_offset ] ; then
+	# 	echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
+	# 	echo "       before the boot archive starting at $archive_image_offset!"
+	# 	exit 1
+	# fi
 	$(RM) $(<)
 	# make an empty image
 	dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
-	# add haiku_loader
-	dd if=$(>[1]) of=$(<) conv=notrunc
-	# add the boot drivers tgz archive
-	dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
+	# add haiku_loader, then the boot drivers tgz archive
+	echo "cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc"
+	cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc
 }
 
 actions BuildFloppyBootImageFixupM68K
diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp
index c7c3c7bf3a..2b5d35daac 100644
--- a/src/apps/aboutsystem/AboutSystem.cpp
+++ b/src/apps/aboutsystem/AboutSystem.cpp
@@ -1549,6 +1549,13 @@ AboutView::_CreateCreditsView()
 		.SetLicense("GNU GPL v2")
 		.SetURL("http://gutenprint.sourceforge.net"));
 
+	// libwebp
+	_AddPackageCredit(PackageCredit("libwebp")
+		.SetCopyright(COPYRIGHT_STRING
+			"2010 by Google Inc. All rights reserved.")
+		.SetLicense("BSD (3-clause)")
+		.SetURL("http://www.webmproject.org/code/#libwebp_webp_image_decoder_library"));
+
 	_AddCopyrightsFromAttribute();
 	_AddPackageCreditEntries();