From 4cf1425f9e4e1935b8660e6be0969919d37dcae8 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 4 Apr 2015 11:43:28 -0500
Subject: [PATCH 1/2] Haiku: Fix build

* Add missing #src include for util macros
---
 src/gallium/auxiliary/util/u_math.h | 2 +-
 src/hgl/SConscript                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 5db5b66..d4f955d 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -528,7 +528,7 @@ unsigned ffs( unsigned u )
 
    return i;
 }
-#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
+#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID) || defined(__HAIKU__)
 #define ffs __builtin_ffs
 #define ffsll __builtin_ffsll
 #endif
diff --git a/src/hgl/SConscript b/src/hgl/SConscript
index 70db149..71881f5 100644
--- a/src/hgl/SConscript
+++ b/src/hgl/SConscript
@@ -6,6 +6,7 @@ Import('*')
 env = env.Clone()
 
 env.Append(CPPPATH = [
+    '#/src',
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/main',
-- 
1.8.3.4

From 29dbd1148b6b114242586c4d619e406ae757e7ff Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 4 Apr 2015 11:44:21 -0500
Subject: [PATCH 2/2] scons: Fix build by disabling OpenVG (cherry pick missed
 in 10.5.2)

---
 src/SConscript                            |  2 --
 src/gallium/SConscript                    |  1 -
 src/gallium/targets/egl-static/SConscript | 11 -----------
 3 files changed, 14 deletions(-)

diff --git a/src/SConscript b/src/SConscript
index c25adc7..188ab08 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -27,8 +27,6 @@ if env['platform'] in ['haiku']:
 
 SConscript('mesa/SConscript')
 
-SConscript('mapi/vgapi/SConscript')
-
 if not env['embedded']:
     if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 25d0af6..baacd29 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -62,7 +62,6 @@ SConscript([
 ])
 
 if not env['embedded']:
-    SConscript('state_trackers/vega/SConscript')
     if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'sunos'):
         SConscript([
             'state_trackers/egl/SConscript',
diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index e423d5d..bbeedaa 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -14,7 +14,6 @@ env.Append(CPPPATH = [
     '#/src/gallium/include',
     '#/src/gallium/winsys',
     '#/src/gallium/state_trackers/egl',
-    '#/src/gallium/state_trackers/vega',
     '#/src/mesa',
 ])
 
@@ -74,14 +73,6 @@ if env['gles']:
     glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi'
     env.Prepend(LIBS = [glapi_name, glsl, mesa])
 
-# OpenVG
-if True:
-    env.Append(CPPDEFINES = ['FEATURE_VG=1'])
-    env.Prepend(LIBPATH = [openvg.dir])
-    # manually add LIBPREFIX on windows
-    openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG'
-    env.Prepend(LIBS = [openvg_name, st_vega])
-
 if env['HAVE_X11']:
     env.Prepend(LIBS = [
         ws_xlib,
@@ -107,8 +98,6 @@ egl_gallium = env.SharedLibrary(
     source = sources,
 )
 
-env.Depends(egl_gallium, [openvg])
-
 egl_gallium = env.InstallSharedLibrary(egl_gallium, version=(1, 4, 0))
 
 env.Alias('egl-gallium', egl_gallium)
-- 
1.8.3.4

From c62410aa7cb68813d83f8d40d601a382b2f0b970 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 4 Apr 2015 13:33:28 -0500
Subject: [PATCH] state_tracker/hgl: Fix missing include directory

---
 src/egl/drivers/haiku/SConscript          | 1 +
 src/gallium/state_trackers/hgl/SConscript | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript
index 9dd2f70..72bac1f 100644
--- a/src/egl/drivers/haiku/SConscript
+++ b/src/egl/drivers/haiku/SConscript
@@ -8,6 +8,7 @@ env.Append(CPPDEFINES = [
 
 env.Append(CPPPATH = [
 	'#/include',
+	'#/include/HaikuGL',
 	'#/src/egl/main',
 	'#/src/loader',
 ])
diff --git a/src/gallium/state_trackers/hgl/SConscript b/src/gallium/state_trackers/hgl/SConscript
index 82a0ce0..d2389c8 100644
--- a/src/gallium/state_trackers/hgl/SConscript
+++ b/src/gallium/state_trackers/hgl/SConscript
@@ -9,6 +9,7 @@ env.Append(CPPPATH = [
     '#/src',
     '#/src/mapi',
     '#/src/mesa',
+    '#/include/HaikuGL',
 ])
 
 sources = [
-- 
1.8.3.4

