Compilation fixes for x86_64.

Added quite a few missing components to image:

alert arp bc CortexAddOnHost

CDPlayer CharacterMap DeskCalc
Devices DiskUsage Expander LaunchBox MediaConverter NetworkStatus
PoorMan Pulse Screenshot ShowImage SoundRecorder TV Workspaces

DataTranslations Media Printers ScreenSaver

BSnow Cortex FontDemo OverlayImage Pairs

cddb_daemon midi_server power_daemon print_server print_addon_server

Canon LIPS3 Compatible Canon LIPS4 Compatible Gutenprint
PCL5 Compatible PCL6 Compatible PDF Writer PS Compatible

libgame.so libmedia.so

Signed-off-by: Alex Smith <alex@alex-smith.me.uk>

build/jam/Haiku64Image

@@ -6,36 +6,39 @@
 # easily add things to the image as I port them.
 
 
-SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
-	chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm
-	compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
-	dumpcatalog echo eject env error expand expr factor false find finddir
-	fmt fold fortune ftp gawk gdb gzip gzexe getlimits groups head hostname
-	id ifconfig <bin>install isvolume join kernel_debugger kill less lessecho
-	lesskey link linkcatkeys listdev ln locale locate logger logname ls
-	makebootable md5sum mimeset mkdir mkfifo mkfs mktemp mount mountvolume
-	mv nl nohup notify nproc od open paste patch pathchk ping pr printenv printf
-	ps ptx pwd query rc readlink ReadOnlyBootPrompt rm rmattr rmdir safemode
-	sdiff seq sha1sum shred shuf shutdown sleep sort split stat strace stty su sum sync
-	sysinfo tac tail tee test timeout touch tr true truncate tsort tty unexpand
-	uname uniq unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs
-	xres yes zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit
-	zmore znew
+SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep cal cat catattr
+	checkfs	chgrp chmod chown chroot cksum clear clockconfig cmp
+	collectcatkeys comm compress copyattr CortexAddOnHost cp csplit cut date
+	dd diff diff3 dircolors dirname df du dumpcatalog echo eject env error
+	expand expr factor false find finddir fmt fold fortune ftp gawk gdb gzip
+	gzexe getlimits groups head hostname id ifconfig <bin>install isvolume
+	join kernel_debugger kill less lessecho	lesskey link linkcatkeys listdev
+	ln locale locate logger logname ls makebootable md5sum mimeset mkdir
+	mkfifo mkfs mktemp mount mountvolume mv nl nohup notify nproc od open
+	paste patch pathchk ping pr printenv printf ps ptx pwd query rc readlink
+	ReadOnlyBootPrompt rm rmattr rmdir safemode sdiff seq sha1sum shred shuf
+	shutdown sleep sort split stat strace stty su sum sync sysinfo tac tail
+	tee test timeout touch tr true truncate tsort tty unexpand uname uniq
+	unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs xres yes
+	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
-SYSTEM_APPS = AboutSystem ActivityMonitor Debugger DriveSetup Installer
-	NetworkStatus ProcessController StyledEdit Terminal
+SYSTEM_APPS = AboutSystem ActivityMonitor CDPlayer CharacterMap Debugger DeskCalc
+	Devices DiskUsage DriveSetup Expander Installer LaunchBox MediaConverter
+	NetworkStatus PoorMan Pulse ProcessController Screenshot ShowImage
+	SoundRecorder StyledEdit Terminal TV Workspaces
 ;
 
-SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
-	Keyboard Keymap Locale Mouse Network Notifications Screen Time Touchpad
-	<preference>Tracker VirtualMemory
+SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations <preference>Deskbar
+	FileTypes Keyboard Keymap Locale Media Mouse Network Notifications
+	Printers Screen ScreenSaver Time Touchpad <preference>Tracker
+	VirtualMemory
 ;
 
-SYSTEM_DEMOS = Sudoku ;
+SYSTEM_DEMOS = BSnow Cortex FontDemo OverlayImage Pairs Sudoku ;
 
-SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libdebug.so libmedia.so
-	libnetwork.so <revisioned>libroot.so libroot-addon-icu.so
+SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libgame.so libdebug.so libmedia.so
+	libmidi2.so libnetwork.so <revisioned>libroot.so libroot-addon-icu.so
 	libtextencoding.so libtiff.so libtracker.so libtranslation.so
 	$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
 ;
@@ -48,8 +51,9 @@ PRIVATE_SYSTEM_LIBS =
 	libilmimf.so
 ;
 
