Merge branch 'master' into x86_64

Conflicts:
	build/jam/FloppyBootImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	headers/private/shared/cpu_type.h
	src/bin/ps.c
	src/bin/sysinfo.cpp
	src/kits/tracker/PoseView.cpp
	src/preferences/appearance/DecorSettingsView.cpp
	src/preferences/virtualmemory/Settings.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/input/InputServer.cpp
	src/servers/input/InputServerMethod.cpp
	src/system/boot/Jamfile
	src/system/boot/platform/raspberrypi_arm/mmu.cpp
	src/system/boot/platform/u-boot/arch/arm/Jamfile
	src/system/kernel/arch/x86/arch_cpu.cpp
	src/system/kernel/arch/x86/arch_thread.cpp
	src/system/kernel/cache/block_cache.cpp
	src/system/kernel/vm/VMAnonymousCache.cpp

build/jam/BuildSetup

@@ -1395,7 +1395,7 @@ if $(HAIKU_NO_WERROR) != 1 {
 	EnableWerror src add-ons translators bmp ;
 #	EnableWerror src add-ons translators exr ;
 	EnableWerror src add-ons translators gif ;
-	EnableWerror src add-ons translators hpgs ;
+#	EnableWerror src add-ons translators hpgs ;
 	EnableWerror src add-ons translators hvif ;
 	EnableWerror src add-ons translators ico ;
 #	EnableWerror src add-ons translators jpeg ; # gcc2

build/jam/FloppyBootImage

@@ -3,12 +3,15 @@
 
 local X86_ONLY = ;
 local PPC_ONLY = ;
+local ARM_ONLY = ;
 if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 	X86_ONLY = "" ;
 } else if $(TARGET_ARCH) = ppc {
 	X86_ONLY = ;
 } else if $(TARGET_ARCH) = m68k {
 	X86_ONLY = ;
+} else if $(TARGET_ARCH) = arm {
+	ARM_ONLY = "" ;
 }
 
 local GPL_ONLY = ;
@@ -115,6 +118,7 @@ if $(TARGET_ARCH) = x86_64 {
 
 	# drivers
 	AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
+	AddNewDriversToFloppyBootArchive disk : $(ARM_ONLY)norflash ;
 	if $(USB_BOOT) = 1 {
 		AddDriversToFloppyBootArchive disk usb : usb_disk ;
 	}
@@ -168,7 +172,7 @@ if $(TARGET_ARCH) = x86_64 {
 		ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
 		it8211
 		$(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
-		scsi_cd scsi_disk $(USB_ONLY)usb_disk
+		scsi_cd scsi_disk $(USB_ONLY)usb_disk $(ARM_ONLY)norflash
 		intel session
 		$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
 		$(BOOT_ADD_ONS_NET)

build/jam/HaikuCD

@@ -28,8 +28,6 @@ AddVariableToScript $(script) : isCD : 1 ;
 AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
 AddVariableToScript $(script) : addBuildCompatibilityLibDir
 	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
-AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
-	: $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
 AddTargetVariableToScript $(script) : <build>addattr ;
 AddTargetVariableToScript $(script) : <build>copyattr ;
 AddTargetVariableToScript $(script) : <build>rc ;

build/jam/HaikuImage

@@ -33,7 +33,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bfsinfo
 	cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
 	csplit cut date dc dd desklink df diff diff3 dircolors dirname
-	draggers driveinfo dstcheck du dumpcatalog
+	diskimage draggers driveinfo dstcheck du dumpcatalog
 	echo eject env error expand expr
 	factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
 	ftp ftpd funzip fwcontrol
@@ -86,19 +86,19 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
 SYSTEM_LIBS =
 	libbe.so libbsd.so libbnetapi.so
 	libdebug.so libdevice.so
-	libgame.so $(X86_ONLY)libGL.so libgnu.so
-	libjpeg.so
-	libmail.so libmedia.so libmidi.so libmidi2.so
+	libgame.so $(X86_ONLY)libGL.so $(X86_ONLY)libglut.so
+	libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
 	libnetwork.so
-	libpng.so
 	<revisioned>libroot.so libroot-addon-icu.so
 	libscreensaver.so
 	libtextencoding.so libtiff.so libtracker.so libtranslation.so
-	libz.so
 	$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
-	$(HAIKU_FREETYPE_CURRENT_LIB)
 ;
 PRIVATE_SYSTEM_LIBS =
+	$(HAIKU_JPEG_CURRENT_LIB)
+	$(HAIKU_LIBPNG_CURRENT_LIB)
+	$(HAIKU_ZLIB_CURRENT_LIB) 
+	$(HAIKU_FREETYPE_CURRENT_LIB)
 	libalm.so
 	libfluidsynth.so
 	libilmimf.so
@@ -129,7 +129,7 @@ SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
 	HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
 	PCXTranslator PNGTranslator PPMTranslator
 	RAWTranslator RTFTranslator SGITranslator STXTTranslator TGATranslator
-	TIFFTranslator WebPTranslator WonderBrushTranslator
+	TIFFTranslator WebPTranslator WonderBrushTranslator ICNSTranslator
 ;
 SYSTEM_ADD_ONS_LOCALE_CATALOGS = <catalog-addon>plaintext ;
 SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
@@ -144,6 +144,8 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
 	video_window_demo.media_addon
 	firewire_dv.media_addon
 	#legacy.media_addon
+	equalizer.media_addon
+	vst_host.media_addon
 ;
 SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(X86_ONLY)ffmpeg raw_decoder ;
 SYSTEM_ADD_ONS_PRINT =
@@ -303,9 +305,8 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
 }
 
 
-# libGL.so has GLU (like BeOS) *and* GLUT API built-in
-SYSTEM_LIBS_LIBGL_ALIASES
-	= libGLU.so libglut.so ;
+# libGL.so has GLU (like BeOS) built-in
+SYSTEM_LIBS_LIBGL_ALIASES = libGLU.so ;
 
 if $(TARGET_ARCH) = x86 {
 	local lib ;
@@ -332,12 +333,37 @@ SYSTEM_LIBS_ALIASES =
 	$(SYSTEM_LIBS_LIBBE_ALIASES)
 ;
 
+OPTIONAL_LIBS_ALIASES =
+	libfreetype.so
+	libjpeg.so
+	libpng.so
+	libz.so
+;
+
 # libfreetype.so links to the current freetype lib
 AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LIB:BS)
 	: $(HAIKU_FREETYPE_CURRENT_LINK) : : true ;
 AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LINK)
 	: libfreetype.so : : true ;
 
+# libpng.so links to the current libpng
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_LIBPNG_CURRENT_LIB:BS)
+	: $(HAIKU_LIBPNG_CURRENT_LINK) : : true ;
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_LIBPNG_CURRENT_LINK)
+	: libpng.so : : true ;
+
+# libjpeg.so links to the current libjpeg
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_JPEG_CURRENT_LIB:BS)
+	: $(HAIKU_JPEG_CURRENT_LINK) : : true ;
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_JPEG_CURRENT_LINK)
+	: libjpeg.so : : true ;
+
+# zlib.so links to the current zlib
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_ZLIB_CURRENT_LIB:BS)
+	: $(HAIKU_ZLIB_CURRENT_LINK) : : true ;
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_ZLIB_CURRENT_LINK)
+	: libz.so : : true ;
+
 # servers
 AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
 
