Ticket #3798: arch-specific-capabilities.diff

build/jam/HaikuImage

@@ -5 +5 @@
 local X86_ONLY = ;
 local PPC_ONLY = ;
 local M68K_ONLY = ;
+local ENABLE_OGL = ;
+local ENABLE_AVC = ;
 if $(TARGET_ARCH) = x86 {
     X86_ONLY = "" ;
+    ENABLE_OGL = "" ;
+    ENABLE_AVC = "" ;
 } else if $(TARGET_ARCH) = ppc {
     PPC_ONLY = "" ;
+    ENABLE_OGL = "" ;
 } else if $(TARGET_ARCH) = m68k {
     M68K_ONLY = "" ;
 }
@@ -59 +64 @@
     ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
 SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
-    GLDirectMode GLTeapot Mandelbrot Pairs
+    $(ENABLE_OGL)GLDirectMode $(ENABLE_OGL)GLTeapot Mandelbrot Pairs
     Playground Pulse Sudoku Gradients
 ;
 SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
     libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so
     libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
     libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
-    libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
-    libilmimf.so libiconv.so
+    $(ENABLE_OGL)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so
+    libalm.so libilmimf.so libiconv.so
 ;
 SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
     net_server media_addon_server input_server app_server fake_app_server
@@ -105 +110 @@
     #legacy.media_addon
 ;
 SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
-    aiff_reader au_reader $(X86_ONLY)avcodec avi_reader
+    aiff_reader au_reader $(ENABLE_AVC)avcodec avi_reader
     matroska mov_reader
     mp3_decoder mp3_reader
     mp4_reader musepack
@@ -120 +125 @@
 SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
     Print\ To\ File Serial\ Port USB\ Port
 ;
-SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow $(ENABLE_OGL)Flurry Haiku IFS Spider
+    Message
+;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
@@ -419 +426 @@
 AddFilesToHaikuImage system add-ons accelerants
     : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
 AddFilesToHaikuImage system add-ons opengl
-    : Mesa\ Software\ Renderer ;
+    : $(ENABLE_OGL)Mesa\ Software\ Renderer ;
 AddFilesToHaikuImage system add-ons Translators
     : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
 AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;