-SYSTEM_SERVERS = app_server debug_server input_server mount_server
-	net_server notification_server registrar syslog_daemon
+SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server midi_server
+	mount_server net_server notification_server power_daemon print_server
+	print_addon_server registrar syslog_daemon
 ;
 
 SYSTEM_NETWORK_DEVICES = ethernet loopback ;
@@ -65,6 +69,17 @@ SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
 	TIFFTranslator WebPTranslator WonderBrushTranslator
 ;
 
+SYSTEM_ADD_ONS_PRINT =
+	Canon\ LIPS3\ Compatible
+	Canon\ LIPS4\ Compatible
+	Gutenprint
+	PCL5\ Compatible
+	PCL6\ Compatible
+	PDF\ Writer
+	PS\ Compatible
+
+;
+
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ;
 SYSTEM_ADD_ONS_DRIVERS_NET = 3com atheros813x ar81xx attansic_l1 attansic_l2
 	broadcom440x broadcom570x dec21xxx etherpci ipro100 ipro1000 jmicron2x0

src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp

@@ -425,7 +425,7 @@ void
 DocInfoWindow::_EmptyKeyList()
 {
 	while (fKeyList->CountItems() > 0L)
-		delete fKeyList->RemoveItem(0L);
+		delete fKeyList->RemoveItem((int32)0);
 }
 
 

src/add-ons/print/drivers/pdf/source/PrinterDriver.cpp

@@ -201,7 +201,7 @@ PrinterDriver::PrintPage(int32 pageNumber, int32 pageCount)
 {
 	char text[128];
 
-	sprintf(text, "Faking print of page %ld/%ld...", pageNumber, pageCount);
+	sprintf(text, "Faking print of page %" B_PRId32 "/%" B_PRId32 "...", pageNumber, pageCount);
 	BAlert *alert = new BAlert("PrinterDriver::PrintPage()", text, "Hmm?");
 	alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
 	alert->Go();

src/apps/bsnow/SnowView.cpp

@@ -169,7 +169,7 @@ void SnowView::AttachedToWindow()
 		fFallenReg = new BRegion;
 		fInvalidator = spawn_thread(SnowMakerThread, INVALIDATOR_THREAD_NAME, B_LOW_PRIORITY, (void *)this);
 		resume_thread(fInvalidator);
-		printf("BSnow: OK: ws = %ld x %ld\n", fCachedWsWidth, fCachedWsHeight);
+		printf("BSnow: OK: ws = %" B_PRId32 " x %" B_PRId32 "\n", fCachedWsWidth, fCachedWsHeight);
 #ifdef DEBUG
 		Window()->AddCommonFilter(new BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, msgfilter));
 #endif