@@ -667,7 +693,7 @@ AddFilesToHaikuImage system add-ons Screen\ Savers
 	: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
 
 AddFilesToHaikuImage system add-ons disk_systems
-	: <disk_system>intel <disk_system>bfs ;
+	: <disk_system>intel <disk_system>bfs <disk_system>ntfs ;
 
 # decorators
 AddDirectoryToHaikuImage home config add-ons decorators ;
@@ -710,42 +736,42 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF"
 # PDF Writer enconding files
 CopyDirectoryToHaikuImage system data
 	: [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
-	: "PDF Writer" : -x .svn -x Jamfile ;
+	: "PDF Writer" : -x Jamfile ;
 
 # Gutenprint data files
 CopyDirectoryToHaikuImage system data
 	: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
-	: gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
+	: gutenprint : -x *.c -x Makefile.am -x Makefile.in ;
 
 # dvb channel settings
 CopyDirectoryToHaikuImage home config settings Media
 	: [ FDirName $(HAIKU_TOP) data settings media dvb ]
-	: dvb : -x .svn -x Jamfile ;
+	: dvb : -x Jamfile ;
 
 # licenses
 CopyDirectoryToHaikuImage system data
 	: [ FDirName $(HAIKU_TOP) data system data licenses ]
-	: licenses : -x .svn ;
+	: licenses ;
 
 # Copy documentation as per DiskUsage's license requirement.
 CopyDirectoryToHaikuImage system documentation
 	: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
-	: diskusage : -x .svn ;
+	: diskusage ;
 
 # Copy documentation as per PDFlib Lite's license requirement.
 CopyDirectoryToHaikuImage system documentation
 	: [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
-	: pdflib : -x .svn ;
+	: pdflib ;
 
 # Copy sample programs as per PDFlib Lite's license requirement.
 CopyDirectoryToHaikuImage develop sample-code
 	: [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ]
-	: pdflib : -x .svn ;
+	: pdflib ;
 
 # Copy Mesa3D GL headers into image
 if $(TARGET_ARCH) = x86 {
 	CopyDirectoryToHaikuImage develop headers os opengl
-		: [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ;
+		: [ FDirName $(HAIKU_MESA_HEADERS) GL ] ;
 }
 
 #pragma mark - Optional Packages
@@ -892,8 +918,6 @@ AddVariableToScript $(script) : addBuildCompatibilityLibDir
 	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
 AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
 AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
-AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
-	: $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
 AddTargetVariableToScript $(script) : <build>addattr ;
 AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
 AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ;

build/jam/ImageRules

@@ -283,16 +283,17 @@ rule CopyDirectoryToContainer container : directoryTokens : sourceDirectory
 }
 
 rule ExtractArchiveToContainer container : directoryTokens : archiveFile
-	: extractedSubDir
+	: extractedSubDir : stripDebugSymbols
 {
 	# ExtractArchiveToContainer <container> : <directory> : <archiveFile>
-	#	: <extractedSubDir> ;
+	#	: <extractedSubDir> : <stripDebugSymbols> ;
 
 	local directory = [ AddDirectoryToContainer $(container)
 		: $(directoryTokens) ] ;
 
 	ARCHIVE_FILES_TO_INSTALL on $(directory) += $(archiveFile) ;
 	ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(archiveFile) = $(extractedSubDir) ;
+	ARCHIVE_FILES_TO_STRIP on $(archiveFile) = $(stripDebugSymbols) ;
 }
 
 rule AddDriversToContainer container : relativeDirectoryTokens : targets
@@ -607,6 +608,11 @@ rule CreateContainerExtractFilesScript container : script
 			ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(dummyTarget) =
 				$(extractedSubDir:E=.) ;
 
+			local stripDebugSymbols = [ on $(archiveFile)
+				return $(ARCHIVE_FILES_TO_STRIP) ] ;
+			STRIP_DEBUG_SYMBOLS_FROM_ARCHIVE on $(dummyTarget) =
+				$(stripDebugSymbols) ;
+
 			Depends $(dummyTarget) : $(initScript) $(archiveFile)
 				$(serializationDependency) ;
 			Depends $(script) : $(dummyTarget) ;
@@ -622,7 +628,8 @@ rule CreateContainerExtractFilesScript container : script
 actions AddExtractFileToContainerExtractFilesScript
 {
 	echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" \
-		"\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" >> $(2[1])
+		"\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" \
+		"\"$(STRIP_DEBUG_SYMBOLS_FROM_ARCHIVE)\"" >> $(2[1])
 }
 
 
@@ -698,7 +705,7 @@ rule AddSourceDirectoryToHaikuImage dirTokens : alwaysUpdate
 
 	CopyDirectoryToHaikuImage home HaikuSources
 		: [ FDirName $(HAIKU_TOP) $(dirTokens) ]
-		: : -x .svn : $(alwaysUpdate) ;
+		: : : $(alwaysUpdate) ;
 }
 
 rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
@@ -708,7 +715,7 @@ rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
 
 	CopyDirectoryToHaikuImage develop headers
 		: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
-		: $(dirName) : -x .svn : $(alwaysUpdate) ;
+		: $(dirName) : : $(alwaysUpdate) ;
 }
 
 rule AddWifiFirmwareToHaikuImage driver : package : archive : extract
@@ -729,7 +736,7 @@ rule AddWifiFirmwareToHaikuImage driver : package : archive : extract
 }
 
 rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate
-	: extractedSubDir
+	: extractedSubDir : stripDebugSymbols
 {
 	# ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> : <alwaysUpdate>
 	#	: <extractedSubDir> ;
@@ -738,7 +745,7 @@ rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate
 	# requested.
 	if ! [ IsUpdateHaikuImageOnly ] || $(alwaysUpdate) {
 		ExtractArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(dirTokens)
-			: $(archiveFile) : $(extractedSubDir) ;
+			: $(archiveFile) : $(extractedSubDir) : $(stripDebugSymbols) ;
 	}
 }
 
@@ -825,6 +832,7 @@ rule InstallSourceArchive file : url
 }
 
 rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
+	: stripDebugSymbols
 {
 	# download archive file
 	local archiveFile = [ DownloadFile $(package) : $(url) ] ;
@@ -835,8 +843,17 @@ rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
 		# copy onto image
 		AddFilesToHaikuImage _packages_ : $(archiveFile) ;
 	} else {
+		if $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) = 1 {
+			stripDebugSymbols ?= 1 ;
+			# The script will only test for = 1. This is in case someone
+			# manually set the flag 'true'
+			if $(stripDebugSymbols) = true {
+				stripDebugSymbols = 1 ;
+			}
+		}
 		# extract onto image
-		ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) ;
+		ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile)
+			: : : $(stripDebugSymbols) ;
 	}
 }
 
@@ -1472,7 +1489,7 @@ actions BuildCDBootPPCImage1 bind MAPS
 	|| \
 	genisoimage -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
 		-V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot \
-		ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd 
+		ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
 	#$(RM) -R $(HAIKU_OUTPUT_DIR)/cd
 }
 

build/jam/OptionalBuildFeatures

@@ -23,9 +23,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
 }
 
 if $(HAIKU_GCC_VERSION[1]) >= 4 {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86-gcc4-2012-06-19.zip ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-r1a4-x86-gcc4-2012-08-29.zip ;
 } else {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86-gcc2-2012-06-19.zip ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-r1a4-x86-gcc2-2012-08-26.zip ;
 }
 
 HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ;
@@ -66,16 +66,20 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
 # ICU
 
 # Note ICU isn't actually optional, but is still an external package
-HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1-x86-gcc2-2011-11-02a.zip ;
-HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ;
+HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-r1a4-x86-gcc2-2012-08-29.zip ;
+HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1.1-r1a4-x86-gcc4-2012-08-29.zip ;
 HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ;
+HAIKU_ICU_ARM_PACKAGE = icu-4.8.1.1-arm-2012-11-16.zip ;
 HAIKU_ICU_X86_64_PACKAGE = icu-4.8.1.1-x86_64-2012-07-30.zip ;
 
