[haiku-commits] r39516 - in haiku/trunk: build/jam src/apps/aboutsystem

  • From: philippe.houdoin@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 19 Nov 2010 16:45:37 +0100 (CET)

Author: phoudoin
Date: 2010-11-19 16:45:37 +0100 (Fri, 19 Nov 2010)
New Revision: 39516
Changeset: http://dev.haiku-os.org/changeset/39516

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/build/jam/ImageRules
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Added WebPTranslator to Haiku image, with due credits in AboutSystem.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage    2010-11-19 15:30:09 UTC (rev 39515)
+++ haiku/trunk/build/jam/HaikuImage    2010-11-19 15:45:37 UTC (rev 39516)
@@ -122,7 +122,7 @@
        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 @@
        #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

Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules    2010-11-19 15:30:09 UTC (rev 39515)
+++ haiku/trunk/build/jam/ImageRules    2010-11-19 15:45:37 UTC (rev 39516)
@@ -1397,20 +1397,19 @@
 
 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

Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp    2010-11-19 15:30:09 UTC 
(rev 39515)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp    2010-11-19 15:45:37 UTC 
(rev 39516)
@@ -1549,6 +1549,13 @@
                .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();
 


Other related posts: