diff --git a/headers/private/opengl/GL/internal/glcore.h b/headers/libs/mesa/GL/internal/glcore.h similarity index 100% rename from headers/private/opengl/GL/internal/glcore.h rename to headers/libs/mesa/GL/internal/glcore.h diff --git a/src/add-ons/opengl/mesa_software_renderer/Jamfile b/src/add-ons/opengl/mesa_software_renderer/Jamfile index 391bd287c8..e9f555bf5b 100644 --- a/src/add-ons/opengl/mesa_software_renderer/Jamfile +++ b/src/add-ons/opengl/mesa_software_renderer/Jamfile @@ -7,7 +7,6 @@ if $(TARGET_PLATFORM) != haiku { # We need our public GL headers also when not compiling for Haiku. } - { local defines ; defines = BEOS_THREADS GNU_ASSEMBLER ; @@ -24,23 +23,20 @@ if $(TARGET_PLATFORM) != haiku { SubDirC++Flags [ FDefines $(defines) ] ; } -UsePrivateHeaders interface opengl ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa main ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa glapi ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa sparc ] ; +UsePrivateHeaders interface ; +UseLibraryHeaders mesa ; + +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa x86 ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ppc ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa sparc ] ; Addon Mesa\ Software\ Renderer : MesaSoftwareRenderer.cpp : libGL.so libmesa.a be $(TARGET_LIBSUPC++) ; -Package haiku-opengl-cvs : - Mesa\ Software\ Renderer : - boot home config add-ons opengl -; - diff --git a/src/add-ons/opengl/nvidia/Jamfile b/src/add-ons/opengl/nvidia/Jamfile index 404b700851..52771f3205 100644 --- a/src/add-ons/opengl/nvidia/Jamfile +++ b/src/add-ons/opengl/nvidia/Jamfile @@ -10,12 +10,12 @@ if $(TARGET_PLATFORM) != haiku { UsePrivateHeaders opengl ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa main ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa glapi ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa x86 ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ppc ] ; Addon NVidia\ Hardware\ Renderer : opengl : NVidiaHardwareRenderer.cpp diff --git a/src/add-ons/opengl/radeon/Jamfile b/src/add-ons/opengl/radeon/Jamfile index 54a8ae4034..230f9efed9 100644 --- a/src/add-ons/opengl/radeon/Jamfile +++ b/src/add-ons/opengl/radeon/Jamfile @@ -10,12 +10,12 @@ if $(TARGET_PLATFORM) != haiku { UsePrivateHeaders opengl ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa main ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa glapi ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa x86 ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ppc ] ; Addon Radeon\ Hardware\ Renderer : opengl : RadeonHardwareRenderer.cpp diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile index 5a066fba5a..2f32f033ab 100644 --- a/src/kits/opengl/Jamfile +++ b/src/kits/opengl/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src kits opengl ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders interface opengl ; +UsePrivateHeaders interface ; +UseLibraryHeaders mesa ; UsePrivateSystemHeaders ; if $(TARGET_PLATFORM) != haiku { @@ -11,14 +12,14 @@ if $(TARGET_PLATFORM) != haiku { } -UseHeaders [ FDirName $(SUBDIR) mesa ] ; -UseHeaders [ FDirName $(SUBDIR) mesa main ] ; -UseHeaders [ FDirName $(SUBDIR) mesa glapi ] ; -UseHeaders [ FDirName $(SUBDIR) mesa math ] ; -UseHeaders [ FDirName $(SUBDIR) mesa tnl ] ; -UseHeaders [ FDirName $(SUBDIR) mesa shader ] ; -UseHeaders [ FDirName $(SUBDIR) mesa swrast ] ; -UseHeaders [ FDirName $(SUBDIR) mesa swrast_setup ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa math ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa shader ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa swrast ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa swrast_setup ] ; { local defines ; @@ -36,6 +37,7 @@ UseHeaders [ FDirName $(SUBDIR) mesa swrast_setup ] ; defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; + SubDirAsFlags $(defines) ; } SharedLibrary libGL.so : @@ -43,7 +45,6 @@ SharedLibrary libGL.so : GLDispatcher.cpp GLRenderer.cpp GLRendererRoster.cpp - : # Mesa GL API dispatching code @@ -60,11 +61,3 @@ SharedLibrary libGL.so : game # BWindowScreen needed by BGLScreen stub class $(TARGET_LIBSTDC++) ; - -Package haiku-opengl-cvs : - libGL.so : - boot beos system lib ; - -SubInclude HAIKU_TOP src kits opengl glu ; -SubInclude HAIKU_TOP src kits opengl glut ; -SubInclude HAIKU_TOP src kits opengl mesa ; diff --git a/src/libs/Jamfile b/src/libs/Jamfile index 63a2e3e288..2ad1d7cbff 100644 --- a/src/libs/Jamfile +++ b/src/libs/Jamfile @@ -18,6 +18,7 @@ SubInclude HAIKU_TOP src libs libtelnet ; SubInclude HAIKU_TOP src libs linprog ; SubInclude HAIKU_TOP src libs lp_solve ; SubInclude HAIKU_TOP src libs mapm ; +SubInclude HAIKU_TOP src libs mesa ; SubInclude HAIKU_TOP src libs ncurses ; SubInclude HAIKU_TOP src libs pdflib ; SubInclude HAIKU_TOP src libs png ; diff --git a/src/kits/opengl/glu/Jamfile b/src/libs/mesa/glu/Jamfile similarity index 98% rename from src/kits/opengl/glu/Jamfile rename to src/libs/mesa/glu/Jamfile index c75a0c1ac2..5835d628b1 100644 --- a/src/kits/opengl/glu/Jamfile +++ b/src/libs/mesa/glu/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src kits opengl glu ; +SubDir HAIKU_TOP src libs mesa glu ; SetSubDirSupportedPlatformsBeOSCompatible ; diff --git a/src/kits/opengl/glu/include/gluos.h b/src/libs/mesa/glu/include/gluos.h similarity index 100% rename from src/kits/opengl/glu/include/gluos.h rename to src/libs/mesa/glu/include/gluos.h diff --git a/src/kits/opengl/glu/libnurbs/interface/bezierEval.cc b/src/libs/mesa/glu/libnurbs/interface/bezierEval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/bezierEval.cc rename to src/libs/mesa/glu/libnurbs/interface/bezierEval.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/bezierEval.h b/src/libs/mesa/glu/libnurbs/interface/bezierEval.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/bezierEval.h rename to src/libs/mesa/glu/libnurbs/interface/bezierEval.h diff --git a/src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc b/src/libs/mesa/glu/libnurbs/interface/bezierPatch.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc rename to src/libs/mesa/glu/libnurbs/interface/bezierPatch.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/bezierPatch.h b/src/libs/mesa/glu/libnurbs/interface/bezierPatch.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/bezierPatch.h rename to src/libs/mesa/glu/libnurbs/interface/bezierPatch.h diff --git a/src/kits/opengl/glu/libnurbs/interface/bezierPatchMesh.cc b/src/libs/mesa/glu/libnurbs/interface/bezierPatchMesh.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/bezierPatchMesh.cc rename to src/libs/mesa/glu/libnurbs/interface/bezierPatchMesh.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/bezierPatchMesh.h b/src/libs/mesa/glu/libnurbs/interface/bezierPatchMesh.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/bezierPatchMesh.h rename to src/libs/mesa/glu/libnurbs/interface/bezierPatchMesh.h diff --git a/src/kits/opengl/glu/libnurbs/interface/glcurveval.cc b/src/libs/mesa/glu/libnurbs/interface/glcurveval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glcurveval.cc rename to src/libs/mesa/glu/libnurbs/interface/glcurveval.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/glcurveval.h b/src/libs/mesa/glu/libnurbs/interface/glcurveval.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glcurveval.h rename to src/libs/mesa/glu/libnurbs/interface/glcurveval.h diff --git a/src/kits/opengl/glu/libnurbs/interface/glimports.h b/src/libs/mesa/glu/libnurbs/interface/glimports.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glimports.h rename to src/libs/mesa/glu/libnurbs/interface/glimports.h diff --git a/src/kits/opengl/glu/libnurbs/interface/glinterface.cc b/src/libs/mesa/glu/libnurbs/interface/glinterface.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glinterface.cc rename to src/libs/mesa/glu/libnurbs/interface/glinterface.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/glrenderer.cc b/src/libs/mesa/glu/libnurbs/interface/glrenderer.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glrenderer.cc rename to src/libs/mesa/glu/libnurbs/interface/glrenderer.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/glrenderer.h b/src/libs/mesa/glu/libnurbs/interface/glrenderer.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glrenderer.h rename to src/libs/mesa/glu/libnurbs/interface/glrenderer.h diff --git a/src/kits/opengl/glu/libnurbs/interface/glsurfeval.cc b/src/libs/mesa/glu/libnurbs/interface/glsurfeval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glsurfeval.cc rename to src/libs/mesa/glu/libnurbs/interface/glsurfeval.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/glsurfeval.h b/src/libs/mesa/glu/libnurbs/interface/glsurfeval.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/glsurfeval.h rename to src/libs/mesa/glu/libnurbs/interface/glsurfeval.h diff --git a/src/kits/opengl/glu/libnurbs/interface/incurveeval.cc b/src/libs/mesa/glu/libnurbs/interface/incurveeval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/incurveeval.cc rename to src/libs/mesa/glu/libnurbs/interface/incurveeval.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/insurfeval.cc b/src/libs/mesa/glu/libnurbs/interface/insurfeval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/insurfeval.cc rename to src/libs/mesa/glu/libnurbs/interface/insurfeval.cc diff --git a/src/kits/opengl/glu/libnurbs/interface/mystdio.h b/src/libs/mesa/glu/libnurbs/interface/mystdio.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/mystdio.h rename to src/libs/mesa/glu/libnurbs/interface/mystdio.h diff --git a/src/kits/opengl/glu/libnurbs/interface/mystdlib.h b/src/libs/mesa/glu/libnurbs/interface/mystdlib.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/interface/mystdlib.h rename to src/libs/mesa/glu/libnurbs/interface/mystdlib.h diff --git a/src/kits/opengl/glu/libnurbs/internals/arc.cc b/src/libs/mesa/glu/libnurbs/internals/arc.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/arc.cc rename to src/libs/mesa/glu/libnurbs/internals/arc.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/arc.h b/src/libs/mesa/glu/libnurbs/internals/arc.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/arc.h rename to src/libs/mesa/glu/libnurbs/internals/arc.h diff --git a/src/kits/opengl/glu/libnurbs/internals/arcsorter.cc b/src/libs/mesa/glu/libnurbs/internals/arcsorter.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/arcsorter.cc rename to src/libs/mesa/glu/libnurbs/internals/arcsorter.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/arcsorter.h b/src/libs/mesa/glu/libnurbs/internals/arcsorter.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/arcsorter.h rename to src/libs/mesa/glu/libnurbs/internals/arcsorter.h diff --git a/src/kits/opengl/glu/libnurbs/internals/arctess.cc b/src/libs/mesa/glu/libnurbs/internals/arctess.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/arctess.cc rename to src/libs/mesa/glu/libnurbs/internals/arctess.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/arctess.h b/src/libs/mesa/glu/libnurbs/internals/arctess.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/arctess.h rename to src/libs/mesa/glu/libnurbs/internals/arctess.h diff --git a/src/kits/opengl/glu/libnurbs/internals/backend.cc b/src/libs/mesa/glu/libnurbs/internals/backend.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/backend.cc rename to src/libs/mesa/glu/libnurbs/internals/backend.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/backend.h b/src/libs/mesa/glu/libnurbs/internals/backend.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/backend.h rename to src/libs/mesa/glu/libnurbs/internals/backend.h diff --git a/src/kits/opengl/glu/libnurbs/internals/basiccrveval.cc b/src/libs/mesa/glu/libnurbs/internals/basiccrveval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/basiccrveval.cc rename to src/libs/mesa/glu/libnurbs/internals/basiccrveval.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/basiccrveval.h b/src/libs/mesa/glu/libnurbs/internals/basiccrveval.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/basiccrveval.h rename to src/libs/mesa/glu/libnurbs/internals/basiccrveval.h diff --git a/src/kits/opengl/glu/libnurbs/internals/basicsurfeval.cc b/src/libs/mesa/glu/libnurbs/internals/basicsurfeval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/basicsurfeval.cc rename to src/libs/mesa/glu/libnurbs/internals/basicsurfeval.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/basicsurfeval.h b/src/libs/mesa/glu/libnurbs/internals/basicsurfeval.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/basicsurfeval.h rename to src/libs/mesa/glu/libnurbs/internals/basicsurfeval.h diff --git a/src/kits/opengl/glu/libnurbs/internals/bezierarc.h b/src/libs/mesa/glu/libnurbs/internals/bezierarc.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/bezierarc.h rename to src/libs/mesa/glu/libnurbs/internals/bezierarc.h diff --git a/src/kits/opengl/glu/libnurbs/internals/bin.cc b/src/libs/mesa/glu/libnurbs/internals/bin.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/bin.cc rename to src/libs/mesa/glu/libnurbs/internals/bin.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/bin.h b/src/libs/mesa/glu/libnurbs/internals/bin.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/bin.h rename to src/libs/mesa/glu/libnurbs/internals/bin.h diff --git a/src/kits/opengl/glu/libnurbs/internals/bufpool.cc b/src/libs/mesa/glu/libnurbs/internals/bufpool.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/bufpool.cc rename to src/libs/mesa/glu/libnurbs/internals/bufpool.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/bufpool.h b/src/libs/mesa/glu/libnurbs/internals/bufpool.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/bufpool.h rename to src/libs/mesa/glu/libnurbs/internals/bufpool.h diff --git a/src/kits/opengl/glu/libnurbs/internals/cachingeval.cc b/src/libs/mesa/glu/libnurbs/internals/cachingeval.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/cachingeval.cc rename to src/libs/mesa/glu/libnurbs/internals/cachingeval.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/cachingeval.h b/src/libs/mesa/glu/libnurbs/internals/cachingeval.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/cachingeval.h rename to src/libs/mesa/glu/libnurbs/internals/cachingeval.h diff --git a/src/kits/opengl/glu/libnurbs/internals/ccw.cc b/src/libs/mesa/glu/libnurbs/internals/ccw.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/ccw.cc rename to src/libs/mesa/glu/libnurbs/internals/ccw.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/coveandtiler.cc b/src/libs/mesa/glu/libnurbs/internals/coveandtiler.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/coveandtiler.cc rename to src/libs/mesa/glu/libnurbs/internals/coveandtiler.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/coveandtiler.h b/src/libs/mesa/glu/libnurbs/internals/coveandtiler.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/coveandtiler.h rename to src/libs/mesa/glu/libnurbs/internals/coveandtiler.h diff --git a/src/kits/opengl/glu/libnurbs/internals/curve.cc b/src/libs/mesa/glu/libnurbs/internals/curve.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/curve.cc rename to src/libs/mesa/glu/libnurbs/internals/curve.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/curve.h b/src/libs/mesa/glu/libnurbs/internals/curve.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/curve.h rename to src/libs/mesa/glu/libnurbs/internals/curve.h diff --git a/src/kits/opengl/glu/libnurbs/internals/curvelist.cc b/src/libs/mesa/glu/libnurbs/internals/curvelist.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/curvelist.cc rename to src/libs/mesa/glu/libnurbs/internals/curvelist.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/curvelist.h b/src/libs/mesa/glu/libnurbs/internals/curvelist.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/curvelist.h rename to src/libs/mesa/glu/libnurbs/internals/curvelist.h diff --git a/src/kits/opengl/glu/libnurbs/internals/curvesub.cc b/src/libs/mesa/glu/libnurbs/internals/curvesub.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/curvesub.cc rename to src/libs/mesa/glu/libnurbs/internals/curvesub.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/dataTransform.cc b/src/libs/mesa/glu/libnurbs/internals/dataTransform.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/dataTransform.cc rename to src/libs/mesa/glu/libnurbs/internals/dataTransform.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/dataTransform.h b/src/libs/mesa/glu/libnurbs/internals/dataTransform.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/dataTransform.h rename to src/libs/mesa/glu/libnurbs/internals/dataTransform.h diff --git a/src/kits/opengl/glu/libnurbs/internals/defines.h b/src/libs/mesa/glu/libnurbs/internals/defines.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/defines.h rename to src/libs/mesa/glu/libnurbs/internals/defines.h diff --git a/src/kits/opengl/glu/libnurbs/internals/displaylist.cc b/src/libs/mesa/glu/libnurbs/internals/displaylist.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/displaylist.cc rename to src/libs/mesa/glu/libnurbs/internals/displaylist.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/displaylist.h b/src/libs/mesa/glu/libnurbs/internals/displaylist.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/displaylist.h rename to src/libs/mesa/glu/libnurbs/internals/displaylist.h diff --git a/src/kits/opengl/glu/libnurbs/internals/displaymode.h b/src/libs/mesa/glu/libnurbs/internals/displaymode.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/displaymode.h rename to src/libs/mesa/glu/libnurbs/internals/displaymode.h diff --git a/src/kits/opengl/glu/libnurbs/internals/flist.cc b/src/libs/mesa/glu/libnurbs/internals/flist.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/flist.cc rename to src/libs/mesa/glu/libnurbs/internals/flist.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/flist.h b/src/libs/mesa/glu/libnurbs/internals/flist.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/flist.h rename to src/libs/mesa/glu/libnurbs/internals/flist.h diff --git a/src/kits/opengl/glu/libnurbs/internals/flistsorter.cc b/src/libs/mesa/glu/libnurbs/internals/flistsorter.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/flistsorter.cc rename to src/libs/mesa/glu/libnurbs/internals/flistsorter.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/flistsorter.h b/src/libs/mesa/glu/libnurbs/internals/flistsorter.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/flistsorter.h rename to src/libs/mesa/glu/libnurbs/internals/flistsorter.h diff --git a/src/kits/opengl/glu/libnurbs/internals/gridline.h b/src/libs/mesa/glu/libnurbs/internals/gridline.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/gridline.h rename to src/libs/mesa/glu/libnurbs/internals/gridline.h diff --git a/src/kits/opengl/glu/libnurbs/internals/gridtrimvertex.h b/src/libs/mesa/glu/libnurbs/internals/gridtrimvertex.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/gridtrimvertex.h rename to src/libs/mesa/glu/libnurbs/internals/gridtrimvertex.h diff --git a/src/kits/opengl/glu/libnurbs/internals/gridvertex.h b/src/libs/mesa/glu/libnurbs/internals/gridvertex.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/gridvertex.h rename to src/libs/mesa/glu/libnurbs/internals/gridvertex.h diff --git a/src/kits/opengl/glu/libnurbs/internals/hull.cc b/src/libs/mesa/glu/libnurbs/internals/hull.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/hull.cc rename to src/libs/mesa/glu/libnurbs/internals/hull.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/hull.h b/src/libs/mesa/glu/libnurbs/internals/hull.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/hull.h rename to src/libs/mesa/glu/libnurbs/internals/hull.h diff --git a/src/kits/opengl/glu/libnurbs/internals/intersect.cc b/src/libs/mesa/glu/libnurbs/internals/intersect.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/intersect.cc rename to src/libs/mesa/glu/libnurbs/internals/intersect.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/jarcloc.h b/src/libs/mesa/glu/libnurbs/internals/jarcloc.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/jarcloc.h rename to src/libs/mesa/glu/libnurbs/internals/jarcloc.h diff --git a/src/kits/opengl/glu/libnurbs/internals/knotvector.cc b/src/libs/mesa/glu/libnurbs/internals/knotvector.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/knotvector.cc rename to src/libs/mesa/glu/libnurbs/internals/knotvector.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/knotvector.h b/src/libs/mesa/glu/libnurbs/internals/knotvector.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/knotvector.h rename to src/libs/mesa/glu/libnurbs/internals/knotvector.h diff --git a/src/kits/opengl/glu/libnurbs/internals/mapdesc.cc b/src/libs/mesa/glu/libnurbs/internals/mapdesc.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mapdesc.cc rename to src/libs/mesa/glu/libnurbs/internals/mapdesc.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/mapdesc.h b/src/libs/mesa/glu/libnurbs/internals/mapdesc.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mapdesc.h rename to src/libs/mesa/glu/libnurbs/internals/mapdesc.h diff --git a/src/kits/opengl/glu/libnurbs/internals/mapdescv.cc b/src/libs/mesa/glu/libnurbs/internals/mapdescv.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mapdescv.cc rename to src/libs/mesa/glu/libnurbs/internals/mapdescv.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/maplist.cc b/src/libs/mesa/glu/libnurbs/internals/maplist.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/maplist.cc rename to src/libs/mesa/glu/libnurbs/internals/maplist.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/maplist.h b/src/libs/mesa/glu/libnurbs/internals/maplist.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/maplist.h rename to src/libs/mesa/glu/libnurbs/internals/maplist.h diff --git a/src/kits/opengl/glu/libnurbs/internals/mesher.cc b/src/libs/mesa/glu/libnurbs/internals/mesher.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mesher.cc rename to src/libs/mesa/glu/libnurbs/internals/mesher.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/mesher.h b/src/libs/mesa/glu/libnurbs/internals/mesher.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mesher.h rename to src/libs/mesa/glu/libnurbs/internals/mesher.h diff --git a/src/kits/opengl/glu/libnurbs/internals/monoTriangulationBackend.cc b/src/libs/mesa/glu/libnurbs/internals/monoTriangulationBackend.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/monoTriangulationBackend.cc rename to src/libs/mesa/glu/libnurbs/internals/monoTriangulationBackend.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/monotonizer.cc b/src/libs/mesa/glu/libnurbs/internals/monotonizer.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/monotonizer.cc rename to src/libs/mesa/glu/libnurbs/internals/monotonizer.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/monotonizer.h b/src/libs/mesa/glu/libnurbs/internals/monotonizer.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/monotonizer.h rename to src/libs/mesa/glu/libnurbs/internals/monotonizer.h diff --git a/src/kits/opengl/glu/libnurbs/internals/myassert.h b/src/libs/mesa/glu/libnurbs/internals/myassert.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/myassert.h rename to src/libs/mesa/glu/libnurbs/internals/myassert.h diff --git a/src/kits/opengl/glu/libnurbs/internals/mycode.cc b/src/libs/mesa/glu/libnurbs/internals/mycode.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mycode.cc rename to src/libs/mesa/glu/libnurbs/internals/mycode.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/mymath.h b/src/libs/mesa/glu/libnurbs/internals/mymath.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mymath.h rename to src/libs/mesa/glu/libnurbs/internals/mymath.h diff --git a/src/kits/opengl/glu/libnurbs/internals/mysetjmp.h b/src/libs/mesa/glu/libnurbs/internals/mysetjmp.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mysetjmp.h rename to src/libs/mesa/glu/libnurbs/internals/mysetjmp.h diff --git a/src/kits/opengl/glu/libnurbs/internals/mystring.h b/src/libs/mesa/glu/libnurbs/internals/mystring.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/mystring.h rename to src/libs/mesa/glu/libnurbs/internals/mystring.h diff --git a/src/kits/opengl/glu/libnurbs/internals/nurbsconsts.h b/src/libs/mesa/glu/libnurbs/internals/nurbsconsts.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/nurbsconsts.h rename to src/libs/mesa/glu/libnurbs/internals/nurbsconsts.h diff --git a/src/kits/opengl/glu/libnurbs/internals/nurbsinterfac.cc b/src/libs/mesa/glu/libnurbs/internals/nurbsinterfac.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/nurbsinterfac.cc rename to src/libs/mesa/glu/libnurbs/internals/nurbsinterfac.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/nurbstess.cc b/src/libs/mesa/glu/libnurbs/internals/nurbstess.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/nurbstess.cc rename to src/libs/mesa/glu/libnurbs/internals/nurbstess.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/nurbstess.h b/src/libs/mesa/glu/libnurbs/internals/nurbstess.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/nurbstess.h rename to src/libs/mesa/glu/libnurbs/internals/nurbstess.h diff --git a/src/kits/opengl/glu/libnurbs/internals/patch.cc b/src/libs/mesa/glu/libnurbs/internals/patch.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/patch.cc rename to src/libs/mesa/glu/libnurbs/internals/patch.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/patch.h b/src/libs/mesa/glu/libnurbs/internals/patch.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/patch.h rename to src/libs/mesa/glu/libnurbs/internals/patch.h diff --git a/src/kits/opengl/glu/libnurbs/internals/patchlist.cc b/src/libs/mesa/glu/libnurbs/internals/patchlist.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/patchlist.cc rename to src/libs/mesa/glu/libnurbs/internals/patchlist.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/patchlist.h b/src/libs/mesa/glu/libnurbs/internals/patchlist.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/patchlist.h rename to src/libs/mesa/glu/libnurbs/internals/patchlist.h diff --git a/src/kits/opengl/glu/libnurbs/internals/pwlarc.h b/src/libs/mesa/glu/libnurbs/internals/pwlarc.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/pwlarc.h rename to src/libs/mesa/glu/libnurbs/internals/pwlarc.h diff --git a/src/kits/opengl/glu/libnurbs/internals/quilt.cc b/src/libs/mesa/glu/libnurbs/internals/quilt.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/quilt.cc rename to src/libs/mesa/glu/libnurbs/internals/quilt.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/quilt.h b/src/libs/mesa/glu/libnurbs/internals/quilt.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/quilt.h rename to src/libs/mesa/glu/libnurbs/internals/quilt.h diff --git a/src/kits/opengl/glu/libnurbs/internals/reader.cc b/src/libs/mesa/glu/libnurbs/internals/reader.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/reader.cc rename to src/libs/mesa/glu/libnurbs/internals/reader.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/reader.h b/src/libs/mesa/glu/libnurbs/internals/reader.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/reader.h rename to src/libs/mesa/glu/libnurbs/internals/reader.h diff --git a/src/kits/opengl/glu/libnurbs/internals/renderhints.cc b/src/libs/mesa/glu/libnurbs/internals/renderhints.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/renderhints.cc rename to src/libs/mesa/glu/libnurbs/internals/renderhints.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/renderhints.h b/src/libs/mesa/glu/libnurbs/internals/renderhints.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/renderhints.h rename to src/libs/mesa/glu/libnurbs/internals/renderhints.h diff --git a/src/kits/opengl/glu/libnurbs/internals/simplemath.h b/src/libs/mesa/glu/libnurbs/internals/simplemath.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/simplemath.h rename to src/libs/mesa/glu/libnurbs/internals/simplemath.h diff --git a/src/kits/opengl/glu/libnurbs/internals/slicer.cc b/src/libs/mesa/glu/libnurbs/internals/slicer.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/slicer.cc rename to src/libs/mesa/glu/libnurbs/internals/slicer.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/slicer.h b/src/libs/mesa/glu/libnurbs/internals/slicer.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/slicer.h rename to src/libs/mesa/glu/libnurbs/internals/slicer.h diff --git a/src/kits/opengl/glu/libnurbs/internals/sorter.cc b/src/libs/mesa/glu/libnurbs/internals/sorter.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/sorter.cc rename to src/libs/mesa/glu/libnurbs/internals/sorter.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/sorter.h b/src/libs/mesa/glu/libnurbs/internals/sorter.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/sorter.h rename to src/libs/mesa/glu/libnurbs/internals/sorter.h diff --git a/src/kits/opengl/glu/libnurbs/internals/splitarcs.cc b/src/libs/mesa/glu/libnurbs/internals/splitarcs.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/splitarcs.cc rename to src/libs/mesa/glu/libnurbs/internals/splitarcs.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/subdivider.cc b/src/libs/mesa/glu/libnurbs/internals/subdivider.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/subdivider.cc rename to src/libs/mesa/glu/libnurbs/internals/subdivider.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/subdivider.h b/src/libs/mesa/glu/libnurbs/internals/subdivider.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/subdivider.h rename to src/libs/mesa/glu/libnurbs/internals/subdivider.h diff --git a/src/kits/opengl/glu/libnurbs/internals/tobezier.cc b/src/libs/mesa/glu/libnurbs/internals/tobezier.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/tobezier.cc rename to src/libs/mesa/glu/libnurbs/internals/tobezier.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/trimline.cc b/src/libs/mesa/glu/libnurbs/internals/trimline.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimline.cc rename to src/libs/mesa/glu/libnurbs/internals/trimline.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/trimline.h b/src/libs/mesa/glu/libnurbs/internals/trimline.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimline.h rename to src/libs/mesa/glu/libnurbs/internals/trimline.h diff --git a/src/kits/opengl/glu/libnurbs/internals/trimregion.cc b/src/libs/mesa/glu/libnurbs/internals/trimregion.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimregion.cc rename to src/libs/mesa/glu/libnurbs/internals/trimregion.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/trimregion.h b/src/libs/mesa/glu/libnurbs/internals/trimregion.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimregion.h rename to src/libs/mesa/glu/libnurbs/internals/trimregion.h diff --git a/src/kits/opengl/glu/libnurbs/internals/trimvertex.h b/src/libs/mesa/glu/libnurbs/internals/trimvertex.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimvertex.h rename to src/libs/mesa/glu/libnurbs/internals/trimvertex.h diff --git a/src/kits/opengl/glu/libnurbs/internals/trimvertpool.cc b/src/libs/mesa/glu/libnurbs/internals/trimvertpool.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimvertpool.cc rename to src/libs/mesa/glu/libnurbs/internals/trimvertpool.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/trimvertpool.h b/src/libs/mesa/glu/libnurbs/internals/trimvertpool.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/trimvertpool.h rename to src/libs/mesa/glu/libnurbs/internals/trimvertpool.h diff --git a/src/kits/opengl/glu/libnurbs/internals/types.h b/src/libs/mesa/glu/libnurbs/internals/types.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/types.h rename to src/libs/mesa/glu/libnurbs/internals/types.h diff --git a/src/kits/opengl/glu/libnurbs/internals/uarray.cc b/src/libs/mesa/glu/libnurbs/internals/uarray.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/uarray.cc rename to src/libs/mesa/glu/libnurbs/internals/uarray.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/uarray.h b/src/libs/mesa/glu/libnurbs/internals/uarray.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/uarray.h rename to src/libs/mesa/glu/libnurbs/internals/uarray.h diff --git a/src/kits/opengl/glu/libnurbs/internals/varray.cc b/src/libs/mesa/glu/libnurbs/internals/varray.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/varray.cc rename to src/libs/mesa/glu/libnurbs/internals/varray.cc diff --git a/src/kits/opengl/glu/libnurbs/internals/varray.h b/src/libs/mesa/glu/libnurbs/internals/varray.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/internals/varray.h rename to src/libs/mesa/glu/libnurbs/internals/varray.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/definitions.h b/src/libs/mesa/glu/libnurbs/nurbtess/definitions.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/definitions.h rename to src/libs/mesa/glu/libnurbs/nurbtess/definitions.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/directedLine.cc b/src/libs/mesa/glu/libnurbs/nurbtess/directedLine.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/directedLine.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/directedLine.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/directedLine.h b/src/libs/mesa/glu/libnurbs/nurbtess/directedLine.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/directedLine.h rename to src/libs/mesa/glu/libnurbs/nurbtess/directedLine.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/glimports.h b/src/libs/mesa/glu/libnurbs/nurbtess/glimports.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/glimports.h rename to src/libs/mesa/glu/libnurbs/nurbtess/glimports.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/gridWrap.cc b/src/libs/mesa/glu/libnurbs/nurbtess/gridWrap.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/gridWrap.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/gridWrap.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/gridWrap.h b/src/libs/mesa/glu/libnurbs/nurbtess/gridWrap.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/gridWrap.h rename to src/libs/mesa/glu/libnurbs/nurbtess/gridWrap.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/monoChain.cc b/src/libs/mesa/glu/libnurbs/nurbtess/monoChain.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/monoChain.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/monoChain.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/monoChain.h b/src/libs/mesa/glu/libnurbs/nurbtess/monoChain.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/monoChain.h rename to src/libs/mesa/glu/libnurbs/nurbtess/monoChain.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/monoPolyPart.cc b/src/libs/mesa/glu/libnurbs/nurbtess/monoPolyPart.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/monoPolyPart.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/monoPolyPart.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/monoPolyPart.h b/src/libs/mesa/glu/libnurbs/nurbtess/monoPolyPart.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/monoPolyPart.h rename to src/libs/mesa/glu/libnurbs/nurbtess/monoPolyPart.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.cc b/src/libs/mesa/glu/libnurbs/nurbtess/monoTriangulation.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/monoTriangulation.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h b/src/libs/mesa/glu/libnurbs/nurbtess/monoTriangulation.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h rename to src/libs/mesa/glu/libnurbs/nurbtess/monoTriangulation.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/mystdio.h b/src/libs/mesa/glu/libnurbs/nurbtess/mystdio.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/mystdio.h rename to src/libs/mesa/glu/libnurbs/nurbtess/mystdio.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/mystdlib.h b/src/libs/mesa/glu/libnurbs/nurbtess/mystdlib.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/mystdlib.h rename to src/libs/mesa/glu/libnurbs/nurbtess/mystdlib.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/partitionX.cc b/src/libs/mesa/glu/libnurbs/nurbtess/partitionX.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/partitionX.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/partitionX.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/partitionX.h b/src/libs/mesa/glu/libnurbs/nurbtess/partitionX.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/partitionX.h rename to src/libs/mesa/glu/libnurbs/nurbtess/partitionX.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/partitionY.cc b/src/libs/mesa/glu/libnurbs/nurbtess/partitionY.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/partitionY.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/partitionY.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/partitionY.h b/src/libs/mesa/glu/libnurbs/nurbtess/partitionY.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/partitionY.h rename to src/libs/mesa/glu/libnurbs/nurbtess/partitionY.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/polyDBG.cc b/src/libs/mesa/glu/libnurbs/nurbtess/polyDBG.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/polyDBG.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/polyDBG.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/polyDBG.h b/src/libs/mesa/glu/libnurbs/nurbtess/polyDBG.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/polyDBG.h rename to src/libs/mesa/glu/libnurbs/nurbtess/polyDBG.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/polyUtil.cc b/src/libs/mesa/glu/libnurbs/nurbtess/polyUtil.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/polyUtil.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/polyUtil.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/polyUtil.h b/src/libs/mesa/glu/libnurbs/nurbtess/polyUtil.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/polyUtil.h rename to src/libs/mesa/glu/libnurbs/nurbtess/polyUtil.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/primitiveStream.cc b/src/libs/mesa/glu/libnurbs/nurbtess/primitiveStream.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/primitiveStream.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/primitiveStream.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/primitiveStream.h b/src/libs/mesa/glu/libnurbs/nurbtess/primitiveStream.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/primitiveStream.h rename to src/libs/mesa/glu/libnurbs/nurbtess/primitiveStream.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/quicksort.cc b/src/libs/mesa/glu/libnurbs/nurbtess/quicksort.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/quicksort.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/quicksort.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/quicksort.h b/src/libs/mesa/glu/libnurbs/nurbtess/quicksort.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/quicksort.h rename to src/libs/mesa/glu/libnurbs/nurbtess/quicksort.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/rectBlock.cc b/src/libs/mesa/glu/libnurbs/nurbtess/rectBlock.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/rectBlock.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/rectBlock.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/rectBlock.h b/src/libs/mesa/glu/libnurbs/nurbtess/rectBlock.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/rectBlock.h rename to src/libs/mesa/glu/libnurbs/nurbtess/rectBlock.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleComp.cc b/src/libs/mesa/glu/libnurbs/nurbtess/sampleComp.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleComp.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleComp.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleComp.h b/src/libs/mesa/glu/libnurbs/nurbtess/sampleComp.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleComp.h rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleComp.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompBot.cc b/src/libs/mesa/glu/libnurbs/nurbtess/sampleCompBot.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleCompBot.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleCompBot.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompBot.h b/src/libs/mesa/glu/libnurbs/nurbtess/sampleCompBot.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleCompBot.h rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleCompBot.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompRight.cc b/src/libs/mesa/glu/libnurbs/nurbtess/sampleCompRight.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleCompRight.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleCompRight.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompRight.h b/src/libs/mesa/glu/libnurbs/nurbtess/sampleCompRight.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleCompRight.h rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleCompRight.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompTop.cc b/src/libs/mesa/glu/libnurbs/nurbtess/sampleCompTop.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleCompTop.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleCompTop.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompTop.h b/src/libs/mesa/glu/libnurbs/nurbtess/sampleCompTop.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleCompTop.h rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleCompTop.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleMonoPoly.cc b/src/libs/mesa/glu/libnurbs/nurbtess/sampleMonoPoly.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleMonoPoly.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleMonoPoly.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampleMonoPoly.h b/src/libs/mesa/glu/libnurbs/nurbtess/sampleMonoPoly.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampleMonoPoly.h rename to src/libs/mesa/glu/libnurbs/nurbtess/sampleMonoPoly.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampledLine.cc b/src/libs/mesa/glu/libnurbs/nurbtess/sampledLine.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampledLine.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/sampledLine.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/sampledLine.h b/src/libs/mesa/glu/libnurbs/nurbtess/sampledLine.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/sampledLine.h rename to src/libs/mesa/glu/libnurbs/nurbtess/sampledLine.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/searchTree.cc b/src/libs/mesa/glu/libnurbs/nurbtess/searchTree.cc similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/searchTree.cc rename to src/libs/mesa/glu/libnurbs/nurbtess/searchTree.cc diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/searchTree.h b/src/libs/mesa/glu/libnurbs/nurbtess/searchTree.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/searchTree.h rename to src/libs/mesa/glu/libnurbs/nurbtess/searchTree.h diff --git a/src/kits/opengl/glu/libnurbs/nurbtess/zlassert.h b/src/libs/mesa/glu/libnurbs/nurbtess/zlassert.h similarity index 100% rename from src/kits/opengl/glu/libnurbs/nurbtess/zlassert.h rename to src/libs/mesa/glu/libnurbs/nurbtess/zlassert.h diff --git a/src/kits/opengl/glu/libtess/README b/src/libs/mesa/glu/libtess/README similarity index 100% rename from src/kits/opengl/glu/libtess/README rename to src/libs/mesa/glu/libtess/README diff --git a/src/kits/opengl/glu/libtess/alg-outline b/src/libs/mesa/glu/libtess/alg-outline similarity index 100% rename from src/kits/opengl/glu/libtess/alg-outline rename to src/libs/mesa/glu/libtess/alg-outline diff --git a/src/kits/opengl/glu/libtess/dict-list.h b/src/libs/mesa/glu/libtess/dict-list.h similarity index 100% rename from src/kits/opengl/glu/libtess/dict-list.h rename to src/libs/mesa/glu/libtess/dict-list.h diff --git a/src/kits/opengl/glu/libtess/dict.c b/src/libs/mesa/glu/libtess/dict.c similarity index 100% rename from src/kits/opengl/glu/libtess/dict.c rename to src/libs/mesa/glu/libtess/dict.c diff --git a/src/kits/opengl/glu/libtess/dict.h b/src/libs/mesa/glu/libtess/dict.h similarity index 100% rename from src/kits/opengl/glu/libtess/dict.h rename to src/libs/mesa/glu/libtess/dict.h diff --git a/src/kits/opengl/glu/libtess/geom.c b/src/libs/mesa/glu/libtess/geom.c similarity index 100% rename from src/kits/opengl/glu/libtess/geom.c rename to src/libs/mesa/glu/libtess/geom.c diff --git a/src/kits/opengl/glu/libtess/geom.h b/src/libs/mesa/glu/libtess/geom.h similarity index 100% rename from src/kits/opengl/glu/libtess/geom.h rename to src/libs/mesa/glu/libtess/geom.h diff --git a/src/kits/opengl/glu/libtess/memalloc.c b/src/libs/mesa/glu/libtess/memalloc.c similarity index 100% rename from src/kits/opengl/glu/libtess/memalloc.c rename to src/libs/mesa/glu/libtess/memalloc.c diff --git a/src/kits/opengl/glu/libtess/memalloc.h b/src/libs/mesa/glu/libtess/memalloc.h similarity index 100% rename from src/kits/opengl/glu/libtess/memalloc.h rename to src/libs/mesa/glu/libtess/memalloc.h diff --git a/src/kits/opengl/glu/libtess/mesh.c b/src/libs/mesa/glu/libtess/mesh.c similarity index 100% rename from src/kits/opengl/glu/libtess/mesh.c rename to src/libs/mesa/glu/libtess/mesh.c diff --git a/src/kits/opengl/glu/libtess/mesh.h b/src/libs/mesa/glu/libtess/mesh.h similarity index 100% rename from src/kits/opengl/glu/libtess/mesh.h rename to src/libs/mesa/glu/libtess/mesh.h diff --git a/src/kits/opengl/glu/libtess/normal.c b/src/libs/mesa/glu/libtess/normal.c similarity index 100% rename from src/kits/opengl/glu/libtess/normal.c rename to src/libs/mesa/glu/libtess/normal.c diff --git a/src/kits/opengl/glu/libtess/normal.h b/src/libs/mesa/glu/libtess/normal.h similarity index 100% rename from src/kits/opengl/glu/libtess/normal.h rename to src/libs/mesa/glu/libtess/normal.h diff --git a/src/kits/opengl/glu/libtess/priorityq-heap.c b/src/libs/mesa/glu/libtess/priorityq-heap.c similarity index 100% rename from src/kits/opengl/glu/libtess/priorityq-heap.c rename to src/libs/mesa/glu/libtess/priorityq-heap.c diff --git a/src/kits/opengl/glu/libtess/priorityq-heap.h b/src/libs/mesa/glu/libtess/priorityq-heap.h similarity index 100% rename from src/kits/opengl/glu/libtess/priorityq-heap.h rename to src/libs/mesa/glu/libtess/priorityq-heap.h diff --git a/src/kits/opengl/glu/libtess/priorityq-sort.h b/src/libs/mesa/glu/libtess/priorityq-sort.h similarity index 100% rename from src/kits/opengl/glu/libtess/priorityq-sort.h rename to src/libs/mesa/glu/libtess/priorityq-sort.h diff --git a/src/kits/opengl/glu/libtess/priorityq.c b/src/libs/mesa/glu/libtess/priorityq.c similarity index 100% rename from src/kits/opengl/glu/libtess/priorityq.c rename to src/libs/mesa/glu/libtess/priorityq.c diff --git a/src/kits/opengl/glu/libtess/priorityq.h b/src/libs/mesa/glu/libtess/priorityq.h similarity index 100% rename from src/kits/opengl/glu/libtess/priorityq.h rename to src/libs/mesa/glu/libtess/priorityq.h diff --git a/src/kits/opengl/glu/libtess/render.c b/src/libs/mesa/glu/libtess/render.c similarity index 100% rename from src/kits/opengl/glu/libtess/render.c rename to src/libs/mesa/glu/libtess/render.c diff --git a/src/kits/opengl/glu/libtess/render.h b/src/libs/mesa/glu/libtess/render.h similarity index 100% rename from src/kits/opengl/glu/libtess/render.h rename to src/libs/mesa/glu/libtess/render.h diff --git a/src/kits/opengl/glu/libtess/sweep.c b/src/libs/mesa/glu/libtess/sweep.c similarity index 100% rename from src/kits/opengl/glu/libtess/sweep.c rename to src/libs/mesa/glu/libtess/sweep.c diff --git a/src/kits/opengl/glu/libtess/sweep.h b/src/libs/mesa/glu/libtess/sweep.h similarity index 100% rename from src/kits/opengl/glu/libtess/sweep.h rename to src/libs/mesa/glu/libtess/sweep.h diff --git a/src/kits/opengl/glu/libtess/tess.c b/src/libs/mesa/glu/libtess/tess.c similarity index 100% rename from src/kits/opengl/glu/libtess/tess.c rename to src/libs/mesa/glu/libtess/tess.c diff --git a/src/kits/opengl/glu/libtess/tess.h b/src/libs/mesa/glu/libtess/tess.h similarity index 100% rename from src/kits/opengl/glu/libtess/tess.h rename to src/libs/mesa/glu/libtess/tess.h diff --git a/src/kits/opengl/glu/libtess/tessmono.c b/src/libs/mesa/glu/libtess/tessmono.c similarity index 100% rename from src/kits/opengl/glu/libtess/tessmono.c rename to src/libs/mesa/glu/libtess/tessmono.c diff --git a/src/kits/opengl/glu/libtess/tessmono.h b/src/libs/mesa/glu/libtess/tessmono.h similarity index 100% rename from src/kits/opengl/glu/libtess/tessmono.h rename to src/libs/mesa/glu/libtess/tessmono.h diff --git a/src/kits/opengl/glu/libutil/error.c b/src/libs/mesa/glu/libutil/error.c similarity index 100% rename from src/kits/opengl/glu/libutil/error.c rename to src/libs/mesa/glu/libutil/error.c diff --git a/src/kits/opengl/glu/libutil/glue.c b/src/libs/mesa/glu/libutil/glue.c similarity index 100% rename from src/kits/opengl/glu/libutil/glue.c rename to src/libs/mesa/glu/libutil/glue.c diff --git a/src/kits/opengl/glu/libutil/gluint.h b/src/libs/mesa/glu/libutil/gluint.h similarity index 100% rename from src/kits/opengl/glu/libutil/gluint.h rename to src/libs/mesa/glu/libutil/gluint.h diff --git a/src/kits/opengl/glu/libutil/mipmap.c b/src/libs/mesa/glu/libutil/mipmap.c similarity index 100% rename from src/kits/opengl/glu/libutil/mipmap.c rename to src/libs/mesa/glu/libutil/mipmap.c diff --git a/src/kits/opengl/glu/libutil/project.c b/src/libs/mesa/glu/libutil/project.c similarity index 100% rename from src/kits/opengl/glu/libutil/project.c rename to src/libs/mesa/glu/libutil/project.c diff --git a/src/kits/opengl/glu/libutil/quad.c b/src/libs/mesa/glu/libutil/quad.c similarity index 100% rename from src/kits/opengl/glu/libutil/quad.c rename to src/libs/mesa/glu/libutil/quad.c diff --git a/src/kits/opengl/glu/libutil/registry.c b/src/libs/mesa/glu/libutil/registry.c similarity index 100% rename from src/kits/opengl/glu/libutil/registry.c rename to src/libs/mesa/glu/libutil/registry.c diff --git a/src/kits/opengl/glut/Jamfile b/src/libs/mesa/glut/Jamfile similarity index 94% rename from src/kits/opengl/glut/Jamfile rename to src/libs/mesa/glut/Jamfile index 6024ef45a8..f46c454dff 100644 --- a/src/kits/opengl/glut/Jamfile +++ b/src/libs/mesa/glut/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src kits opengl glut ; +SubDir HAIKU_TOP src libs mesa glut ; SetSubDirSupportedPlatformsBeOSCompatible ; diff --git a/src/kits/opengl/glut/beos_x11.cpp b/src/libs/mesa/glut/beos_x11.cpp similarity index 100% rename from src/kits/opengl/glut/beos_x11.cpp rename to src/libs/mesa/glut/beos_x11.cpp diff --git a/src/kits/opengl/glut/beos_x11.h b/src/libs/mesa/glut/beos_x11.h similarity index 100% rename from src/kits/opengl/glut/beos_x11.h rename to src/libs/mesa/glut/beos_x11.h diff --git a/src/kits/opengl/glut/glutBlocker.cpp b/src/libs/mesa/glut/glutBlocker.cpp similarity index 100% rename from src/kits/opengl/glut/glutBlocker.cpp rename to src/libs/mesa/glut/glutBlocker.cpp diff --git a/src/kits/opengl/glut/glutBlocker.h b/src/libs/mesa/glut/glutBlocker.h similarity index 100% rename from src/kits/opengl/glut/glutBlocker.h rename to src/libs/mesa/glut/glutBlocker.h diff --git a/src/kits/opengl/glut/glutCallback.cpp b/src/libs/mesa/glut/glutCallback.cpp similarity index 100% rename from src/kits/opengl/glut/glutCallback.cpp rename to src/libs/mesa/glut/glutCallback.cpp diff --git a/src/kits/opengl/glut/glutColor.cpp b/src/libs/mesa/glut/glutColor.cpp similarity index 100% rename from src/kits/opengl/glut/glutColor.cpp rename to src/libs/mesa/glut/glutColor.cpp diff --git a/src/kits/opengl/glut/glutCursor.cpp b/src/libs/mesa/glut/glutCursor.cpp similarity index 100% rename from src/kits/opengl/glut/glutCursor.cpp rename to src/libs/mesa/glut/glutCursor.cpp diff --git a/src/kits/opengl/glut/glutCursors.h b/src/libs/mesa/glut/glutCursors.h similarity index 100% rename from src/kits/opengl/glut/glutCursors.h rename to src/libs/mesa/glut/glutCursors.h diff --git a/src/kits/opengl/glut/glutDstr.cpp b/src/libs/mesa/glut/glutDstr.cpp similarity index 100% rename from src/kits/opengl/glut/glutDstr.cpp rename to src/libs/mesa/glut/glutDstr.cpp diff --git a/src/kits/opengl/glut/glutEvent.cpp b/src/libs/mesa/glut/glutEvent.cpp similarity index 100% rename from src/kits/opengl/glut/glutEvent.cpp rename to src/libs/mesa/glut/glutEvent.cpp diff --git a/src/kits/opengl/glut/glutGet.cpp b/src/libs/mesa/glut/glutGet.cpp similarity index 100% rename from src/kits/opengl/glut/glutGet.cpp rename to src/libs/mesa/glut/glutGet.cpp diff --git a/src/kits/opengl/glut/glutInit.cpp b/src/libs/mesa/glut/glutInit.cpp similarity index 100% rename from src/kits/opengl/glut/glutInit.cpp rename to src/libs/mesa/glut/glutInit.cpp diff --git a/src/kits/opengl/glut/glutMenu.cpp b/src/libs/mesa/glut/glutMenu.cpp similarity index 100% rename from src/kits/opengl/glut/glutMenu.cpp rename to src/libs/mesa/glut/glutMenu.cpp diff --git a/src/kits/opengl/glut/glutMenu.h b/src/libs/mesa/glut/glutMenu.h similarity index 100% rename from src/kits/opengl/glut/glutMenu.h rename to src/libs/mesa/glut/glutMenu.h diff --git a/src/kits/opengl/glut/glutOverlay.cpp b/src/libs/mesa/glut/glutOverlay.cpp similarity index 100% rename from src/kits/opengl/glut/glutOverlay.cpp rename to src/libs/mesa/glut/glutOverlay.cpp diff --git a/src/kits/opengl/glut/glutState.h b/src/libs/mesa/glut/glutState.h similarity index 100% rename from src/kits/opengl/glut/glutState.h rename to src/libs/mesa/glut/glutState.h diff --git a/src/kits/opengl/glut/glutWindow.cpp b/src/libs/mesa/glut/glutWindow.cpp similarity index 100% rename from src/kits/opengl/glut/glutWindow.cpp rename to src/libs/mesa/glut/glutWindow.cpp diff --git a/src/kits/opengl/glut/glutWindow.h b/src/libs/mesa/glut/glutWindow.h similarity index 100% rename from src/kits/opengl/glut/glutWindow.h rename to src/libs/mesa/glut/glutWindow.h diff --git a/src/kits/opengl/glut/glut_8x13.c b/src/libs/mesa/glut/glut_8x13.c similarity index 100% rename from src/kits/opengl/glut/glut_8x13.c rename to src/libs/mesa/glut/glut_8x13.c diff --git a/src/kits/opengl/glut/glut_9x15.c b/src/libs/mesa/glut/glut_9x15.c similarity index 100% rename from src/kits/opengl/glut/glut_9x15.c rename to src/libs/mesa/glut/glut_9x15.c diff --git a/src/kits/opengl/glut/glut_bitmap.c b/src/libs/mesa/glut/glut_bitmap.c similarity index 100% rename from src/kits/opengl/glut/glut_bitmap.c rename to src/libs/mesa/glut/glut_bitmap.c diff --git a/src/kits/opengl/glut/glut_bwidth.c b/src/libs/mesa/glut/glut_bwidth.c similarity index 100% rename from src/kits/opengl/glut/glut_bwidth.c rename to src/libs/mesa/glut/glut_bwidth.c diff --git a/src/kits/opengl/glut/glut_ext.c b/src/libs/mesa/glut/glut_ext.c similarity index 100% rename from src/kits/opengl/glut/glut_ext.c rename to src/libs/mesa/glut/glut_ext.c diff --git a/src/kits/opengl/glut/glut_hel10.c b/src/libs/mesa/glut/glut_hel10.c similarity index 100% rename from src/kits/opengl/glut/glut_hel10.c rename to src/libs/mesa/glut/glut_hel10.c diff --git a/src/kits/opengl/glut/glut_hel12.c b/src/libs/mesa/glut/glut_hel12.c similarity index 100% rename from src/kits/opengl/glut/glut_hel12.c rename to src/libs/mesa/glut/glut_hel12.c diff --git a/src/kits/opengl/glut/glut_hel18.c b/src/libs/mesa/glut/glut_hel18.c similarity index 100% rename from src/kits/opengl/glut/glut_hel18.c rename to src/libs/mesa/glut/glut_hel18.c diff --git a/src/kits/opengl/glut/glut_mroman.c b/src/libs/mesa/glut/glut_mroman.c similarity index 100% rename from src/kits/opengl/glut/glut_mroman.c rename to src/libs/mesa/glut/glut_mroman.c diff --git a/src/kits/opengl/glut/glut_roman.c b/src/libs/mesa/glut/glut_roman.c similarity index 100% rename from src/kits/opengl/glut/glut_roman.c rename to src/libs/mesa/glut/glut_roman.c diff --git a/src/kits/opengl/glut/glut_shapes.c b/src/libs/mesa/glut/glut_shapes.c similarity index 100% rename from src/kits/opengl/glut/glut_shapes.c rename to src/libs/mesa/glut/glut_shapes.c diff --git a/src/kits/opengl/glut/glut_stroke.c b/src/libs/mesa/glut/glut_stroke.c similarity index 100% rename from src/kits/opengl/glut/glut_stroke.c rename to src/libs/mesa/glut/glut_stroke.c diff --git a/src/kits/opengl/glut/glut_swidth.c b/src/libs/mesa/glut/glut_swidth.c similarity index 100% rename from src/kits/opengl/glut/glut_swidth.c rename to src/libs/mesa/glut/glut_swidth.c diff --git a/src/kits/opengl/glut/glut_teapot.c b/src/libs/mesa/glut/glut_teapot.c similarity index 100% rename from src/kits/opengl/glut/glut_teapot.c rename to src/libs/mesa/glut/glut_teapot.c diff --git a/src/kits/opengl/glut/glut_tr10.c b/src/libs/mesa/glut/glut_tr10.c similarity index 100% rename from src/kits/opengl/glut/glut_tr10.c rename to src/libs/mesa/glut/glut_tr10.c diff --git a/src/kits/opengl/glut/glut_tr24.c b/src/libs/mesa/glut/glut_tr24.c similarity index 100% rename from src/kits/opengl/glut/glut_tr24.c rename to src/libs/mesa/glut/glut_tr24.c diff --git a/src/kits/opengl/glut/glut_util.c b/src/libs/mesa/glut/glut_util.c similarity index 100% rename from src/kits/opengl/glut/glut_util.c rename to src/libs/mesa/glut/glut_util.c diff --git a/src/kits/opengl/glut/glut_vidresize.c b/src/libs/mesa/glut/glut_vidresize.c similarity index 100% rename from src/kits/opengl/glut/glut_vidresize.c rename to src/libs/mesa/glut/glut_vidresize.c diff --git a/src/kits/opengl/glut/glutbitmap.h b/src/libs/mesa/glut/glutbitmap.h similarity index 100% rename from src/kits/opengl/glut/glutbitmap.h rename to src/libs/mesa/glut/glutbitmap.h diff --git a/src/kits/opengl/glut/glutint.h b/src/libs/mesa/glut/glutint.h similarity index 100% rename from src/kits/opengl/glut/glutint.h rename to src/libs/mesa/glut/glutint.h diff --git a/src/kits/opengl/glut/glutstroke.h b/src/libs/mesa/glut/glutstroke.h similarity index 100% rename from src/kits/opengl/glut/glutstroke.h rename to src/libs/mesa/glut/glutstroke.h diff --git a/src/kits/opengl/mesa/Jamfile b/src/libs/mesa/mesa/Jamfile similarity index 98% rename from src/kits/opengl/mesa/Jamfile rename to src/libs/mesa/mesa/Jamfile index 61734f7741..50716dfb07 100644 --- a/src/kits/opengl/mesa/Jamfile +++ b/src/libs/mesa/mesa/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src kits opengl mesa ; +SubDir HAIKU_TOP src libs mesa mesa ; SetSubDirSupportedPlatformsBeOSCompatible ; @@ -10,7 +10,7 @@ if $(TARGET_PLATFORM) != haiku { # Don't compile libmesa.a with debugging. DEBUG = 0 ; -UsePrivateHeaders opengl ; +UseLibraryHeaders mesa ; UseHeaders [ FDirName $(SUBDIR) main ] ; UseHeaders [ FDirName $(SUBDIR) glapi ] ; diff --git a/src/kits/opengl/mesa/drivers/common/driverfuncs.c b/src/libs/mesa/mesa/drivers/common/driverfuncs.c similarity index 100% rename from src/kits/opengl/mesa/drivers/common/driverfuncs.c rename to src/libs/mesa/mesa/drivers/common/driverfuncs.c diff --git a/src/kits/opengl/mesa/drivers/common/driverfuncs.h b/src/libs/mesa/mesa/drivers/common/driverfuncs.h similarity index 100% rename from src/kits/opengl/mesa/drivers/common/driverfuncs.h rename to src/libs/mesa/mesa/drivers/common/driverfuncs.h diff --git a/src/kits/opengl/mesa/glapi/dispatch.h b/src/libs/mesa/mesa/glapi/dispatch.h similarity index 100% rename from src/kits/opengl/mesa/glapi/dispatch.h rename to src/libs/mesa/mesa/glapi/dispatch.h diff --git a/src/kits/opengl/mesa/glapi/glapi.c b/src/libs/mesa/mesa/glapi/glapi.c similarity index 100% rename from src/kits/opengl/mesa/glapi/glapi.c rename to src/libs/mesa/mesa/glapi/glapi.c diff --git a/src/kits/opengl/mesa/glapi/glapi.h b/src/libs/mesa/mesa/glapi/glapi.h similarity index 100% rename from src/kits/opengl/mesa/glapi/glapi.h rename to src/libs/mesa/mesa/glapi/glapi.h diff --git a/src/kits/opengl/mesa/glapi/glapi_getproc.c b/src/libs/mesa/mesa/glapi/glapi_getproc.c similarity index 100% rename from src/kits/opengl/mesa/glapi/glapi_getproc.c rename to src/libs/mesa/mesa/glapi/glapi_getproc.c diff --git a/src/kits/opengl/mesa/glapi/glapioffsets.h b/src/libs/mesa/mesa/glapi/glapioffsets.h similarity index 100% rename from src/kits/opengl/mesa/glapi/glapioffsets.h rename to src/libs/mesa/mesa/glapi/glapioffsets.h diff --git a/src/kits/opengl/mesa/glapi/glapitable.h b/src/libs/mesa/mesa/glapi/glapitable.h similarity index 100% rename from src/kits/opengl/mesa/glapi/glapitable.h rename to src/libs/mesa/mesa/glapi/glapitable.h diff --git a/src/kits/opengl/mesa/glapi/glapitemp.h b/src/libs/mesa/mesa/glapi/glapitemp.h similarity index 100% rename from src/kits/opengl/mesa/glapi/glapitemp.h rename to src/libs/mesa/mesa/glapi/glapitemp.h diff --git a/src/kits/opengl/mesa/glapi/glprocs.h b/src/libs/mesa/mesa/glapi/glprocs.h similarity index 100% rename from src/kits/opengl/mesa/glapi/glprocs.h rename to src/libs/mesa/mesa/glapi/glprocs.h diff --git a/src/kits/opengl/mesa/glapi/glthread.c b/src/libs/mesa/mesa/glapi/glthread.c similarity index 100% rename from src/kits/opengl/mesa/glapi/glthread.c rename to src/libs/mesa/mesa/glapi/glthread.c diff --git a/src/kits/opengl/mesa/glapi/glthread.h b/src/libs/mesa/mesa/glapi/glthread.h similarity index 100% rename from src/kits/opengl/mesa/glapi/glthread.h rename to src/libs/mesa/mesa/glapi/glthread.h diff --git a/src/kits/opengl/mesa/main/accum.c b/src/libs/mesa/mesa/main/accum.c similarity index 100% rename from src/kits/opengl/mesa/main/accum.c rename to src/libs/mesa/mesa/main/accum.c diff --git a/src/kits/opengl/mesa/main/accum.h b/src/libs/mesa/mesa/main/accum.h similarity index 100% rename from src/kits/opengl/mesa/main/accum.h rename to src/libs/mesa/mesa/main/accum.h diff --git a/src/kits/opengl/mesa/main/api_arrayelt.c b/src/libs/mesa/mesa/main/api_arrayelt.c similarity index 100% rename from src/kits/opengl/mesa/main/api_arrayelt.c rename to src/libs/mesa/mesa/main/api_arrayelt.c diff --git a/src/kits/opengl/mesa/main/api_arrayelt.h b/src/libs/mesa/mesa/main/api_arrayelt.h similarity index 100% rename from src/kits/opengl/mesa/main/api_arrayelt.h rename to src/libs/mesa/mesa/main/api_arrayelt.h diff --git a/src/kits/opengl/mesa/main/api_exec.c b/src/libs/mesa/mesa/main/api_exec.c similarity index 100% rename from src/kits/opengl/mesa/main/api_exec.c rename to src/libs/mesa/mesa/main/api_exec.c diff --git a/src/kits/opengl/mesa/main/api_exec.h b/src/libs/mesa/mesa/main/api_exec.h similarity index 100% rename from src/kits/opengl/mesa/main/api_exec.h rename to src/libs/mesa/mesa/main/api_exec.h diff --git a/src/kits/opengl/mesa/main/api_loopback.c b/src/libs/mesa/mesa/main/api_loopback.c similarity index 100% rename from src/kits/opengl/mesa/main/api_loopback.c rename to src/libs/mesa/mesa/main/api_loopback.c diff --git a/src/kits/opengl/mesa/main/api_loopback.h b/src/libs/mesa/mesa/main/api_loopback.h similarity index 100% rename from src/kits/opengl/mesa/main/api_loopback.h rename to src/libs/mesa/mesa/main/api_loopback.h diff --git a/src/kits/opengl/mesa/main/api_noop.c b/src/libs/mesa/mesa/main/api_noop.c similarity index 100% rename from src/kits/opengl/mesa/main/api_noop.c rename to src/libs/mesa/mesa/main/api_noop.c diff --git a/src/kits/opengl/mesa/main/api_noop.h b/src/libs/mesa/mesa/main/api_noop.h similarity index 100% rename from src/kits/opengl/mesa/main/api_noop.h rename to src/libs/mesa/mesa/main/api_noop.h diff --git a/src/kits/opengl/mesa/main/api_validate.c b/src/libs/mesa/mesa/main/api_validate.c similarity index 100% rename from src/kits/opengl/mesa/main/api_validate.c rename to src/libs/mesa/mesa/main/api_validate.c diff --git a/src/kits/opengl/mesa/main/api_validate.h b/src/libs/mesa/mesa/main/api_validate.h similarity index 100% rename from src/kits/opengl/mesa/main/api_validate.h rename to src/libs/mesa/mesa/main/api_validate.h diff --git a/src/kits/opengl/mesa/main/arrayobj.c b/src/libs/mesa/mesa/main/arrayobj.c similarity index 100% rename from src/kits/opengl/mesa/main/arrayobj.c rename to src/libs/mesa/mesa/main/arrayobj.c diff --git a/src/kits/opengl/mesa/main/arrayobj.h b/src/libs/mesa/mesa/main/arrayobj.h similarity index 100% rename from src/kits/opengl/mesa/main/arrayobj.h rename to src/libs/mesa/mesa/main/arrayobj.h diff --git a/src/kits/opengl/mesa/main/attrib.c b/src/libs/mesa/mesa/main/attrib.c similarity index 100% rename from src/kits/opengl/mesa/main/attrib.c rename to src/libs/mesa/mesa/main/attrib.c diff --git a/src/kits/opengl/mesa/main/attrib.h b/src/libs/mesa/mesa/main/attrib.h similarity index 100% rename from src/kits/opengl/mesa/main/attrib.h rename to src/libs/mesa/mesa/main/attrib.h diff --git a/src/kits/opengl/mesa/main/bitset.h b/src/libs/mesa/mesa/main/bitset.h similarity index 100% rename from src/kits/opengl/mesa/main/bitset.h rename to src/libs/mesa/mesa/main/bitset.h diff --git a/src/kits/opengl/mesa/main/blend.c b/src/libs/mesa/mesa/main/blend.c similarity index 100% rename from src/kits/opengl/mesa/main/blend.c rename to src/libs/mesa/mesa/main/blend.c diff --git a/src/kits/opengl/mesa/main/blend.h b/src/libs/mesa/mesa/main/blend.h similarity index 100% rename from src/kits/opengl/mesa/main/blend.h rename to src/libs/mesa/mesa/main/blend.h diff --git a/src/kits/opengl/mesa/main/bufferobj.c b/src/libs/mesa/mesa/main/bufferobj.c similarity index 100% rename from src/kits/opengl/mesa/main/bufferobj.c rename to src/libs/mesa/mesa/main/bufferobj.c diff --git a/src/kits/opengl/mesa/main/bufferobj.h b/src/libs/mesa/mesa/main/bufferobj.h similarity index 100% rename from src/kits/opengl/mesa/main/bufferobj.h rename to src/libs/mesa/mesa/main/bufferobj.h diff --git a/src/kits/opengl/mesa/main/buffers.c b/src/libs/mesa/mesa/main/buffers.c similarity index 100% rename from src/kits/opengl/mesa/main/buffers.c rename to src/libs/mesa/mesa/main/buffers.c diff --git a/src/kits/opengl/mesa/main/buffers.h b/src/libs/mesa/mesa/main/buffers.h similarity index 100% rename from src/kits/opengl/mesa/main/buffers.h rename to src/libs/mesa/mesa/main/buffers.h diff --git a/src/kits/opengl/mesa/main/clear.c b/src/libs/mesa/mesa/main/clear.c similarity index 100% rename from src/kits/opengl/mesa/main/clear.c rename to src/libs/mesa/mesa/main/clear.c diff --git a/src/kits/opengl/mesa/main/clear.h b/src/libs/mesa/mesa/main/clear.h similarity index 100% rename from src/kits/opengl/mesa/main/clear.h rename to src/libs/mesa/mesa/main/clear.h diff --git a/src/kits/opengl/mesa/main/clip.c b/src/libs/mesa/mesa/main/clip.c similarity index 100% rename from src/kits/opengl/mesa/main/clip.c rename to src/libs/mesa/mesa/main/clip.c diff --git a/src/kits/opengl/mesa/main/clip.h b/src/libs/mesa/mesa/main/clip.h similarity index 100% rename from src/kits/opengl/mesa/main/clip.h rename to src/libs/mesa/mesa/main/clip.h diff --git a/src/kits/opengl/mesa/main/colormac.h b/src/libs/mesa/mesa/main/colormac.h similarity index 100% rename from src/kits/opengl/mesa/main/colormac.h rename to src/libs/mesa/mesa/main/colormac.h diff --git a/src/kits/opengl/mesa/main/colortab.c b/src/libs/mesa/mesa/main/colortab.c similarity index 100% rename from src/kits/opengl/mesa/main/colortab.c rename to src/libs/mesa/mesa/main/colortab.c diff --git a/src/kits/opengl/mesa/main/colortab.h b/src/libs/mesa/mesa/main/colortab.h similarity index 100% rename from src/kits/opengl/mesa/main/colortab.h rename to src/libs/mesa/mesa/main/colortab.h diff --git a/src/kits/opengl/mesa/main/config.h b/src/libs/mesa/mesa/main/config.h similarity index 100% rename from src/kits/opengl/mesa/main/config.h rename to src/libs/mesa/mesa/main/config.h diff --git a/src/kits/opengl/mesa/main/context.c b/src/libs/mesa/mesa/main/context.c similarity index 100% rename from src/kits/opengl/mesa/main/context.c rename to src/libs/mesa/mesa/main/context.c diff --git a/src/kits/opengl/mesa/main/context.h b/src/libs/mesa/mesa/main/context.h similarity index 100% rename from src/kits/opengl/mesa/main/context.h rename to src/libs/mesa/mesa/main/context.h diff --git a/src/kits/opengl/mesa/main/convolve.c b/src/libs/mesa/mesa/main/convolve.c similarity index 100% rename from src/kits/opengl/mesa/main/convolve.c rename to src/libs/mesa/mesa/main/convolve.c diff --git a/src/kits/opengl/mesa/main/convolve.h b/src/libs/mesa/mesa/main/convolve.h similarity index 100% rename from src/kits/opengl/mesa/main/convolve.h rename to src/libs/mesa/mesa/main/convolve.h diff --git a/src/kits/opengl/mesa/main/dd.h b/src/libs/mesa/mesa/main/dd.h similarity index 100% rename from src/kits/opengl/mesa/main/dd.h rename to src/libs/mesa/mesa/main/dd.h diff --git a/src/kits/opengl/mesa/main/debug.c b/src/libs/mesa/mesa/main/debug.c similarity index 100% rename from src/kits/opengl/mesa/main/debug.c rename to src/libs/mesa/mesa/main/debug.c diff --git a/src/kits/opengl/mesa/main/debug.h b/src/libs/mesa/mesa/main/debug.h similarity index 100% rename from src/kits/opengl/mesa/main/debug.h rename to src/libs/mesa/mesa/main/debug.h diff --git a/src/kits/opengl/mesa/main/depth.c b/src/libs/mesa/mesa/main/depth.c similarity index 100% rename from src/kits/opengl/mesa/main/depth.c rename to src/libs/mesa/mesa/main/depth.c diff --git a/src/kits/opengl/mesa/main/depth.h b/src/libs/mesa/mesa/main/depth.h similarity index 100% rename from src/kits/opengl/mesa/main/depth.h rename to src/libs/mesa/mesa/main/depth.h diff --git a/src/kits/opengl/mesa/main/depthstencil.c b/src/libs/mesa/mesa/main/depthstencil.c similarity index 100% rename from src/kits/opengl/mesa/main/depthstencil.c rename to src/libs/mesa/mesa/main/depthstencil.c diff --git a/src/kits/opengl/mesa/main/depthstencil.h b/src/libs/mesa/mesa/main/depthstencil.h similarity index 100% rename from src/kits/opengl/mesa/main/depthstencil.h rename to src/libs/mesa/mesa/main/depthstencil.h diff --git a/src/kits/opengl/mesa/main/dispatch.c b/src/libs/mesa/mesa/main/dispatch.c similarity index 100% rename from src/kits/opengl/mesa/main/dispatch.c rename to src/libs/mesa/mesa/main/dispatch.c diff --git a/src/kits/opengl/mesa/main/dlist.c b/src/libs/mesa/mesa/main/dlist.c similarity index 100% rename from src/kits/opengl/mesa/main/dlist.c rename to src/libs/mesa/mesa/main/dlist.c diff --git a/src/kits/opengl/mesa/main/dlist.h b/src/libs/mesa/mesa/main/dlist.h similarity index 100% rename from src/kits/opengl/mesa/main/dlist.h rename to src/libs/mesa/mesa/main/dlist.h diff --git a/src/kits/opengl/mesa/main/dlopen.c b/src/libs/mesa/mesa/main/dlopen.c similarity index 100% rename from src/kits/opengl/mesa/main/dlopen.c rename to src/libs/mesa/mesa/main/dlopen.c diff --git a/src/kits/opengl/mesa/main/dlopen.h b/src/libs/mesa/mesa/main/dlopen.h similarity index 100% rename from src/kits/opengl/mesa/main/dlopen.h rename to src/libs/mesa/mesa/main/dlopen.h diff --git a/src/kits/opengl/mesa/main/drawpix.c b/src/libs/mesa/mesa/main/drawpix.c similarity index 100% rename from src/kits/opengl/mesa/main/drawpix.c rename to src/libs/mesa/mesa/main/drawpix.c diff --git a/src/kits/opengl/mesa/main/drawpix.h b/src/libs/mesa/mesa/main/drawpix.h similarity index 100% rename from src/kits/opengl/mesa/main/drawpix.h rename to src/libs/mesa/mesa/main/drawpix.h diff --git a/src/kits/opengl/mesa/main/enable.c b/src/libs/mesa/mesa/main/enable.c similarity index 100% rename from src/kits/opengl/mesa/main/enable.c rename to src/libs/mesa/mesa/main/enable.c diff --git a/src/kits/opengl/mesa/main/enable.h b/src/libs/mesa/mesa/main/enable.h similarity index 100% rename from src/kits/opengl/mesa/main/enable.h rename to src/libs/mesa/mesa/main/enable.h diff --git a/src/kits/opengl/mesa/main/enums.c b/src/libs/mesa/mesa/main/enums.c similarity index 100% rename from src/kits/opengl/mesa/main/enums.c rename to src/libs/mesa/mesa/main/enums.c diff --git a/src/kits/opengl/mesa/main/enums.h b/src/libs/mesa/mesa/main/enums.h similarity index 100% rename from src/kits/opengl/mesa/main/enums.h rename to src/libs/mesa/mesa/main/enums.h diff --git a/src/kits/opengl/mesa/main/eval.c b/src/libs/mesa/mesa/main/eval.c similarity index 100% rename from src/kits/opengl/mesa/main/eval.c rename to src/libs/mesa/mesa/main/eval.c diff --git a/src/kits/opengl/mesa/main/eval.h b/src/libs/mesa/mesa/main/eval.h similarity index 100% rename from src/kits/opengl/mesa/main/eval.h rename to src/libs/mesa/mesa/main/eval.h diff --git a/src/kits/opengl/mesa/main/execmem.c b/src/libs/mesa/mesa/main/execmem.c similarity index 100% rename from src/kits/opengl/mesa/main/execmem.c rename to src/libs/mesa/mesa/main/execmem.c diff --git a/src/kits/opengl/mesa/main/extensions.c b/src/libs/mesa/mesa/main/extensions.c similarity index 100% rename from src/kits/opengl/mesa/main/extensions.c rename to src/libs/mesa/mesa/main/extensions.c diff --git a/src/kits/opengl/mesa/main/extensions.h b/src/libs/mesa/mesa/main/extensions.h similarity index 100% rename from src/kits/opengl/mesa/main/extensions.h rename to src/libs/mesa/mesa/main/extensions.h diff --git a/src/kits/opengl/mesa/main/fbobject.c b/src/libs/mesa/mesa/main/fbobject.c similarity index 100% rename from src/kits/opengl/mesa/main/fbobject.c rename to src/libs/mesa/mesa/main/fbobject.c diff --git a/src/kits/opengl/mesa/main/fbobject.h b/src/libs/mesa/mesa/main/fbobject.h similarity index 100% rename from src/kits/opengl/mesa/main/fbobject.h rename to src/libs/mesa/mesa/main/fbobject.h diff --git a/src/kits/opengl/mesa/main/feedback.c b/src/libs/mesa/mesa/main/feedback.c similarity index 100% rename from src/kits/opengl/mesa/main/feedback.c rename to src/libs/mesa/mesa/main/feedback.c diff --git a/src/kits/opengl/mesa/main/feedback.h b/src/libs/mesa/mesa/main/feedback.h similarity index 100% rename from src/kits/opengl/mesa/main/feedback.h rename to src/libs/mesa/mesa/main/feedback.h diff --git a/src/kits/opengl/mesa/main/ffvertex_prog.c b/src/libs/mesa/mesa/main/ffvertex_prog.c similarity index 100% rename from src/kits/opengl/mesa/main/ffvertex_prog.c rename to src/libs/mesa/mesa/main/ffvertex_prog.c diff --git a/src/kits/opengl/mesa/main/ffvertex_prog.h b/src/libs/mesa/mesa/main/ffvertex_prog.h similarity index 100% rename from src/kits/opengl/mesa/main/ffvertex_prog.h rename to src/libs/mesa/mesa/main/ffvertex_prog.h diff --git a/src/kits/opengl/mesa/main/fog.c b/src/libs/mesa/mesa/main/fog.c similarity index 100% rename from src/kits/opengl/mesa/main/fog.c rename to src/libs/mesa/mesa/main/fog.c diff --git a/src/kits/opengl/mesa/main/fog.h b/src/libs/mesa/mesa/main/fog.h similarity index 100% rename from src/kits/opengl/mesa/main/fog.h rename to src/libs/mesa/mesa/main/fog.h diff --git a/src/kits/opengl/mesa/main/framebuffer.c b/src/libs/mesa/mesa/main/framebuffer.c similarity index 100% rename from src/kits/opengl/mesa/main/framebuffer.c rename to src/libs/mesa/mesa/main/framebuffer.c diff --git a/src/kits/opengl/mesa/main/framebuffer.h b/src/libs/mesa/mesa/main/framebuffer.h similarity index 100% rename from src/kits/opengl/mesa/main/framebuffer.h rename to src/libs/mesa/mesa/main/framebuffer.h diff --git a/src/kits/opengl/mesa/main/get.c b/src/libs/mesa/mesa/main/get.c similarity index 100% rename from src/kits/opengl/mesa/main/get.c rename to src/libs/mesa/mesa/main/get.c diff --git a/src/kits/opengl/mesa/main/get.h b/src/libs/mesa/mesa/main/get.h similarity index 100% rename from src/kits/opengl/mesa/main/get.h rename to src/libs/mesa/mesa/main/get.h diff --git a/src/kits/opengl/mesa/main/getstring.c b/src/libs/mesa/mesa/main/getstring.c similarity index 100% rename from src/kits/opengl/mesa/main/getstring.c rename to src/libs/mesa/mesa/main/getstring.c diff --git a/src/kits/opengl/mesa/main/glheader.h b/src/libs/mesa/mesa/main/glheader.h similarity index 100% rename from src/kits/opengl/mesa/main/glheader.h rename to src/libs/mesa/mesa/main/glheader.h diff --git a/src/kits/opengl/mesa/main/hash.c b/src/libs/mesa/mesa/main/hash.c similarity index 100% rename from src/kits/opengl/mesa/main/hash.c rename to src/libs/mesa/mesa/main/hash.c diff --git a/src/kits/opengl/mesa/main/hash.h b/src/libs/mesa/mesa/main/hash.h similarity index 100% rename from src/kits/opengl/mesa/main/hash.h rename to src/libs/mesa/mesa/main/hash.h diff --git a/src/kits/opengl/mesa/main/hint.c b/src/libs/mesa/mesa/main/hint.c similarity index 100% rename from src/kits/opengl/mesa/main/hint.c rename to src/libs/mesa/mesa/main/hint.c diff --git a/src/kits/opengl/mesa/main/hint.h b/src/libs/mesa/mesa/main/hint.h similarity index 100% rename from src/kits/opengl/mesa/main/hint.h rename to src/libs/mesa/mesa/main/hint.h diff --git a/src/kits/opengl/mesa/main/histogram.c b/src/libs/mesa/mesa/main/histogram.c similarity index 100% rename from src/kits/opengl/mesa/main/histogram.c rename to src/libs/mesa/mesa/main/histogram.c diff --git a/src/kits/opengl/mesa/main/histogram.h b/src/libs/mesa/mesa/main/histogram.h similarity index 100% rename from src/kits/opengl/mesa/main/histogram.h rename to src/libs/mesa/mesa/main/histogram.h diff --git a/src/kits/opengl/mesa/main/image.c b/src/libs/mesa/mesa/main/image.c similarity index 100% rename from src/kits/opengl/mesa/main/image.c rename to src/libs/mesa/mesa/main/image.c diff --git a/src/kits/opengl/mesa/main/image.h b/src/libs/mesa/mesa/main/image.h similarity index 100% rename from src/kits/opengl/mesa/main/image.h rename to src/libs/mesa/mesa/main/image.h diff --git a/src/kits/opengl/mesa/main/imports.c b/src/libs/mesa/mesa/main/imports.c similarity index 100% rename from src/kits/opengl/mesa/main/imports.c rename to src/libs/mesa/mesa/main/imports.c diff --git a/src/kits/opengl/mesa/main/imports.h b/src/libs/mesa/mesa/main/imports.h similarity index 100% rename from src/kits/opengl/mesa/main/imports.h rename to src/libs/mesa/mesa/main/imports.h diff --git a/src/kits/opengl/mesa/main/light.c b/src/libs/mesa/mesa/main/light.c similarity index 100% rename from src/kits/opengl/mesa/main/light.c rename to src/libs/mesa/mesa/main/light.c diff --git a/src/kits/opengl/mesa/main/light.h b/src/libs/mesa/mesa/main/light.h similarity index 100% rename from src/kits/opengl/mesa/main/light.h rename to src/libs/mesa/mesa/main/light.h diff --git a/src/kits/opengl/mesa/main/lines.c b/src/libs/mesa/mesa/main/lines.c similarity index 100% rename from src/kits/opengl/mesa/main/lines.c rename to src/libs/mesa/mesa/main/lines.c diff --git a/src/kits/opengl/mesa/main/lines.h b/src/libs/mesa/mesa/main/lines.h similarity index 100% rename from src/kits/opengl/mesa/main/lines.h rename to src/libs/mesa/mesa/main/lines.h diff --git a/src/kits/opengl/mesa/main/macros.h b/src/libs/mesa/mesa/main/macros.h similarity index 100% rename from src/kits/opengl/mesa/main/macros.h rename to src/libs/mesa/mesa/main/macros.h diff --git a/src/kits/opengl/mesa/main/matrix.c b/src/libs/mesa/mesa/main/matrix.c similarity index 100% rename from src/kits/opengl/mesa/main/matrix.c rename to src/libs/mesa/mesa/main/matrix.c diff --git a/src/kits/opengl/mesa/main/matrix.h b/src/libs/mesa/mesa/main/matrix.h similarity index 100% rename from src/kits/opengl/mesa/main/matrix.h rename to src/libs/mesa/mesa/main/matrix.h diff --git a/src/kits/opengl/mesa/main/mfeatures.h b/src/libs/mesa/mesa/main/mfeatures.h similarity index 100% rename from src/kits/opengl/mesa/main/mfeatures.h rename to src/libs/mesa/mesa/main/mfeatures.h diff --git a/src/kits/opengl/mesa/main/mipmap.c b/src/libs/mesa/mesa/main/mipmap.c similarity index 100% rename from src/kits/opengl/mesa/main/mipmap.c rename to src/libs/mesa/mesa/main/mipmap.c diff --git a/src/kits/opengl/mesa/main/mipmap.h b/src/libs/mesa/mesa/main/mipmap.h similarity index 100% rename from src/kits/opengl/mesa/main/mipmap.h rename to src/libs/mesa/mesa/main/mipmap.h diff --git a/src/kits/opengl/mesa/main/mm.c b/src/libs/mesa/mesa/main/mm.c similarity index 100% rename from src/kits/opengl/mesa/main/mm.c rename to src/libs/mesa/mesa/main/mm.c diff --git a/src/kits/opengl/mesa/main/mm.h b/src/libs/mesa/mesa/main/mm.h similarity index 100% rename from src/kits/opengl/mesa/main/mm.h rename to src/libs/mesa/mesa/main/mm.h diff --git a/src/kits/opengl/mesa/main/mtypes.h b/src/libs/mesa/mesa/main/mtypes.h similarity index 100% rename from src/kits/opengl/mesa/main/mtypes.h rename to src/libs/mesa/mesa/main/mtypes.h diff --git a/src/kits/opengl/mesa/main/multisample.c b/src/libs/mesa/mesa/main/multisample.c similarity index 100% rename from src/kits/opengl/mesa/main/multisample.c rename to src/libs/mesa/mesa/main/multisample.c diff --git a/src/kits/opengl/mesa/main/multisample.h b/src/libs/mesa/mesa/main/multisample.h similarity index 100% rename from src/kits/opengl/mesa/main/multisample.h rename to src/libs/mesa/mesa/main/multisample.h diff --git a/src/kits/opengl/mesa/main/pixel.c b/src/libs/mesa/mesa/main/pixel.c similarity index 100% rename from src/kits/opengl/mesa/main/pixel.c rename to src/libs/mesa/mesa/main/pixel.c diff --git a/src/kits/opengl/mesa/main/pixel.h b/src/libs/mesa/mesa/main/pixel.h similarity index 100% rename from src/kits/opengl/mesa/main/pixel.h rename to src/libs/mesa/mesa/main/pixel.h diff --git a/src/kits/opengl/mesa/main/pixelstore.c b/src/libs/mesa/mesa/main/pixelstore.c similarity index 100% rename from src/kits/opengl/mesa/main/pixelstore.c rename to src/libs/mesa/mesa/main/pixelstore.c diff --git a/src/kits/opengl/mesa/main/pixelstore.h b/src/libs/mesa/mesa/main/pixelstore.h similarity index 100% rename from src/kits/opengl/mesa/main/pixelstore.h rename to src/libs/mesa/mesa/main/pixelstore.h diff --git a/src/kits/opengl/mesa/main/points.c b/src/libs/mesa/mesa/main/points.c similarity index 100% rename from src/kits/opengl/mesa/main/points.c rename to src/libs/mesa/mesa/main/points.c diff --git a/src/kits/opengl/mesa/main/points.h b/src/libs/mesa/mesa/main/points.h similarity index 100% rename from src/kits/opengl/mesa/main/points.h rename to src/libs/mesa/mesa/main/points.h diff --git a/src/kits/opengl/mesa/main/polygon.c b/src/libs/mesa/mesa/main/polygon.c similarity index 100% rename from src/kits/opengl/mesa/main/polygon.c rename to src/libs/mesa/mesa/main/polygon.c diff --git a/src/kits/opengl/mesa/main/polygon.h b/src/libs/mesa/mesa/main/polygon.h similarity index 100% rename from src/kits/opengl/mesa/main/polygon.h rename to src/libs/mesa/mesa/main/polygon.h diff --git a/src/kits/opengl/mesa/main/queryobj.c b/src/libs/mesa/mesa/main/queryobj.c similarity index 100% rename from src/kits/opengl/mesa/main/queryobj.c rename to src/libs/mesa/mesa/main/queryobj.c diff --git a/src/kits/opengl/mesa/main/queryobj.h b/src/libs/mesa/mesa/main/queryobj.h similarity index 100% rename from src/kits/opengl/mesa/main/queryobj.h rename to src/libs/mesa/mesa/main/queryobj.h diff --git a/src/kits/opengl/mesa/main/rastpos.c b/src/libs/mesa/mesa/main/rastpos.c similarity index 100% rename from src/kits/opengl/mesa/main/rastpos.c rename to src/libs/mesa/mesa/main/rastpos.c diff --git a/src/kits/opengl/mesa/main/rastpos.h b/src/libs/mesa/mesa/main/rastpos.h similarity index 100% rename from src/kits/opengl/mesa/main/rastpos.h rename to src/libs/mesa/mesa/main/rastpos.h diff --git a/src/kits/opengl/mesa/main/rbadaptors.c b/src/libs/mesa/mesa/main/rbadaptors.c similarity index 100% rename from src/kits/opengl/mesa/main/rbadaptors.c rename to src/libs/mesa/mesa/main/rbadaptors.c diff --git a/src/kits/opengl/mesa/main/rbadaptors.h b/src/libs/mesa/mesa/main/rbadaptors.h similarity index 100% rename from src/kits/opengl/mesa/main/rbadaptors.h rename to src/libs/mesa/mesa/main/rbadaptors.h diff --git a/src/kits/opengl/mesa/main/readpix.c b/src/libs/mesa/mesa/main/readpix.c similarity index 100% rename from src/kits/opengl/mesa/main/readpix.c rename to src/libs/mesa/mesa/main/readpix.c diff --git a/src/kits/opengl/mesa/main/readpix.h b/src/libs/mesa/mesa/main/readpix.h similarity index 100% rename from src/kits/opengl/mesa/main/readpix.h rename to src/libs/mesa/mesa/main/readpix.h diff --git a/src/kits/opengl/mesa/main/renderbuffer.c b/src/libs/mesa/mesa/main/renderbuffer.c similarity index 100% rename from src/kits/opengl/mesa/main/renderbuffer.c rename to src/libs/mesa/mesa/main/renderbuffer.c diff --git a/src/kits/opengl/mesa/main/renderbuffer.h b/src/libs/mesa/mesa/main/renderbuffer.h similarity index 100% rename from src/kits/opengl/mesa/main/renderbuffer.h rename to src/libs/mesa/mesa/main/renderbuffer.h diff --git a/src/kits/opengl/mesa/main/scissor.c b/src/libs/mesa/mesa/main/scissor.c similarity index 100% rename from src/kits/opengl/mesa/main/scissor.c rename to src/libs/mesa/mesa/main/scissor.c diff --git a/src/kits/opengl/mesa/main/scissor.h b/src/libs/mesa/mesa/main/scissor.h similarity index 100% rename from src/kits/opengl/mesa/main/scissor.h rename to src/libs/mesa/mesa/main/scissor.h diff --git a/src/kits/opengl/mesa/main/shaders.c b/src/libs/mesa/mesa/main/shaders.c similarity index 100% rename from src/kits/opengl/mesa/main/shaders.c rename to src/libs/mesa/mesa/main/shaders.c diff --git a/src/kits/opengl/mesa/main/shaders.h b/src/libs/mesa/mesa/main/shaders.h similarity index 100% rename from src/kits/opengl/mesa/main/shaders.h rename to src/libs/mesa/mesa/main/shaders.h diff --git a/src/kits/opengl/mesa/main/simple_list.h b/src/libs/mesa/mesa/main/simple_list.h similarity index 100% rename from src/kits/opengl/mesa/main/simple_list.h rename to src/libs/mesa/mesa/main/simple_list.h diff --git a/src/kits/opengl/mesa/main/state.c b/src/libs/mesa/mesa/main/state.c similarity index 100% rename from src/kits/opengl/mesa/main/state.c rename to src/libs/mesa/mesa/main/state.c diff --git a/src/kits/opengl/mesa/main/state.h b/src/libs/mesa/mesa/main/state.h similarity index 100% rename from src/kits/opengl/mesa/main/state.h rename to src/libs/mesa/mesa/main/state.h diff --git a/src/kits/opengl/mesa/main/stencil.c b/src/libs/mesa/mesa/main/stencil.c similarity index 100% rename from src/kits/opengl/mesa/main/stencil.c rename to src/libs/mesa/mesa/main/stencil.c diff --git a/src/kits/opengl/mesa/main/stencil.h b/src/libs/mesa/mesa/main/stencil.h similarity index 100% rename from src/kits/opengl/mesa/main/stencil.h rename to src/libs/mesa/mesa/main/stencil.h diff --git a/src/kits/opengl/mesa/main/texcompress.c b/src/libs/mesa/mesa/main/texcompress.c similarity index 100% rename from src/kits/opengl/mesa/main/texcompress.c rename to src/libs/mesa/mesa/main/texcompress.c diff --git a/src/kits/opengl/mesa/main/texcompress.h b/src/libs/mesa/mesa/main/texcompress.h similarity index 100% rename from src/kits/opengl/mesa/main/texcompress.h rename to src/libs/mesa/mesa/main/texcompress.h diff --git a/src/kits/opengl/mesa/main/texcompress_fxt1.c b/src/libs/mesa/mesa/main/texcompress_fxt1.c similarity index 100% rename from src/kits/opengl/mesa/main/texcompress_fxt1.c rename to src/libs/mesa/mesa/main/texcompress_fxt1.c diff --git a/src/kits/opengl/mesa/main/texcompress_s3tc.c b/src/libs/mesa/mesa/main/texcompress_s3tc.c similarity index 100% rename from src/kits/opengl/mesa/main/texcompress_s3tc.c rename to src/libs/mesa/mesa/main/texcompress_s3tc.c diff --git a/src/kits/opengl/mesa/main/texenv.c b/src/libs/mesa/mesa/main/texenv.c similarity index 100% rename from src/kits/opengl/mesa/main/texenv.c rename to src/libs/mesa/mesa/main/texenv.c diff --git a/src/kits/opengl/mesa/main/texenv.h b/src/libs/mesa/mesa/main/texenv.h similarity index 100% rename from src/kits/opengl/mesa/main/texenv.h rename to src/libs/mesa/mesa/main/texenv.h diff --git a/src/kits/opengl/mesa/main/texenvprogram.c b/src/libs/mesa/mesa/main/texenvprogram.c similarity index 100% rename from src/kits/opengl/mesa/main/texenvprogram.c rename to src/libs/mesa/mesa/main/texenvprogram.c diff --git a/src/kits/opengl/mesa/main/texenvprogram.h b/src/libs/mesa/mesa/main/texenvprogram.h similarity index 100% rename from src/kits/opengl/mesa/main/texenvprogram.h rename to src/libs/mesa/mesa/main/texenvprogram.h diff --git a/src/kits/opengl/mesa/main/texformat.c b/src/libs/mesa/mesa/main/texformat.c similarity index 100% rename from src/kits/opengl/mesa/main/texformat.c rename to src/libs/mesa/mesa/main/texformat.c diff --git a/src/kits/opengl/mesa/main/texformat.h b/src/libs/mesa/mesa/main/texformat.h similarity index 100% rename from src/kits/opengl/mesa/main/texformat.h rename to src/libs/mesa/mesa/main/texformat.h diff --git a/src/kits/opengl/mesa/main/texformat_tmp.h b/src/libs/mesa/mesa/main/texformat_tmp.h similarity index 100% rename from src/kits/opengl/mesa/main/texformat_tmp.h rename to src/libs/mesa/mesa/main/texformat_tmp.h diff --git a/src/kits/opengl/mesa/main/texgen.c b/src/libs/mesa/mesa/main/texgen.c similarity index 100% rename from src/kits/opengl/mesa/main/texgen.c rename to src/libs/mesa/mesa/main/texgen.c diff --git a/src/kits/opengl/mesa/main/texgen.h b/src/libs/mesa/mesa/main/texgen.h similarity index 100% rename from src/kits/opengl/mesa/main/texgen.h rename to src/libs/mesa/mesa/main/texgen.h diff --git a/src/kits/opengl/mesa/main/teximage.c b/src/libs/mesa/mesa/main/teximage.c similarity index 100% rename from src/kits/opengl/mesa/main/teximage.c rename to src/libs/mesa/mesa/main/teximage.c diff --git a/src/kits/opengl/mesa/main/teximage.h b/src/libs/mesa/mesa/main/teximage.h similarity index 100% rename from src/kits/opengl/mesa/main/teximage.h rename to src/libs/mesa/mesa/main/teximage.h diff --git a/src/kits/opengl/mesa/main/texobj.c b/src/libs/mesa/mesa/main/texobj.c similarity index 100% rename from src/kits/opengl/mesa/main/texobj.c rename to src/libs/mesa/mesa/main/texobj.c diff --git a/src/kits/opengl/mesa/main/texobj.h b/src/libs/mesa/mesa/main/texobj.h similarity index 100% rename from src/kits/opengl/mesa/main/texobj.h rename to src/libs/mesa/mesa/main/texobj.h diff --git a/src/kits/opengl/mesa/main/texparam.c b/src/libs/mesa/mesa/main/texparam.c similarity index 100% rename from src/kits/opengl/mesa/main/texparam.c rename to src/libs/mesa/mesa/main/texparam.c diff --git a/src/kits/opengl/mesa/main/texparam.h b/src/libs/mesa/mesa/main/texparam.h similarity index 100% rename from src/kits/opengl/mesa/main/texparam.h rename to src/libs/mesa/mesa/main/texparam.h diff --git a/src/kits/opengl/mesa/main/texrender.c b/src/libs/mesa/mesa/main/texrender.c similarity index 100% rename from src/kits/opengl/mesa/main/texrender.c rename to src/libs/mesa/mesa/main/texrender.c diff --git a/src/kits/opengl/mesa/main/texrender.h b/src/libs/mesa/mesa/main/texrender.h similarity index 100% rename from src/kits/opengl/mesa/main/texrender.h rename to src/libs/mesa/mesa/main/texrender.h diff --git a/src/kits/opengl/mesa/main/texstate.c b/src/libs/mesa/mesa/main/texstate.c similarity index 100% rename from src/kits/opengl/mesa/main/texstate.c rename to src/libs/mesa/mesa/main/texstate.c diff --git a/src/kits/opengl/mesa/main/texstate.h b/src/libs/mesa/mesa/main/texstate.h similarity index 100% rename from src/kits/opengl/mesa/main/texstate.h rename to src/libs/mesa/mesa/main/texstate.h diff --git a/src/kits/opengl/mesa/main/texstore.c b/src/libs/mesa/mesa/main/texstore.c similarity index 100% rename from src/kits/opengl/mesa/main/texstore.c rename to src/libs/mesa/mesa/main/texstore.c diff --git a/src/kits/opengl/mesa/main/texstore.h b/src/libs/mesa/mesa/main/texstore.h similarity index 100% rename from src/kits/opengl/mesa/main/texstore.h rename to src/libs/mesa/mesa/main/texstore.h diff --git a/src/kits/opengl/mesa/main/varray.c b/src/libs/mesa/mesa/main/varray.c similarity index 100% rename from src/kits/opengl/mesa/main/varray.c rename to src/libs/mesa/mesa/main/varray.c diff --git a/src/kits/opengl/mesa/main/varray.h b/src/libs/mesa/mesa/main/varray.h similarity index 100% rename from src/kits/opengl/mesa/main/varray.h rename to src/libs/mesa/mesa/main/varray.h diff --git a/src/kits/opengl/mesa/main/version.h b/src/libs/mesa/mesa/main/version.h similarity index 100% rename from src/kits/opengl/mesa/main/version.h rename to src/libs/mesa/mesa/main/version.h diff --git a/src/kits/opengl/mesa/main/vsnprintf.c b/src/libs/mesa/mesa/main/vsnprintf.c similarity index 100% rename from src/kits/opengl/mesa/main/vsnprintf.c rename to src/libs/mesa/mesa/main/vsnprintf.c diff --git a/src/kits/opengl/mesa/main/vtxfmt.c b/src/libs/mesa/mesa/main/vtxfmt.c similarity index 100% rename from src/kits/opengl/mesa/main/vtxfmt.c rename to src/libs/mesa/mesa/main/vtxfmt.c diff --git a/src/kits/opengl/mesa/main/vtxfmt.h b/src/libs/mesa/mesa/main/vtxfmt.h similarity index 100% rename from src/kits/opengl/mesa/main/vtxfmt.h rename to src/libs/mesa/mesa/main/vtxfmt.h diff --git a/src/kits/opengl/mesa/main/vtxfmt_tmp.h b/src/libs/mesa/mesa/main/vtxfmt_tmp.h similarity index 100% rename from src/kits/opengl/mesa/main/vtxfmt_tmp.h rename to src/libs/mesa/mesa/main/vtxfmt_tmp.h diff --git a/src/kits/opengl/mesa/math/m_clip_tmp.h b/src/libs/mesa/mesa/math/m_clip_tmp.h similarity index 100% rename from src/kits/opengl/mesa/math/m_clip_tmp.h rename to src/libs/mesa/mesa/math/m_clip_tmp.h diff --git a/src/kits/opengl/mesa/math/m_copy_tmp.h b/src/libs/mesa/mesa/math/m_copy_tmp.h similarity index 100% rename from src/kits/opengl/mesa/math/m_copy_tmp.h rename to src/libs/mesa/mesa/math/m_copy_tmp.h diff --git a/src/kits/opengl/mesa/math/m_debug.h b/src/libs/mesa/mesa/math/m_debug.h similarity index 100% rename from src/kits/opengl/mesa/math/m_debug.h rename to src/libs/mesa/mesa/math/m_debug.h diff --git a/src/kits/opengl/mesa/math/m_debug_clip.c b/src/libs/mesa/mesa/math/m_debug_clip.c similarity index 100% rename from src/kits/opengl/mesa/math/m_debug_clip.c rename to src/libs/mesa/mesa/math/m_debug_clip.c diff --git a/src/kits/opengl/mesa/math/m_debug_norm.c b/src/libs/mesa/mesa/math/m_debug_norm.c similarity index 100% rename from src/kits/opengl/mesa/math/m_debug_norm.c rename to src/libs/mesa/mesa/math/m_debug_norm.c diff --git a/src/kits/opengl/mesa/math/m_debug_util.h b/src/libs/mesa/mesa/math/m_debug_util.h similarity index 100% rename from src/kits/opengl/mesa/math/m_debug_util.h rename to src/libs/mesa/mesa/math/m_debug_util.h diff --git a/src/kits/opengl/mesa/math/m_debug_xform.c b/src/libs/mesa/mesa/math/m_debug_xform.c similarity index 100% rename from src/kits/opengl/mesa/math/m_debug_xform.c rename to src/libs/mesa/mesa/math/m_debug_xform.c diff --git a/src/kits/opengl/mesa/math/m_dotprod_tmp.h b/src/libs/mesa/mesa/math/m_dotprod_tmp.h similarity index 100% rename from src/kits/opengl/mesa/math/m_dotprod_tmp.h rename to src/libs/mesa/mesa/math/m_dotprod_tmp.h diff --git a/src/kits/opengl/mesa/math/m_eval.c b/src/libs/mesa/mesa/math/m_eval.c similarity index 100% rename from src/kits/opengl/mesa/math/m_eval.c rename to src/libs/mesa/mesa/math/m_eval.c diff --git a/src/kits/opengl/mesa/math/m_eval.h b/src/libs/mesa/mesa/math/m_eval.h similarity index 100% rename from src/kits/opengl/mesa/math/m_eval.h rename to src/libs/mesa/mesa/math/m_eval.h diff --git a/src/kits/opengl/mesa/math/m_matrix.c b/src/libs/mesa/mesa/math/m_matrix.c similarity index 100% rename from src/kits/opengl/mesa/math/m_matrix.c rename to src/libs/mesa/mesa/math/m_matrix.c diff --git a/src/kits/opengl/mesa/math/m_matrix.h b/src/libs/mesa/mesa/math/m_matrix.h similarity index 100% rename from src/kits/opengl/mesa/math/m_matrix.h rename to src/libs/mesa/mesa/math/m_matrix.h diff --git a/src/kits/opengl/mesa/math/m_norm_tmp.h b/src/libs/mesa/mesa/math/m_norm_tmp.h similarity index 100% rename from src/kits/opengl/mesa/math/m_norm_tmp.h rename to src/libs/mesa/mesa/math/m_norm_tmp.h diff --git a/src/kits/opengl/mesa/math/m_trans_tmp.h b/src/libs/mesa/mesa/math/m_trans_tmp.h similarity index 100% rename from src/kits/opengl/mesa/math/m_trans_tmp.h rename to src/libs/mesa/mesa/math/m_trans_tmp.h diff --git a/src/kits/opengl/mesa/math/m_translate.c b/src/libs/mesa/mesa/math/m_translate.c similarity index 100% rename from src/kits/opengl/mesa/math/m_translate.c rename to src/libs/mesa/mesa/math/m_translate.c diff --git a/src/kits/opengl/mesa/math/m_translate.h b/src/libs/mesa/mesa/math/m_translate.h similarity index 100% rename from src/kits/opengl/mesa/math/m_translate.h rename to src/libs/mesa/mesa/math/m_translate.h diff --git a/src/kits/opengl/mesa/math/m_vector.c b/src/libs/mesa/mesa/math/m_vector.c similarity index 100% rename from src/kits/opengl/mesa/math/m_vector.c rename to src/libs/mesa/mesa/math/m_vector.c diff --git a/src/kits/opengl/mesa/math/m_vector.h b/src/libs/mesa/mesa/math/m_vector.h similarity index 100% rename from src/kits/opengl/mesa/math/m_vector.h rename to src/libs/mesa/mesa/math/m_vector.h diff --git a/src/kits/opengl/mesa/math/m_xform.c b/src/libs/mesa/mesa/math/m_xform.c similarity index 100% rename from src/kits/opengl/mesa/math/m_xform.c rename to src/libs/mesa/mesa/math/m_xform.c diff --git a/src/kits/opengl/mesa/math/m_xform.h b/src/libs/mesa/mesa/math/m_xform.h similarity index 100% rename from src/kits/opengl/mesa/math/m_xform.h rename to src/libs/mesa/mesa/math/m_xform.h diff --git a/src/kits/opengl/mesa/math/m_xform_tmp.h b/src/libs/mesa/mesa/math/m_xform_tmp.h similarity index 100% rename from src/kits/opengl/mesa/math/m_xform_tmp.h rename to src/libs/mesa/mesa/math/m_xform_tmp.h diff --git a/src/kits/opengl/mesa/math/mathmod.h b/src/libs/mesa/mesa/math/mathmod.h similarity index 100% rename from src/kits/opengl/mesa/math/mathmod.h rename to src/libs/mesa/mesa/math/mathmod.h diff --git a/src/kits/opengl/mesa/ppc/common_ppc.c b/src/libs/mesa/mesa/ppc/common_ppc.c similarity index 100% rename from src/kits/opengl/mesa/ppc/common_ppc.c rename to src/libs/mesa/mesa/ppc/common_ppc.c diff --git a/src/kits/opengl/mesa/ppc/common_ppc_features.h b/src/libs/mesa/mesa/ppc/common_ppc_features.h similarity index 100% rename from src/kits/opengl/mesa/ppc/common_ppc_features.h rename to src/libs/mesa/mesa/ppc/common_ppc_features.h diff --git a/src/kits/opengl/mesa/shader/arbprogparse.c b/src/libs/mesa/mesa/shader/arbprogparse.c similarity index 100% rename from src/kits/opengl/mesa/shader/arbprogparse.c rename to src/libs/mesa/mesa/shader/arbprogparse.c diff --git a/src/kits/opengl/mesa/shader/arbprogparse.h b/src/libs/mesa/mesa/shader/arbprogparse.h similarity index 100% rename from src/kits/opengl/mesa/shader/arbprogparse.h rename to src/libs/mesa/mesa/shader/arbprogparse.h diff --git a/src/kits/opengl/mesa/shader/arbprogram.c b/src/libs/mesa/mesa/shader/arbprogram.c similarity index 100% rename from src/kits/opengl/mesa/shader/arbprogram.c rename to src/libs/mesa/mesa/shader/arbprogram.c diff --git a/src/kits/opengl/mesa/shader/arbprogram.h b/src/libs/mesa/mesa/shader/arbprogram.h similarity index 100% rename from src/kits/opengl/mesa/shader/arbprogram.h rename to src/libs/mesa/mesa/shader/arbprogram.h diff --git a/src/kits/opengl/mesa/shader/arbprogram_syn.h b/src/libs/mesa/mesa/shader/arbprogram_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/arbprogram_syn.h rename to src/libs/mesa/mesa/shader/arbprogram_syn.h diff --git a/src/kits/opengl/mesa/shader/atifragshader.c b/src/libs/mesa/mesa/shader/atifragshader.c similarity index 100% rename from src/kits/opengl/mesa/shader/atifragshader.c rename to src/libs/mesa/mesa/shader/atifragshader.c diff --git a/src/kits/opengl/mesa/shader/atifragshader.h b/src/libs/mesa/mesa/shader/atifragshader.h similarity index 100% rename from src/kits/opengl/mesa/shader/atifragshader.h rename to src/libs/mesa/mesa/shader/atifragshader.h diff --git a/src/kits/opengl/mesa/shader/grammar/grammar.c b/src/libs/mesa/mesa/shader/grammar/grammar.c similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar.c rename to src/libs/mesa/mesa/shader/grammar/grammar.c diff --git a/src/kits/opengl/mesa/shader/grammar/grammar.h b/src/libs/mesa/mesa/shader/grammar/grammar.h similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar.h rename to src/libs/mesa/mesa/shader/grammar/grammar.h diff --git a/src/kits/opengl/mesa/shader/grammar/grammar_crt.c b/src/libs/mesa/mesa/shader/grammar/grammar_crt.c similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar_crt.c rename to src/libs/mesa/mesa/shader/grammar/grammar_crt.c diff --git a/src/kits/opengl/mesa/shader/grammar/grammar_crt.h b/src/libs/mesa/mesa/shader/grammar/grammar_crt.h similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar_crt.h rename to src/libs/mesa/mesa/shader/grammar/grammar_crt.h diff --git a/src/kits/opengl/mesa/shader/grammar/grammar_mesa.c b/src/libs/mesa/mesa/shader/grammar/grammar_mesa.c similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar_mesa.c rename to src/libs/mesa/mesa/shader/grammar/grammar_mesa.c diff --git a/src/kits/opengl/mesa/shader/grammar/grammar_mesa.h b/src/libs/mesa/mesa/shader/grammar/grammar_mesa.h similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar_mesa.h rename to src/libs/mesa/mesa/shader/grammar/grammar_mesa.h diff --git a/src/kits/opengl/mesa/shader/grammar/grammar_syn.h b/src/libs/mesa/mesa/shader/grammar/grammar_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/grammar/grammar_syn.h rename to src/libs/mesa/mesa/shader/grammar/grammar_syn.h diff --git a/src/kits/opengl/mesa/shader/nvfragparse.c b/src/libs/mesa/mesa/shader/nvfragparse.c similarity index 100% rename from src/kits/opengl/mesa/shader/nvfragparse.c rename to src/libs/mesa/mesa/shader/nvfragparse.c diff --git a/src/kits/opengl/mesa/shader/nvfragparse.h b/src/libs/mesa/mesa/shader/nvfragparse.h similarity index 100% rename from src/kits/opengl/mesa/shader/nvfragparse.h rename to src/libs/mesa/mesa/shader/nvfragparse.h diff --git a/src/kits/opengl/mesa/shader/nvprogram.c b/src/libs/mesa/mesa/shader/nvprogram.c similarity index 100% rename from src/kits/opengl/mesa/shader/nvprogram.c rename to src/libs/mesa/mesa/shader/nvprogram.c diff --git a/src/kits/opengl/mesa/shader/nvprogram.h b/src/libs/mesa/mesa/shader/nvprogram.h similarity index 100% rename from src/kits/opengl/mesa/shader/nvprogram.h rename to src/libs/mesa/mesa/shader/nvprogram.h diff --git a/src/kits/opengl/mesa/shader/nvvertparse.c b/src/libs/mesa/mesa/shader/nvvertparse.c similarity index 100% rename from src/kits/opengl/mesa/shader/nvvertparse.c rename to src/libs/mesa/mesa/shader/nvvertparse.c diff --git a/src/kits/opengl/mesa/shader/nvvertparse.h b/src/libs/mesa/mesa/shader/nvvertparse.h similarity index 100% rename from src/kits/opengl/mesa/shader/nvvertparse.h rename to src/libs/mesa/mesa/shader/nvvertparse.h diff --git a/src/kits/opengl/mesa/shader/prog_cache.c b/src/libs/mesa/mesa/shader/prog_cache.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_cache.c rename to src/libs/mesa/mesa/shader/prog_cache.c diff --git a/src/kits/opengl/mesa/shader/prog_cache.h b/src/libs/mesa/mesa/shader/prog_cache.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_cache.h rename to src/libs/mesa/mesa/shader/prog_cache.h diff --git a/src/kits/opengl/mesa/shader/prog_debug.c b/src/libs/mesa/mesa/shader/prog_debug.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_debug.c rename to src/libs/mesa/mesa/shader/prog_debug.c diff --git a/src/kits/opengl/mesa/shader/prog_debug.h b/src/libs/mesa/mesa/shader/prog_debug.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_debug.h rename to src/libs/mesa/mesa/shader/prog_debug.h diff --git a/src/kits/opengl/mesa/shader/prog_execute.c b/src/libs/mesa/mesa/shader/prog_execute.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_execute.c rename to src/libs/mesa/mesa/shader/prog_execute.c diff --git a/src/kits/opengl/mesa/shader/prog_execute.h b/src/libs/mesa/mesa/shader/prog_execute.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_execute.h rename to src/libs/mesa/mesa/shader/prog_execute.h diff --git a/src/kits/opengl/mesa/shader/prog_instruction.c b/src/libs/mesa/mesa/shader/prog_instruction.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_instruction.c rename to src/libs/mesa/mesa/shader/prog_instruction.c diff --git a/src/kits/opengl/mesa/shader/prog_instruction.h b/src/libs/mesa/mesa/shader/prog_instruction.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_instruction.h rename to src/libs/mesa/mesa/shader/prog_instruction.h diff --git a/src/kits/opengl/mesa/shader/prog_noise.c b/src/libs/mesa/mesa/shader/prog_noise.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_noise.c rename to src/libs/mesa/mesa/shader/prog_noise.c diff --git a/src/kits/opengl/mesa/shader/prog_noise.h b/src/libs/mesa/mesa/shader/prog_noise.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_noise.h rename to src/libs/mesa/mesa/shader/prog_noise.h diff --git a/src/kits/opengl/mesa/shader/prog_parameter.c b/src/libs/mesa/mesa/shader/prog_parameter.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_parameter.c rename to src/libs/mesa/mesa/shader/prog_parameter.c diff --git a/src/kits/opengl/mesa/shader/prog_parameter.h b/src/libs/mesa/mesa/shader/prog_parameter.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_parameter.h rename to src/libs/mesa/mesa/shader/prog_parameter.h diff --git a/src/kits/opengl/mesa/shader/prog_print.c b/src/libs/mesa/mesa/shader/prog_print.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_print.c rename to src/libs/mesa/mesa/shader/prog_print.c diff --git a/src/kits/opengl/mesa/shader/prog_print.h b/src/libs/mesa/mesa/shader/prog_print.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_print.h rename to src/libs/mesa/mesa/shader/prog_print.h diff --git a/src/kits/opengl/mesa/shader/prog_statevars.c b/src/libs/mesa/mesa/shader/prog_statevars.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_statevars.c rename to src/libs/mesa/mesa/shader/prog_statevars.c diff --git a/src/kits/opengl/mesa/shader/prog_statevars.h b/src/libs/mesa/mesa/shader/prog_statevars.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_statevars.h rename to src/libs/mesa/mesa/shader/prog_statevars.h diff --git a/src/kits/opengl/mesa/shader/prog_uniform.c b/src/libs/mesa/mesa/shader/prog_uniform.c similarity index 100% rename from src/kits/opengl/mesa/shader/prog_uniform.c rename to src/libs/mesa/mesa/shader/prog_uniform.c diff --git a/src/kits/opengl/mesa/shader/prog_uniform.h b/src/libs/mesa/mesa/shader/prog_uniform.h similarity index 100% rename from src/kits/opengl/mesa/shader/prog_uniform.h rename to src/libs/mesa/mesa/shader/prog_uniform.h diff --git a/src/kits/opengl/mesa/shader/program.c b/src/libs/mesa/mesa/shader/program.c similarity index 100% rename from src/kits/opengl/mesa/shader/program.c rename to src/libs/mesa/mesa/shader/program.c diff --git a/src/kits/opengl/mesa/shader/program.h b/src/libs/mesa/mesa/shader/program.h similarity index 100% rename from src/kits/opengl/mesa/shader/program.h rename to src/libs/mesa/mesa/shader/program.h diff --git a/src/kits/opengl/mesa/shader/programopt.c b/src/libs/mesa/mesa/shader/programopt.c similarity index 100% rename from src/kits/opengl/mesa/shader/programopt.c rename to src/libs/mesa/mesa/shader/programopt.c diff --git a/src/kits/opengl/mesa/shader/programopt.h b/src/libs/mesa/mesa/shader/programopt.h similarity index 100% rename from src/kits/opengl/mesa/shader/programopt.h rename to src/libs/mesa/mesa/shader/programopt.h diff --git a/src/kits/opengl/mesa/shader/shader_api.c b/src/libs/mesa/mesa/shader/shader_api.c similarity index 100% rename from src/kits/opengl/mesa/shader/shader_api.c rename to src/libs/mesa/mesa/shader/shader_api.c diff --git a/src/kits/opengl/mesa/shader/shader_api.h b/src/libs/mesa/mesa/shader/shader_api.h similarity index 100% rename from src/kits/opengl/mesa/shader/shader_api.h rename to src/libs/mesa/mesa/shader/shader_api.h diff --git a/src/kits/opengl/mesa/shader/slang/library/gc_to_bin.c b/src/libs/mesa/mesa/shader/slang/library/gc_to_bin.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/gc_to_bin.c rename to src/libs/mesa/mesa/shader/slang/library/gc_to_bin.c diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_120_core.gc b/src/libs/mesa/mesa/shader/slang/library/slang_120_core.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_120_core.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_120_core.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_120_core_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_120_core_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_120_core_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_120_core_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_common.gc b/src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_common.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_common.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_common.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_common_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_common_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_common_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_common_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_fragment.gc b/src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_fragment.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_fragment.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_fragment.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_common_builtin.gc b/src/libs/mesa/mesa/shader/slang/library/slang_common_builtin.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_common_builtin.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_common_builtin.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_common_builtin_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_common_builtin_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_common_builtin_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_common_builtin_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_core.gc b/src/libs/mesa/mesa/shader/slang/library/slang_core.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_core.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_core.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_core_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_core_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_core_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_core_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_fragment_builtin.gc b/src/libs/mesa/mesa/shader/slang/library/slang_fragment_builtin.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_fragment_builtin.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_fragment_builtin.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_fragment_builtin_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_fragment_builtin_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_fragment_builtin_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_fragment_builtin_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_pp_directives.syn b/src/libs/mesa/mesa/shader/slang/library/slang_pp_directives.syn similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_pp_directives.syn rename to src/libs/mesa/mesa/shader/slang/library/slang_pp_directives.syn diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_pp_directives_syn.h b/src/libs/mesa/mesa/shader/slang/library/slang_pp_directives_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_pp_directives_syn.h rename to src/libs/mesa/mesa/shader/slang/library/slang_pp_directives_syn.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_pp_expression.syn b/src/libs/mesa/mesa/shader/slang/library/slang_pp_expression.syn similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_pp_expression.syn rename to src/libs/mesa/mesa/shader/slang/library/slang_pp_expression.syn diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_pp_expression_syn.h b/src/libs/mesa/mesa/shader/slang/library/slang_pp_expression_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_pp_expression_syn.h rename to src/libs/mesa/mesa/shader/slang/library/slang_pp_expression_syn.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_pp_version.syn b/src/libs/mesa/mesa/shader/slang/library/slang_pp_version.syn similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_pp_version.syn rename to src/libs/mesa/mesa/shader/slang/library/slang_pp_version.syn diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_pp_version_syn.h b/src/libs/mesa/mesa/shader/slang/library/slang_pp_version_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_pp_version_syn.h rename to src/libs/mesa/mesa/shader/slang/library/slang_pp_version_syn.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_shader.syn b/src/libs/mesa/mesa/shader/slang/library/slang_shader.syn similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_shader.syn rename to src/libs/mesa/mesa/shader/slang/library/slang_shader.syn diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_shader_syn.h b/src/libs/mesa/mesa/shader/slang/library/slang_shader_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_shader_syn.h rename to src/libs/mesa/mesa/shader/slang/library/slang_shader_syn.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_version.syn b/src/libs/mesa/mesa/shader/slang/library/slang_version.syn similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_version.syn rename to src/libs/mesa/mesa/shader/slang/library/slang_version.syn diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_version_syn.h b/src/libs/mesa/mesa/shader/slang/library/slang_version_syn.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_version_syn.h rename to src/libs/mesa/mesa/shader/slang/library/slang_version_syn.h diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_vertex_builtin.gc b/src/libs/mesa/mesa/shader/slang/library/slang_vertex_builtin.gc similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_vertex_builtin.gc rename to src/libs/mesa/mesa/shader/slang/library/slang_vertex_builtin.gc diff --git a/src/kits/opengl/mesa/shader/slang/library/slang_vertex_builtin_gc.h b/src/libs/mesa/mesa/shader/slang/library/slang_vertex_builtin_gc.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/slang_vertex_builtin_gc.h rename to src/libs/mesa/mesa/shader/slang/library/slang_vertex_builtin_gc.h diff --git a/src/kits/opengl/mesa/shader/slang/library/syn_to_c.c b/src/libs/mesa/mesa/shader/slang/library/syn_to_c.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/library/syn_to_c.c rename to src/libs/mesa/mesa/shader/slang/library/syn_to_c.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_builtin.c b/src/libs/mesa/mesa/shader/slang/slang_builtin.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_builtin.c rename to src/libs/mesa/mesa/shader/slang/slang_builtin.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_builtin.h b/src/libs/mesa/mesa/shader/slang/slang_builtin.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_builtin.h rename to src/libs/mesa/mesa/shader/slang/slang_builtin.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_codegen.c b/src/libs/mesa/mesa/shader/slang/slang_codegen.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_codegen.c rename to src/libs/mesa/mesa/shader/slang/slang_codegen.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_codegen.h b/src/libs/mesa/mesa/shader/slang/slang_codegen.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_codegen.h rename to src/libs/mesa/mesa/shader/slang/slang_codegen.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile.c b/src/libs/mesa/mesa/shader/slang/slang_compile.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile.c rename to src/libs/mesa/mesa/shader/slang/slang_compile.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile.h b/src/libs/mesa/mesa/shader/slang/slang_compile.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile.h rename to src/libs/mesa/mesa/shader/slang/slang_compile.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_function.c b/src/libs/mesa/mesa/shader/slang/slang_compile_function.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_function.c rename to src/libs/mesa/mesa/shader/slang/slang_compile_function.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_function.h b/src/libs/mesa/mesa/shader/slang/slang_compile_function.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_function.h rename to src/libs/mesa/mesa/shader/slang/slang_compile_function.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_operation.c b/src/libs/mesa/mesa/shader/slang/slang_compile_operation.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_operation.c rename to src/libs/mesa/mesa/shader/slang/slang_compile_operation.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_operation.h b/src/libs/mesa/mesa/shader/slang/slang_compile_operation.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_operation.h rename to src/libs/mesa/mesa/shader/slang/slang_compile_operation.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_struct.c b/src/libs/mesa/mesa/shader/slang/slang_compile_struct.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_struct.c rename to src/libs/mesa/mesa/shader/slang/slang_compile_struct.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_struct.h b/src/libs/mesa/mesa/shader/slang/slang_compile_struct.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_struct.h rename to src/libs/mesa/mesa/shader/slang/slang_compile_struct.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_variable.c b/src/libs/mesa/mesa/shader/slang/slang_compile_variable.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_variable.c rename to src/libs/mesa/mesa/shader/slang/slang_compile_variable.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_compile_variable.h b/src/libs/mesa/mesa/shader/slang/slang_compile_variable.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_compile_variable.h rename to src/libs/mesa/mesa/shader/slang/slang_compile_variable.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_emit.c b/src/libs/mesa/mesa/shader/slang/slang_emit.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_emit.c rename to src/libs/mesa/mesa/shader/slang/slang_emit.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_emit.h b/src/libs/mesa/mesa/shader/slang/slang_emit.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_emit.h rename to src/libs/mesa/mesa/shader/slang/slang_emit.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_ir.c b/src/libs/mesa/mesa/shader/slang/slang_ir.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_ir.c rename to src/libs/mesa/mesa/shader/slang/slang_ir.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_ir.h b/src/libs/mesa/mesa/shader/slang/slang_ir.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_ir.h rename to src/libs/mesa/mesa/shader/slang/slang_ir.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_label.c b/src/libs/mesa/mesa/shader/slang/slang_label.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_label.c rename to src/libs/mesa/mesa/shader/slang/slang_label.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_label.h b/src/libs/mesa/mesa/shader/slang/slang_label.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_label.h rename to src/libs/mesa/mesa/shader/slang/slang_label.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_link.c b/src/libs/mesa/mesa/shader/slang/slang_link.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_link.c rename to src/libs/mesa/mesa/shader/slang/slang_link.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_link.h b/src/libs/mesa/mesa/shader/slang/slang_link.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_link.h rename to src/libs/mesa/mesa/shader/slang/slang_link.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_log.c b/src/libs/mesa/mesa/shader/slang/slang_log.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_log.c rename to src/libs/mesa/mesa/shader/slang/slang_log.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_log.h b/src/libs/mesa/mesa/shader/slang/slang_log.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_log.h rename to src/libs/mesa/mesa/shader/slang/slang_log.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_mem.c b/src/libs/mesa/mesa/shader/slang/slang_mem.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_mem.c rename to src/libs/mesa/mesa/shader/slang/slang_mem.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_mem.h b/src/libs/mesa/mesa/shader/slang/slang_mem.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_mem.h rename to src/libs/mesa/mesa/shader/slang/slang_mem.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_preprocess.c b/src/libs/mesa/mesa/shader/slang/slang_preprocess.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_preprocess.c rename to src/libs/mesa/mesa/shader/slang/slang_preprocess.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_preprocess.h b/src/libs/mesa/mesa/shader/slang/slang_preprocess.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_preprocess.h rename to src/libs/mesa/mesa/shader/slang/slang_preprocess.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_print.c b/src/libs/mesa/mesa/shader/slang/slang_print.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_print.c rename to src/libs/mesa/mesa/shader/slang/slang_print.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_print.h b/src/libs/mesa/mesa/shader/slang/slang_print.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_print.h rename to src/libs/mesa/mesa/shader/slang/slang_print.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_simplify.c b/src/libs/mesa/mesa/shader/slang/slang_simplify.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_simplify.c rename to src/libs/mesa/mesa/shader/slang/slang_simplify.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_simplify.h b/src/libs/mesa/mesa/shader/slang/slang_simplify.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_simplify.h rename to src/libs/mesa/mesa/shader/slang/slang_simplify.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_storage.c b/src/libs/mesa/mesa/shader/slang/slang_storage.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_storage.c rename to src/libs/mesa/mesa/shader/slang/slang_storage.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_storage.h b/src/libs/mesa/mesa/shader/slang/slang_storage.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_storage.h rename to src/libs/mesa/mesa/shader/slang/slang_storage.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_typeinfo.c b/src/libs/mesa/mesa/shader/slang/slang_typeinfo.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_typeinfo.c rename to src/libs/mesa/mesa/shader/slang/slang_typeinfo.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_typeinfo.h b/src/libs/mesa/mesa/shader/slang/slang_typeinfo.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_typeinfo.h rename to src/libs/mesa/mesa/shader/slang/slang_typeinfo.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_utility.c b/src/libs/mesa/mesa/shader/slang/slang_utility.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_utility.c rename to src/libs/mesa/mesa/shader/slang/slang_utility.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_utility.h b/src/libs/mesa/mesa/shader/slang/slang_utility.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_utility.h rename to src/libs/mesa/mesa/shader/slang/slang_utility.h diff --git a/src/kits/opengl/mesa/shader/slang/slang_vartable.c b/src/libs/mesa/mesa/shader/slang/slang_vartable.c similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_vartable.c rename to src/libs/mesa/mesa/shader/slang/slang_vartable.c diff --git a/src/kits/opengl/mesa/shader/slang/slang_vartable.h b/src/libs/mesa/mesa/shader/slang/slang_vartable.h similarity index 100% rename from src/kits/opengl/mesa/shader/slang/slang_vartable.h rename to src/libs/mesa/mesa/shader/slang/slang_vartable.h diff --git a/src/kits/opengl/mesa/sparc/clip.S b/src/libs/mesa/mesa/sparc/clip.S similarity index 100% rename from src/kits/opengl/mesa/sparc/clip.S rename to src/libs/mesa/mesa/sparc/clip.S diff --git a/src/kits/opengl/mesa/sparc/glapi_sparc.S b/src/libs/mesa/mesa/sparc/glapi_sparc.S similarity index 100% rename from src/kits/opengl/mesa/sparc/glapi_sparc.S rename to src/libs/mesa/mesa/sparc/glapi_sparc.S diff --git a/src/kits/opengl/mesa/sparc/norm.S b/src/libs/mesa/mesa/sparc/norm.S similarity index 100% rename from src/kits/opengl/mesa/sparc/norm.S rename to src/libs/mesa/mesa/sparc/norm.S diff --git a/src/kits/opengl/mesa/sparc/sparc.c b/src/libs/mesa/mesa/sparc/sparc.c similarity index 100% rename from src/kits/opengl/mesa/sparc/sparc.c rename to src/libs/mesa/mesa/sparc/sparc.c diff --git a/src/kits/opengl/mesa/sparc/sparc.h b/src/libs/mesa/mesa/sparc/sparc.h similarity index 100% rename from src/kits/opengl/mesa/sparc/sparc.h rename to src/libs/mesa/mesa/sparc/sparc.h diff --git a/src/kits/opengl/mesa/sparc/sparc_matrix.h b/src/libs/mesa/mesa/sparc/sparc_matrix.h similarity index 100% rename from src/kits/opengl/mesa/sparc/sparc_matrix.h rename to src/libs/mesa/mesa/sparc/sparc_matrix.h diff --git a/src/kits/opengl/mesa/sparc/xform.S b/src/libs/mesa/mesa/sparc/xform.S similarity index 100% rename from src/kits/opengl/mesa/sparc/xform.S rename to src/libs/mesa/mesa/sparc/xform.S diff --git a/src/kits/opengl/mesa/swrast/s_aaline.c b/src/libs/mesa/mesa/swrast/s_aaline.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_aaline.c rename to src/libs/mesa/mesa/swrast/s_aaline.c diff --git a/src/kits/opengl/mesa/swrast/s_aaline.h b/src/libs/mesa/mesa/swrast/s_aaline.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_aaline.h rename to src/libs/mesa/mesa/swrast/s_aaline.h diff --git a/src/kits/opengl/mesa/swrast/s_aalinetemp.h b/src/libs/mesa/mesa/swrast/s_aalinetemp.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_aalinetemp.h rename to src/libs/mesa/mesa/swrast/s_aalinetemp.h diff --git a/src/kits/opengl/mesa/swrast/s_aatriangle.c b/src/libs/mesa/mesa/swrast/s_aatriangle.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_aatriangle.c rename to src/libs/mesa/mesa/swrast/s_aatriangle.c diff --git a/src/kits/opengl/mesa/swrast/s_aatriangle.h b/src/libs/mesa/mesa/swrast/s_aatriangle.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_aatriangle.h rename to src/libs/mesa/mesa/swrast/s_aatriangle.h diff --git a/src/kits/opengl/mesa/swrast/s_aatritemp.h b/src/libs/mesa/mesa/swrast/s_aatritemp.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_aatritemp.h rename to src/libs/mesa/mesa/swrast/s_aatritemp.h diff --git a/src/kits/opengl/mesa/swrast/s_accum.c b/src/libs/mesa/mesa/swrast/s_accum.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_accum.c rename to src/libs/mesa/mesa/swrast/s_accum.c diff --git a/src/kits/opengl/mesa/swrast/s_accum.h b/src/libs/mesa/mesa/swrast/s_accum.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_accum.h rename to src/libs/mesa/mesa/swrast/s_accum.h diff --git a/src/kits/opengl/mesa/swrast/s_alpha.c b/src/libs/mesa/mesa/swrast/s_alpha.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_alpha.c rename to src/libs/mesa/mesa/swrast/s_alpha.c diff --git a/src/kits/opengl/mesa/swrast/s_alpha.h b/src/libs/mesa/mesa/swrast/s_alpha.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_alpha.h rename to src/libs/mesa/mesa/swrast/s_alpha.h diff --git a/src/kits/opengl/mesa/swrast/s_atifragshader.c b/src/libs/mesa/mesa/swrast/s_atifragshader.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_atifragshader.c rename to src/libs/mesa/mesa/swrast/s_atifragshader.c diff --git a/src/kits/opengl/mesa/swrast/s_atifragshader.h b/src/libs/mesa/mesa/swrast/s_atifragshader.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_atifragshader.h rename to src/libs/mesa/mesa/swrast/s_atifragshader.h diff --git a/src/kits/opengl/mesa/swrast/s_bitmap.c b/src/libs/mesa/mesa/swrast/s_bitmap.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_bitmap.c rename to src/libs/mesa/mesa/swrast/s_bitmap.c diff --git a/src/kits/opengl/mesa/swrast/s_blend.c b/src/libs/mesa/mesa/swrast/s_blend.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_blend.c rename to src/libs/mesa/mesa/swrast/s_blend.c diff --git a/src/kits/opengl/mesa/swrast/s_blend.h b/src/libs/mesa/mesa/swrast/s_blend.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_blend.h rename to src/libs/mesa/mesa/swrast/s_blend.h diff --git a/src/kits/opengl/mesa/swrast/s_blit.c b/src/libs/mesa/mesa/swrast/s_blit.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_blit.c rename to src/libs/mesa/mesa/swrast/s_blit.c diff --git a/src/kits/opengl/mesa/swrast/s_buffers.c b/src/libs/mesa/mesa/swrast/s_buffers.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_buffers.c rename to src/libs/mesa/mesa/swrast/s_buffers.c diff --git a/src/kits/opengl/mesa/swrast/s_context.c b/src/libs/mesa/mesa/swrast/s_context.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_context.c rename to src/libs/mesa/mesa/swrast/s_context.c diff --git a/src/kits/opengl/mesa/swrast/s_context.h b/src/libs/mesa/mesa/swrast/s_context.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_context.h rename to src/libs/mesa/mesa/swrast/s_context.h diff --git a/src/kits/opengl/mesa/swrast/s_copypix.c b/src/libs/mesa/mesa/swrast/s_copypix.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_copypix.c rename to src/libs/mesa/mesa/swrast/s_copypix.c diff --git a/src/kits/opengl/mesa/swrast/s_depth.c b/src/libs/mesa/mesa/swrast/s_depth.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_depth.c rename to src/libs/mesa/mesa/swrast/s_depth.c diff --git a/src/kits/opengl/mesa/swrast/s_depth.h b/src/libs/mesa/mesa/swrast/s_depth.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_depth.h rename to src/libs/mesa/mesa/swrast/s_depth.h diff --git a/src/kits/opengl/mesa/swrast/s_drawpix.c b/src/libs/mesa/mesa/swrast/s_drawpix.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_drawpix.c rename to src/libs/mesa/mesa/swrast/s_drawpix.c diff --git a/src/kits/opengl/mesa/swrast/s_feedback.c b/src/libs/mesa/mesa/swrast/s_feedback.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_feedback.c rename to src/libs/mesa/mesa/swrast/s_feedback.c diff --git a/src/kits/opengl/mesa/swrast/s_feedback.h b/src/libs/mesa/mesa/swrast/s_feedback.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_feedback.h rename to src/libs/mesa/mesa/swrast/s_feedback.h diff --git a/src/kits/opengl/mesa/swrast/s_fog.c b/src/libs/mesa/mesa/swrast/s_fog.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_fog.c rename to src/libs/mesa/mesa/swrast/s_fog.c diff --git a/src/kits/opengl/mesa/swrast/s_fog.h b/src/libs/mesa/mesa/swrast/s_fog.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_fog.h rename to src/libs/mesa/mesa/swrast/s_fog.h diff --git a/src/kits/opengl/mesa/swrast/s_fragprog.c b/src/libs/mesa/mesa/swrast/s_fragprog.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_fragprog.c rename to src/libs/mesa/mesa/swrast/s_fragprog.c diff --git a/src/kits/opengl/mesa/swrast/s_fragprog.h b/src/libs/mesa/mesa/swrast/s_fragprog.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_fragprog.h rename to src/libs/mesa/mesa/swrast/s_fragprog.h diff --git a/src/kits/opengl/mesa/swrast/s_imaging.c b/src/libs/mesa/mesa/swrast/s_imaging.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_imaging.c rename to src/libs/mesa/mesa/swrast/s_imaging.c diff --git a/src/kits/opengl/mesa/swrast/s_lines.c b/src/libs/mesa/mesa/swrast/s_lines.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_lines.c rename to src/libs/mesa/mesa/swrast/s_lines.c diff --git a/src/kits/opengl/mesa/swrast/s_lines.h b/src/libs/mesa/mesa/swrast/s_lines.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_lines.h rename to src/libs/mesa/mesa/swrast/s_lines.h diff --git a/src/kits/opengl/mesa/swrast/s_linetemp.h b/src/libs/mesa/mesa/swrast/s_linetemp.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_linetemp.h rename to src/libs/mesa/mesa/swrast/s_linetemp.h diff --git a/src/kits/opengl/mesa/swrast/s_logic.c b/src/libs/mesa/mesa/swrast/s_logic.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_logic.c rename to src/libs/mesa/mesa/swrast/s_logic.c diff --git a/src/kits/opengl/mesa/swrast/s_logic.h b/src/libs/mesa/mesa/swrast/s_logic.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_logic.h rename to src/libs/mesa/mesa/swrast/s_logic.h diff --git a/src/kits/opengl/mesa/swrast/s_masking.c b/src/libs/mesa/mesa/swrast/s_masking.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_masking.c rename to src/libs/mesa/mesa/swrast/s_masking.c diff --git a/src/kits/opengl/mesa/swrast/s_masking.h b/src/libs/mesa/mesa/swrast/s_masking.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_masking.h rename to src/libs/mesa/mesa/swrast/s_masking.h diff --git a/src/kits/opengl/mesa/swrast/s_points.c b/src/libs/mesa/mesa/swrast/s_points.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_points.c rename to src/libs/mesa/mesa/swrast/s_points.c diff --git a/src/kits/opengl/mesa/swrast/s_points.h b/src/libs/mesa/mesa/swrast/s_points.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_points.h rename to src/libs/mesa/mesa/swrast/s_points.h diff --git a/src/kits/opengl/mesa/swrast/s_readpix.c b/src/libs/mesa/mesa/swrast/s_readpix.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_readpix.c rename to src/libs/mesa/mesa/swrast/s_readpix.c diff --git a/src/kits/opengl/mesa/swrast/s_span.c b/src/libs/mesa/mesa/swrast/s_span.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_span.c rename to src/libs/mesa/mesa/swrast/s_span.c diff --git a/src/kits/opengl/mesa/swrast/s_span.h b/src/libs/mesa/mesa/swrast/s_span.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_span.h rename to src/libs/mesa/mesa/swrast/s_span.h diff --git a/src/kits/opengl/mesa/swrast/s_spantemp.h b/src/libs/mesa/mesa/swrast/s_spantemp.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_spantemp.h rename to src/libs/mesa/mesa/swrast/s_spantemp.h diff --git a/src/kits/opengl/mesa/swrast/s_stencil.c b/src/libs/mesa/mesa/swrast/s_stencil.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_stencil.c rename to src/libs/mesa/mesa/swrast/s_stencil.c diff --git a/src/kits/opengl/mesa/swrast/s_stencil.h b/src/libs/mesa/mesa/swrast/s_stencil.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_stencil.h rename to src/libs/mesa/mesa/swrast/s_stencil.h diff --git a/src/kits/opengl/mesa/swrast/s_texcombine.c b/src/libs/mesa/mesa/swrast/s_texcombine.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_texcombine.c rename to src/libs/mesa/mesa/swrast/s_texcombine.c diff --git a/src/kits/opengl/mesa/swrast/s_texcombine.h b/src/libs/mesa/mesa/swrast/s_texcombine.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_texcombine.h rename to src/libs/mesa/mesa/swrast/s_texcombine.h diff --git a/src/kits/opengl/mesa/swrast/s_texfilter.c b/src/libs/mesa/mesa/swrast/s_texfilter.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_texfilter.c rename to src/libs/mesa/mesa/swrast/s_texfilter.c diff --git a/src/kits/opengl/mesa/swrast/s_texfilter.h b/src/libs/mesa/mesa/swrast/s_texfilter.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_texfilter.h rename to src/libs/mesa/mesa/swrast/s_texfilter.h diff --git a/src/kits/opengl/mesa/swrast/s_texstore.c b/src/libs/mesa/mesa/swrast/s_texstore.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_texstore.c rename to src/libs/mesa/mesa/swrast/s_texstore.c diff --git a/src/kits/opengl/mesa/swrast/s_triangle.c b/src/libs/mesa/mesa/swrast/s_triangle.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_triangle.c rename to src/libs/mesa/mesa/swrast/s_triangle.c diff --git a/src/kits/opengl/mesa/swrast/s_triangle.h b/src/libs/mesa/mesa/swrast/s_triangle.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_triangle.h rename to src/libs/mesa/mesa/swrast/s_triangle.h diff --git a/src/kits/opengl/mesa/swrast/s_trispan.h b/src/libs/mesa/mesa/swrast/s_trispan.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_trispan.h rename to src/libs/mesa/mesa/swrast/s_trispan.h diff --git a/src/kits/opengl/mesa/swrast/s_tritemp.h b/src/libs/mesa/mesa/swrast/s_tritemp.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_tritemp.h rename to src/libs/mesa/mesa/swrast/s_tritemp.h diff --git a/src/kits/opengl/mesa/swrast/s_zoom.c b/src/libs/mesa/mesa/swrast/s_zoom.c similarity index 100% rename from src/kits/opengl/mesa/swrast/s_zoom.c rename to src/libs/mesa/mesa/swrast/s_zoom.c diff --git a/src/kits/opengl/mesa/swrast/s_zoom.h b/src/libs/mesa/mesa/swrast/s_zoom.h similarity index 100% rename from src/kits/opengl/mesa/swrast/s_zoom.h rename to src/libs/mesa/mesa/swrast/s_zoom.h diff --git a/src/kits/opengl/mesa/swrast/swrast.h b/src/libs/mesa/mesa/swrast/swrast.h similarity index 100% rename from src/kits/opengl/mesa/swrast/swrast.h rename to src/libs/mesa/mesa/swrast/swrast.h diff --git a/src/kits/opengl/mesa/swrast_setup/ss_context.c b/src/libs/mesa/mesa/swrast_setup/ss_context.c similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/ss_context.c rename to src/libs/mesa/mesa/swrast_setup/ss_context.c diff --git a/src/kits/opengl/mesa/swrast_setup/ss_context.h b/src/libs/mesa/mesa/swrast_setup/ss_context.h similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/ss_context.h rename to src/libs/mesa/mesa/swrast_setup/ss_context.h diff --git a/src/kits/opengl/mesa/swrast_setup/ss_triangle.c b/src/libs/mesa/mesa/swrast_setup/ss_triangle.c similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/ss_triangle.c rename to src/libs/mesa/mesa/swrast_setup/ss_triangle.c diff --git a/src/kits/opengl/mesa/swrast_setup/ss_triangle.h b/src/libs/mesa/mesa/swrast_setup/ss_triangle.h similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/ss_triangle.h rename to src/libs/mesa/mesa/swrast_setup/ss_triangle.h diff --git a/src/kits/opengl/mesa/swrast_setup/ss_tritmp.h b/src/libs/mesa/mesa/swrast_setup/ss_tritmp.h similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/ss_tritmp.h rename to src/libs/mesa/mesa/swrast_setup/ss_tritmp.h diff --git a/src/kits/opengl/mesa/swrast_setup/ss_vb.h b/src/libs/mesa/mesa/swrast_setup/ss_vb.h similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/ss_vb.h rename to src/libs/mesa/mesa/swrast_setup/ss_vb.h diff --git a/src/kits/opengl/mesa/swrast_setup/swrast_setup.h b/src/libs/mesa/mesa/swrast_setup/swrast_setup.h similarity index 100% rename from src/kits/opengl/mesa/swrast_setup/swrast_setup.h rename to src/libs/mesa/mesa/swrast_setup/swrast_setup.h diff --git a/src/kits/opengl/mesa/tnl/t_context.c b/src/libs/mesa/mesa/tnl/t_context.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_context.c rename to src/libs/mesa/mesa/tnl/t_context.c diff --git a/src/kits/opengl/mesa/tnl/t_context.h b/src/libs/mesa/mesa/tnl/t_context.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_context.h rename to src/libs/mesa/mesa/tnl/t_context.h diff --git a/src/kits/opengl/mesa/tnl/t_draw.c b/src/libs/mesa/mesa/tnl/t_draw.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_draw.c rename to src/libs/mesa/mesa/tnl/t_draw.c diff --git a/src/kits/opengl/mesa/tnl/t_pipeline.c b/src/libs/mesa/mesa/tnl/t_pipeline.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_pipeline.c rename to src/libs/mesa/mesa/tnl/t_pipeline.c diff --git a/src/kits/opengl/mesa/tnl/t_pipeline.h b/src/libs/mesa/mesa/tnl/t_pipeline.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_pipeline.h rename to src/libs/mesa/mesa/tnl/t_pipeline.h diff --git a/src/kits/opengl/mesa/tnl/t_rasterpos.c b/src/libs/mesa/mesa/tnl/t_rasterpos.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_rasterpos.c rename to src/libs/mesa/mesa/tnl/t_rasterpos.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_cliptmp.h b/src/libs/mesa/mesa/tnl/t_vb_cliptmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_cliptmp.h rename to src/libs/mesa/mesa/tnl/t_vb_cliptmp.h diff --git a/src/kits/opengl/mesa/tnl/t_vb_cull.c b/src/libs/mesa/mesa/tnl/t_vb_cull.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_cull.c rename to src/libs/mesa/mesa/tnl/t_vb_cull.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_fog.c b/src/libs/mesa/mesa/tnl/t_vb_fog.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_fog.c rename to src/libs/mesa/mesa/tnl/t_vb_fog.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_light.c b/src/libs/mesa/mesa/tnl/t_vb_light.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_light.c rename to src/libs/mesa/mesa/tnl/t_vb_light.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_lighttmp.h b/src/libs/mesa/mesa/tnl/t_vb_lighttmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_lighttmp.h rename to src/libs/mesa/mesa/tnl/t_vb_lighttmp.h diff --git a/src/kits/opengl/mesa/tnl/t_vb_normals.c b/src/libs/mesa/mesa/tnl/t_vb_normals.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_normals.c rename to src/libs/mesa/mesa/tnl/t_vb_normals.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_points.c b/src/libs/mesa/mesa/tnl/t_vb_points.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_points.c rename to src/libs/mesa/mesa/tnl/t_vb_points.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_program.c b/src/libs/mesa/mesa/tnl/t_vb_program.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_program.c rename to src/libs/mesa/mesa/tnl/t_vb_program.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_render.c b/src/libs/mesa/mesa/tnl/t_vb_render.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_render.c rename to src/libs/mesa/mesa/tnl/t_vb_render.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_rendertmp.h b/src/libs/mesa/mesa/tnl/t_vb_rendertmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_rendertmp.h rename to src/libs/mesa/mesa/tnl/t_vb_rendertmp.h diff --git a/src/kits/opengl/mesa/tnl/t_vb_texgen.c b/src/libs/mesa/mesa/tnl/t_vb_texgen.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_texgen.c rename to src/libs/mesa/mesa/tnl/t_vb_texgen.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_texmat.c b/src/libs/mesa/mesa/tnl/t_vb_texmat.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_texmat.c rename to src/libs/mesa/mesa/tnl/t_vb_texmat.c diff --git a/src/kits/opengl/mesa/tnl/t_vb_vertex.c b/src/libs/mesa/mesa/tnl/t_vb_vertex.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vb_vertex.c rename to src/libs/mesa/mesa/tnl/t_vb_vertex.c diff --git a/src/kits/opengl/mesa/tnl/t_vertex.c b/src/libs/mesa/mesa/tnl/t_vertex.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vertex.c rename to src/libs/mesa/mesa/tnl/t_vertex.c diff --git a/src/kits/opengl/mesa/tnl/t_vertex.h b/src/libs/mesa/mesa/tnl/t_vertex.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vertex.h rename to src/libs/mesa/mesa/tnl/t_vertex.h diff --git a/src/kits/opengl/mesa/tnl/t_vertex_generic.c b/src/libs/mesa/mesa/tnl/t_vertex_generic.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vertex_generic.c rename to src/libs/mesa/mesa/tnl/t_vertex_generic.c diff --git a/src/kits/opengl/mesa/tnl/t_vertex_sse.c b/src/libs/mesa/mesa/tnl/t_vertex_sse.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vertex_sse.c rename to src/libs/mesa/mesa/tnl/t_vertex_sse.c diff --git a/src/kits/opengl/mesa/tnl/t_vp_build.c b/src/libs/mesa/mesa/tnl/t_vp_build.c similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vp_build.c rename to src/libs/mesa/mesa/tnl/t_vp_build.c diff --git a/src/kits/opengl/mesa/tnl/t_vp_build.h b/src/libs/mesa/mesa/tnl/t_vp_build.h similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vp_build.h rename to src/libs/mesa/mesa/tnl/t_vp_build.h diff --git a/src/kits/opengl/mesa/tnl/t_vtx_x86_gcc.S b/src/libs/mesa/mesa/tnl/t_vtx_x86_gcc.S similarity index 100% rename from src/kits/opengl/mesa/tnl/t_vtx_x86_gcc.S rename to src/libs/mesa/mesa/tnl/t_vtx_x86_gcc.S diff --git a/src/kits/opengl/mesa/tnl/tnl.h b/src/libs/mesa/mesa/tnl/tnl.h similarity index 100% rename from src/kits/opengl/mesa/tnl/tnl.h rename to src/libs/mesa/mesa/tnl/tnl.h diff --git a/src/kits/opengl/mesa/tnl_dd/imm/NOTES.imm b/src/libs/mesa/mesa/tnl_dd/imm/NOTES.imm similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/NOTES.imm rename to src/libs/mesa/mesa/tnl_dd/imm/NOTES.imm diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_capi.h b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_capi.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_capi.h rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_capi.h diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_napi.h b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_napi.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_napi.h rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_napi.h diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_primtmp.h b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_primtmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_primtmp.h rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_primtmp.h diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_tapi.h b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_tapi.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_tapi.h rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_tapi.h diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_vapi.h b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_vapi.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_vapi.h rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_vapi.h diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_vb.c b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_vb.c similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_vb.c rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_vb.c diff --git a/src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h b/src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h rename to src/libs/mesa/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd.c b/src/libs/mesa/mesa/tnl_dd/t_dd.c similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd.c rename to src/libs/mesa/mesa/tnl_dd/t_dd.c diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_dmatmp.h b/src/libs/mesa/mesa/tnl_dd/t_dd_dmatmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_dmatmp.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_dmatmp.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_dmatmp2.h b/src/libs/mesa/mesa/tnl_dd/t_dd_dmatmp2.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_dmatmp2.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_dmatmp2.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_rendertmp.h b/src/libs/mesa/mesa/tnl_dd/t_dd_rendertmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_rendertmp.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_rendertmp.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_triemit.h b/src/libs/mesa/mesa/tnl_dd/t_dd_triemit.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_triemit.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_triemit.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_tritmp.h b/src/libs/mesa/mesa/tnl_dd/t_dd_tritmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_tritmp.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_tritmp.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_unfilled.h b/src/libs/mesa/mesa/tnl_dd/t_dd_unfilled.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_unfilled.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_unfilled.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_vb.c b/src/libs/mesa/mesa/tnl_dd/t_dd_vb.c similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_vb.c rename to src/libs/mesa/mesa/tnl_dd/t_dd_vb.c diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_vbtmp.h b/src/libs/mesa/mesa/tnl_dd/t_dd_vbtmp.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_vbtmp.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_vbtmp.h diff --git a/src/kits/opengl/mesa/tnl_dd/t_dd_vertex.h b/src/libs/mesa/mesa/tnl_dd/t_dd_vertex.h similarity index 100% rename from src/kits/opengl/mesa/tnl_dd/t_dd_vertex.h rename to src/libs/mesa/mesa/tnl_dd/t_dd_vertex.h diff --git a/src/kits/opengl/mesa/vbo/vbo.h b/src/libs/mesa/mesa/vbo/vbo.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo.h rename to src/libs/mesa/mesa/vbo/vbo.h diff --git a/src/kits/opengl/mesa/vbo/vbo_attrib.h b/src/libs/mesa/mesa/vbo/vbo_attrib.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_attrib.h rename to src/libs/mesa/mesa/vbo/vbo_attrib.h diff --git a/src/kits/opengl/mesa/vbo/vbo_attrib_tmp.h b/src/libs/mesa/mesa/vbo/vbo_attrib_tmp.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_attrib_tmp.h rename to src/libs/mesa/mesa/vbo/vbo_attrib_tmp.h diff --git a/src/kits/opengl/mesa/vbo/vbo_context.c b/src/libs/mesa/mesa/vbo/vbo_context.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_context.c rename to src/libs/mesa/mesa/vbo/vbo_context.c diff --git a/src/kits/opengl/mesa/vbo/vbo_context.h b/src/libs/mesa/mesa/vbo/vbo_context.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_context.h rename to src/libs/mesa/mesa/vbo/vbo_context.h diff --git a/src/kits/opengl/mesa/vbo/vbo_exec.c b/src/libs/mesa/mesa/vbo/vbo_exec.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_exec.c rename to src/libs/mesa/mesa/vbo/vbo_exec.c diff --git a/src/kits/opengl/mesa/vbo/vbo_exec.h b/src/libs/mesa/mesa/vbo/vbo_exec.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_exec.h rename to src/libs/mesa/mesa/vbo/vbo_exec.h diff --git a/src/kits/opengl/mesa/vbo/vbo_exec_api.c b/src/libs/mesa/mesa/vbo/vbo_exec_api.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_exec_api.c rename to src/libs/mesa/mesa/vbo/vbo_exec_api.c diff --git a/src/kits/opengl/mesa/vbo/vbo_exec_array.c b/src/libs/mesa/mesa/vbo/vbo_exec_array.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_exec_array.c rename to src/libs/mesa/mesa/vbo/vbo_exec_array.c diff --git a/src/kits/opengl/mesa/vbo/vbo_exec_draw.c b/src/libs/mesa/mesa/vbo/vbo_exec_draw.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_exec_draw.c rename to src/libs/mesa/mesa/vbo/vbo_exec_draw.c diff --git a/src/kits/opengl/mesa/vbo/vbo_exec_eval.c b/src/libs/mesa/mesa/vbo/vbo_exec_eval.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_exec_eval.c rename to src/libs/mesa/mesa/vbo/vbo_exec_eval.c diff --git a/src/kits/opengl/mesa/vbo/vbo_rebase.c b/src/libs/mesa/mesa/vbo/vbo_rebase.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_rebase.c rename to src/libs/mesa/mesa/vbo/vbo_rebase.c diff --git a/src/kits/opengl/mesa/vbo/vbo_save.c b/src/libs/mesa/mesa/vbo/vbo_save.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_save.c rename to src/libs/mesa/mesa/vbo/vbo_save.c diff --git a/src/kits/opengl/mesa/vbo/vbo_save.h b/src/libs/mesa/mesa/vbo/vbo_save.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_save.h rename to src/libs/mesa/mesa/vbo/vbo_save.h diff --git a/src/kits/opengl/mesa/vbo/vbo_save_api.c b/src/libs/mesa/mesa/vbo/vbo_save_api.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_save_api.c rename to src/libs/mesa/mesa/vbo/vbo_save_api.c diff --git a/src/kits/opengl/mesa/vbo/vbo_save_draw.c b/src/libs/mesa/mesa/vbo/vbo_save_draw.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_save_draw.c rename to src/libs/mesa/mesa/vbo/vbo_save_draw.c diff --git a/src/kits/opengl/mesa/vbo/vbo_save_loopback.c b/src/libs/mesa/mesa/vbo/vbo_save_loopback.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_save_loopback.c rename to src/libs/mesa/mesa/vbo/vbo_save_loopback.c diff --git a/src/kits/opengl/mesa/vbo/vbo_split.c b/src/libs/mesa/mesa/vbo/vbo_split.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_split.c rename to src/libs/mesa/mesa/vbo/vbo_split.c diff --git a/src/kits/opengl/mesa/vbo/vbo_split.h b/src/libs/mesa/mesa/vbo/vbo_split.h similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_split.h rename to src/libs/mesa/mesa/vbo/vbo_split.h diff --git a/src/kits/opengl/mesa/vbo/vbo_split_copy.c b/src/libs/mesa/mesa/vbo/vbo_split_copy.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_split_copy.c rename to src/libs/mesa/mesa/vbo/vbo_split_copy.c diff --git a/src/kits/opengl/mesa/vbo/vbo_split_inplace.c b/src/libs/mesa/mesa/vbo/vbo_split_inplace.c similarity index 100% rename from src/kits/opengl/mesa/vbo/vbo_split_inplace.c rename to src/libs/mesa/mesa/vbo/vbo_split_inplace.c diff --git a/src/kits/opengl/mesa/x86-64/glapi_x86-64.S b/src/libs/mesa/mesa/x86-64/glapi_x86-64.S similarity index 100% rename from src/kits/opengl/mesa/x86-64/glapi_x86-64.S rename to src/libs/mesa/mesa/x86-64/glapi_x86-64.S diff --git a/src/kits/opengl/mesa/x86-64/x86-64.c b/src/libs/mesa/mesa/x86-64/x86-64.c similarity index 100% rename from src/kits/opengl/mesa/x86-64/x86-64.c rename to src/libs/mesa/mesa/x86-64/x86-64.c diff --git a/src/kits/opengl/mesa/x86-64/x86-64.h b/src/libs/mesa/mesa/x86-64/x86-64.h similarity index 100% rename from src/kits/opengl/mesa/x86-64/x86-64.h rename to src/libs/mesa/mesa/x86-64/x86-64.h diff --git a/src/kits/opengl/mesa/x86-64/xform4.S b/src/libs/mesa/mesa/x86-64/xform4.S similarity index 100% rename from src/kits/opengl/mesa/x86-64/xform4.S rename to src/libs/mesa/mesa/x86-64/xform4.S diff --git a/src/kits/opengl/mesa/x86/3dnow.c b/src/libs/mesa/mesa/x86/3dnow.c similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow.c rename to src/libs/mesa/mesa/x86/3dnow.c diff --git a/src/kits/opengl/mesa/x86/3dnow.h b/src/libs/mesa/mesa/x86/3dnow.h similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow.h rename to src/libs/mesa/mesa/x86/3dnow.h diff --git a/src/kits/opengl/mesa/x86/3dnow_normal.S b/src/libs/mesa/mesa/x86/3dnow_normal.S similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow_normal.S rename to src/libs/mesa/mesa/x86/3dnow_normal.S diff --git a/src/kits/opengl/mesa/x86/3dnow_xform1.S b/src/libs/mesa/mesa/x86/3dnow_xform1.S similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow_xform1.S rename to src/libs/mesa/mesa/x86/3dnow_xform1.S diff --git a/src/kits/opengl/mesa/x86/3dnow_xform2.S b/src/libs/mesa/mesa/x86/3dnow_xform2.S similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow_xform2.S rename to src/libs/mesa/mesa/x86/3dnow_xform2.S diff --git a/src/kits/opengl/mesa/x86/3dnow_xform3.S b/src/libs/mesa/mesa/x86/3dnow_xform3.S similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow_xform3.S rename to src/libs/mesa/mesa/x86/3dnow_xform3.S diff --git a/src/kits/opengl/mesa/x86/3dnow_xform4.S b/src/libs/mesa/mesa/x86/3dnow_xform4.S similarity index 100% rename from src/kits/opengl/mesa/x86/3dnow_xform4.S rename to src/libs/mesa/mesa/x86/3dnow_xform4.S diff --git a/src/kits/opengl/mesa/x86/assyntax.h b/src/libs/mesa/mesa/x86/assyntax.h similarity index 100% rename from src/kits/opengl/mesa/x86/assyntax.h rename to src/libs/mesa/mesa/x86/assyntax.h diff --git a/src/kits/opengl/mesa/x86/clip_args.h b/src/libs/mesa/mesa/x86/clip_args.h similarity index 100% rename from src/kits/opengl/mesa/x86/clip_args.h rename to src/libs/mesa/mesa/x86/clip_args.h diff --git a/src/kits/opengl/mesa/x86/common_x86.c b/src/libs/mesa/mesa/x86/common_x86.c similarity index 100% rename from src/kits/opengl/mesa/x86/common_x86.c rename to src/libs/mesa/mesa/x86/common_x86.c diff --git a/src/kits/opengl/mesa/x86/common_x86_asm.S b/src/libs/mesa/mesa/x86/common_x86_asm.S similarity index 100% rename from src/kits/opengl/mesa/x86/common_x86_asm.S rename to src/libs/mesa/mesa/x86/common_x86_asm.S diff --git a/src/kits/opengl/mesa/x86/common_x86_asm.h b/src/libs/mesa/mesa/x86/common_x86_asm.h similarity index 100% rename from src/kits/opengl/mesa/x86/common_x86_asm.h rename to src/libs/mesa/mesa/x86/common_x86_asm.h diff --git a/src/kits/opengl/mesa/x86/common_x86_features.h b/src/libs/mesa/mesa/x86/common_x86_features.h similarity index 100% rename from src/kits/opengl/mesa/x86/common_x86_features.h rename to src/libs/mesa/mesa/x86/common_x86_features.h diff --git a/src/kits/opengl/mesa/x86/common_x86_macros.h b/src/libs/mesa/mesa/x86/common_x86_macros.h similarity index 100% rename from src/kits/opengl/mesa/x86/common_x86_macros.h rename to src/libs/mesa/mesa/x86/common_x86_macros.h diff --git a/src/kits/opengl/mesa/x86/gen_matypes.c b/src/libs/mesa/mesa/x86/gen_matypes.c similarity index 100% rename from src/kits/opengl/mesa/x86/gen_matypes.c rename to src/libs/mesa/mesa/x86/gen_matypes.c diff --git a/src/kits/opengl/mesa/x86/glapi_x86.S b/src/libs/mesa/mesa/x86/glapi_x86.S similarity index 100% rename from src/kits/opengl/mesa/x86/glapi_x86.S rename to src/libs/mesa/mesa/x86/glapi_x86.S diff --git a/src/kits/opengl/mesa/x86/mmx.h b/src/libs/mesa/mesa/x86/mmx.h similarity index 100% rename from src/kits/opengl/mesa/x86/mmx.h rename to src/libs/mesa/mesa/x86/mmx.h diff --git a/src/kits/opengl/mesa/x86/mmx_blend.S b/src/libs/mesa/mesa/x86/mmx_blend.S similarity index 100% rename from src/kits/opengl/mesa/x86/mmx_blend.S rename to src/libs/mesa/mesa/x86/mmx_blend.S diff --git a/src/kits/opengl/mesa/x86/mmx_blendtmp.h b/src/libs/mesa/mesa/x86/mmx_blendtmp.h similarity index 100% rename from src/kits/opengl/mesa/x86/mmx_blendtmp.h rename to src/libs/mesa/mesa/x86/mmx_blendtmp.h diff --git a/src/kits/opengl/mesa/x86/norm_args.h b/src/libs/mesa/mesa/x86/norm_args.h similarity index 100% rename from src/kits/opengl/mesa/x86/norm_args.h rename to src/libs/mesa/mesa/x86/norm_args.h diff --git a/src/kits/opengl/mesa/x86/read_rgba_span_x86.S b/src/libs/mesa/mesa/x86/read_rgba_span_x86.S similarity index 100% rename from src/kits/opengl/mesa/x86/read_rgba_span_x86.S rename to src/libs/mesa/mesa/x86/read_rgba_span_x86.S diff --git a/src/kits/opengl/mesa/x86/read_rgba_span_x86.h b/src/libs/mesa/mesa/x86/read_rgba_span_x86.h similarity index 100% rename from src/kits/opengl/mesa/x86/read_rgba_span_x86.h rename to src/libs/mesa/mesa/x86/read_rgba_span_x86.h diff --git a/src/kits/opengl/mesa/x86/rtasm/x86sse.c b/src/libs/mesa/mesa/x86/rtasm/x86sse.c similarity index 100% rename from src/kits/opengl/mesa/x86/rtasm/x86sse.c rename to src/libs/mesa/mesa/x86/rtasm/x86sse.c diff --git a/src/kits/opengl/mesa/x86/rtasm/x86sse.h b/src/libs/mesa/mesa/x86/rtasm/x86sse.h similarity index 100% rename from src/kits/opengl/mesa/x86/rtasm/x86sse.h rename to src/libs/mesa/mesa/x86/rtasm/x86sse.h diff --git a/src/kits/opengl/mesa/x86/sse.c b/src/libs/mesa/mesa/x86/sse.c similarity index 100% rename from src/kits/opengl/mesa/x86/sse.c rename to src/libs/mesa/mesa/x86/sse.c diff --git a/src/kits/opengl/mesa/x86/sse.h b/src/libs/mesa/mesa/x86/sse.h similarity index 100% rename from src/kits/opengl/mesa/x86/sse.h rename to src/libs/mesa/mesa/x86/sse.h diff --git a/src/kits/opengl/mesa/x86/sse_normal.S b/src/libs/mesa/mesa/x86/sse_normal.S similarity index 100% rename from src/kits/opengl/mesa/x86/sse_normal.S rename to src/libs/mesa/mesa/x86/sse_normal.S diff --git a/src/kits/opengl/mesa/x86/sse_xform1.S b/src/libs/mesa/mesa/x86/sse_xform1.S similarity index 100% rename from src/kits/opengl/mesa/x86/sse_xform1.S rename to src/libs/mesa/mesa/x86/sse_xform1.S diff --git a/src/kits/opengl/mesa/x86/sse_xform2.S b/src/libs/mesa/mesa/x86/sse_xform2.S similarity index 100% rename from src/kits/opengl/mesa/x86/sse_xform2.S rename to src/libs/mesa/mesa/x86/sse_xform2.S diff --git a/src/kits/opengl/mesa/x86/sse_xform3.S b/src/libs/mesa/mesa/x86/sse_xform3.S similarity index 100% rename from src/kits/opengl/mesa/x86/sse_xform3.S rename to src/libs/mesa/mesa/x86/sse_xform3.S diff --git a/src/kits/opengl/mesa/x86/sse_xform4.S b/src/libs/mesa/mesa/x86/sse_xform4.S similarity index 100% rename from src/kits/opengl/mesa/x86/sse_xform4.S rename to src/libs/mesa/mesa/x86/sse_xform4.S diff --git a/src/kits/opengl/mesa/x86/x86.c b/src/libs/mesa/mesa/x86/x86.c similarity index 100% rename from src/kits/opengl/mesa/x86/x86.c rename to src/libs/mesa/mesa/x86/x86.c diff --git a/src/kits/opengl/mesa/x86/x86.h b/src/libs/mesa/mesa/x86/x86.h similarity index 100% rename from src/kits/opengl/mesa/x86/x86.h rename to src/libs/mesa/mesa/x86/x86.h diff --git a/src/kits/opengl/mesa/x86/x86_cliptest.S b/src/libs/mesa/mesa/x86/x86_cliptest.S similarity index 100% rename from src/kits/opengl/mesa/x86/x86_cliptest.S rename to src/libs/mesa/mesa/x86/x86_cliptest.S diff --git a/src/kits/opengl/mesa/x86/x86_xform2.S b/src/libs/mesa/mesa/x86/x86_xform2.S similarity index 100% rename from src/kits/opengl/mesa/x86/x86_xform2.S rename to src/libs/mesa/mesa/x86/x86_xform2.S diff --git a/src/kits/opengl/mesa/x86/x86_xform3.S b/src/libs/mesa/mesa/x86/x86_xform3.S similarity index 100% rename from src/kits/opengl/mesa/x86/x86_xform3.S rename to src/libs/mesa/mesa/x86/x86_xform3.S diff --git a/src/kits/opengl/mesa/x86/x86_xform4.S b/src/libs/mesa/mesa/x86/x86_xform4.S similarity index 100% rename from src/kits/opengl/mesa/x86/x86_xform4.S rename to src/libs/mesa/mesa/x86/x86_xform4.S diff --git a/src/kits/opengl/mesa/x86/xform_args.h b/src/libs/mesa/mesa/x86/xform_args.h similarity index 100% rename from src/kits/opengl/mesa/x86/xform_args.h rename to src/libs/mesa/mesa/x86/xform_args.h