-if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = arm || $(TARGET_ARCH) = x86_64 {
 	local icu_package ;
 	if $(TARGET_ARCH) = ppc {
 		icu_package = $(HAIKU_ICU_PPC_PACKAGE) ;
 		HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-ppc-2011-12-19.zip ;
+	} else if $(TARGET_ARCH) = arm {
+		icu_package = $(HAIKU_ICU_ARM_PACKAGE) ;
+		HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1.1-arm-2012-11-16.zip ;
 	} else if $(TARGET_ARCH) = x86_64 {
 		icu_package = $(HAIKU_ICU_X86_64_PACKAGE) ;
 		HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1.1-x86_64-2012-07-30.zip ;
@@ -184,6 +188,29 @@ if $(HAIKU_BUILD_FEATURE_CLUCENE) {
 }
 
 
+# GLU (GL Utilities)
+if $(TARGET_ARCH) = x86 {
+	if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		HAIKU_GLU_FILE = glu-9.0-x86-gcc4-2012-11-13.zip ;
+	} else {
+		HAIKU_GLU_FILE = glu-9.0-x86-gcc2-2012-11-13.zip ;
+	}
+
+	local zipFile = [ DownloadFile $(HAIKU_GLU_FILE)
+		: $(baseURL)/lib/$(HAIKU_GLU_FILE) ] ;
+
+	HAIKU_GLU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(HAIKU_GLU_FILE:B) ] ;
+	HAIKU_GLU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_GLU_DIR)
+		: develop/headers/os/opengl/GL : $(zipFile) : extracted-glu-headers ] ;
+	HAIKU_GLU_LIBS = [ ExtractArchive $(HAIKU_GLU_DIR)
+		: system/lib/libGLU.a : $(zipFile) : extracted-glu ] ;
+	HAIKU_GLU_HEADERS = [ FDirName $(HAIKU_GLU_DIR) develop headers os opengl ] ;
+} else {
+	Echo "GLU not yet available on $(TARGET_ARCH)" ;
+}
+
+
 # Mesa
 if $(TARGET_ARCH) = x86 {
 	local glslObject ;
@@ -209,7 +236,6 @@ if $(TARGET_ARCH) = x86 {
 
 	HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
 		:
-		lib.haiku/libglu.a
 		$(galliumObjects)
 		lib.haiku/libglapi.a
 		$(glslObject)
@@ -219,6 +245,9 @@ if $(TARGET_ARCH) = x86 {
 
 	HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
 
+	Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
+	Depends $(HAIKU_MESA_LIBS) : $(HAIKU_GLU_LIBS) ;
+
 } else {
 	Echo "Mesa 3D rendering support not available on $(TARGET_ARCH)" ;
 }
@@ -228,19 +257,19 @@ if $(TARGET_ARCH) = x86 {
 local ffmpegBaseURL = $(baseURL)/lib ;
 if $(TARGET_ARCH) = x86 {
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-x86-gcc4-2012-03-28.zip ;
-		HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc4-2012-03-12.zip ;
-		HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc4-2012-03-12.zip ;
-		HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc4-2012-03-12.zip ;
-		HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc4-2012-03-12.zip ;
-		HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc4-2012-03-14.zip ;
+		HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-r1a4-x86-gcc4-2012-09-02.zip ;
+		HAIKU_SPEEX_FILE = speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ;
+		HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ;
+		HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ;
+		HAIKU_LIBOGG_FILE = libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ;
+		HAIKU_LIBVPX_FILE = libvpx-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ;
 	} else {
-		HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-x86-gcc2-2012-03-28.zip ;
-		HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc2-2012-03-11.zip ;
-		HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc2-2012-03-11.zip ;
-		HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc2-2012-03-11.zip ;
-		HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc2-2012-03-11.zip ;
-		HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc2-2012-03-14.zip ;
+		HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-r1a4-x86-gcc2-2012-08-30.zip ;
+		HAIKU_SPEEX_FILE = speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip ;
+		HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip ;
+		HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip ;
+		HAIKU_LIBOGG_FILE = libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip ;
+		HAIKU_LIBVPX_FILE = libvpx-1.0.0-r1a4-x86-gcc2-2012-08-29.zip ;
 	}
 
 	local ffmpegZipFile = [ DownloadFile $(HAIKU_FFMPEG_FILE)
@@ -350,9 +379,9 @@ if $(TARGET_ARCH) = x86 {
 local mikmodBaseURL = http://haiku-files.org/files/optional-packages/lib ;
 if $(TARGET_ARCH) = x86 {
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip ;
+		HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip ;
 	} else {
-		HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip ;
+		HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip ;
 	}
 
 	local mikmodZipFile = [ DownloadFile $(HAIKU_MIKMOD_FILE)
@@ -386,9 +415,9 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 	} else if $(TARGET_ARCH) = x86_64 {
 		HAIKU_FREETYPE_FILE = freetype-2.4.9-x86_64-2012-08-04.zip ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc4-2012-06-15.zip ;
+		HAIKU_FREETYPE_FILE = freetype-2.4.9-r1a4-x86-gcc4-2012-09-02.zip ;
 	} else {
-		HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc2-2012-06-19.zip ;
+		HAIKU_FREETYPE_FILE = freetype-2.4.9-r1a4-x86-gcc2-2012-08-28.zip ;
 	}
 
 	local freetypeZipFile = [ DownloadFile $(HAIKU_FREETYPE_FILE)
@@ -431,7 +460,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
 	HAIKU_BUILD_FEATURE_TAGLIB = 1 ;
 }
 
-HAIKU_TAGLIB_PACKAGE = taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ;
+HAIKU_TAGLIB_PACKAGE = taglib-1.6.3-r1a4-x86-gcc2-2012-09-03.zip ;
 HAIKU_TAGLIB_URL = $(baseURL)/$(HAIKU_TAGLIB_PACKAGE) ;
 
 if $(HAIKU_BUILD_FEATURE_TAGLIB) {
@@ -473,7 +502,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
 	HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
 }
 
-HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-07-20-1.zip ;
+HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ;
 
 if $(HAIKU_BUILD_FEATURE_WEBKIT) {
 	if $(TARGET_ARCH) != x86 {
@@ -507,3 +536,123 @@ if $(HAIKU_BUILD_FEATURE_WEBKIT) {
 		HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
 	}
 }
+
+# libpng
+local libpngBaseURL = $(baseURL)/lib ;
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
+	if $(TARGET_ARCH) = ppc {
+		HAIKU_LIBPNG_FILE = libpng-1.5.12-ppc-gcc4-2012-08-27.zip ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		HAIKU_LIBPNG_FILE = libpng-1.5.12-x86-gcc4-2012-08-23.zip ;
+	} else {
+		HAIKU_LIBPNG_FILE = libpng-1.5.12-x86-gcc2-2012-08-23.zip ;
+	}
+
+	local libpngZipFile = [ DownloadFile $(HAIKU_LIBPNG_FILE)
+		: $(libpngBaseURL)/$(HAIKU_LIBPNG_FILE) ] ;
+
+	HAIKU_LIBPNG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(HAIKU_LIBPNG_FILE:B) ] ;
+
+	HAIKU_LIBPNG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBPNG_DIR)
+		: common/include : $(libpngZipFile)
+		: extracted-libpng ] ;
+
+	HAIKU_LIBPNG_LIB = [ ExtractArchive $(HAIKU_LIBPNG_DIR)
+		:
+		common/lib/libpng.so
+		: $(libpngZipFile)
+		: extracted-libpng ] ;
+	HAIKU_LIBPNG_CURRENT_LIB = [ ExtractArchive $(HAIKU_LIBPNG_DIR)
+		:
+		common/lib/libpng15.so.15.12.0
+		: $(libpngZipFile)
+		: extracted-libpng ] ;
+	Depends $(HAIKU_LIBPNG_LIB) $(HAIKU_LIBPNG_CURRENT_LIB) : $(HAIKU_LIBPNG_HEADERS_DEPENDENCY) ;
+
+	HAIKU_LIBPNG_CURRENT_LINK = libpng15.so.15 ;
+
+	HAIKU_LIBPNG_HEADERS = [ FDirName $(HAIKU_LIBPNG_DIR) common include ] ;
+} else {
+	Echo "libpng support not available on $(TARGET_ARCH)" ;
+}
+
+# jpeg
+local jpegBaseURL = $(baseURL)/lib ;
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
+	if $(TARGET_ARCH) = ppc {
+		HAIKU_JPEG_FILE = jpeg-8d-ppc-gcc4-2012-08-27.zip ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		HAIKU_JPEG_FILE = jpeg-8d-x86-gcc4-2012-08-23.zip ;
+	} else {
+		HAIKU_JPEG_FILE = jpeg-8d-x86-gcc2-2012-08-23.zip ;
+	}
+
+	local jpegZipFile = [ DownloadFile $(HAIKU_JPEG_FILE)
+		: $(jpegBaseURL)/$(HAIKU_JPEG_FILE) ] ;
+
+	HAIKU_JPEG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(HAIKU_JPEG_FILE:B) ] ;
+
+	HAIKU_JPEG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_JPEG_DIR)
+		: common/include : $(jpegZipFile)
+		: extracted-jpeg ] ;
+
+	HAIKU_JPEG_LIB = [ ExtractArchive $(HAIKU_JPEG_DIR)
+		:
+		common/lib/libjpeg.so
+		: $(jpegZipFile)
+		: extracted-jpeg ] ;
+	HAIKU_JPEG_CURRENT_LIB = [ ExtractArchive $(HAIKU_JPEG_DIR)
+		:
+		common/lib/libjpeg.so.8.4.0
+		: $(jpegZipFile)
+		: extracted-jpeg ] ;
+	Depends $(HAIKU_JPEG_LIB) $(HAIKU_JPEG_CURRENT_LIB) : $(HAIKU_JPEG_HEADERS_DEPENDENCY) ;
+
+	HAIKU_JPEG_CURRENT_LINK = libjpeg.so.8 ;
+
+	HAIKU_JPEG_HEADERS = [ FDirName $(HAIKU_JPEG_DIR) common include ] ;
+} else {
+	Echo "jpeg support not available on $(TARGET_ARCH)" ;
+}
+
+# zlib
+local zlibBaseURL = $(baseURL)/lib ;
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
+	if $(TARGET_ARCH) = ppc {
+		HAIKU_ZLIB_FILE = zlib-1.2.7-ppc-gcc4-2012-10-30.zip ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc4-2012-10-30.zip ;
+	} else {
+		HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc2-2012-10-30.zip ;
+	}
+
+	local zlibZipFile = [ DownloadFile $(HAIKU_ZLIB_FILE)
+		: $(zlibBaseURL)/$(HAIKU_ZLIB_FILE) ] ;
+
+	HAIKU_ZLIB_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(HAIKU_ZLIB_FILE:B) ] ;
+
+	HAIKU_ZLIB_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ZLIB_DIR)
+		: common/include : $(zlibZipFile)
+		: extracted-zlib ] ;
+
+	HAIKU_ZLIB_LIB = [ ExtractArchive $(HAIKU_ZLIB_DIR)
+		:
+		common/lib/libz.so
+		: $(zlibZipFile)
+		: extracted-zlib ] ;
+	HAIKU_ZLIB_CURRENT_LIB = [ ExtractArchive $(HAIKU_ZLIB_DIR)
+		:
+		common/lib/libz.so.1.2.7
+		: $(zlibZipFile)
+		: extracted-zlib ] ;
+	Depends $(HAIKU_ZLIB_LIB) $(HAIKU_ZLIB_CURRENT_LIB) : $(HAIKU_ZLIB_HEADERS_DEPENDENCY) ;
+
+	HAIKU_ZLIB_CURRENT_LINK = libz.so.1 ;
+
+	HAIKU_ZLIB_HEADERS = [ FDirName $(HAIKU_ZLIB_DIR) common include ] ;
+} else {
+	Echo "zlib support not available on $(TARGET_ARCH)" ;
+}

