Ticket #3798: 0002-Use-finer-grained-capability-indicators-for-HaikuIma.patch

build/jam/HaikuImage

@@ -30 +30 @@
     IDE_ONLY = "" ;
 }
 
+local FBSD_NET_ONLY = ;
+if $(HAIKU_FREEBSD_NETWORK_COMPAT_ENABLED) = 1 {
+    FBSD_NET_ONLY = "" ;
+}
+
+local FFMPEG_ONLY = ;
+if $(HAIKU_FFMPEG_ENABLED) = 1 {
+    FFMPEG_ONLY = "" ;
+}
+
+local OPENGL_ONLY = ;
+if $(HAIKU_OPENGL_ENABLED = 1 {
+    OPENGL_ONLY = "" ;
+}
+
 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
@@ -70 +85 @@
 
 SYSTEM_APPS = AboutSystem ActivityMonitor $(X86_ONLY)BootManager CharacterMap
     CodyCam DeskCalc Devices DiskProbe DiskUsage DriveSetup CDPlayer Expander
-    $(X86_ONLY)GLInfo Icon-O-Matic Installer LaunchBox Magnify Mail
+    $(OPENGL_ONLY)GLInfo Icon-O-Matic Installer LaunchBox Magnify Mail
     MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
     PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder
     StyledEdit Terminal TextSearch TV WebWatch Workspaces
@@ -80 +95 @@
     Mouse Network Notifications Printers Screen ScreenSaver
     Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
-SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
-    $(HAIKU_INCLUDE_TRADEMARKS)$(X86_ONLY)Haiku3d Mandelbrot OverlayImage Pairs
-    Playground Pulse Sudoku
+SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(OPENGL_ONLY)GLTeapot
+    $(HAIKU_INCLUDE_TRADEMARKS)$(OPENGL_ONLY)Haiku3d Mandelbrot OverlayImage
+    Pairs Playground Pulse Sudoku
 ;
 SYSTEM_LIBS =
     libbe.so libbsd.so libbnetapi.so
     libdebug.so libdevice.so
-    libgame.so $(X86_ONLY)libGL.so $(X86_ONLY)libglut.so
-    libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
+    libgame.so $(OPENGL_ONLY)libGL.so $(OPENGL_ONLY)libglut.so libgnu.so
+    libmail.so libmedia.so libmidi.so libmidi2.so
     libnetwork.so
     <revisioned>libroot.so libroot-addon-icu.so
     libscreensaver.so
@@ -148 +163 @@
     equalizer.media_addon
     vst_host.media_addon
 ;
-SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(X86_ONLY)ffmpeg raw_decoder ;
+SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(FFMPEG_ONLY)ffmpeg raw_decoder ;
 SYSTEM_ADD_ONS_PRINT =
     Canon\ LIPS3\ Compatible
     Canon\ LIPS4\ Compatible
@@ -163 +178 @@
     # Parallel\ Port
     Print\ To\ File Serial\ Port USB\ Port
 ;
-SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow $(X86_ONLY)Flurry
-    $(X86_ONLY)GLife $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves
+SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow $(OPENGL_ONLY)Flurry
+    $(OPENGL_ONLY)GLife $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves
     Message Spider ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ice1712 sis7018 ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;
@@ -175 +190 @@
     $(X86_ONLY)intel_810
 ;
 SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ice1712 usb_midi ;
-SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
-    $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2
-    $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x $(X86_ONLY)dec21xxx etherpci
-    $(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0
-    $(X86_ONLY)marvell_yukon $(X86_ONLY)nforce $(X86_ONLY)pcnet pegasus
-    $(X86_ONLY)rtl8139 $(X86_ONLY)rtl81xx $(X86_ONLY)sis19x sis900
-    $(X86_ONLY)syskonnect usb_davicom usb_asix usb_ecm $(X86_ONLY)via_rhine
-    $(X86_ONLY)vt612x wb840
+SYSTEM_ADD_ONS_DRIVERS_NET = $(FBSD_NET_ONLY)3com
+    $(FBSD_NET_ONLY)ar81xx $(FBSD_NET_ONLY)atheros813x
+    $(FBSD_NET_ONLY)attansic_l1 $(FBSD_NET_ONLY)attansic_l2
+    $(FBSD_NET_ONLY)broadcom440x $(FBSD_NET_ONLY)broadcom570x
+    $(FBSD_NET_ONLY)dec21xxx
+    etherpci
+    $(FBSD_NET_ONLY)ipro100 $(FBSD_NET_ONLY)ipro1000
+    $(FBSD_NET_ONLY)jmicron2x0
+    $(FBSD_NET_ONLY)marvell_yukon
+    $(FBSD_NET_ONLY)nforce
+    $(FBSD_NET_ONLY)pcnet pegasus
+    $(FBSD_NET_ONLY)rtl8139 $(FBSD_NET_ONLY)rtl81xx
+    $(X86_ONLY)sis19x sis900 $(FBSD_NET_ONLY)syskonnect
+    usb_asix usb_davicom usb_ecm
+    $(FBSD_NET_ONLY)via_rhine $(FBSD_NET_ONLY)vt612x
+    wb840
 
     # WLAN drivers
-    $(X86_ONLY)aironetwifi $(X86_ONLY)atheroswifi $(X86_ONLY)broadcom43xx
-    $(X86_ONLY)iprowifi2100 $(X86_ONLY)iprowifi2200 $(X86_ONLY)iprowifi3945
-    $(X86_ONLY)iprowifi4965 $(X86_ONLY)marvell88w8363 $(X86_ONLY)marvell88w8335
-    $(X86_ONLY)ralink2860 $(X86_ONLY)ralinkwifi $(X86_ONLY)wavelanwifi
+    $(FBSD_NET_ONLY)aironetwifi $(FBSD_NET_ONLY)atheroswifi
+    $(FBSD_NET_ONLY)broadcom43xx $(FBSD_NET_ONLY)iprowifi2100
+    $(FBSD_NET_ONLY)iprowifi2200 $(FBSD_NET_ONLY)iprowifi3945
+    $(FBSD_NET_ONLY)iprowifi4965 $(FBSD_NET_ONLY)marvell88w8363
+    $(FBSD_NET_ONLY)marvell88w8335 $(FBSD_NET_ONLY)ralink2860
+    $(FBSD_NET_ONLY)ralinkwifi $(FBSD_NET_ONLY)wavelanwifi
 
     # WWAN drivers
     #$(GPL_ONLY)usb_beceemwmx