@@ -326,7 +326,7 @@ void SnowView::Calc()
 	if (fCachedWsWidth != pFrame.Width() || fCachedWsHeight != pFrame.Height()) {
 		fCachedWsWidth = pFrame.IntegerWidth();
 		fCachedWsHeight = pFrame.IntegerHeight();
-		printf("BSnow: Parent resized to %ld %ld\n", fCachedWsWidth, fCachedWsHeight);
+		printf("BSnow: Parent resized to %" B_PRId32 " %" B_PRId32 "\n", fCachedWsWidth, fCachedWsHeight);
 		fFallenReg->MakeEmpty(); /* remove all the fallen snow */
 		ResizeTo(pFrame.IntegerWidth(), pFrame.IntegerHeight());
 		fDragger->MoveTo(pFrame.IntegerWidth()-7, pFrame.IntegerHeight()-7);

src/apps/cdplayer/CDDBSupport.cpp

@@ -245,7 +245,7 @@ CDDBData::Load(const entry_ref &ref)
 					time->SetMinutes(0);
 					time->SetSeconds(0);
 
-					STRACE(("CDDBData::Load: Adding Track %s (%ld:%ld)\n", newTrack->String(),
+					STRACE(("CDDBData::Load: Adding Track %s (%" B_PRId32 ":%" B_PRId32 ")\n", newTrack->String(),
 							time->minutes, time->seconds));
 
 					fTrackList.AddItem(newTrack);
@@ -332,7 +332,8 @@ CDDBData::Save(const char *filename)
 	BString entry;
 	char timestring[10];
 
-	sprintf(timestring,"%.2ld:%.2ld", fDiscTime.GetMinutes(), fDiscTime.GetSeconds());
+	sprintf(timestring,"%.2" B_PRId32 ":%.2" B_PRId32 "", fDiscTime.GetMinutes(),
+		fDiscTime.GetSeconds());
 
 	entry << fArtist << " - " << fAlbum << "\t" << timestring << "\n";
 	file.Write(entry.String(), entry.Length());
@@ -351,7 +352,8 @@ CDDBData::Save(const char *filename)
 
 		entry = *trackstr;
 
-		sprintf(timestring,"%.2ld:%.2ld", time->GetMinutes(), time->GetSeconds());
+		sprintf(timestring,"%.2" B_PRId32 ":%.2" B_PRId32 "", time->GetMinutes(),
+			time->GetSeconds());
 
 		entry << "\t" << timestring << "\n";
 		file.Write(entry.String(), entry.Length());
@@ -361,7 +363,8 @@ CDDBData::Save(const char *filename)
 	}
 
 	file.WriteAttr("CD:key", B_INT32_TYPE, 0, &fDiscID, sizeof(int32));
-	STRACE(("CDDBData::Save: Wrote CD identifier: %ld(%lx)\n", fDiscID, fDiscID));
+	STRACE(("CDDBData::Save: Wrote CD identifier: %" B_PRId32 "(%" B_PRIx32 ")\n",
+		fDiscID, fDiscID));
 	file.WriteAttr("CD:tracks", B_STRING_TYPE, 0, tracksattr.String(), tracksattr.Length() + 1);
 
 	if (fGenre.CountChars() > 0)
@@ -391,7 +394,7 @@ CDDBData::RenameTrack(const int32 &index, const char *newName)
 
 	BString *name = (BString*)fTrackList.ItemAt(index);
 	if (name) {
-		STRACE(("CDDBData::RenameTrack(%ld,%s)\n", index, newName));
+		STRACE(("CDDBData::RenameTrack(%" B_PRId32 ",%s)\n", index, newName));
 		name->SetTo(newName);
 		return true;
 	}
@@ -409,7 +412,8 @@ CDDBData::AddTrack(const char *track, const CDAudioTime &time,
 		STRACE(("CDDBData::AddTrack failed - NULL name\n"));
 		return;
 	}
-	STRACE(("CDDBData::AddTrack(%s, %ld:%.2ld,%d)\n", track, time.minutes, time.seconds, index));
+	STRACE(("CDDBData::AddTrack(%s, %" B_PRId32 ":%.2" B_PRId32 ",%d)\n", track,
+		time.minutes, time.seconds, index));
 
 	fTrackList.AddItem(new BString(track));
 	fTimeList.AddItem(new CDAudioTime(time));
@@ -691,7 +695,7 @@ CDDBQuery::_ReadFromServer(BString &data)
 
 	// Query for the existence of the disc in the database
 	char idString[10];
-	sprintf(idString, "%08lx", fCDData.DiscID());
+	sprintf(idString, "%08" B_PRIx32, fCDData.DiscID());
 	BString query;
 
 	int32 trackCount = GetTrackCount(&fSCSIData);

src/apps/charactermap/CharacterWindow.cpp

@@ -60,7 +60,7 @@ class FontSizeSlider : public BSlider {
 protected:
 	const char* UpdateText() const
 	{
-		snprintf(fText, sizeof(fText), "%ldpt", Value());
+		snprintf(fText, sizeof(fText), "%" B_PRId32 "pt", Value());
 		return fText;
 	}
 
@@ -310,7 +310,7 @@ CharacterWindow::MessageReceived(BMessage* message)
 				sizeof(utf8Hex));
 
 			char text[128];
-			snprintf(text, sizeof(text), " %s: %#lx (%ld), UTF-8: %s",
+			snprintf(text, sizeof(text), " %s: %#" B_PRIx32 " (%" B_PRId32 "), UTF-8: %s",
 				B_TRANSLATE("Code"), character, character, utf8Hex);
 
 			char glyph[20];

src/apps/cortex/TransportView/TransportView.cpp

@@ -528,7 +528,7 @@ void TransportView::_selectGroup(
 	err = m_manager->findGroup(groupID, &m_group);
 	if(err < B_OK) {
 		PRINT((
-			"* TransportView::_selectGroup(%ld): findGroup() failed:\n"
+			"* TransportView::_selectGroup(%" B_PRId32 "): findGroup() failed:\n"
 			"  %s\n",
 			groupID,
 			strerror(err)));
@@ -784,7 +784,7 @@ void TransportView::_populateTimeSourceMenu(
 			B_RAW_TYPE,
 			&r->node(),
 			sizeof(media_node));
-		sprintf(nameBuffer, "%s: %ld",
+		sprintf(nameBuffer, "%s: %" B_PRId32,
 			r->name(),
 			r->id());
 		i = new BMenuItem(
@@ -1088,12 +1088,12 @@ void TransportView::_timeSourceCreated(
 	if(err < B_OK)
 		return;
 
-//	PRINT(("### _timeSourceCreated(): %ld\n", id));
+//	PRINT(("### _timeSourceCreated(): %" B_PRId32 "\n", id));
 	NodeRef* ref;
 	err = m_manager->getNodeRef(id, &ref);
 	if(err < B_OK) {
 		PRINT((
-			"!!! TransportView::_timeSourceCreated(): node %ld doesn't exist\n",
+			"!!! TransportView::_timeSourceCreated(): node %" B_PRId32 " doesn't exist\n",
 			id));
 		return; 
 	}
@@ -1105,7 +1105,7 @@ void TransportView::_timeSourceCreated(
 		B_RAW_TYPE,
 		&ref->node(),
 		sizeof(media_node));
-	sprintf(nameBuffer, "%s: %ld",
+	sprintf(nameBuffer, "%s: %" B_PRId32,
 		ref->name(),
 		ref->id());
 	BMenuItem* i = new BMenuItem(
@@ -1126,7 +1126,7 @@ void TransportView::_timeSourceDeleted(
 	if(err < B_OK)
 		return;
 
-//	PRINT(("### _timeSourceDeleted(): %ld\n", id));
+//	PRINT(("### _timeSourceDeleted(): %" B_PRId32 "\n", id));
 
 	BMenu* menu = m_timeSourceView->Menu();
 	ASSERT(menu);

src/apps/deskcalc/DeskCalc.cpp

@@ -38,7 +38,7 @@ main(int argc, char* argv[])
 			BString result = parser.Evaluate(expression.String());
 			printf("%s\n", result.String());
 		} catch (ParseException e) {
-			printf("%s at %ld\n", e.message.String(), e.position + 1);
+			printf("%s at %" B_PRId32 "\n", e.message.String(), e.position + 1);
 			return 1;
 		}
 	}

src/apps/deskcalc/ExpressionTextView.cpp

@@ -373,7 +373,7 @@ ExpressionTextView::AddExpressionToHistory(const char* expression)
 		return;
 	}
 	while (fPreviousExpressions.CountItems() > kMaxPreviousExpressions)
-		delete (BString*)fPreviousExpressions.RemoveItem(0L);
+		delete (BString*)fPreviousExpressions.RemoveItem((int32)0);
 
 	fHistoryPos = fPreviousExpressions.CountItems();
 }

src/apps/fontdemo/ControlView.cpp

@@ -380,7 +380,7 @@ ControlView::MessageReceived(BMessage* msg)
 		 				printf("Failed to add style or family to the message\n");
 		 				return;
 		 			}
-		 			printf("InstalledStyles(%ld), Font(%s), Style(%s)\n",
+					printf("InstalledStyles(%" B_PRId32 "), Font(%s), Style(%s)\n",
 		 				installedStyles, newFontFamilyItem->Label(),
 		 				newstyleitem->Label());
 					_UpdateAndSendStyle(msg);

src/apps/mediaconverter/MediaConverterApp.cpp

@@ -525,10 +525,10 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 		for (int64 i = start; (i <= end) && !fCancel; i += framesRead) {
 			if ((ret = inVidTrack->ReadFrames(videoBuffer, &framesRead,
 					&mh)) != B_OK) {
-				fprintf(stderr, "Error reading video frame %Ld: %s\n", i,
+				fprintf(stderr, "Error reading video frame %" B_PRId64 ": %s\n", i,
 						strerror(ret));
 				snprintf(status.LockBuffer(128), 128,
-						B_TRANSLATE("Error read video frame %Ld"), i);
+						B_TRANSLATE("Error read video frame %" B_PRId64), i);
 				status.UnlockBuffer();
 				SetStatusMessage(status.String());
 
@@ -537,10 +537,10 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 
 			if ((ret = outVidTrack->WriteFrames(videoBuffer, framesRead,
 					mh.u.encoded_video.field_flags)) != B_OK) {
-				fprintf(stderr, "Error writing video frame %Ld: %s\n", i,
+				fprintf(stderr, "Error writing video frame %" B_PRId64 ": %s\n", i,
 						strerror(ret));
 				snprintf(status.LockBuffer(128), 128,
-						B_TRANSLATE("Error writing video frame %Ld"), i);
+						B_TRANSLATE("Error writing video frame %" B_PRId64), i);
 				status.UnlockBuffer();
 				SetStatusMessage(status.String());
 
@@ -551,7 +551,7 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 			if (currPercent > lastPercent) {
 				lastPercent = currPercent;
 				snprintf(status.LockBuffer(128), 128,
-					B_TRANSLATE("Writing video track: %ld%% complete"),
+					B_TRANSLATE("Writing video track: %" B_PRId32 "%% complete"),
 					currPercent);
 				status.UnlockBuffer();
 				SetStatusMessage(status.String());
@@ -587,7 +587,7 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 				&mh)) != B_OK) {
 				fprintf(stderr, "Error reading audio frames: %s\n", strerror(ret));
 				snprintf(status.LockBuffer(128), 128,
-					B_TRANSLATE("Error read audio frame %Ld"), i);
+					B_TRANSLATE("Error read audio frame %" B_PRId64), i);
 				status.UnlockBuffer();
 				SetStatusMessage(status.String());
 
@@ -598,7 +598,7 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 				framesRead)) != B_OK) {
 				fprintf(stderr, "Error writing audio frames: %s\n",	strerror(ret));
 				snprintf(status.LockBuffer(128), 128,
-					B_TRANSLATE("Error writing audio frame %Ld"), i);
+					B_TRANSLATE("Error writing audio frame %" B_PRId64), i);
 				status.UnlockBuffer();
 				SetStatusMessage(status.String());
 
@@ -609,7 +609,7 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 			if (currPercent > lastPercent) {
 				lastPercent = currPercent;
 				snprintf(status.LockBuffer(128), 128,
-					B_TRANSLATE("Writing audio track: %ld%% complete"),
+					B_TRANSLATE("Writing audio track: %" B_PRId32 "%% complete"),
 					currPercent);
 				status.UnlockBuffer();
 				SetStatusMessage(status.String());

src/apps/mediaconverter/MediaConverterWindow.cpp

@@ -501,7 +501,7 @@ MediaConverterWindow::BuildAudioVideoMenus()
 	BMenu* menu = fAudioMenu->Menu();
 	BMenuItem* item;
 	// clear out old audio codec menu items
-	while ((item = menu->RemoveItem(0L)) != NULL)
+	while ((item = menu->RemoveItem((int32)0)) != NULL)
 		delete item;
 
 	bool separator = true;
@@ -558,7 +558,7 @@ MediaConverterWindow::BuildAudioVideoMenus()
 
 	// clear out old video codec menu items
 	menu = fVideoMenu->Menu();
-	while ((item = menu->RemoveItem(0L)) != NULL)
+	while ((item = menu->RemoveItem((int32)0)) != NULL)
 		delete item;
 
 	separator = true;

src/apps/pairs/PairsView.cpp

@@ -183,7 +183,7 @@ PairsView::_ReadRandomIcons()
 	}
 
 	// delete the remaining bitmaps from the list
-	while (BBitmap* bitmap = (BBitmap*)bitmaps.RemoveItem(0L))
+	while (BBitmap* bitmap = (BBitmap*)bitmaps.RemoveItem((int32)0))
 		delete bitmap;
 }
 

src/apps/poorman/StatusSlider.cpp

@@ -23,7 +23,7 @@ StatusSlider::StatusSlider(const char* name, const char* label,
 const char*
 StatusSlider::UpdateText() const
 {
-	sprintf(fTemp, "%ld %s", Value(), fStatusPrefix);
+	sprintf(fTemp, "%" B_PRId32 " %s", Value(), fStatusPrefix);
 
 	return fTemp;
 }

src/apps/poorman/libhttpd/libhttpd.c

@@ -2921,7 +2921,7 @@ ls( httpd_conn* hc )
 
 		/* And print. */
 		(void)  fprintf( fp,
-		   "%10lld  %s  <A HREF=\"/%.500s%s\">%.80s</A>%s%s%s\n",
+		   "%10" B_PRId64 "  %s  <A HREF=\"/%.500s%s\">%.80s</A>%s%s%s\n",
 		    (int64_t) lsb.st_size,
 		    timestr, encrname, S_ISDIR(sb.st_mode) ? "/" : "",
 		    nameptrs[i], linkprefix, link, fileclass );