build/jam/OptionalLibPackages

@@ -38,24 +38,24 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
 		Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip ;
+			allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip
+			: $(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip ;
 		InstallOptionalHaikuImagePackage
-			dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip ;
+			dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip
+			: $(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip ;
 		InstallOptionalHaikuImagePackage
-			jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip ;
+			jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip
+			: $(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip ;
+			allegro-4.4.1.1-r1a4-x86-gcc2-2012-08-30.zip
+			: $(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc2-2012-08-30.zip ;
 		InstallOptionalHaikuImagePackage
-			dumb-0.9.3-x86-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc2-2011-05-19.zip ;
+			dumb-0.9.3-r1a4-x86-gcc2-2012-08-30.zip
+			: $(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc2-2012-08-30.zip ;
 		InstallOptionalHaikuImagePackage
-			jgmod-0.99-x86-gcc2-2011-08-02.zip
-			: $(baseURL)/lib/jgmod-0.99-x86-gcc2-2011-08-02.zip ;
+			jgmod-0.99-r1a4-x86-gcc2-2012-08-30.zip
+			: $(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc2-2012-08-30.zip ;
 	}
 }
 
@@ -67,8 +67,8 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] {
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
 			InstallOptionalHaikuImagePackage
-				box2d-2.1.2-r1a3-r1a3-x86-gcc4-2011-05-26.zip
-				: $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip
+				box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
+				: $(baseURL)/lib/box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
 				: : true ;
 		} else {
 			Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ;
@@ -83,13 +83,13 @@ if [ IsOptionalHaikuImagePackageAdded fribidi ] {
 		Echo "No optional package fribidi available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip
+			fribidi-0.19.2-r1a4-x86-gcc4-2012-09-01.zip
+			: $(baseURL)/lib/fribidi-0.19.2-r1a4-x86-gcc4-2012-09-01.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip
+			fribidi-0.19.2-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/fribidi-0.19.2-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -101,13 +101,13 @@ if [ IsOptionalHaikuImagePackageAdded lcms ] {
 		Echo "No optional package lcms available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip
+			lcms-2.1-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/lcms-2.1-r1a4-x86-gcc4-2012-09-02.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip
+			lcms-2.1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/lcms-2.1-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -119,13 +119,13 @@ if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] {
 		Echo "No optional package libart_lgpl available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip
+			libart_lgpl-2.3.21-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libart_lgpl-2.3.21-r1a4-x86-gcc4-2012-09-02.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip
+			libart_lgpl-2.3.21-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libart_lgpl-2.3.21-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -137,13 +137,13 @@ if [ IsOptionalHaikuImagePackageAdded libmad ] {
 		Echo "No optional package libmad available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip
+			libmad-0.15.1b-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libmad-0.15.1b-r1a4-x86-gcc4-2012-09-02.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip
+			libmad-0.15.1b-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libmad-0.15.1b-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -155,13 +155,13 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
 		Echo "No optional package libmikmod available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip
+			libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip
+			libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -173,13 +173,13 @@ if [ IsOptionalHaikuImagePackageAdded libmodplug ] {
 		Echo "No optional package libmodplug available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip
+			libmodplug-0.8.8.4-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libmodplug-0.8.8.4-r1a4-x86-gcc4-2012-09-02.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip
+			libmodplug-0.8.8.4-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libmodplug-0.8.8.4-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -191,13 +191,13 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] {
 		Echo "No optional package libpaper available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip
+			libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip
+			: $(baseURL)/lib/libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip
+			libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip
+			: $(baseURL)/lib/libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip
 			: : true ;
 	}
 }
@@ -209,13 +209,13 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
 		Echo "No optional package physfs available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip
+			physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
+			: $(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			physfs-2.0.1-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc2-2011-05-19.zip
+			physfs-2.0.1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc2-2012-08-29.zip
 			: : true ;
 	}
 }
@@ -227,78 +227,78 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 		Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libsdl-1.2.15-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/libsdl-1.2.15-x86-gcc4-2012-05-31.zip ;
+			libsdl-1.2.15-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libsdl-1.2.15-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			guilib-1.2.1-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2012-05-31.zip ;
+			guilib-1.2.1-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/guilib-1.2.1-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip ;
+			sdl-gfx-2.0.23-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sdl-gfx-2.0.23-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-image-1.2.12-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sdl-image-1.2.12-x86-gcc4-2012-05-31.zip ;
+			sdl-image-1.2.12-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sdl-image-1.2.12-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip ;
+			sdl-mixer-1.2.11-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sdl-mixer-1.2.11-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-net-1.2.8-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sdl-net-1.2.8-x86-gcc4-2012-05-31.zip ;
+			sdl-net-1.2.8-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sdl-net-1.2.8-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-sound-1.0.3-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc4-2012-05-31.zip ;
+			sdl-sound-1.0.3-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sdl-sound-1.0.3-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-rtf-0.1.0-r1a4-x86-gcc4-2012-09-03.zip
+			: $(baseURL)/lib/sdl-rtf-0.1.0-r1a4-x86-gcc4-2012-09-03.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-ttf-2.0.11-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sdl-ttf-2.0.11-x86-gcc4-2012-05-31.zip ;
+			sdl-ttf-2.0.11-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sdl-ttf-2.0.11-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			sge-030809-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/sge-030809-x86-gcc4-2012-05-31.zip ;
+			sge-030809-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/sge-030809-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			smjpeg-0.2.1-x86-gcc4-2012-05-31.zip
-			: $(baseURL)/lib/smjpeg-0.2.1-x86-gcc4-2012-05-31.zip ;
+			smjpeg-0.2.1-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/smjpeg-0.2.1-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			smpeg-0.4.5-x86-gcc4-2011-05-31.zip
-			: $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2012-05-31.zip ;
+			smpeg-0.4.5-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/smpeg-0.4.5-r1a4-x86-gcc4-2012-09-02.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			libsdl-1.2.15-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/libsdl-1.2.15-x86-gcc2-2012-06-24.zip ;
+			libsdl-1.2.15-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libsdl-1.2.15-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			guilib-1.2.1-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2012-06-24.zip ;
+			guilib-1.2.1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/guilib-1.2.1-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-gfx-2.0.23-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/sdl-gfx-2.0.23-x86-gcc2-2012-06-24.zip ;
+			sdl-gfx-2.0.23-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/sdl-gfx-2.0.23-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-image-1.2.12-x86-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/sdl-image-1.2.12-x86-gcc2-2012-06-24.zip ;
+			sdl-image-1.2.12-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/sdl-image-1.2.12-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-mixer-1.2.11-x86-gcc2-2012-06-25.zip
-			: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc2-2012-06-25.zip ;
+			sdl-mixer-1.2.11-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/sdl-mixer-1.2.11-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-net-1.2.8-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/sdl-net-1.2.8-x86-gcc2-2012-06-24.zip ;
+			sdl-net-1.2.8-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/sdl-net-1.2.8-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-sound-1.0.3-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc2-2012-06-24.zip ;
+			sdl-sound-1.0-hg-r1a4-x86-gcc2-2012-08-30.zip
+			: $(baseURL)/lib/sdl-sound-1.0-hg-r1a4-x86-gcc2-2012-08-30.zip ;
 		InstallOptionalHaikuImagePackage
 			sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip
 			: $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-ttf-2.0.11-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/sdl-ttf-2.0.11-x86-gcc2-2012-06-24.zip ;
+			sdl-ttf-2.0.11-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/sdl-ttf-2.0.11-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			sge-030809-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/sge-030809-x86-gcc2-2012-06-24.zip ;
+			sge-030809-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/sge-030809-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			smjpeg-0.2.1-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/smjpeg-0.2.1-x86-gcc2-2012-06-24.zip ;
+			smjpeg-0.2.1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/smjpeg-0.2.1-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			smpeg-0.4.5-x86-gcc2-2012-06-24.zip
-			: $(baseURL)/lib/smpeg-0.4.5-x86-gcc2-2012-06-24.zip ;
+			smpeg-0.4.5-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/smpeg-0.4.5-r1a4-x86-gcc2-2012-08-29.zip ;
 	}
 }
 
@@ -309,48 +309,48 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
 		Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
+			flac-1.2.1-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/flac-1.2.1-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip ;
+			libao-1.0.0-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libao-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip ;
+			libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip ;
+			libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip ;
+			libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			speex-1.2rc1-x86-gcc4-2012-03-12.zip
-			: $(baseURL)/lib/speex-1.2rc1-x86-gcc4-2012-03-12.zip ;
+			speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ;
 		InstallOptionalHaikuImagePackage
-			vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip ;
+			vorbis-tools-1.4.0-r1a4-x86-gcc4-2012-09-02.zip
+			: $(baseURL)/lib/vorbis-tools-1.4.0-r1a4-x86-gcc4-2012-09-02.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ;
+			flac-1.2.1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/flac-1.2.1-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip ;
+			libao-1.0.0-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libao-1.0.0-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip ;
+			libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip ;
+			libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip ;
+			libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip
-			: $(baseURL)/lib/speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip ;
+			speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip ;
 		InstallOptionalHaikuImagePackage
-			vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip ;
+			vorbis-tools-1.4.0-r1a4-x86-gcc2-2012-08-29.zip
+			: $(baseURL)/lib/vorbis-tools-1.4.0-r1a4-x86-gcc2-2012-08-29.zip ;
 	}
 }
 

build/jam/OptionalPackageDependencies

@@ -10,6 +10,7 @@ OptionalPackageDependencies ArmyKnife : TagLib ;
 OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies BurnItNow : CDRecord ;
+OptionalPackageDependencies Caya : Expat ;
 OptionalPackageDependencies CDRecord : GetText LibIconv ;
 OptionalPackageDependencies Curl : OpenSSL ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;

build/jam/ReleaseBuildProfiles

@@ -16,6 +16,7 @@ switch $(HAIKU_BUILD_PROFILE) {
 		HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
 		AddGroupToHaikuImage party : 101 : user sshd ;
 		HAIKU_IMAGE_HOST_NAME = shredder ;
+		HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
 		HAIKU_IMAGE_SIZE = 800 ;
 
 		AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates
@@ -24,7 +25,8 @@ switch $(HAIKU_BUILD_PROFILE) {
 			WebPositive WonderBrush ;
 		AddOptionalHaikuImagePackages CVS Development Git Mercurial
 			Python Subversion OpenSSH OpenSSL ;
-		AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook XZ-Utils ;
+		AddOptionalHaikuImagePackages KeymapSwitcher Nano P7zip Welcome
+			BeBook XZ-Utils ;
 		AddOptionalHaikuImagePackages wpa_supplicant ;
 	}
 
@@ -37,8 +39,9 @@ switch $(HAIKU_BUILD_PROFILE) {
 		HAIKU_ROOT_USER_NAME = user ;
 		HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
 		AddGroupToHaikuImage party : 101 : user sshd ;
+		HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
 		HAIKU_IMAGE_HOST_NAME = shredder ;
-		HAIKU_IMAGE_SIZE = 550 ;
+		HAIKU_IMAGE_SIZE = 600 ;
 
 		AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ;
 		AddOptionalHaikuImagePackages Development Git OpenSSH OpenSSL ;

build/jam/UserBuildConfig.ReadMe

@@ -63,6 +63,7 @@ HAIKU_IMAGE_DIR		= /tmp ;
 HAIKU_IMAGE_SIZE	= 100 ;
 
 # Enable stripping the debug symbols from optional packages.
+# Note, some optional packages may override this to prevent stripping.
 HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
 
 # Set image volume label to "Walter". Default label is "Haiku".

build/jam/board/raspberry_pi/BoardSetup

@@ -7,7 +7,7 @@ HAIKU_BOOT_PLATFORM = raspberrypi_arm ;
 # Various hardcoded addresses
 #
 
-HAIKU_BOARD_LOADER_BASE = 0x32000000 ;
+HAIKU_BOARD_LOADER_BASE = 0x0 ;
 
 #
 # Flash image

build/jam/board/raspberry_pi/info.txt

@@ -1,4 +1,5 @@
 Setting up the Haiku boot partition
+-------------------------------------
 
 partition 1 -- FAT32, bootable flag, type 'c'
 partition 2 -- BeFS, Haiku filesystem, type 'eb'
@@ -7,7 +8,7 @@ The boot partition must contain the following files to boot Haiku:
 * bootcode.bin : 2nd stage bootloader, starts with SDRAM disabled
 * loader.bin : 3rd stage bootloader, starts with SDRAM enabled
 * start.elf: The GPU binary firmware image, provided by the foundation.
-* kernel.img: Haiku Loader (haiku_loader)
+* haiku_loader: Haiku Loader
 * config.txt: A configuration file read by the GPU.
 
 Optional files:
@@ -20,4 +21,13 @@ Additional GPU firmware images, rename over start.elf to use them:
   - this is the default
 * arm224_start.elf : 224M ARM, 32M GPU split
   - (use this for Linux only with no 3D or video processing.
-    Its enough for the 1080p framebuffer, but not much else)
+	Enough for the 1080p framebuffer, but not much else)
+
+Building
+-------------------------------------
+jam -q -sHAIKU_BOOT_BOARD=raspberry_pi -sHAIKU_BOOT_PLATFORM=raspberrypi_arm haiku_loader
+
+config.txt options
+-------------------------------------
+kernel=haiku_loader
+disable_commandline_tags=1

build/scripts/build_cross_tools

@@ -89,12 +89,15 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
 	$tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion
 
+# force the POSIX locale, as the build (makeinfo) might choke otherwise
+export LC_ALL=POSIX
+
 # build binutils
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \
 	--prefix=$installDir --target=i586-pc-haiku --disable-nls \
 	--enable-shared=yes --disable-werror || exit 1
-make $additionalMakeArgs || exit 1
+make -j1 $additionalMakeArgs || exit 1
 make $additionalMakeArgs install || exit 1
 
 PATH=$PATH:$installDir/bin
@@ -109,7 +112,7 @@ copy_headers()
 	sourceDir=$1
 	targetDir=$2
 
-	headers="`find $sourceDir -name \*\.h | grep -v /.svn`"
+	headers="`find $sourceDir -name \*\.h`"
 	headers="`echo $headers | sed -e s@$sourceDir/@@g`"
 	for f in $headers; do
 		headerTargetDir=$targetDir/`dirname $f`
@@ -154,7 +157,7 @@ eval "sed $sedExpr Makefile.bak > Makefile" || exit 1
 rm Makefile.bak
 
 # make gcc
-make cross || {
+make -j1 cross || {
 	echo "ERROR: Building gcc failed." >&2
 	exit 1
 }

build/scripts/build_cross_tools_gcc4

@@ -113,6 +113,8 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $stdcxxObjDir \
 	$tmpIncludeDir $tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
+# force the POSIX locale, as the build (makeinfo) might choke otherwise
+export LC_ALL=POSIX
 
 # build binutils
 cd $binutilsObjDir
@@ -133,7 +135,7 @@ copy_headers()
 	sourceDir=$1
 	targetDir=$2
 
-	headers="$(find $sourceDir -name \*\.h | grep -v /.svn)"
+	headers="$(find $sourceDir -name \*\.h)"
 	headers="$(echo $headers | sed -e s@$sourceDir/@@g)"
 	for f in $headers; do
 		headerTargetDir=$targetDir/$(dirname $f)

build/scripts/build_haiku_image

@@ -16,7 +16,6 @@ set -o errexit
 # dontClearImage
 # isVMwareImage
 # optionalPackageDescriptions
-# stripOptionalPackageDebugSymbols
 #
 # addattr
 # copyattr
@@ -158,10 +157,11 @@ stripDebugInfo()
 
 extractFile()
 {
-	# extractFile <archive> <directory>
+	# extractFile <archive> <directory> <extractedSubDir> <stripDebugSymbols>
 	archiveFile=$1
 	targetExtractedDir=$2
 	extractedSubDir=$3
+	stripDebugSymbols=$4
 
 	echo "Extracting $archiveFile ..."
 
@@ -188,7 +188,7 @@ extractFile()
 		rm $extractDir/.OptionalPackageDescription
 	fi
 
-	if [ "$stripOptionalPackageDebugSymbols" = "1" ]; then
+	if [ "$stripDebugSymbols" = "1" ]; then
 		# strip executables in common/bin
 		if [ -d $extractDir/common/bin ]; then
 			for file in `find $extractDir/common/bin -type f -a -perm +100 \