From da093f807e91107a1dfe2bb53ecf25f9094fa755 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 23 Apr 2026 16:16:50 -0400 Subject: [PATCH] Always include framebuffer and virtio_gpu in the build. The virtio_gpu driver is included the "Haiku" package file, so it logically makes sense to do the same for its accelerant. --- build/jam/images/definitions/minimum | 1 - build/jam/images/definitions/regular | 1 - build/jam/packages/Haiku | 2 ++ build/jam/packages/HaikuBootstrap | 4 +++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index a9bc4a6479..ed19fe86fc 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -262,7 +262,6 @@ SYSTEM_NETWORK_PROTOCOLS = ; SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures - framebuffer.accelerant x86,x86_64 @{ vesa.accelerant }@ # x86,x86_64 diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index b9c6d51f8e..ba335ee050 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -188,7 +188,6 @@ SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures neomagic.accelerant s3.accelerant }@ # x86 - virtio_gpu.accelerant ] ; SYSTEM_ADD_ONS_TRANSLATORS += [ FFilterByBuildFeatures diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index f820b353ae..472e06025c 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -362,6 +362,8 @@ AddBootModuleSymlinksToPackage # add-ons AddFilesToPackage add-ons accelerants : + framebuffer.accelerant + virtio_gpu.accelerant $(SYSTEM_ADD_ONS_ACCELERANTS) ; AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ; diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index db03805eac..0890c1a87e 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -239,7 +239,9 @@ local terminalThemes = [ Glob $(HAIKU_TOP)/data/system/data/terminal_themes : "[ AddFilesToPackage data Terminal Themes : $(terminalThemes) ; # add-ons -AddFilesToPackage add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ; +AddFilesToPackage add-ons accelerants : + framebuffer.accelerant + $(SYSTEM_ADD_ONS_ACCELERANTS) ; AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ; AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;