i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added WebPTranslator to Haiku image, with due credits in AboutSystem.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39516 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-11-19 15:45:37 +00:00
parent 47dbffcd1e
commit 5a2f51f20e
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+3 -3
View File
@@ -122,7 +122,7 @@ SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
PCXTranslator PNGTranslator PPMTranslator PCXTranslator PNGTranslator PPMTranslator
RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator 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_LOCALE_CATALOGS = <catalog-addon>zeta <catalog-addon>plaintext ;
SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
@@ -139,8 +139,8 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
#legacy.media_addon #legacy.media_addon
; ;
SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(X86_ONLY)ffmpeg raw_decoder ; SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(X86_ONLY)ffmpeg raw_decoder ;
SYSTEM_ADD_ONS_PRINT = SYSTEM_ADD_ONS_PRINT =
Canon\ LIPS3\ Compatible Canon\ LIPS3\ Compatible
Canon\ LIPS4\ Compatible Canon\ LIPS4\ Compatible
Gutenprint Gutenprint
PCL5\ Compatible PCL5\ Compatible
build/jam/ImageRules
+10 -11
View File
@@ -1397,20 +1397,19 @@ rule BuildFloppyBootImage image : haikuLoader : archive
actions BuildFloppyBootImage1 actions BuildFloppyBootImage1
{ {
haiku_loader_size=`stat -c %s $(>[1])` # haiku_loader_size=`stat -c %s $(>[1])`
archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc` # archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
if [ $haiku_loader_size -gt $archive_image_offset ] ; then # if [ $haiku_loader_size -gt $archive_image_offset ] ; then
echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit " # echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
echo " before the boot archive starting at $archive_image_offset!" # echo " before the boot archive starting at $archive_image_offset!"
exit 1 # exit 1
fi # fi
$(RM) $(<) $(RM) $(<)
# make an empty image # make an empty image
dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE) dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
# add haiku_loader # add haiku_loader, then the boot drivers tgz archive
dd if=$(>[1]) of=$(<) conv=notrunc echo "cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc"
# add the boot drivers tgz archive cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc
dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
} }
actions BuildFloppyBootImageFixupM68K actions BuildFloppyBootImageFixupM68K
src/apps/aboutsystem/AboutSystem.cpp
+7
View File
@@ -1549,6 +1549,13 @@ AboutView::_CreateCreditsView()
.SetLicense("GNU GPL v2") .SetLicense("GNU GPL v2")
.SetURL("http://gutenprint.sourceforge.net")); .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(); _AddCopyrightsFromAttribute();
_AddPackageCreditEntries(); _AddPackageCreditEntries();