Merge remote-tracking branch 'haiku/master' into package-management

This reverts 8f7f28a7c3 (OpenGL: Upgrade
to
Mesa 9.2).

Conflicts:
	build/jam/BuildFeatures
	build/jam/HaikuImage
	build/jam/OptionalPackages
	build/scripts/build_cross_tools_gcc4
	src/add-ons/opengl/swpipe/Jamfile
	src/apps/diskusage/Jamfile
	src/kits/tracker/ContainerWindow.cpp
	src/kits/tracker/DeskWindow.cpp
	src/kits/tracker/Jamfile

build/jam/images/HaikuImage

@@ -61,7 +61,7 @@ SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
 SYSTEM_DEMOS = [ FFilterByBuildFeatures
 	BSnow Chart Clock Cortex FontDemo GLTeapot@x86
 	$(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@x86 Mandelbrot OverlayImage Pairs
-	Playground Pulse Sudoku
+	PatchBay Playground Pulse Sudoku
 ] ;
 
 
@@ -205,7 +205,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
 	ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
 	ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86
-	virtio
+	virtio random
 ] ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
 	nfs4 attribute_overlay write_overlay ntfs packagefs reiserfs@x86 udf

build/jam/packages/Haiku

@@ -36,6 +36,7 @@ if $(HAIKU_ATA_STACK) = 1 {
 		: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
 }
 
+AddFilesToPackage add-ons kernel busses random : virtio_rng ;
 AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
 AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToPackage add-ons kernel busses virtio : virtio_pci ;
@@ -64,8 +65,7 @@ AddNewDriversToPackage power		: acpi_battery@x86 ;
 #AddNewDriversToPackage display		: display_controls@x86 ;
 
 # legacy drivers
-AddDriversToPackage					: console dprintf null random <driver>tty
-										zero ;
+AddDriversToPackage					: console dprintf null <driver>tty zero ;
 AddDriversToPackage audio hmulti	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToPackage audio old		: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
 AddDriversToPackage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
@@ -280,14 +280,14 @@ AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
 AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
 
 AddFilesToPackage add-ons Tracker
-	: FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
-		Open\ Terminal-T ZipOMatic-Z ;
+	: FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder
+		Open\ Terminal ZipOMatic ;
 AddSymlinkToPackage add-ons Tracker
-	: /boot/system/preferences/Backgrounds : Background-B ;
+	: /boot/system/preferences/Backgrounds : Background ;
 AddSymlinkToPackage add-ons Tracker
-	: /boot/system/apps/TextSearch : TextSearch-G ;
+	: /boot/system/apps/TextSearch : TextSearch ;
 AddSymlinkToPackage add-ons Tracker
-	: /boot/system/apps/DiskUsage : DiskUsage-I ;
+	: /boot/system/apps/DiskUsage : DiskUsage ;
 
 AddFilesToPackage add-ons input_server devices
 	: <input>keyboard <input>mouse <input>tablet <input>wacom ;

build/scripts/build_cross_tools_gcc4

@@ -118,7 +118,7 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
 	gmpObjDir=$objDir/gmp
 	cloogObjDir=$objDir/cloog
 	mkdir -p $pplObjDir $gmpObjDir $cloogObjDir || exit 1
-	
+
 	gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
 		--enable-cloog-backend=isl --with-ppl=$installDir \
 		--disable-cloog-version-check --with-gmp=$installDir \
@@ -136,6 +136,7 @@ export LC_ALL=POSIX
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
 	--prefix=$installDir $buildHostSpec --target=$haikuMachine \
+	--enable-targets=$haikuMachine,i386-efi-pe,x86_64-efi-pe \
 	--disable-nls --disable-shared --disable-werror \
 	--with-sysroot=$sysrootDir \
 	$binutilsConfigureArgs \
@@ -152,7 +153,7 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
 		--disable-shared --enable-cxx || exit 1
 	$MAKE $additionalMakeArgs || exit 1
 	$MAKE $additionalMakeArgs install || exit 1
-	
+
 	# build ppl
 	cd $pplObjDir
 	CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \