HL25 SDK Update

2024-11-21 12:01:07 +00:00 · 2024-08-20 19:58:27 -07:00 · 2024-08-20 19:58:27 -07:00 · 0fc8913c54
commit 0fc8913c54
parent c7240b9657
841 changed files with 155253 additions and 19375 deletions
--- a/README.md
+++ b/README.md
@ -37,7 +37,7 @@ If it has not been reported, create a new issue with at least the following info
 - a detailed description of the issue, including any output from the command line;
 - steps for reproducing the issue;
 - your system information.\*; and
- the `version` output from the in‐game console.
+- the `version` output from the in-game console.

 Please place logs either in a code block (press `M` in your browser for a GFM cheat sheet) or a [gist](https://gist.github.com).

@ -55,3 +55,19 @@ There are basic rules of conduct that should be followed at all times by everyon
 - Do not repeatedly update an open issue remarking that the issue persists.

 Remember: Just because the issue you reported was reported here does not mean that it is an issue with Half-Life.  As well, should your issue not be resolved immediately, it does not mean that a resolution is not being researched or tested.  Patience is always appreciated.
+
+
+Building the SDK code
+-------
+
+Visual Studio 2019 is required to build mod DLLs on Windows. In the Visual Studio installer, install "Desktop development with C++" under "Workloads" and "C++ MFC for latest v142 build tools (x86 & x64)" under "Individual components". Python must also be installed to run scripts used as part of the build process (Python 3.9 has been tested).
+
+To generate a Visual Studio solution with projects for each mod, run `create_vs_projects.bat` from a command line. This will create a solution file called `goldsrc.sln` in a folder called `build-debugoptimized-sln`. You can add `release` to the command line to generate a solution that builds the Release configuration instead, e.g. `create_vs_projects.bat release`. 
+
+create_vs_projects uses [Meson](https://mesonbuild.com/) to generate the projects and solution. Each mod DLL must have a corresponding `meson.build` file that specifies the included files and dependencies.
+
+By default, as a post-build step, built mod DLLs are copied to a folder called `game` one level up from the root SDK folder. This behavior can be customized by modifying `vs_add_build_steps.py` under `devtools`. 
+
+Tools have not yet been updated for Meson / VS2019, but can be built using the VS2010 projects in the projects\vs2010 folder. See the `readme.txt` file there.
+
+Linux binaries are built using Makefiles found in the `linux` folder, and are expected to be built / run in the Steam Runtime "scout" environment. You will need to set the environment variables VALVE_NO_AUTO_P4=1 and USE_STEAM_RUNTIME=1 while building.
--- a/cl_dll/ammo.cpp
+++ b/cl_dll/ammo.cpp
@ -74,10 +74,15 @@ void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon )
 {
 	int i, iRes;

-	if (ScreenWidth < 640)
-		iRes = 320;
-	else
+	
+	if (ScreenWidth > 2560 && ScreenHeight > 1600)
+		iRes = 2560;
+	else if (ScreenWidth >= 1280 && ScreenHeight > 720)
+		iRes = 1280;
+	else if (ScreenWidth >= 640)
 		iRes = 640;
+	else
+		iRes = 320;

 	char sz[128];

@ -325,16 +330,17 @@ int CHudAmmo::VidInit(void)
 	// If we've already loaded weapons, let's get new sprites
 	gWR.LoadAllWeaponSprites();

-	if (ScreenWidth >= 640)
-	{
-		giABWidth = 20;
-		giABHeight = 4;
-	}
-	else
-	{
-		giABWidth = 10;
-		giABHeight = 2;
-	}
+	int nScale = 1;
+
+	if (ScreenWidth > 2560 && ScreenHeight > 1600)
+		nScale = 4;
+	else if (ScreenWidth >= 1280 && ScreenHeight > 720)
+		nScale = 3;
+	else if (ScreenWidth >= 640)
+		nScale = 2;
+
+	giABWidth = 10 * nScale;
+	giABHeight = 2 * nScale;

 	return 1;
 }
@ -641,7 +647,9 @@ int CHudAmmo::MsgFunc_WeaponList(const char *pszName, int iSize, void *pbuf )
 	
 	WEAPON Weapon;

-	strcpy( Weapon.szName, READ_STRING() );
+	strncpy( Weapon.szName, READ_STRING(), MAX_WEAPON_NAME );
+	Weapon.szName[ sizeof(Weapon.szName) - 1 ] = '\0';
+
 	Weapon.iAmmoType = (int)READ_CHAR();	
 	
 	Weapon.iMax1 = READ_BYTE();
@ -659,6 +667,27 @@ int CHudAmmo::MsgFunc_WeaponList(const char *pszName, int iSize, void *pbuf )
 	Weapon.iFlags = READ_BYTE();
 	Weapon.iClip = 0;

+	if (Weapon.iId < 0 || Weapon.iId >= MAX_WEAPONS)
+		return 0;
+
+	if (Weapon.iSlot < 0 || Weapon.iSlot >= MAX_WEAPON_SLOTS+1)
+		return 0;
+
+	if (Weapon.iSlotPos < 0 || Weapon.iSlotPos >= MAX_WEAPON_POSITIONS+1)
+		return 0;
+
+	if (Weapon.iAmmoType < -1 || Weapon.iAmmoType >= MAX_AMMO_TYPES)
+		return 0;
+
+	if (Weapon.iAmmo2Type < -1 || Weapon.iAmmo2Type >= MAX_AMMO_TYPES)
+		return 0;
+
+	if (Weapon.iAmmoType >= 0 && Weapon.iMax1 == 0)
+		return 0;
+
+	if (Weapon.iAmmo2Type >= 0 && Weapon.iMax2 == 0)
+		return 0;
+
 	gWR.AddWeapon( &Weapon );

 	return 1;
@ -862,7 +891,7 @@ int CHudAmmo::Draw(float flTime)

 	AmmoWidth = gHUD.GetSpriteRect(gHUD.m_HUD_number_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).left;

-	a = (int) max( MIN_ALPHA, m_fFade );
+	a = max<int>( MIN_ALPHA, m_fFade );

 	if (m_fFade > 0)
 		m_fFade -= (gHUD.m_flTimeDelta * 20);
@ -871,8 +900,8 @@ int CHudAmmo::Draw(float flTime)

 	ScaleColors(r, g, b, a );

-	// Does this weapon have a clip?
 	y = ScreenHeight - gHUD.m_iFontHeight - gHUD.m_iFontHeight/2;
+	y += (int)(gHUD.m_iFontHeight * 0.2f);

 	// Does weapon have any ammo at all?
 	if (m_pWeapon->iAmmoType > 0)
@ -1191,7 +1220,7 @@ client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes
 	
 	while(i--)
 	{
-		if ((!strcmp(psz, p->szName)) && (p->iRes == iRes))
+		if ((p->iRes == iRes) && (!strcmp(psz, p->szName)))
 			return p;
 		p++;
 	}
--- a/cl_dll/ammo_secondary.cpp
+++ b/cl_dll/ammo_secondary.cpp
@ -61,7 +61,7 @@ int CHudAmmoSecondary :: Draw(float flTime)
 	// draw secondary ammo icons above normal ammo readout
 	int a, x, y, r, g, b, AmmoWidth;
 	UnpackRGB( r, g, b, RGB_YELLOWISH );
-	a = (int) max( MIN_ALPHA, m_fFade );
+	a = max<int>( MIN_ALPHA, m_fFade );
 	if (m_fFade > 0)
 		m_fFade -= (gHUD.m_flTimeDelta * 20);  // slowly lower alpha to fade out icons
 	ScaleColors( r, g, b, a );
--- a/cl_dll/ammohistory.cpp
+++ b/cl_dll/ammohistory.cpp
@ -126,11 +126,11 @@ int HistoryResource :: DrawAmmoHistory( float flTime )
 				int r, g, b;
 				UnpackRGB(r,g,b, RGB_YELLOWISH);
 				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
-				ScaleColors(r, g, b, min(scale, 255) );
+				ScaleColors(r, g, b, min<int>(scale, 255) );

 				// Draw the pic
 				int ypos = ScreenHeight - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
-				int xpos = ScreenWidth - 24;
+				int xpos = ScreenWidth - (rcPic.right - rcPic.left) - 4;
 				if ( spr && *spr )    // weapon isn't loaded yet so just don't draw the pic
 				{ // the dll has to make sure it has sent info the weapons you need
 					SPR_Set( *spr, r, g, b );
@ -154,7 +154,7 @@ int HistoryResource :: DrawAmmoHistory( float flTime )
 					UnpackRGB(r,g,b, RGB_REDISH);	// if the weapon doesn't have ammo, display it as red

 				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
-				ScaleColors(r, g, b, min(scale, 255) );
+				ScaleColors(r, g, b, min<int>(scale, 255) );

 				int ypos = ScreenHeight - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
 				int xpos = ScreenWidth - (weap->rcInactive.right - weap->rcInactive.left);
@ -172,7 +172,7 @@ int HistoryResource :: DrawAmmoHistory( float flTime )

 				UnpackRGB(r,g,b, RGB_YELLOWISH);
 				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
-				ScaleColors(r, g, b, min(scale, 255) );
+				ScaleColors(r, g, b, min<int>(scale, 255) );

 				int ypos = ScreenHeight - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
 				int xpos = ScreenWidth - (rect.right - rect.left) - 10;
--- a/cl_dll/battery.cpp
+++ b/cl_dll/battery.cpp
@ -134,7 +134,11 @@ int CHudBattery::Draw(float flTime)
 	int iOffset = (m_prc1->bottom - m_prc1->top)/6;

 	y = ScreenHeight - gHUD.m_iFontHeight - gHUD.m_iFontHeight / 2;
-	x = ScreenWidth/5;
+	
+	int width = (m_prc1->right - m_prc1->left);
+
+	// this used to just be ScreenWidth/5 but that caused real issues at higher resolutions. Instead, base it on the width of this sprite.
+	x = 3 * width;

 	// make sure we have the right sprite handles
 	if ( !m_hSprite1 )
@ -151,7 +155,8 @@ int CHudBattery::Draw(float flTime)
 		SPR_DrawAdditive( 0, x, y - iOffset + (rc.top - m_prc2->top), &rc);
 	}

-	x += (m_prc1->right - m_prc1->left);
+	x += width;
+	y += (int)(gHUD.m_iFontHeight * 0.2f);
 	x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iBat, r, g, b);

 	return 1;
--- a/cl_dll/cl_util.h
+++ b/cl_dll/cl_util.h
@ -83,6 +83,7 @@ inline struct cvar_s *CVAR_CREATE( const char *cv, const char *val, const int fl
 #define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
 #define ServerCmd (*gEngfuncs.pfnServerCmd)
 #define EngineClientCmd (*gEngfuncs.pfnClientCmd)
+#define EngineFilteredClientCmd (*gEngfuncs.pfnFilteredClientCmd)
 #define SetCrosshair (*gEngfuncs.pfnSetCrosshair)
 #define AngleVectors (*gEngfuncs.pfnAngleVectors)

@ -162,8 +163,6 @@ inline int safe_sprintf( char *dst, int len_dst, const char *format, ...)
 inline void PlaySound( char *szSound, float vol ) { gEngfuncs.pfnPlaySoundByName( szSound, vol ); }
 inline void PlaySound( int iSound, float vol ) { gEngfuncs.pfnPlaySoundByIndex( iSound, vol ); }

-#define max(a, b)  (((a) > (b)) ? (a) : (b))
-#define min(a, b)  (((a) < (b)) ? (a) : (b))
 #define fabs(x)	   ((x) > 0 ? (x) : 0 - (x))

 void ScaleColors( int &r, int &g, int &b, int a );
--- a/cl_dll/death.cpp
+++ b/cl_dll/death.cpp
@ -73,7 +73,7 @@ int CHudDeathNotice :: Init( void )

 	HOOK_MESSAGE( DeathMsg );

-	CVAR_CREATE( "hud_deathnotice_time", "6", 0 );
+	CVAR_CREATE( "hud_deathnotice_time", "6", FCVAR_ARCHIVE );

 	return 1;
 }
@ -94,7 +94,12 @@ int CHudDeathNotice :: VidInit( void )

 int CHudDeathNotice :: Draw( float flTime )
 {
-	int x, y, r, g, b;
+	int x, y, r, g, b, texty;
+
+	int gap = 20;
+
+	wrect_t& sprite = gHUD.GetSpriteRect(m_HUD_d_skull);
+	gap = sprite.bottom - sprite.top;

 	for ( int i = 0; i < MAX_DEATHNOTICES; i++ )
 	{
@ -115,10 +120,12 @@ int CHudDeathNotice :: Draw( float flTime )
 		if ( gViewPort && gViewPort->AllowedToPrintText() )
 		{
 			// Draw the death notice
-			y = DEATHNOTICE_TOP + 2 + (20 * i);  //!!!
+			y = DEATHNOTICE_TOP + 2 + (gap * i);
+
+			texty = y + 4;

 			int id = (rgDeathNoticeList[i].iId == -1) ? m_HUD_d_skull : rgDeathNoticeList[i].iId;
-			x = ScreenWidth - ConsoleStringLen(rgDeathNoticeList[i].szVictim) - (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left);
+			x = ScreenWidth - ConsoleStringLen(rgDeathNoticeList[i].szVictim) - (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left) - 4;

 			if ( !rgDeathNoticeList[i].iSuicide )
 			{
@ -127,7 +134,7 @@ int CHudDeathNotice :: Draw( float flTime )
 				// Draw killers name
 				if ( rgDeathNoticeList[i].KillerColor )
 					gEngfuncs.pfnDrawSetTextColor( rgDeathNoticeList[i].KillerColor[0], rgDeathNoticeList[i].KillerColor[1], rgDeathNoticeList[i].KillerColor[2] );
-				x = 5 + DrawConsoleString( x, y, rgDeathNoticeList[i].szKiller );
+				x = 5 + DrawConsoleString( x, texty, rgDeathNoticeList[i].szKiller );
 			}

 			r = 255;  g = 80;	b = 0;
@ -147,7 +154,7 @@ int CHudDeathNotice :: Draw( float flTime )
 			{
 				if ( rgDeathNoticeList[i].VictimColor )
 					gEngfuncs.pfnDrawSetTextColor( rgDeathNoticeList[i].VictimColor[0], rgDeathNoticeList[i].VictimColor[1], rgDeathNoticeList[i].VictimColor[2] );
-				x = DrawConsoleString( x, y, rgDeathNoticeList[i].szVictim );
+				x = DrawConsoleString( x, texty, rgDeathNoticeList[i].szVictim );
 			}
 		}
 	}
--- a/cl_dll/ev_hldm.cpp
+++ b/cl_dll/ev_hldm.cpp
@ -97,6 +97,7 @@ float EV_HLDM_PlayTextureSound( int idx, pmtrace_t *ptr, float *vecSrc, float *v
 {
 	// hit the world, try to play sound based on texture material type
 	char chTextureType = CHAR_TEX_CONCRETE;
+	cl_entity_t *cl_entity = NULL;
 	float fvol;
 	float fvolbar;
 	char *rgsz[4];
@ -115,12 +116,7 @@ float EV_HLDM_PlayTextureSound( int idx, pmtrace_t *ptr, float *vecSrc, float *v
 	chTextureType = 0;

 	// Player
-	if ( entity >= 1 && entity <= gEngfuncs.GetMaxClients() )
-	{
-		// hit body
-		chTextureType = CHAR_TEX_FLESH;
-	}
-	else if ( entity == 0 )
+	if ( entity == 0 )
 	{
 		// get texture from entity or world (world is ent(0))
 		pTextureName = (char *)gEngfuncs.pEventAPI->EV_TraceTexture( ptr->ent, vecSrc, vecEnd );
@ -149,6 +145,20 @@ float EV_HLDM_PlayTextureSound( int idx, pmtrace_t *ptr, float *vecSrc, float *v
 			chTextureType = PM_FindTextureType( szbuffer );	
 		}
 	}
+	else
+	{
+		// JoshA: Look up the entity and find the EFLAG_FLESH_SOUND flag.
+		// This broke at some point then TF:C added prediction.
+		//
+		// It used to use Classify of pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE
+		// to determine what sound to play, but that's server side and isn't available on the client
+		// and got lost in the translation to that.
+		// Now the server will replicate that state via an eflag.
+		cl_entity = gEngfuncs.GetEntityByIndex( entity );
+
+		if ( cl_entity && !!( cl_entity->curstate.eflags & EFLAG_FLESH_SOUND ) )
+			chTextureType = CHAR_TEX_FLESH;
+	}
 	
 	switch (chTextureType)
 	{
@ -400,7 +410,16 @@ void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int
 		gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	

 		gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
-		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+		// JoshA: Changed from PM_STUDIO_BOX to PM_NORMAL in prediction code as otherwise if you hit an NPC or player's
+		// bounding box but not one of their hitboxes, the shot won't hit on the server but it will
+		// play a hit sound on the client and not make a decal (as if it hit the NPC/player).
+		// We should mirror the way the server does the test here as close as possible.
+		//
+		// I initially thought I was just fixing some stupid Half-Life bug but no,
+		// this is *the* root cause of all the ghost shot bad prediction bugs in Half-Life Deathmatch!
+		//
+		// Also... CStrike was always using PM_NORMAL for all of these so it didn't have the problem.
+		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_NORMAL, -1, &tr );

 		tracer = EV_HLDM_CheckTracer( idx, vecSrc, tr.endpos, forward, right, iBulletType, iTracerFreq, tracerCount );

@ -912,7 +931,7 @@ void EV_FireGauss( event_args_t *args )
 		gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	

 		gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
-		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecDest, PM_STUDIO_BOX, -1, &tr );
+		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecDest, PM_NORMAL, -1, &tr );

 		gEngfuncs.pEventAPI->EV_PopPMStates();

@ -1034,7 +1053,7 @@ void EV_FireGauss( event_args_t *args )
 					gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );

 					gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
-					gEngfuncs.pEventAPI->EV_PlayerTrace( start, vecDest, PM_STUDIO_BOX, -1, &beam_tr );
+					gEngfuncs.pEventAPI->EV_PlayerTrace( start, vecDest, PM_NORMAL, -1, &beam_tr );

 					if ( !beam_tr.allsolid )
 					{
@ -1043,7 +1062,7 @@ void EV_FireGauss( event_args_t *args )

 						// trace backwards to find exit point

-						gEngfuncs.pEventAPI->EV_PlayerTrace( beam_tr.endpos, tr.endpos, PM_STUDIO_BOX, -1, &beam_tr );
+						gEngfuncs.pEventAPI->EV_PlayerTrace( beam_tr.endpos, tr.endpos, PM_NORMAL, -1, &beam_tr );

 						VectorSubtract( beam_tr.endpos, tr.endpos, delta );
 						
@ -1239,7 +1258,7 @@ void EV_FireCrossbow2( event_args_t *args )
 	// Now add in all of the players.
 	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
 	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
-	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_NORMAL, -1, &tr );
 	
 	//We hit something
 	if ( tr.fraction < 1.0 )
@ -1444,7 +1463,7 @@ void EV_EgonFire( event_args_t *args )
 			gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	

 			gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
-			gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+			gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_NORMAL, -1, &tr );

 			gEngfuncs.pEventAPI->EV_PopPMStates();

--- a/cl_dll/geiger.cpp
+++ b/cl_dll/geiger.cpp
@ -68,10 +68,14 @@ int CHudGeiger::Draw (float flTime)
 	int rg[3];
 	int i;
 	
-	if (m_iGeigerRange <= 800 && m_iGeigerRange > 0)
+	if (m_iGeigerRange < 1000 && m_iGeigerRange > 0)
 	{
 		// peicewise linear is better than continuous formula for this
-		if (m_iGeigerRange > 600)
+		if (m_iGeigerRange > 800)
+		{
+			pct = 0;			//Con_Printf ( "range > 800\n");
+		}
+		else if (m_iGeigerRange > 600)
 		{
 			pct = 2;
 			flvol = 0.4;		//Con_Printf ( "range > 600\n");
--- a/cl_dll/health.cpp
+++ b/cl_dll/health.cpp
@ -217,6 +217,7 @@ int CHudHealth::Draw(float flTime)
 		SPR_DrawAdditive(0, x, y, &gHUD.GetSpriteRect(m_HUD_cross));

 		x = CrossWidth + HealthWidth / 2;
+		y += (int)(gHUD.m_iFontHeight * 0.2f);

 		x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iHealth, r, g, b);

@ -307,49 +308,49 @@ int CHudHealth::DrawPain(float flTime)
 	if (m_fAttackFront > 0.4)
 	{
 		GetPainColor(r,g,b);
-		shade = a * max( m_fAttackFront, 0.5 );
+		shade = a * max( m_fAttackFront, 0.5f );
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b );

 		x = ScreenWidth/2 - SPR_Width(m_hSprite, 0)/2;
 		y = ScreenHeight/2 - SPR_Height(m_hSprite,0) * 3;
 		SPR_DrawAdditive(0, x, y, NULL);
-		m_fAttackFront = max( 0, m_fAttackFront - fFade );
+		m_fAttackFront = max( 0.0f, m_fAttackFront - fFade );
 	} else
 		m_fAttackFront = 0;

 	if (m_fAttackRight > 0.4)
 	{
 		GetPainColor(r,g,b);
-		shade = a * max( m_fAttackRight, 0.5 );
+		shade = a * max( m_fAttackRight, 0.5f );
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b );

 		x = ScreenWidth/2 + SPR_Width(m_hSprite, 1) * 2;
 		y = ScreenHeight/2 - SPR_Height(m_hSprite,1)/2;
 		SPR_DrawAdditive(1, x, y, NULL);
-		m_fAttackRight = max( 0, m_fAttackRight - fFade );
+		m_fAttackRight = max( 0.0f, m_fAttackRight - fFade );
 	} else
 		m_fAttackRight = 0;

 	if (m_fAttackRear > 0.4)
 	{
 		GetPainColor(r,g,b);
-		shade = a * max( m_fAttackRear, 0.5 );
+		shade = a * max( m_fAttackRear, 0.5f );
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b );

 		x = ScreenWidth/2 - SPR_Width(m_hSprite, 2)/2;
 		y = ScreenHeight/2 + SPR_Height(m_hSprite,2) * 2;
 		SPR_DrawAdditive(2, x, y, NULL);
-		m_fAttackRear = max( 0, m_fAttackRear - fFade );
+		m_fAttackRear = max( 0.0f, m_fAttackRear - fFade );
 	} else
 		m_fAttackRear = 0;

 	if (m_fAttackLeft > 0.4)
 	{
 		GetPainColor(r,g,b);
-		shade = a * max( m_fAttackLeft, 0.5 );
+		shade = a * max( m_fAttackLeft, 0.5f );
 		ScaleColors(r, g, b, shade);
 		SPR_Set(m_hSprite, r, g, b );

@ -357,7 +358,7 @@ int CHudHealth::DrawPain(float flTime)
 		y = ScreenHeight/2 - SPR_Height(m_hSprite,3)/2;
 		SPR_DrawAdditive(3, x, y, NULL);

-		m_fAttackLeft = max( 0, m_fAttackLeft - fFade );
+		m_fAttackLeft = max( 0.0f, m_fAttackLeft - fFade );
 	} else
 		m_fAttackLeft = 0;

--- a/cl_dll/hl/hl_baseentity.cpp
+++ b/cl_dll/hl/hl_baseentity.cpp
@ -86,7 +86,9 @@ void ClientPrint( entvars_t *client, int msg_dest, const char *msg_name, const c
 int CBaseToggle::Restore( class CRestore & ) { return 1; }
 int CBaseToggle::Save( class CSave & ) { return 1; }
 void CBaseToggle :: KeyValue( struct KeyValueData_s * ) { }
-
+void CBaseToggle::PlaySentence( const char *pszSentence, float duration, float volume, float attenuation ) { }
+void CBaseToggle::PlayScriptedSentence( const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener ) { }
+void CBaseToggle::SentenceStop( void ) { }
 // CGrenade Stubs
 void CGrenade::BounceSound( void ) { }
 void CGrenade::Explode( Vector, Vector ) { }
@ -206,9 +208,6 @@ BOOL CBaseMonster :: FindLateralCover ( const Vector &vecThreat, const Vector &v
 Vector CBaseMonster :: ShootAtEnemy( const Vector &shootOrigin ) { return g_vecZero; }
 BOOL CBaseMonster :: FacingIdeal( void ) { return FALSE; }
 BOOL CBaseMonster :: FCanActiveIdle ( void ) { return FALSE; }
-void CBaseMonster::PlaySentence( const char *pszSentence, float duration, float volume, float attenuation ) { }
-void CBaseMonster::PlayScriptedSentence( const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener ) { }
-void CBaseMonster::SentenceStop( void ) { }
 void CBaseMonster::CorpseFallThink( void ) { }
 void CBaseMonster :: MonsterInitDead( void ) { }
 BOOL CBaseMonster :: BBoxFlat ( void ) { return TRUE; }
--- a/cl_dll/hl/hl_weapons.cpp
+++ b/cl_dll/hl/hl_weapons.cpp
@ -811,6 +811,8 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
 	player.m_afButtonPressed =  buttonsChanged & cmd->buttons;	
 	// The ones not down are "released"
 	player.m_afButtonReleased = buttonsChanged & (~cmd->buttons);
+	player.pev->v_angle = cmd->viewangles;
+	player.pev->origin = from->client.origin;

 	// Set player variables that weapons code might check/alter
 	player.pev->button = cmd->buttons;
--- a/cl_dll/hud.cpp
+++ b/cl_dll/hud.cpp
@ -81,7 +81,8 @@ static CHLVoiceStatusHelper g_VoiceStatusHelper;

 extern client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount);

-extern cvar_t *sensitivity;
+extern float IN_GetMouseSensitivity();
+
 cvar_t *cl_lw = NULL;

 void ShutdownInput (void);
@ -326,8 +327,9 @@ void CHud :: Init( void )
 	m_iLogo = 0;
 	m_iFOV = 0;

-	CVAR_CREATE( "zoom_sensitivity_ratio", "1.2", 0 );
-	default_fov = CVAR_CREATE( "default_fov", "90", 0 );
+	CVAR_CREATE( "zoom_sensitivity_ratio", "1.2", FCVAR_ARCHIVE );
+	CVAR_CREATE( "cl_autowepswitch", "1", FCVAR_USERINFO|FCVAR_ARCHIVE );
+	default_fov = CVAR_CREATE( "default_fov", "90", FCVAR_ARCHIVE );
 	m_pCvarStealMouse = CVAR_CREATE( "hud_capturemouse", "1", FCVAR_ARCHIVE );
 	m_pCvarDraw = CVAR_CREATE( "hud_draw", "1", FCVAR_ARCHIVE );
 	cl_lw = gEngfuncs.pfnGetCvarPointer( "cl_lw" );
@ -371,6 +373,9 @@ void CHud :: Init( void )
 	ServersInit();

 	MsgFunc_ResetHUD(0, 0, NULL );
+
+	gEngfuncs.pfnClientCmd("richpresence_gamemode\n"); // reset
+	gEngfuncs.pfnClientCmd("richpresence_update\n");
 }

 // CHud destructor
@ -425,10 +430,15 @@ void CHud :: VidInit( void )
 	m_hsprLogo = 0;	
 	m_hsprCursor = 0;

-	if (ScreenWidth < 640)
-		m_iRes = 320;
-	else
+	if (ScreenWidth > 2560 && ScreenHeight > 1600)
+		m_iRes = 2560;
+	else if (ScreenWidth >= 1280 && ScreenHeight > 720)
+		m_iRes = 1280;
+	else if (ScreenWidth >= 640)
 		m_iRes = 640;
+	else
+		m_iRes = 320;
+	

 	// Only load this once
 	if ( !m_pSpriteList )
@ -653,7 +663,7 @@ int CHud::MsgFunc_SetFOV(const char *pszName,  int iSize, void *pbuf)
 	else
 	{  
 		// set a new sensitivity that is proportional to the change from the FOV default
-		m_flMouseSensitivity = sensitivity->value * ((float)newfov / (float)def_fov) * CVAR_GET_FLOAT("zoom_sensitivity_ratio");
+		m_flMouseSensitivity = IN_GetMouseSensitivity() * ((float)newfov / (float)def_fov) * CVAR_GET_FLOAT("zoom_sensitivity_ratio");
 	}

 	return 1;
--- a/cl_dll/hud.h
+++ b/cl_dll/hud.h
@ -438,6 +438,7 @@ private:

 	int m_HUD_title_life;
 	int m_HUD_title_half;
+	bool m_bEndAfterMessage;
 };

 //
--- a/cl_dll/hud_bench.cpp
+++ b/cl_dll/hud_bench.cpp
@ -146,8 +146,8 @@ int CHudBenchmark::MsgFunc_Bench(const char *pszName, int iSize, void *pbuf)
 	m_fReceiveTime = gHUD.m_flTime;
 	m_StoredLatency = ( m_fReceiveTime - m_fSendTime );

-	m_StoredLatency = min( 1.0, m_StoredLatency );
-	m_StoredLatency = max( 0.0, m_StoredLatency );
+	m_StoredLatency = min( 1.0f, m_StoredLatency );
+	m_StoredLatency = max( 0.0f, m_StoredLatency );

 	m_StoredPacketLoss = 0.0;

@ -286,8 +286,8 @@ void CHudBenchmark::Think( void )
 			float switch_time;
 			float total_time;
 			
-			latency = max( 0.0, latency );
-			latency = min( 1.0, latency );
+			latency = max( 0.0f, latency );
+			latency = min( 1.0f, latency );

 			total_time = Bench_GetSwitchTime();
 			total_time -= 2.0;
@ -341,8 +341,8 @@ void CHudBenchmark::Think( void )

 			// Only takes 1/2 time to get up to maximum speed
 			frac *= 2.0;
-			frac = max( 0.0, frac );
-			frac = min( 1.0, frac );
+			frac = max( 0.0f, frac );
+			frac = min( 1.0f, frac );

 			m_nObjects = (int)(NUM_BENCH_OBJ * frac);
 		}
--- a/cl_dll/hud_msg.cpp
+++ b/cl_dll/hud_msg.cpp
@ -101,6 +101,13 @@ int CHud :: MsgFunc_GameMode(const char *pszName, int iSize, void *pbuf )
 	BEGIN_READ( pbuf, iSize );
 	m_Teamplay = READ_BYTE();

+	if ( m_Teamplay )
+		gEngfuncs.pfnClientCmd("richpresence_gamemode Teamplay\n");
+	else
+		gEngfuncs.pfnClientCmd("richpresence_gamemode\n"); // reset
+
+	gEngfuncs.pfnClientCmd("richpresence_update\n");
+
 	return 1;
 }

--- a/cl_dll/hud_redraw.cpp
+++ b/cl_dll/hud_redraw.cpp
@ -36,7 +36,7 @@ extern int g_iVisibleMouse;

 float HUD_GetFOV( void );

-extern cvar_t *sensitivity;
+extern float IN_GetMouseSensitivity();

 // Think
 void CHud::Think(void)
@ -75,13 +75,13 @@ void CHud::Think(void)
 	else
 	{  
 		// set a new sensitivity that is proportional to the change from the FOV default
-		m_flMouseSensitivity = sensitivity->value * ((float)newfov / (float)default_fov->value) * CVAR_GET_FLOAT("zoom_sensitivity_ratio");
+		m_flMouseSensitivity = IN_GetMouseSensitivity() * ( (float)newfov / (float) max<int>( default_fov->value, 90 ) ) * CVAR_GET_FLOAT("zoom_sensitivity_ratio");
 	}

 	// think about default fov
 	if ( m_iFOV == 0 )
 	{  // only let players adjust up in fov,  and only if they are not overriden by something else
-		m_iFOV = max( default_fov->value, 90 );  
+		m_iFOV = max<int>( default_fov->value, 90 );
 	}
 	
 	if ( gEngfuncs.IsSpectateOnly() )
--- a/cl_dll/hud_spectator.cpp
+++ b/cl_dll/hud_spectator.cpp
@ -1,4 +1,4 @@
-//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//========= Copyright <EFBFBD> 1996-2001, Valve LLC, All rights reserved. ============
 //
 // Purpose: 
 //
@ -210,7 +210,8 @@ void UTIL_StringToVector( float * pVector, const char *pString )
 	char *pstr, *pfront, tempString[128];
 	int	j;

-	strcpy( tempString, pString );
+	strncpy( tempString, pString, sizeof( tempString ) );
+	tempString[ sizeof( tempString ) - 1 ] = '\0';
 	pstr = pfront = tempString;
 	
 	for ( j = 0; j < 3; j++ )		
@ -812,7 +813,7 @@ void CHudSpectator::DirectorMessage( int iSize, void *pbuf )
 							break;

 		case DRC_CMD_STUFFTEXT:
-							EngineClientCmd( READ_STRING() );
+							EngineFilteredClientCmd( READ_STRING() );
 							break;

 		case DRC_CMD_CAMPATH:
--- a/cl_dll/inputw32.cpp
+++ b/cl_dll/inputw32.cpp
@ -23,6 +23,7 @@
 #include "view.h"
 #include "Exports.h"

+#include <SDL2/SDL_events.h>
 #include <SDL2/SDL_mouse.h>
 #include <SDL2/SDL_gamecontroller.h>

@ -55,8 +56,6 @@ extern cvar_t *cl_pitchspeed;
 extern cvar_t *cl_movespeedkey;


-static double s_flRawInputUpdateTime = 0.0f;
-static bool m_bRawInput = false;
 static bool m_bMouseThread = false;
 extern globalvars_t *gpGlobals;

@ -78,6 +77,13 @@ static cvar_t *m_customaccel_exponent;
 // if threaded mouse is enabled then the time to sleep between polls
 static cvar_t *m_mousethread_sleep;

+static cvar_t* m_rawinput = nullptr;
+
+static bool IN_UseRawInput()
+{
+	return m_rawinput ? ( m_rawinput->value != 0 ) : false;
+}
+
 int			mouse_buttons;
 int			mouse_oldbuttonstate;
 POINT		current_pos;
@ -138,6 +144,7 @@ cvar_t	*joy_advaxisz;
 cvar_t	*joy_advaxisr;
 cvar_t	*joy_advaxisu;
 cvar_t	*joy_advaxisv;
+cvar_t	*joy_supported;
 cvar_t	*joy_forwardthreshold;
 cvar_t	*joy_sidethreshold;
 cvar_t	*joy_pitchthreshold;
@ -149,7 +156,7 @@ cvar_t	*joy_yawsensitivity;
 cvar_t	*joy_wwhack1;
 cvar_t	*joy_wwhack2;

-int			joy_avail, joy_advancedinit, joy_haspov;
+int			joy_avail = 0, joy_advancedinit, joy_haspov;

 #ifdef _WIN32
 DWORD	s_hMouseThreadId = 0;
@ -158,6 +165,7 @@ HANDLE	s_hMouseQuitEvent = 0;
 HANDLE	s_hMouseDoneQuitEvent = 0;
 #endif

+
 /*
 ===========
 Force_CenterView_f
@ -344,6 +352,28 @@ void IN_GetMousePos( int *mx, int *my )
 	gEngfuncs.GetMousePosition( mx, my );
 }

+/*
+===========
+IN_GetMouseSensitivity
+
+Get mouse sensitivity with sanitization
+===========
+*/
+float IN_GetMouseSensitivity()
+{
+	// Absurdly high sensitivity values can cause the game to hang, so clamp
+	if ( sensitivity->value > 10000.0 )
+	{
+		gEngfuncs.Cvar_SetValue( "sensitivity", 10000.0 );
+	}
+	else if ( sensitivity->value < 0.01 )
+	{
+		gEngfuncs.Cvar_SetValue( "sensitivity", 0.01 );
+	}
+
+	return sensitivity->value;
+}
+
 /*
 ===========
 IN_ResetMouse
@ -355,22 +385,33 @@ void IN_ResetMouse( void )
 {
 	// no work to do in SDL
 #ifdef _WIN32
-	if ( !m_bRawInput && mouseactive && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY )
+	if ( !IN_UseRawInput() && mouseactive && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY )
 	{

 		SetCursorPos ( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() );
 		ThreadInterlockedExchange( &old_mouse_pos.x, gEngfuncs.GetWindowCenterX() );
 		ThreadInterlockedExchange( &old_mouse_pos.y, gEngfuncs.GetWindowCenterY() );
 	}
-
-	if ( gpGlobals && gpGlobals->time - s_flRawInputUpdateTime > 1.0f )
-	{
-		s_flRawInputUpdateTime = gpGlobals->time;
-		m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0;
-	}
 #endif
 }

+
+/*
+===========
+IN_ResetRelativeMouseState
+===========
+*/
+void IN_ResetRelativeMouseState(void)
+{
+    if ( IN_UseRawInput() )
+    {
+        SDL_PumpEvents();
+        int deltaX, deltaY;
+        SDL_GetRelativeMouseState(&deltaX, &deltaY);
+    }
+}
+
+
 /*
 ===========
 IN_MouseEvent
@ -414,7 +455,7 @@ void IN_ScaleMouse( float *x, float *y )
 	float my = *y;

 	// This is the default sensitivity
-	float mouse_senstivity = ( gHUD.GetSensitivity() != 0 ) ? gHUD.GetSensitivity() : sensitivity->value;
+	float mouse_senstivity = ( gHUD.GetSensitivity() != 0 ) ? gHUD.GetSensitivity() : IN_GetMouseSensitivity();

 	// Using special accleration values
 	if ( m_customaccel->value != 0 ) 
@ -474,7 +515,7 @@ void IN_MouseMove ( float frametime, usercmd_t *cmd)
 	{
 		int deltaX, deltaY;
 #ifdef _WIN32
-		if ( !m_bRawInput )
+		if ( !IN_UseRawInput() )
 		{
 			if ( m_bMouseThread )
 			{
@ -497,7 +538,7 @@ void IN_MouseMove ( float frametime, usercmd_t *cmd)
 		}
 		
 #ifdef _WIN32
-		if ( !m_bRawInput )
+		if ( !IN_UseRawInput() )
 		{
 			if ( m_bMouseThread )
 			{
@ -598,7 +639,7 @@ void CL_DLLEXPORT IN_Accumulate (void)
 	    if (mouseactive)
 	    {
 #ifdef _WIN32
-			if ( !m_bRawInput )
+			if ( !IN_UseRawInput() )
 			{
 				if ( !m_bMouseThread )
 				{
@ -650,11 +691,18 @@ void IN_StartupJoystick (void)
 	if ( gEngfuncs.CheckParm ("-nojoy", NULL ) ) 
 		return; 

- 	// assume no joystick
-	joy_avail = 0; 
+	static float flLastCheck = 0.0f;
+	if ( flLastCheck > 0.0f && (gEngfuncs.GetAbsoluteTime()-flLastCheck)  < 1.0f )
+		return;
+
+	//gEngfuncs.Con_Printf("IN_StartupJoystick, %f\n", flLastCheck);
+
+	flLastCheck = gEngfuncs.GetAbsoluteTime();

 	int nJoysticks = SDL_NumJoysticks();
 	if ( nJoysticks > 0 )
+	{
+		if ( s_pJoystick == NULL )
 		{
 			for ( int i = 0; i < nJoysticks; i++ )
 			{
@ -672,7 +720,7 @@ void IN_StartupJoystick (void)
 						
 						// mark the joystick as available and advanced initialization not completed
 						// this is needed as cvars are not available during initialization
-					gEngfuncs.Con_Printf ("joystick found\n\n", SDL_GameControllerName(s_pJoystick)); 
+						gEngfuncs.Con_Printf ("joystick found %s\n\n", SDL_GameControllerName(s_pJoystick)); 
 						joy_avail = 1; 
 						joy_advancedinit = 0;
 						break;
@ -681,10 +729,18 @@ void IN_StartupJoystick (void)
 				}
 			}
 		}
+	}
 	else
 	{
+		if ( s_pJoystick )
+			SDL_GameControllerClose( s_pJoystick );
+		s_pJoystick = NULL;
+		if ( joy_avail )
+		{
+			joy_avail = 0; 
 			gEngfuncs.Con_DPrintf ("joystick not found -- driver not present\n\n");
 		}
+	}
 	
 }

@ -806,12 +862,14 @@ void IN_Commands (void)
 		{
 			key_index = (i < 4) ? K_JOY1 : K_AUX1;
 			gEngfuncs.Key_Event (key_index + i, 1);
+			//gEngfuncs.Con_Printf ("Button %d pressed\n", i);
 		}

 		if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
 		{
 			key_index = (i < 4) ? K_JOY1 : K_AUX1;
 			gEngfuncs.Key_Event (key_index + i, 0);
+			//gEngfuncs.Con_Printf ("Button %d released\n", i);
 		}
 	}
 	joy_oldbuttonstate = buttonstate;
@ -875,6 +933,9 @@ void IN_JoyMove ( float frametime, usercmd_t *cmd )
 		joy_advancedinit = 1;
 	}

+	// re-scan for joystick presence
+	IN_StartupJoystick();
+
 	// verify joystick is available and that the user wants to use it
 	if (!joy_avail || !in_joystick->value)
 	{
@ -1062,7 +1123,7 @@ IN_Init
 void IN_Init (void)
 {
 	m_filter				= gEngfuncs.pfnRegisterVariable ( "m_filter","0", FCVAR_ARCHIVE );
-	sensitivity				= gEngfuncs.pfnRegisterVariable ( "sensitivity","3", FCVAR_ARCHIVE ); // user mouse sensitivity setting.
+	sensitivity				= gEngfuncs.pfnRegisterVariable ( "sensitivity","3", FCVAR_ARCHIVE | FCVAR_FILTERSTUFFTEXT ); // user mouse sensitivity setting.

 	in_joystick				= gEngfuncs.pfnRegisterVariable ( "joystick","0", FCVAR_ARCHIVE );
 	joy_name				= gEngfuncs.pfnRegisterVariable ( "joyname", "joystick", 0 );
@ -1073,6 +1134,7 @@ void IN_Init (void)
 	joy_advaxisr			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisr", "0", 0 );
 	joy_advaxisu			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisu", "0", 0 );
 	joy_advaxisv			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisv", "0", 0 );
+	joy_supported			= gEngfuncs.pfnRegisterVariable	( "joysupported", "1", 0 );
 	joy_forwardthreshold	= gEngfuncs.pfnRegisterVariable ( "joyforwardthreshold", "0.15", 0 );
 	joy_sidethreshold		= gEngfuncs.pfnRegisterVariable ( "joysidethreshold", "0.15", 0 );
 	joy_pitchthreshold		= gEngfuncs.pfnRegisterVariable ( "joypitchthreshold", "0.15", 0 );
@ -1089,12 +1151,13 @@ void IN_Init (void)
 	m_customaccel_max		= gEngfuncs.pfnRegisterVariable ( "m_customaccel_max", "0", FCVAR_ARCHIVE );
 	m_customaccel_exponent	= gEngfuncs.pfnRegisterVariable ( "m_customaccel_exponent", "1", FCVAR_ARCHIVE );

+	m_rawinput 				= gEngfuncs.pfnGetCvarPointer("m_rawinput");
+
 #ifdef _WIN32
-	m_bRawInput				= CVAR_GET_FLOAT( "m_rawinput" ) > 0;
 	m_bMouseThread			= gEngfuncs.CheckParm ("-mousethread", NULL ) != NULL;
 	m_mousethread_sleep			= gEngfuncs.pfnRegisterVariable ( "m_mousethread_sleep", "10", FCVAR_ARCHIVE );

-	if ( !m_bRawInput && m_bMouseThread && m_mousethread_sleep ) 
+	if ( !IN_UseRawInput() && m_bMouseThread && m_mousethread_sleep ) 
 	{
 		s_mouseDeltaX = s_mouseDeltaY = 0;
 		
--- a/cl_dll/menu.cpp
+++ b/cl_dll/menu.cpp
@ -143,6 +143,10 @@ int CHudMenu :: Draw( float flTime )
 	if ( gViewPort && gViewPort->IsScoreBoardVisible() )
 		return 1;

+	SCREENINFO screenInfo;
+    screenInfo.iSize = sizeof( SCREENINFO );
+    gEngfuncs.pfnGetScreenInfo( &screenInfo );
+
 	// draw the menu, along the left-hand side of the screen

 	// count the number of newlines
@ -154,8 +158,10 @@ int CHudMenu :: Draw( float flTime )
 			nlc++;
 	}

+	int nFontHeight = max(12, screenInfo.iCharHeight);
+
 	// center it
-	int y = (ScreenHeight/2) - ((nlc/2)*12) - 40; // make sure it is above the say text
+	int y = (ScreenHeight/2) - ((nlc/2)* nFontHeight) - (3 * nFontHeight + nFontHeight / 3); // make sure it is above the say text

 	menu_r		= 255;
 	menu_g		= 255;
@ -175,7 +181,7 @@ int CHudMenu :: Draw( float flTime )
 		{
 			menu_ralign	 = FALSE;
 			menu_x		 = 20;
-			y			+= (12);
+			y += nFontHeight;
 			
 			sptr++;
 		}
--- a/cl_dll/meson.build
+++ b/cl_dll/meson.build
@ -0,0 +1,175 @@
+hl_client_src = [
+    'hud_spectator.cpp',
+    '../game_shared/vgui_scrollbar2.cpp',
+    '../game_shared/vgui_slider2.cpp',
+    'vgui_SpectatorPanel.cpp',
+    '../dlls/crossbow.cpp',
+    '../dlls/crowbar.cpp',
+    '../dlls/egon.cpp',
+    'ev_hldm.cpp',
+    '../dlls/gauss.cpp',
+    '../dlls/handgrenade.cpp',
+    'hl/hl_baseentity.cpp',
+    'hl/hl_events.cpp',
+    'hl/hl_objects.cpp',
+    'hl/hl_weapons.cpp',
+    '../dlls/wpn_shared/hl_wpn_glock.cpp',
+    '../dlls/hornetgun.cpp',
+    '../dlls/mp5.cpp',
+    '../dlls/python.cpp',
+    '../dlls/rpg.cpp',
+    '../dlls/satchel.cpp',
+    '../dlls/shotgun.cpp',
+    '../dlls/squeakgrenade.cpp',
+    '../dlls/tripmine.cpp',
+    'ammo.cpp',
+    'ammo_secondary.cpp',
+    'ammohistory.cpp',
+    'battery.cpp',
+    'cdll_int.cpp',
+    'com_weapons.cpp',
+    'death.cpp',
+    'demo.cpp',
+    'entity.cpp',
+    'ev_common.cpp',
+    'events.cpp',
+    'flashlight.cpp',
+    'GameStudioModelRenderer.cpp',
+    'geiger.cpp',
+    'health.cpp',
+    'hud.cpp',
+    'hud_bench.cpp',
+    'hud_benchtrace.cpp',
+    'hud_msg.cpp',
+    'hud_redraw.cpp',
+    'hud_servers.cpp',
+    'hud_update.cpp',
+    'in_camera.cpp',
+    'input.cpp',
+    'inputw32.cpp',
+    '../public/interface.cpp',
+    'interpolation.cpp',
+    'menu.cpp',
+    'message.cpp',
+    '../common/parsemsg.cpp',
+    '../pm_shared/pm_debug.c',
+    '../pm_shared/pm_math.c',
+    '../pm_shared/pm_shared.c',
+    'saytext.cpp',
+    'status_icons.cpp',
+    'statusbar.cpp',
+    'studio_util.cpp',
+    'StudioModelRenderer.cpp',
+    'text_message.cpp',
+    'train.cpp',
+    'tri.cpp',
+    'util.cpp',
+    '../game_shared/vgui_checkbutton2.cpp',
+    'vgui_ClassMenu.cpp',
+    'vgui_ControlConfigPanel.cpp',
+    'vgui_CustomObjects.cpp',
+    '../game_shared/vgui_grid.cpp',
+    '../game_shared/vgui_helpers.cpp',
+    'vgui_int.cpp',
+    '../game_shared/vgui_listbox.cpp',
+    '../game_shared/vgui_loadtga.cpp',
+    'vgui_MOTDWindow.cpp',
+    'vgui_SchemeManager.cpp',
+    'vgui_ScorePanel.cpp',
+    'vgui_ServerBrowser.cpp',
+    'vgui_TeamFortressViewport.cpp',
+    'vgui_TeamMenu.cpp',
+    'view.cpp',
+    '../game_shared/voice_banmgr.cpp',
+    'voice_status.cpp',
+    'ammo.h',
+    'ammohistory.h',
+    'camera.h',
+    'cl_dll.h',
+    'cl_util.h',
+    'com_weapons.h',
+    'demo.h',
+    'ev_hldm.h',
+    'eventscripts.h',
+    'GameStudioModelRenderer.h',
+    'health.h',
+    'hud.h',
+    'hud_servers.h',
+    'hud_servers_priv.h',
+    'hud_spectator.h',
+    '../public/cl_dll/IGameClientExports.h',
+    'in_defs.h',
+    'interpolation.h',
+    'kbutton.h',
+    '../common/parsemsg.h',
+    '../pm_shared/pm_debug.h',
+    '../pm_shared/pm_defs.h',
+    '../pm_shared/pm_info.h',
+    '../pm_shared/pm_materials.h',
+    '../pm_shared/pm_movevars.h',
+    '../pm_shared/pm_shared.h',
+    'StudioModelRenderer.h',
+    'tri.h',
+    'util_vector.h',
+    'vgui_ControlConfigPanel.h',
+    'vgui_int.h',
+    'vgui_SchemeManager.h',
+    'vgui_ScorePanel.h',
+    '../game_shared/vgui_scrollbar2.h',
+    'vgui_ServerBrowser.h',
+    '../game_shared/vgui_slider2.h',
+    'vgui_SpectatorPanel.h',
+    'view.h',
+    '../game_shared/voice_banmgr.h',
+    '../game_shared/voice_status.h',
+    'wrect.h',
+]
+
+hl_client_defines = [
+    '-DVOXEL',
+    '-DQUAKE2',
+    '-DVALVE_DLL',
+    '-DCLIENT_DLL',
+    '-DCLIENT_WEAPONS',
+    '-DHL_DLL',
+]
+
+hl_client_includes = include_directories([
+    '.',
+    '../dlls',
+    '../pm_shared',
+    '../game_shared',
+    '../engine',
+    '../utils/vgui/include',
+])
+
+hl_client_deps = [
+    vgui2_dep,
+    vgui_dep,
+    SDL2_dep,
+    ws2_32_dep,
+]
+
+install_dir = '/valve/cl_dlls' 
+target_name = 'client'
+hl_client_lib = shared_library(target_name, hl_client_src,
+    dependencies        : hl_client_deps,
+    cpp_args            : hl_client_defines,
+    c_args              : hl_client_defines,
+    include_directories : [ hl_client_includes, goldsrc_includes ],
+    install             : true,
+    install_dir         : output_dir + install_dir,
+)
+
+hl_client_dep = declare_dependency(
+    link_with           : [ hl_client_lib ],
+)
+
+# this doesn't run when we need it to; the vcxproj won't be generated yet........ thought REGEN might run it but nah
+# cmd = join_paths(meson.current_build_dir(), '..\..\devtools\inject_post_build.bat')
+# cs = run_command(cmd, [target_name, meson.current_build_dir(), install_dir], check: false)
+# #message(cs.stdout())
+
+cmd = join_paths(meson.current_build_dir(), '..\..\devtools\meson_set_outdir.bat')
+cs = run_command(cmd, [target_name, meson.current_build_dir(), install_dir], check: false)
+#message(cs.stdout())
--- a/cl_dll/message.cpp
+++ b/cl_dll/message.cpp
@ -20,6 +20,7 @@

 #include "hud.h"
 #include "cl_util.h"
+#include "commonmacros.h"
 #include <string.h>
 #include <stdio.h>
 #include "parsemsg.h"
@ -58,6 +59,7 @@ void CHudMessage::Reset( void )
 	memset( m_pMessages, 0, sizeof( m_pMessages[0] ) * maxHUDMessages );
 	memset( m_startTime, 0, sizeof( m_startTime[0] ) * maxHUDMessages );
 	
+	m_bEndAfterMessage = false;
 	m_gameTitleTime = 0;
 	m_pGameTitle = NULL;
 }
@ -147,13 +149,13 @@ void CHudMessage::MessageScanNextChar( void )
 	srcGreen = m_parms.pMessage->g1;
 	srcBlue = m_parms.pMessage->b1;
 	blend = 0;	// Pure source
-	destRed = destGreen = destBlue = 0;

 	switch( m_parms.pMessage->effect )
 	{
 	// Fade-in / Fade-out
 	case 0:
 	case 1:
+		destRed = destGreen = destBlue = 0;
 		blend = m_parms.fadeBlend;
 		break;

@ -168,6 +170,7 @@ void CHudMessage::MessageScanNextChar( void )
 		{
 			float deltaTime = m_parms.time - m_parms.charTime;

+			destRed = destGreen = destBlue = 0;
 			if ( m_parms.time > m_parms.fadeTime )
 			{
 				blend = m_parms.fadeBlend;
@ -285,7 +288,7 @@ void CHudMessage::MessageDrawScan( client_textmessage_t *pMessage, float time )
 	{
 		m_parms.lineLength = 0;
 		m_parms.width = 0;
-		while ( *pText && *pText != '\n' )
+		while ( *pText && *pText != '\n' && m_parms.lineLength < ARRAYSIZE( line ) - 1 )
 		{
 			unsigned char c = *pText;
 			line[m_parms.lineLength] = c;
@ -402,6 +405,12 @@ int CHudMessage::Draw( float fTime )
 			{
 				// The message is over
 				m_pMessages[i] = NULL;
+
+				if (m_bEndAfterMessage)
+				{
+					// leave game
+					gEngfuncs.pfnClientCmd("wait\nwait\nwait\nwait\nwait\nwait\nwait\ndisconnect\n");
+				}
 			}
 		}
 	}
@ -487,6 +496,14 @@ int CHudMessage::MsgFunc_HudText( const char *pszName,  int iSize, void *pbuf )

 	char *pString = READ_STRING();

+	bool bIsEnding = false;
+	const char *HL1_ENDING_STR = "END3";
+
+	if (strlen(pString) == strlen(HL1_ENDING_STR) && strcmp(HL1_ENDING_STR, pString) == 0)
+	{
+		m_bEndAfterMessage = true;
+	}
+
 	MessageAdd( pString, gHUD.m_flTime );
 	// Remember the time -- to fix up level transitions
 	m_parms.time = gHUD.m_flTime;
--- a/cl_dll/text_message.cpp
+++ b/cl_dll/text_message.cpp
@ -46,6 +46,7 @@ int CHudTextMessage::Init(void)
 // the new value is pushed into dst_buffer
 char *CHudTextMessage::LocaliseTextString( const char *msg, char *dst_buffer, int buffer_size )
 {
+	int len = buffer_size;
 	char *dst = dst_buffer;
 	for ( char *src = (char*)msg; *src != 0 && buffer_size > 0; buffer_size-- )
 	{
@ -85,7 +86,7 @@ char *CHudTextMessage::LocaliseTextString( const char *msg, char *dst_buffer, in
 		}
 	}

-	dst_buffer[buffer_size-1] = 0; // ensure null termination
+	dst_buffer[len-1] = 0; // ensure null termination
 	return dst_buffer;
 }

@ -195,7 +196,7 @@ int CHudTextMessage::MsgFunc_TextMsg( const char *pszName, int iSize, void *pbuf

 	case HUD_PRINTNOTIFY:
 		psz[0] = 1;  // mark this message to go into the notify buffer
-		safe_sprintf( psz+1, MSG_BUF_SIZE, msg_text, sstr1, sstr2, sstr3, sstr4 );
+		safe_sprintf( psz+1, MSG_BUF_SIZE - 1, msg_text, sstr1, sstr2, sstr3, sstr4 );
 		ConsolePrint( ConvertCRtoNL( psz ) );
 		break;

--- a/cl_dll/util.cpp
+++ b/cl_dll/util.cpp
@ -118,15 +118,19 @@ void VectorMA (const float *veca, float scale, const float *vecb, float *vecc)

 HSPRITE LoadSprite(const char *pszName)
 {
-	int i;
+	int iRes;
 	char sz[256]; 

-	if (ScreenWidth < 640)
-		i = 320;
+	if (ScreenWidth > 2560 && ScreenHeight > 1600)
+		iRes = 2560;
+	else if (ScreenWidth >= 1280 && ScreenHeight > 720)
+		iRes = 1280;
+	else if (ScreenWidth >= 640)
+		iRes = 640;
 	else
-		i = 640;
+		iRes = 320;

-	sprintf(sz, pszName, i);
+	sprintf(sz, pszName, iRes);

 	return SPR_Load(sz);
 }
--- a/cl_dll/vgui_TeamFortressViewport.cpp
+++ b/cl_dll/vgui_TeamFortressViewport.cpp
@ -78,6 +78,7 @@ int g_iUser3 = 0;
 #define SBOARD_INDENT_Y_400		20

 void IN_ResetMouse( void );
+void IN_ResetRelativeMouseState( void );
 extern CMenuPanel *CMessageWindowPanel_Create( const char *szMOTD, const char *szTitle, int iShadeFullscreen, int iRemoveMe, int x, int y, int wide, int tall );
 extern float * GetClientColor( int clientIndex );

@ -817,8 +818,7 @@ try

 			// Get the button text
 			pfile = gEngfuncs.COM_ParseFile(pfile, token);
-			strncpy( cText, token, 32 );
-			cText[31] = '\0';
+			CHudTextMessage::LocaliseTextString( token, cText, sizeof( cText ) );

 			// save off the last button text we've come across (for error reporting)
 			strcpy( szLastButtonText, cText );
@ -2081,6 +2081,12 @@ void TeamFortressViewport::UpdateCursorState()
 		IN_ResetMouse();
 	}

+	if ( g_iVisibleMouse )
+	{
+		//Clear any residual input so our camera doesn't jerk when dismissing the UI
+		IN_ResetRelativeMouseState();
+	}
+
 	g_iVisibleMouse = false;
 	App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_none) );
 }
--- a/cl_dll/view.cpp
+++ b/cl_dll/view.cpp
@ -199,8 +199,8 @@ float V_CalcBob ( struct ref_params_s *pparams )

 	bob = sqrt( vel[0] * vel[0] + vel[1] * vel[1] ) * cl_bob->value;
 	bob = bob * 0.3 + bob * 0.7 * sin(cycle);
-	bob = min( bob, 4 );
-	bob = max( bob, -7 );
+	bob = min( bob, 4.0f );
+	bob = max( bob, -7.0f );
 	return bob;
 	
 }
@ -374,9 +374,6 @@ void V_CalcGunAngle ( struct ref_params_s *pparams )
 	// don't apply all of the v_ipitch to prevent normally unseen parts of viewmodel from coming into view.
 	viewent->angles[PITCH] -= v_idlescale * sin(pparams->time*v_ipitch_cycle.value) * (v_ipitch_level.value * 0.5);
 	viewent->angles[YAW]   -= v_idlescale * sin(pparams->time*v_iyaw_cycle.value) * v_iyaw_level.value;
-
-	VectorCopy( viewent->angles, viewent->curstate.angles );
-	VectorCopy( viewent->angles, viewent->latched.prevangles );
 }

 /*
@ -827,6 +824,15 @@ void V_CalcNormalRefdef ( struct ref_params_s *pparams )
 		}
 	}

+	// Update the latched view origin/angles here, this was
+	// previously done in V_CalcGunAngle but that happens
+	// before a bunch of other stuff happens, which nukes
+	// a bunch of the viewbob fx.
+    VectorCopy( view->origin, view->curstate.origin );
+    VectorCopy( view->origin, view->latched.prevorigin );
+	VectorCopy( view->angles, view->curstate.angles );
+	VectorCopy( view->angles, view->latched.prevangles );
+
 	lasttime = pparams->time;

 	v_origin = pparams->vieworg;
@ -1679,7 +1685,7 @@ void V_DropPunchAngle ( float frametime, float *ev_punchangle )
 	
 	len = VectorNormalize ( ev_punchangle );
 	len -= (10.0 + len * 0.5) * frametime;
-	len = max( len, 0.0 );
+	len = max( len, 0.0f );
 	VectorScale ( ev_punchangle, len, ev_punchangle );
 }

@ -1712,7 +1718,7 @@ void V_Init (void)
 	v_centerspeed		= gEngfuncs.pfnRegisterVariable( "v_centerspeed","500", 0 );

 	cl_bobcycle			= gEngfuncs.pfnRegisterVariable( "cl_bobcycle","0.8", 0 );// best default for my experimental gun wag (sjb)
-	cl_bob				= gEngfuncs.pfnRegisterVariable( "cl_bob","0.01", 0 );// best default for my experimental gun wag (sjb)
+	cl_bob				= gEngfuncs.pfnRegisterVariable( "cl_bob","0.01", FCVAR_ARCHIVE );// best default for my experimental gun wag (sjb)
 	cl_bobup			= gEngfuncs.pfnRegisterVariable( "cl_bobup","0.5", 0 );
 	cl_waterdist		= gEngfuncs.pfnRegisterVariable( "cl_waterdist","4", 0 );
 	cl_chasedist		= gEngfuncs.pfnRegisterVariable( "cl_chasedist","112", 0 );
--- a/common/const.h
+++ b/common/const.h
@ -116,6 +116,7 @@

 // entity flags
 #define EFLAG_SLERP				1	// do studio interpolation of this entity
+#define EFLAG_FLESH_SOUND		2	// JoshA: Whether this entity should sound like flesh. (ie. pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
 		
 //
 // temp entity events
--- a/common/cvardef.h
+++ b/common/cvardef.h
@ -25,6 +25,10 @@
 #define FCVAR_PRINTABLEONLY (1<<7)  // This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
 #define FCVAR_UNLOGGED		(1<<8)  // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
 #define FCVAR_NOEXTRAWHITEPACE	(1<<9)  // strip trailing/leading white space from this cvar
+#define FCVAR_PRIVILEGED	(1<<10)	// Not queryable/settable by unprivileged sources
+#define FCVAR_FILTERSTUFFTEXT	(1<<11)	// Not queryable/settable if unprivileged and filterstufftext is enabled
+#define FCVAR_FILTERCHARS	(1<<12) // This cvar's string will be filtered for 'bad' characters (e.g. ';', '\n')
+#define FCVAR_NOBADPATHS	(1<<13) // This cvar's string cannot contain file paths that are above the current directory

 typedef struct cvar_s
 {
--- a/common/mathlib.h
+++ b/common/mathlib.h
@ -108,8 +108,8 @@ void __inline restore_fpu_cw(void)
 	_asm	fldcw	old_cw
 }
 #else
+#define quick_ftol(f) ((int)(f))
 #define set_fpu_cw() /* */
-#define quick_ftol(f) ftol(f)
 #define restore_fpu_cw() /* */
 #endif

--- a/common/netadr.h
+++ b/common/netadr.h
@ -19,21 +19,26 @@
 #pragma once
 #endif

+// JoshA: Unfortunately netadr_s is passed to clients for connectionless packets.
+// No Valve mod uses them, but custom mods *might*, so not changing the start of this struct layout.
+// It's very unlikely they touch this, but I'd like to play as safe as possible with all ABI etc for mod compat.
+// If we want to add IPv6 someday, bung it at the end of netadr_s and leave ip + ipx alone.
+
 typedef enum
 {
 	NA_UNUSED,
 	NA_LOOPBACK,
 	NA_BROADCAST,
 	NA_IP,
-	NA_IPX,
-	NA_BROADCAST_IPX,
+	NA_IPX, // deprecated
+	NA_BROADCAST_IPX, // deprecated
 } netadrtype_t;

 typedef struct netadr_s
 {
 	netadrtype_t	type;
 	unsigned char	ip[4];
-	unsigned char	ipx[10];
+	unsigned char	ipx[10]; // deprecated
 	unsigned short	port;
 } netadr_t;

--- a/common/qfont.h
+++ b/common/qfont.h
@ -21,7 +21,7 @@
 // Font stuff

 #define NUM_GLYPHS 256
-// does not exist: // #include "basetypes.h"
+#include "basetypes.h"

 typedef struct
 {
@ -35,7 +35,7 @@ typedef struct qfont_s
 	int			rowcount;
 	int			rowheight;
 	charinfo	fontinfo[ NUM_GLYPHS ];
-	unsigned char data[4];
+	byte 		data[4];
 } qfont_t;

 #endif // qfont.h
--- a/create_vs_projects.bat
+++ b/create_vs_projects.bat
@ -0,0 +1,75 @@
+@if "%overbose%" == "" echo off
+
+REM ----------------------------------
+REM create_vs_projects.bat
+REM create a usable sln and vcxproj for the goldsrc dlls
+REM ----------------------------------
+
+setlocal enabledelayedexpansion
+goto Setup
+
+:Setup
+set _PYTHON_=vpython
+
+set _VSVER_=2019
+set _BUILD_=DEBUG
+set _BUILDTYPE_=debugoptimized
+
+REM TODO: better arg support here
+if "%1" == "release" (
+	set _BUILD_=RELEASE
+	set _BUILDTYPE_=release
+)
+
+if "%_BUILD_%" == "DEBUG" (
+	set _BUILDTYPE_=debugoptimized
+)
+
+set "_PGM_FILES_=%ProgramFiles%"
+if not exist "!_PGM_FILES_!\Microsoft Visual Studio\%_VSVER_%\" (
+	set "_PGM_FILES_=%ProgramFiles(x86)%"
+)
+
+set "VSINSTALLDIR=!_PGM_FILES_!\Microsoft Visual Studio\%_VSVER_%\BuildTools\"
+set "_VC_VARS_=!VSINSTALLDIR!VC\Auxiliary\Build\vcvars32.bat"
+if not exist "!_VC_VARS_!" (
+	set "VSINSTALLDIR=!_PGM_FILES_!\Microsoft Visual Studio\%_VSVER_%\Professional\"
+	set "_VC_VARS_=!VSINSTALLDIR!VC\Auxiliary\Build\vcvars32.bat"
+)
+if not exist "!_VC_VARS_!" (
+	set "VSINSTALLDIR=!_PGM_FILES_!\Microsoft Visual Studio\%_VSVER_%\Community\"
+	set "_VC_VARS_=!VSINSTALLDIR!VC\Auxiliary\Build\vcvars32.bat"
+)
+call "%_VC_VARS_%"
+
+call %_PYTHON_% --version 2>NUL
+if errorlevel 1 (
+	echo %_PYTHON_% not installed, using system python3.
+	set _PYTHON_=python3
+	
+	call !_PYTHON_! --version 2>NUL
+	if errorlevel 1 (
+		echo !_PYTHON_! ALSO not installed, using system python.
+		set _PYTHON_=python
+	)
+)
+goto GenerateSLN
+
+:GenerateSLN
+echo:
+echo ------------------------------------------------------------------
+echo cleaning previous sln artifacts.
+RD /S /Q "build-%_BUILDTYPE_%-sln"
+echo ------------------------------------------------------------------
+call %_PYTHON_% devtools\meson\meson.py setup --buildtype %_BUILDTYPE_% --backend vs%_VSVER_% build-%_BUILDTYPE_%-sln
+
+REM now we post-process the meson output
+call %_PYTHON_% devtools\vs_add_build_steps.py %_BUILDTYPE_%
+call %_PYTHON_% devtools\vs_add_launch_config.py cl_dll\client.vcxproj hl %_BUILDTYPE_%
+
+goto End
+
+:End
+echo:
+echo ------------------------------------------------------------------
+echo Work Complete.
--- a/devtools/image_to_background.py
+++ b/devtools/image_to_background.py
@ -0,0 +1,86 @@
+from PIL import Image
+import sys
+import os
+
+def convert_to_tiles(input_file, output_folder, tile_size=(256, 256)):
+    # Open the image
+    img = Image.open(input_file)
+    width, height = img.size
+
+    # Create the output folder if it doesn't exist
+    if not os.path.exists(output_folder):
+        os.makedirs(output_folder)
+
+    output_img_folder = os.path.join(output_folder, "background")
+    if not os.path.exists(output_img_folder):
+        os.makedirs(output_img_folder)
+
+    row = 0
+    col = 0
+    
+    prefix = "21_9"
+
+    # background txt file should look like:
+    #
+    # resolution	800	600
+    #
+    # resource/background/800_1_a_loading.tga		fit		0	0
+    # resource/background/800_1_b_loading.tga		fit		256	0
+    # etc
+
+    layout_file = f"resolution\t{width}\t{height}\n\n"
+
+    # Loop through the image and extract tiles
+    for j in range(0, height, tile_size[1]):
+        row = row + 1
+        col = 0
+
+        for i in range(0, width, tile_size[0]):
+            # Calculate the boundaries for the tile, making sure it doesn't exceed the image dimensions
+            right_bound = min(i + tile_size[0], width)
+            bottom_bound = min(j + tile_size[1], height)
+            
+            box = (i, j, right_bound, bottom_bound)
+            tile = img.crop(box)
+
+            tile_char = chr(ord('a')+col)
+            target_file = f"{prefix}_{row}_{tile_char}_loading.tga"
+            tile_filename = os.path.join(output_img_folder, target_file)
+            tile.save(tile_filename)
+            print(f"Saved {tile_filename}")
+
+            line = f"resource/background/{target_file}\tfit\t{i}\t{j}\n"
+            layout_file += line
+
+            col = col + 1
+    
+    print("------------------------------------------")
+    print(layout_file)
+    print("------------------------------------------")
+    
+    out_txt = os.path.join(output_folder, "BackgroundLayout.txt")
+    with open(out_txt, 'w') as f:
+        f.write(layout_file)
+
+    out_txt = os.path.join(output_folder, "BackgroundLoadingLayout.txt")
+    with open(out_txt, 'w') as f:
+        f.write(layout_file)
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: python image_to_background.py path_to_image (psd/png/tga)")
+        sys.exit(1)
+
+    img_path = sys.argv[1]
+    img_dir = os.path.dirname(img_path)
+    img_dir = os.path.join(img_dir, "Background")
+    
+    print(f"out dir: {img_dir}")
+
+    convert_to_tiles(img_path, img_dir)
+
+    #width, height, palette, data = read_spr(spr_path)
+    #save_as_png(spr_path + "__.png", width, height, palette, data)
+
+    print(f"Converted {img_path}")
+    
--- a/devtools/meson/COPYING
+++ b/devtools/meson/COPYING
@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/devtools/meson/MANIFEST.in
+++ b/devtools/meson/MANIFEST.in
@ -0,0 +1,19 @@
+graft test?cases
+graft manual?tests
+graft cross
+graft data
+graft graphics
+graft man
+graft tools
+graft packaging
+graft unittests
+
+include contributing.md
+include COPYING
+include README.md
+include run_cross_test.py
+include run_tests.py
+include run_unittests.py
+include run_meson_command_tests.py
+include run_project_tests.py
+include meson.py
--- a/devtools/meson/PKG-INFO
+++ b/devtools/meson/PKG-INFO
@ -0,0 +1,33 @@
+Metadata-Version: 2.1
+Name: meson
+Version: 1.2.2
+Summary: A high performance build system
+Home-page: https://mesonbuild.com
+Author: Jussi Pakkanen
+Author-email: jpakkane@gmail.com
+License: Apache License, Version 2.0
+Project-URL: Source, https://github.com/mesonbuild/meson
+Keywords: meson,mesonbuild,build system,cmake
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Natural Language :: English
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: BSD
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Software Development :: Build Tools
+Requires-Python: >=3.7
+Provides-Extra: ninja
+Provides-Extra: progress
+Provides-Extra: typing
+License-File: COPYING
+
+Meson is a cross-platform build system designed to be both as fast and as user friendly as possible. It supports many languages and compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its build definitions are written in a simple non-Turing complete DSL.
--- a/devtools/meson/README.md
+++ b/devtools/meson/README.md
@ -0,0 +1,104 @@
+<p align="center">
+<img src="https://mesonbuild.com/assets/images/meson_logo.png">
+</p>
+Meson® is a project to create the best possible next-generation
+build system.
+
+#### Status
+
+[![PyPI](https://img.shields.io/pypi/v/meson.svg)](https://pypi.python.org/pypi/meson)
+[![Build Status](https://dev.azure.com/jussi0947/jussi/_apis/build/status/mesonbuild.meson)](https://dev.azure.com/jussi0947/jussi/_build/latest?definitionId=1)
+[![Codecov](https://codecov.io/gh/mesonbuild/meson/coverage.svg?branch=master)](https://codecov.io/gh/mesonbuild/meson/branch/master)
+
+#### Dependencies
+
+ - [Python](https://python.org) (version 3.7 or newer)
+ - [Ninja](https://ninja-build.org) (version 1.8.2 or newer)
+
+Latest Meson version supporting previous Python versions:
+- Python 3.6: **0.61.5**
+- Python 3.5: **0.56.2**
+- Python 3.4: **0.45.1**
+
+#### Installing from source
+
+Meson is available on [PyPi](https://pypi.python.org/pypi/meson), so
+it can be installed with `pip3 install meson`.  The exact command to
+type to install with `pip` can vary between systems, be sure to use
+the Python 3 version of `pip`.
+
+If you wish you can install it locally with the standard Python command:
+
+```console
+python3 -m pip install meson
+```
+
+For builds using Ninja, Ninja can be downloaded directly from Ninja
+[GitHub release page](https://github.com/ninja-build/ninja/releases)
+or via [PyPi](https://pypi.python.org/pypi/ninja)
+
+```console
+python3 -m pip install ninja
+```
+
+More on Installing Meson build can be found at the
+[getting meson page](https://mesonbuild.com/Getting-meson.html).
+
+#### Creating a standalone script
+
+Meson can be run as a [Python zip
+app](https://docs.python.org/3/library/zipapp.html). To generate the
+executable run the following command:
+
+    ./packaging/create_zipapp.py --outfile meson.pyz --interpreter '/usr/bin/env python3' <source checkout>
+
+#### Running
+
+Meson requires that you have a source directory and a build directory
+and that these two are different. In your source root must exist a
+file called `meson.build`. To generate the build system run this
+command:
+
+`meson setup <source directory> <build directory>`
+
+Depending on how you obtained Meson the command might also be called
+`meson.py` instead of plain `meson`. In the rest of this document we
+are going to use the latter form.
+
+You can omit either of the two directories, and Meson will substitute
+the current directory and autodetect what you mean. This allows you to
+do things like this:
+
+```console
+cd <source root>
+meson setup builddir
+```
+
+To compile, cd into your build directory and type `ninja`. To run unit
+tests, type `ninja test`.
+
+More on running Meson build system commands can be found at the
+[running meson page](https://mesonbuild.com/Running-Meson.html)
+or by typing `meson --help`.
+
+#### Contributing
+
+We love code contributions. See the [contribution
+page](https://mesonbuild.com/Contributing.html) on the website for
+details.
+
+
+#### IRC
+
+The channel to use is `#mesonbuild` either via Matrix ([web
+interface][matrix_web]) or [OFTC IRC][oftc_irc].
+
+[matrix_web]: https://app.element.io/#/room/#mesonbuild:matrix.org
+[oftc_irc]: https://www.oftc.net/
+
+#### Further info
+
+More information about the Meson build system can be found at the
+[project's home page](https://mesonbuild.com).
+
+Meson is a registered trademark of ***Jussi Pakkanen***.
--- a/devtools/meson/contributing.md
+++ b/devtools/meson/contributing.md
@ -0,0 +1,8 @@
+## Contributing to the Meson build system
+
+Thank you for your interest in participating to the development!
+A large fraction of Meson is contributed by people outside
+the core team and we are *excited* to see what you do.
+
+**Contribution instructions can be found on the website**
+ @ https://mesonbuild.com/Contributing.html
--- a/devtools/meson/cross/arm64cl.txt
+++ b/devtools/meson/cross/arm64cl.txt
@ -0,0 +1,18 @@
+[binaries]
+c = 'cl'
+cpp = 'cl'
+fc = 'false'
+ar = 'lib'
+windres = 'rc'
+
+[built-in options]
+c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP']
+c_link_args = ['-APPCONTAINER', 'WindowsApp.lib']
+cpp_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP']
+cpp_link_args = ['-APPCONTAINER', 'WindowsApp.lib']
+
+[host_machine]
+system = 'windows'
+cpu_family = 'aarch64'
+cpu = 'armv8'
+endian = 'little'
--- a/devtools/meson/cross/armcc.txt
+++ b/devtools/meson/cross/armcc.txt
@ -0,0 +1,20 @@
+# This file assumes that path to the arm compiler toolchain is added
+# to the environment(PATH) variable, so that Meson can find
+# the armcc, armlink and armar while building.
+[binaries]
+c = 'armcc'
+cpp = 'armcc'
+ar = 'armar'
+strip = 'armar'
+
+[built-in options]
+# The '--cpu' option with the appropriate target type should be mentioned
+# to cross compile c/c++ code with armcc,.
+c_args      = ['--cpu=Cortex-M0plus']
+cpp_args    = ['--cpu=Cortex-M0plus']
+
+[host_machine]
+system = 'bare metal'      # Update with your system name - bare metal/OS.
+cpu_family = 'arm'
+cpu = 'Cortex-M0+'
+endian = 'little'
--- a/devtools/meson/cross/armclang-linux.txt
+++ b/devtools/meson/cross/armclang-linux.txt
@ -0,0 +1,31 @@
+# Using ARM compilers from Linux command line is tricky and
+# not really well documented because they want you to use
+# their IDE instead.
+#
+# First you need to do the full install with the IDE and set
+# up license files et al. This may be possible from the command
+# line.
+#
+# Then you need to do the following:
+#
+# Select toolchain by running /opt/arm/developmentstudio-2019.0/bin/select_default_toolchain
+# Armcc is only available in toolchain version 5.
+# Armclang is only available in toolchain version 6.
+# Start shell with /opt/arm/developmentstudio-2019.0/bin/suite_exec zsh
+# Now the compilers will work.
+
+[binaries]
+# we could set exe_wrapper = qemu-arm-static but to test the case
+# when cross compiled binaries can't be run we don't do that
+c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--target=aarch64-arm-none-eabi']
+#c = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler5.06u6/bin/armcc'
+#cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+#strip = '/usr/arm-linux-gnueabihf/bin/strip'
+#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+[host_machine]
+system = 'baremetal'
+cpu_family = 'arm'
+cpu = 'armv7' # Not sure if correct.
+endian = 'little'
--- a/devtools/meson/cross/armclang.txt
+++ b/devtools/meson/cross/armclang.txt
@ -0,0 +1,20 @@
+# This file assumes that path to the arm compiler toolchain is added
+# to the environment(PATH) variable, so that Meson can find
+# the armclang, armlink and armar while building.
+[binaries]
+c = ['armclang', '--target=arm-arm-none-eabi']
+cpp = ['armclang', '--target=arm-arm-none-eabi']
+ar = 'armar'
+strip = 'armar'
+
+[built-in options]
+# The '--target', '-mcpu' options with the appropriate values should be mentioned
+# to cross compile c/c++ code with armclang.
+c_args      = ['-mcpu=cortex-m0plus']
+cpp_args    = ['-mcpu=cortex-m0plus']
+
+[host_machine]
+system = 'bare metal'      # Update with your system name - bare metal/OS.
+cpu_family = 'arm'
+cpu = 'Cortex-M0+'
+endian = 'little'
--- a/devtools/meson/cross/c2000.txt
+++ b/devtools/meson/cross/c2000.txt
@ -0,0 +1,28 @@
+# This file assumes that path to the Texas Instruments C20000 toolchain is added
+# to the environment(PATH) variable, so that Meson can find
+# cl2000 and ar2000 while building.
+[binaries]
+c = 'cl2000'
+ar = 'ar2000'
+strip = 'cl2000'
+
+[host_machine]
+system = 'bare metal'
+cpu_family = 'c2000'
+cpu = 'c28x'
+endian = 'little'
+
+[built-in options]
+c_args = [
+    '-v28',
+    '-ml',
+    '-mt']
+c_link_args = [
+    '-z',
+    '--rom_model',
+    '\f28004x_flash.cmd']
+cpp_args = []
+cpp_link_args = []
+
+[properties]
+needs_exe_wrapper = true
--- a/devtools/meson/cross/ccomp-armv7a.txt
+++ b/devtools/meson/cross/ccomp-armv7a.txt
@ -0,0 +1,13 @@
+[binaries]
+c = ['ccomp', '-target', 'armv7a-eabi']
+ar = 'ccomp'
+strip = 'strip'
+
+[built-in options]
+c_args      = ['-fall']
+
+[host_machine]
+system = 'bare metal'      # Update with your system name - bare metal/OS.
+cpu_family = 'arm'
+cpu = 'Cortex-A9'
+endian = 'little'
--- a/devtools/meson/cross/ccrx.txt
+++ b/devtools/meson/cross/ccrx.txt
@ -0,0 +1,22 @@
+# This file assumes that path to the Renesas CC-RX toolchain is added
+# to the environment(PATH) variable, so that Meson can find
+# ccrx and rlink while building.
+[binaries]
+c = 'ccrx'
+cpp = 'ccrx'
+ar = 'rlink'
+strip = 'rlink'
+
+[built-in options]
+# The '--cpu' option with the appropriate target type should be mentioned
+# to cross compile c/c++ code with ccrx,.
+c_args      = ['-cpu=rx600']
+cpp_args    = ['-cpu=rx600']
+c_link_args = []
+cpp_link_args = []
+
+[host_machine]
+system = 'bare metal'
+cpu_family = 'rx'
+cpu = 'rx600'
+endian = 'little'
--- a/devtools/meson/cross/iphone.txt
+++ b/devtools/meson/cross/iphone.txt
@ -0,0 +1,32 @@
+# This is a cross compilation file from OSX Yosemite to iPhone
+# Apple keeps changing the location and names of files so
+# these might not work for you. Use the googles and xcrun.
+
+[binaries]
+c = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
+cpp = ['clang++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
+objc = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
+objcpp = ['clang++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
+ar = 'ar'
+strip = 'strip'
+
+[built-in options]
+c_args = ['-miphoneos-version-min=11.0']
+cpp_args = ['-miphoneos-version-min=11.0']
+c_link_args = ['-miphoneos-version-min=11.0']
+cpp_link_args = ['-miphoneos-version-min=11.0']
+objc_args = ['-miphoneos-version-min=11.0']
+objcpp_args = ['-miphoneos-version-min=11.0']
+
+[properties]
+root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'
+has_function_printf = true
+has_function_hfkerhisadf = false
+
+[host_machine]
+system = 'darwin'
+subsystem = 'ios'
+kernel = 'xnu'
+cpu_family = 'aarch64'
+cpu = 'aarch64'
+endian = 'little'
--- a/devtools/meson/cross/linux-mingw-w64-32bit.json
+++ b/devtools/meson/cross/linux-mingw-w64-32bit.json
@ -0,0 +1,7 @@
+{
+  "file": "linux-mingw-w64-32bit.txt",
+  "tests": ["common", "cmake"],
+  "env": {
+    "WINEPATH": "/usr/lib/gcc/i686-w64-mingw32/9.2-posix;/usr/i686-w64-mingw32/bin;/usr/i686-w64-mingw32/lib"
+  }
+}
--- a/devtools/meson/cross/linux-mingw-w64-32bit.txt
+++ b/devtools/meson/cross/linux-mingw-w64-32bit.txt
@ -0,0 +1,31 @@
+[binaries]
+c = '/usr/bin/i686-w64-mingw32-gcc'
+cpp = '/usr/bin/i686-w64-mingw32-g++'
+objc = '/usr/bin/i686-w64-mingw32-gcc'
+ar = '/usr/bin/i686-w64-mingw32-ar'
+strip = '/usr/bin/i686-w64-mingw32-strip'
+pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+windres = '/usr/bin/i686-w64-mingw32-windres'
+exe_wrapper = 'wine'
+ld = '/usr/bin/i686-w64-mingw32-ld'
+cmake = '/usr/bin/cmake'
+
+[properties]
+# Directory that contains 'bin', 'lib', etc
+root = '/usr/i686-w64-mingw32'
+# Directory that contains 'bin', 'lib', etc for the toolchain and system libraries
+sys_root = '/usr/i686-w64-mingw32/sys-root/mingw'
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
+
+[cmake]
+
+CMAKE_BUILD_WITH_INSTALL_RPATH     = 'ON'
+CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  = 'NEVER'
+CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  = 'ONLY'
+CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  = 'ONLY'
+CMAKE_FIND_ROOT_PATH_MODE_PACKAGE  = 'ONLY'
--- a/devtools/meson/cross/linux-mingw-w64-64bit.json
+++ b/devtools/meson/cross/linux-mingw-w64-64bit.json
@ -0,0 +1,7 @@
+{
+  "file": "linux-mingw-w64-64bit.txt",
+  "tests": ["common", "cmake"],
+  "env": {
+    "WINEPATH": "/usr/lib/gcc/x86_64-w64-mingw32/9.2-posix;/usr/x86_64-w64-mingw32/bin;/usr/x86_64-w64-mingw32/lib"
+  }
+}
--- a/devtools/meson/cross/linux-mingw-w64-64bit.txt
+++ b/devtools/meson/cross/linux-mingw-w64-64bit.txt
@ -0,0 +1,30 @@
+[binaries]
+c = '/usr/bin/x86_64-w64-mingw32-gcc'
+cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ar = '/usr/bin/x86_64-w64-mingw32-ar'
+strip = '/usr/bin/x86_64-w64-mingw32-strip'
+pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+windres = '/usr/bin/x86_64-w64-mingw32-windres'
+exe_wrapper = 'wine'
+cmake = '/usr/bin/cmake'
+
+[properties]
+# Directory that contains 'bin', 'lib', etc
+root = '/usr/x86_64-w64-mingw32'
+# Directory that contains 'bin', 'lib', etc for the toolchain and system libraries
+sys_root = '/usr/x86_64-w64-mingw32/sys-root/mingw'
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+
+[cmake]
+
+CMAKE_BUILD_WITH_INSTALL_RPATH     = 'ON'
+CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  = 'NEVER'
+CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  = 'ONLY'
+CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  = 'ONLY'
+CMAKE_FIND_ROOT_PATH_MODE_PACKAGE  = 'ONLY'
--- a/devtools/meson/cross/metrowerks-arm.txt
+++ b/devtools/meson/cross/metrowerks-arm.txt
@ -0,0 +1,28 @@
+# This file assumes that the path to your Metrowerks Embedded ARM
+# toolchain is added to the environment(PATH) variable, so that
+# Meson can find the binaries while building.
+
+# You should also do one of the following to ensure Meson can
+# locate the .lcf linker script:
+# - Add the cross directory to PATH as well
+# - Edit c_link_args and cpp_link_args with the full
+#   path to the .lcf file on your machine
+
+[binaries]
+c = 'mwccarm'
+c_ld = 'mwldarm'
+cpp = 'mwccarm'
+cpp_ld = 'mwldarm'
+ar = 'mwldarm'
+as = 'mwasmarm'
+
+[built-in options]
+c_args = ['-lang', 'c99', '-D_NITRO', '-nosyspath']
+c_link_args = 'metrowerks.lcf'
+cpp_args = ['-lang', 'c++', '-D_NITRO', '-nosyspath']
+cpp_link_args = 'metrowerks.lcf'
+
+[host_machine]
+system = 'bare metal'
+cpu_family = 'arm'
+endian = 'little'
--- a/devtools/meson/cross/metrowerks-eppc.txt
+++ b/devtools/meson/cross/metrowerks-eppc.txt
@ -0,0 +1,28 @@
+# This file assumes that the path to your Metrowerks toolchain
+# of choice is added to the environment(PATH) variable, so that
+# Meson can find the binaries while building.
+
+# You should also do one of the following to ensure Meson can
+# locate the .lcf linker script:
+# - Add the cross directory to PATH as well
+# - Edit c_link_args and cpp_link_args with the full
+#   path to the lcf file on your machine
+
+[binaries]
+c = 'mwcceppc'
+c_ld = 'mwldeppc'
+cpp = 'mwcceppc'
+cpp_ld = 'mwldeppc'
+ar = 'mwldeppc'
+as = 'mwasmeppc'
+
+[built-in options]
+c_args = ['-lang', 'c99', '-nosyspath']
+c_link_args = 'metrowerks.lcf'
+cpp_args = ['-lang', 'c++', '-nosyspath']
+cpp_link_args = 'metrowerks.lcf'
+
+[host_machine]
+system = 'bare metal'
+cpu_family = 'ppc'
+endian = 'little'
--- a/devtools/meson/cross/metrowerks.lcf
+++ b/devtools/meson/cross/metrowerks.lcf
@ -0,0 +1,18 @@
+# General-purpose linker script for Metrowerks toolchains.
+# This script will link a blank application. Its only purpose
+# is to allow the toolchains to run Meson tests. To link an
+# actual application, you need to write your own fine-tuned lcf.
+
+MEMORY {
+    TEST (RWX) : ORIGIN=0, LENGTH=0
+}
+
+SECTIONS {
+    .TEST:{
+        * (.text)
+	  * (.data)
+	  * (.rodata)
+	  * (.bss)
+        __startup=.;
+    } > TEST
+}
--- a/devtools/meson/cross/msp430.txt
+++ b/devtools/meson/cross/msp430.txt
@ -0,0 +1,25 @@
+# This file assumes that path to the Texas Instruments MSP430 toolchain is added
+# to the environment(PATH) variable, so that Meson can find
+# cl430 and ar430 while building.
+[binaries]
+c      = cl430
+ar     = ar430
+strip  = strip430
+
+[host_machine]
+system = 'baremetal'
+cpu_family = 'msp430'
+endian = 'little'
+
+[built-in options]
+c_args = [
+    '-vmsp',
+    '--printf_support=minimal']
+c_link_args = [
+    '--rom_model',
+    '-llibc.a',]
+cpp_args = []
+cpp_link_args = []
+
+[properties]
+needs_exe_wrapper = true
--- a/devtools/meson/cross/none.txt
+++ b/devtools/meson/cross/none.txt
@ -0,0 +1,19 @@
+# native file used to make the build machine compiler unusable
+
+[host_machine]
+system = 'none'
+cpu_family = 'none'
+cpu = 'none'
+endian = 'little'
+
+[properties]
+
+[binaries]
+c = ['false']
+cpp = ['false']
+fc = ['false']
+objc = ['false']
+objcpp = ['false']
+ar = ['false']
+pkg-config = ['false']
+cmake = ['false']
--- a/devtools/meson/cross/ownstdlib.txt
+++ b/devtools/meson/cross/ownstdlib.txt
@ -0,0 +1,13 @@
+# This is a setup for compiling a program that runs natively
+# but uses a custom std lib. This test will only work on
+# x86_64.
+
+[target_machine]
+system = 'linux'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+
+[properties]
+
+c_stdlib = 'mylibc' # Subproject name
--- a/devtools/meson/cross/tvos.txt
+++ b/devtools/meson/cross/tvos.txt
@ -0,0 +1,29 @@
+# This is a cross compilation file from OSX Yosemite to Apple tvOS
+# Apple keeps changing the location and names of files so
+# these might not work for you. Use the googles and xcrun.
+
+[binaries]
+c = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
+cpp = ['clang++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
+ar = 'ar'
+strip = 'strip'
+
+[built-in options]
+c_args = ['-mtvos-version-min=12.0']
+cpp_args = ['-mtvos-version-min=12.0']
+c_link_args = ['-mtvos-version-min=12.0']
+cpp_link_args = ['-mtvos-version-min=12.0']
+
+[properties]
+root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer'
+
+has_function_printf = true
+has_function_hfkerhisadf = false
+
+[host_machine]
+system = 'darwin'
+subsystem = 'tvos'
+kernel = 'xnu'
+cpu_family = 'arm'
+cpu = 'arm64'
+endian = 'little'
--- a/devtools/meson/cross/ubuntu-armhf.json
+++ b/devtools/meson/cross/ubuntu-armhf.json
@ -0,0 +1,5 @@
+{
+  "file": "ubuntu-armhf.txt",
+  "tests": ["common"],
+  "env": {}
+}
--- a/devtools/meson/cross/ubuntu-armhf.txt
+++ b/devtools/meson/cross/ubuntu-armhf.txt
@ -0,0 +1,29 @@
+[binaries]
+# we could set exe_wrapper = qemu-arm-static but to test the case
+# when cross compiled binaries can't be run we don't do that
+c = ['/usr/bin/arm-linux-gnueabihf-gcc']
+cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ar = '/usr/arm-linux-gnueabihf/bin/ar'
+strip = '/usr/arm-linux-gnueabihf/bin/strip'
+pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+[built-in options]
+# Used in unit test '140 get define'
+c_args = ['-DMESON_TEST_ISSUE_1665=1']
+cpp_args = '-DMESON_TEST_ISSUE_1665=1'
+
+[properties]
+root = '/usr/arm-linux-gnueabihf'
+
+has_function_printf = true
+has_function_hfkerhisadf = false
+
+skip_sanity_check = true
+
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv7' # Not sure if correct.
+endian = 'little'
--- a/devtools/meson/cross/ubuntu-faketarget.txt
+++ b/devtools/meson/cross/ubuntu-faketarget.txt
@ -0,0 +1,13 @@
+# This is a setup for compiling a program that runs natively
+# but produces output that runs on a different platform.
+# That is either a cross compiler or something like binutils.
+
+# We don't need to specify any properties or compilers,
+# for we use the native ones and can run the resulting
+# binaries directly.
+
+[target_machine]
+system = 'linux'
+cpu_family = 'mips'
+cpu = 'mips'
+endian = 'little'
--- a/devtools/meson/cross/wasm.txt
+++ b/devtools/meson/cross/wasm.txt
@ -0,0 +1,17 @@
+[binaries]
+c = '/home/jpakkane/src/emsdk/upstream/emscripten/emcc'
+cpp = '/home/jpakkane/src/emsdk/upstream/emscripten/em++'
+ar = '/home/jpakkane/src/emsdk/upstream/emscripten/emar'
+
+[built-in options]
+c_args = []
+c_link_args = ['-sEXPORT_ALL=1']
+cpp_args = []
+cpp_link_args = ['-sEXPORT_ALL=1']
+
+[host_machine]
+
+system = 'emscripten'
+cpu_family = 'wasm32'
+cpu = 'wasm32'
+endian = 'little'
--- a/devtools/meson/cross/xc16.txt
+++ b/devtools/meson/cross/xc16.txt
@ -0,0 +1,26 @@
+# This file assumes that path to the Microchip xc16 toolchain is added
+# to the environment(PATH) variable, so that Meson can find
+# xc16-gcc and xc16-ar while building.
+[binaries]
+c = 'xc16-gcc'
+ar = 'xc16-ar'
+strip = 'xc16-gcc'
+
+[host_machine]
+system = 'bare metal'
+cpu_family = 'dspic'
+cpu = '33ep64mc203'
+endian = 'little'
+
+[properties]
+needs_exe_wrapper = true
+
+[built-in options]
+c_args = [
+    '-c',
+    '-mcpu=33EP64MC203',
+    '-omf=elf']
+c_link_args = [
+    '-mcpu=33EP64MC203',
+    '-omf=elf',
+    '-Wl,--script=p33EP64MC203.gld,']
--- a/devtools/meson/data/.coveragerc.in
+++ b/devtools/meson/data/.coveragerc.in
@ -0,0 +1,25 @@
+[run]
+branch      = True
+parallel    = True
+concurrency = multiprocessing
+data_file   = @ROOT@/.coverage/coverage
+source      = @ROOT@/mesonbuild/
+
+[report]
+exclude_lines =
+  if T.TYPE_CHECKING:
+
+[paths]
+mesonbuild =
+    mesonbuild/
+    __w/meson/meson/mesonbuild/
+    @ROOT@/mesonbuild/
+
+[html]
+directory = @ROOT@/.coverage/html
+
+[xml]
+output    = @ROOT@/.coverage/coverage.xml
+
+[json]
+output    = @ROOT@/.coverage/coverage.json
--- a/devtools/meson/data/com.mesonbuild.install.policy
+++ b/devtools/meson/data/com.mesonbuild.install.policy
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD polkit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/software/polkit/policyconfig-1.dtd">
+<policyconfig>
+
+  <vendor>The Meson Build System</vendor>
+  <vendor_url>https://github.com/mesonbuild/meson</vendor_url>
+
+  <action id="com.mesonbuild.install.run">
+    <description>Install the given project via Meson</description>
+    <message>Authentication is required to install this project</message>
+    <icon_name>preferences-system</icon_name>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/python3</annotate>
+    <annotate key="org.freedesktop.policykit.exec.argv1">/usr/bin/meson</annotate>
+  </action>
+
+</policyconfig>
--- a/devtools/meson/data/macros.meson
+++ b/devtools/meson/data/macros.meson
@ -0,0 +1,45 @@
+%__meson %{_bindir}/meson
+%__meson_wrap_mode nodownload
+%__meson_auto_features enabled
+
+%meson \
+    %set_build_flags \
+    %{shrink:%{__meson} setup \
+        --buildtype=plain \
+        --prefix=%{_prefix} \
+        --libdir=%{_libdir} \
+        --libexecdir=%{_libexecdir} \
+        --bindir=%{_bindir} \
+        --sbindir=%{_sbindir} \
+        --includedir=%{_includedir} \
+        --datadir=%{_datadir} \
+        --mandir=%{_mandir} \
+        --infodir=%{_infodir} \
+        --localedir=%{_datadir}/locale \
+        --sysconfdir=%{_sysconfdir} \
+        --localstatedir=%{_localstatedir} \
+        --sharedstatedir=%{_sharedstatedir} \
+        --wrap-mode=%{__meson_wrap_mode} \
+        --auto-features=%{__meson_auto_features} \
+        %{_vpath_srcdir} %{_vpath_builddir} \
+        %{nil}}
+
+%meson_build \
+    %{shrink:%{__meson} compile \
+        -C %{_vpath_builddir} \
+        -j %{_smp_build_ncpus} \
+        --verbose \
+        %{nil}}
+
+%meson_install \
+    %{shrink:DESTDIR=%{buildroot} %{__meson} install \
+        -C %{_vpath_builddir} \
+        --no-rebuild \
+        %{nil}}
+
+%meson_test \
+    %{shrink:%{__meson} test \
+        -C %{_vpath_builddir} \
+        --num-processes %{_smp_build_ncpus} \
+        --print-errorlogs \
+        %{nil}}
--- a/devtools/meson/data/schema.xsd
+++ b/devtools/meson/data/schema.xsd
@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- from https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/resources/com/thalesgroup/dtkit/junit/model/xsd/junit-4.xsd -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="failure">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="message" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="error">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="message" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="properties">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="property" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="property">
+        <xs:complexType>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="skipped">
+        <xs:complexType mixed="true">
+            <xs:attribute name="message" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="system-err" type="xs:string"/>
+    <xs:element name="system-out" type="xs:string"/>
+
+    <xs:element name="testcase">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="skipped" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="error" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="failure" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="system-out" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="system-err" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="assertions" type="xs:string" use="optional"/>
+            <xs:attribute name="time" type="xs:string" use="optional"/>
+            <xs:attribute name="classname" type="xs:string" use="optional"/>
+            <xs:attribute name="status" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testsuite">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="properties" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="testcase" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="system-out" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="system-err" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="tests" type="xs:string" use="required"/>
+            <xs:attribute name="failures" type="xs:string" use="optional"/>
+            <xs:attribute name="errors" type="xs:string" use="optional"/>
+            <xs:attribute name="time" type="xs:string" use="optional"/>
+            <xs:attribute name="disabled" type="xs:string" use="optional"/>
+            <xs:attribute name="skipped" type="xs:string" use="optional"/>
+            <xs:attribute name="timestamp" type="xs:string" use="optional"/>
+            <xs:attribute name="hostname" type="xs:string" use="optional"/>
+            <xs:attribute name="id" type="xs:string" use="optional"/>
+            <xs:attribute name="package" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testsuites">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="testsuite" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="optional"/>
+            <xs:attribute name="time" type="xs:string" use="optional"/>
+            <xs:attribute name="tests" type="xs:string" use="optional"/>
+            <xs:attribute name="failures" type="xs:string" use="optional"/>
+            <xs:attribute name="disabled" type="xs:string" use="optional"/>
+            <xs:attribute name="errors" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+</xs:schema>
--- a/devtools/meson/data/shell-completions/bash/meson
+++ b/devtools/meson/data/shell-completions/bash/meson
@ -0,0 +1,492 @@
+_meson() {
+  command="${COMP_WORDS[1]}"
+  meson_subcommands=(
+      setup
+      configure
+      dist
+      install
+      introspect
+      init
+      test
+      wrap
+      subprojects
+      help
+      rewrite
+      compile
+      devenv
+      env2mfile
+  )
+
+  if [[ " ${meson_subcommands[*]} " =~ " ${command} " ]]; then
+      _meson-$command "${COMP_WORDS[@]:1}"
+  else
+      _meson-setup "${COMP_WORDS[@]}"
+  fi
+} &&
+complete -F _meson meson
+
+_meson_complete_option() {
+  option_string=$1
+
+  if [[ $# -eq 2 ]] && ! [[ "$option_string" == *=* ]]; then
+    option_string="$option_string=$2"
+  fi
+
+  if [[ "$option_string" == *=* ]]; then
+    _meson_complete_option_value "$option_string"
+  else
+    _meson_complete_option_name "$option_string"
+  fi
+}
+
+_meson_complete_option_name() {
+  option=$1
+  options=($(python3 -c 'import sys, json
+for option in json.load(sys.stdin):
+  print(option["name"])
+' <<< "$(_meson_get_options)"))
+  compopt -o nospace
+  COMPREPLY=($(compgen -W '${options[@]}' -S= -- "$option"))
+}
+
+_meson_complete_option_value() {
+  cur=$1
+  option_name=${cur%%=*}
+  option_value=${cur#*=}
+
+  if _meson_complete_filedir "$option_name" "$option_value"; then
+    return
+  fi
+
+# TODO: support all the option types
+  options=($(python3 -c 'import sys, json
+for option in json.load(sys.stdin):
+  if option["name"] != "'$option_name'":
+    continue
+  choices = []
+  if option["type"] == "boolean":
+    choices.append("true")
+    choices.append("false")
+  elif option["type"] == "combo":
+    for choice in option["choices"]:
+      choices.append(choice)
+  for choice in choices:
+    if choice.startswith("'$cur'"):
+      print(choice)
+' <<< "$(_meson_get_options)"))
+  COMPREPLY=("${options[@]}")
+}
+
+_meson_get_options() {
+  local options
+  for builddir in "${COMP_WORDS[@]}"; do
+    if [ -d "$builddir" ]; then
+      break
+    fi
+    builddir=.
+  done
+  options=$(meson introspect "$builddir" --buildoptions 2>/dev/null) &&
+  echo "$options" ||
+  echo '[]'
+}
+
+_meson_complete_filedir() {
+  _filedir_in() {
+    pushd "$1" &>/dev/null
+      local COMPREPLY=()
+      _filedir
+      echo "${COMPREPLY[@]}"
+    popd &>/dev/null
+  }
+
+  option=$1
+  cur=$2
+  case $option in
+    prefix |\
+    libdir |\
+    libexecdir |\
+    bindir |\
+    sbindir |\
+    includedir |\
+    datadir |\
+    mandir |\
+    infodir |\
+    localedir |\
+    sysconfdir |\
+    localstatedir |\
+    sharedstatedir)
+      _filedir -d
+      ;;
+    cross-file)
+      _filedir
+      COMPREPLY+=($(_filedir_in "$XDG_DATA_DIRS"/meson/cross))
+      COMPREPLY+=($(_filedir_in /usr/local/share/meson/cross))
+      COMPREPLY+=($(_filedir_in /usr/share/meson/cross))
+      COMPREPLY+=($(_filedir_in "$XDG_DATA_HOME"/meson/cross))
+      COMPREPLY+=($(_filedir_in ~/.local/share/meson/cross))
+      ;;
+    *)
+      return 1;;
+  esac
+  return 0
+}
+
+_meson-setup() {
+
+  shortopts=(
+    h
+    D
+    v
+  )
+
+  longopts=(
+    help
+    prefix
+    libdir
+    libexecdir
+    bindir
+    sbindir
+    includedir
+    datadir
+    mandir
+    infodir
+    localedir
+    sysconfdir
+    localstatedir
+    sharedstatedir
+    backend
+    buildtype
+    strip
+    unity
+    werror
+    layout
+    default-library
+    warnlevel
+    stdsplit
+    errorlogs
+    cross-file
+    version
+    wrap-mode
+  )
+
+  local cur prev
+  if _get_comp_words_by_ref cur prev &>/dev/null &&
+    [ "${prev:0:2}" = '--' ] && _meson_complete_option "${prev:2}" "$cur"; then
+    return
+  elif _get_comp_words_by_ref cur prev &>/dev/null &&
+    [ "${prev:0:1}" = '-' ] && [ "${prev:1:2}" != '-' ] && _meson_complete_option "${prev:1}"; then
+    return
+  elif _get_comp_words_by_ref -n '=' cur prev &>/dev/null; then
+    if [ $prev == -D ]; then
+      _meson_complete_option "$cur"
+      return
+    fi
+  else
+    cur="${COMP_WORDS[COMP_CWORD]}"
+  fi
+
+  if [[ "$cur" == "--"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+  elif [[ "$cur" == "-"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}' -- "${cur:1}"))
+  else
+    _filedir -d
+    if [ -z "$cur" ]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}'))
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}'))
+    fi
+
+    if [ $COMP_CWORD -eq 1 ]; then
+      COMPREPLY+=($(compgen -W "${meson_subcommands[*]}" -- "$cur"))
+    fi
+  fi
+}
+
+_meson-configure() {
+
+  shortopts=(
+    h
+    D
+  )
+
+  longopts=(
+    help
+    clearcache
+  )
+
+  local cur prev
+  if _get_comp_words_by_ref -n '=' cur prev &>/dev/null; then
+    if [ $prev == -D ]; then
+      _meson_complete_option "$cur"
+      return
+    fi
+  else
+    cur="${COMP_WORDS[COMP_CWORD]}"
+  fi
+
+  if [[ "$cur" == "--"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+  elif [[ "$cur" == "-"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}' -- "${cur:1}"))
+  else
+    for dir in "${COMP_WORDS[@]}"; do
+      if [ -d "$dir" ]; then
+        break
+      fi
+      dir=.
+    done
+    if [ ! -d "$dir/meson-private" ]; then
+      _filedir -d
+    fi
+
+    if [ -z "$cur" ]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}'))
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}'))
+    fi
+  fi
+}
+
+_meson-dist() {
+  : TODO
+}
+
+_meson-install() {
+  : TODO
+}
+
+_meson-introspect() {
+  shortopts=(
+    h
+  )
+
+  longopts=(
+    targets
+    installed
+    buildsystem-files
+    buildoptions
+    tests
+    benchmarks
+    dependencies
+    projectinfo
+  )
+
+  local cur prev
+  if ! _get_comp_words_by_ref cur prev &>/dev/null; then
+    cur="${COMP_WORDS[COMP_CWORD]}"
+  fi
+
+  if [[ "$cur" == "--"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+  elif [[ "$cur" == "-"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}' -- "${cur:1}"))
+  else
+    for dir in "${COMP_WORDS[@]}"; do
+      if [ -d "$dir" ]; then
+        break
+      fi
+      dir=.
+    done
+    if [ ! -d "$dir/meson-private" ]; then
+      _filedir -d
+    fi
+
+    if [ -z "$cur" ]; then
+      COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}'))
+      COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}'))
+    fi
+  fi
+}
+
+_meson-init() {
+  shortopts=(
+    h
+    C
+    n
+    e
+    e
+    d
+    l
+    b
+    f
+  )
+
+  longopts=(
+    help
+	name
+	executable
+	deps
+	language
+	builddir
+	force
+	type
+	version
+  )
+
+  if [[ "$cur" == "--"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+  elif [[ "$cur" == "-"* && ${#cur} -gt 1 ]]; then
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}' -- "${cur:1}"))
+  else
+    if [ -z "$cur" ]; then
+      COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}'))
+      COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}'))
+    fi
+  fi
+
+}
+
+_meson-test() {
+  shortopts=(
+    q
+    v
+    t
+    C
+  )
+
+  longopts=(
+    quiet
+    verbose
+    timeout-multiplier
+    repeat
+    no-rebuild
+    gdb
+    list
+    wrapper --wrap
+    no-suite
+    suite
+    no-stdsplit
+    print-errorlogs
+    benchmark
+    logbase
+    num-processes
+    setup
+    test-args
+  )
+
+  local cur prev
+  if _get_comp_words_by_ref -n ':' cur prev &>/dev/null; then
+    case $prev in
+      --repeat)
+        # number, can't be completed
+        return
+        ;;
+      --wrapper)
+        _command_offset $COMP_CWORD
+        return
+        ;;
+      -C)
+        _filedir -d
+        return
+        ;;
+      --suite | --no-suite)
+        for i in "${!COMP_WORDS[@]}"; do
+          opt="${COMP_WORDS[i]}"
+          dir="${COMP_WORDS[i+1]}"
+          case "$opt" in
+            -C)
+              break
+              ;;
+          esac
+          dir=.
+        done
+        suites=($(python3 -c 'import sys, json;
+for test in json.load(sys.stdin):
+  for suite in test["suite"]:
+    print(suite)
+    ' <<< "$(meson introspect "$dir" --tests)"))
+# TODO
+        COMPREPLY+=($(compgen -W "${suites[*]}" -- "$cur"))
+        return
+        ;;
+      --logbase)
+        # free string, can't be completed
+        return
+        ;;
+      --num-processes)
+        # number, can't be completed
+        return
+        ;;
+      -t | --timeout-multiplier)
+        # number, can't be completed
+        return
+        ;;
+      --setup)
+        # TODO
+        return
+        ;;
+      --test-args)
+        return
+        ;;
+    esac
+  else
+    cur="${COMP_WORDS[COMP_CWORD]}"
+  fi
+
+  if [[ "$cur" == "--"* ]]; then
+    COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+  elif [[ "$cur" == "-"* && ${#cur} -gt 1 ]]; then
+    COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}' -- "${cur:1}"))
+  else
+    for dir in "${COMP_WORDS[@]}"; do
+      if [ -d "$dir" ]; then
+        break
+      fi
+      dir=.
+    done
+    if [ ! -d "$dir/meson-private" ]; then
+      _filedir -d
+    fi
+
+    for i in "${!COMP_WORDS[@]}"; do
+      opt="${COMP_WORDS[i]}"
+      dir="${COMP_WORDS[i+1]}"
+      case "$opt" in
+        -C)
+          break
+          ;;
+      esac
+      dir=.
+    done
+    tests=($(python3 -c 'import sys, json;
+for test in json.load(sys.stdin):
+  print(test["name"])
+' <<< "$(meson introspect "$dir" --tests)"))
+    COMPREPLY+=($(compgen -W "${tests[*]}" -- "$cur"))
+
+    if [ -z "$cur" ]; then
+      COMPREPLY+=($(compgen -P '--' -W '${longopts[*]}' -- "${cur:2}"))
+      COMPREPLY+=($(compgen -P '-' -W '${shortopts[*]}' -- "${cur:1}"))
+    fi
+  fi
+}
+
+_meson-wrap() {
+  : TODO
+}
+
+_meson-subprojects() {
+  : TODO
+}
+
+_meson-help() {
+  : # Nothing to do
+}
+
+_meson-rewrite() {
+  : TODO
+}
+
+_meson-compile() {
+  : TODO
+}
+
+_meson-devenv() {
+  : TODO
+}
+
+_meson-env2mfile() {
+  : TODO
+}
--- a/devtools/meson/data/shell-completions/zsh/_meson
+++ b/devtools/meson/data/shell-completions/zsh/_meson
@ -0,0 +1,425 @@
+#compdef meson
+
+# vim:ts=2 sw=2
+
+# Copyright (c) 2017 Arseny Maslennikov
+# All rights reserved.  Individual authors, whether or not
+# specifically named, retain copyright in all changes; in what follows, they
+# are referred to as `the Meson development team'.  This is for convenience
+# only and this body has no legal status.  This file is distributed under
+# the following licence.
+#
+# Permission is hereby granted, without written agreement and without
+# licence or royalty fees, to use, copy, modify, and distribute this
+# software and to distribute modified versions of this software for any
+# purpose, provided that the above copyright notice and the following
+# two paragraphs appear in all copies of this software.
+#
+# In no event shall the Meson development team be liable to any party for
+# direct, indirect, special, incidental, or consequential damages arising out
+# of the use of this software and its documentation, even if the Meson
+# development team have been advised of the possibility of such damage.
+#
+# The Meson development team specifically disclaim any warranties, including,
+# but not limited to, the implied warranties of merchantability and fitness
+# for a particular purpose.  The software provided hereunder is on an "as is"
+# basis, and the Meson development team have no obligation to provide
+# maintenance, support, updates, enhancements, or modifications.
+
+local curcontext="$curcontext" state line
+local -i ret
+
+local __meson_backends="(ninja xcode ${(j. .)${:-vs{,2010,2015,2017}}})"
+local __meson_build_types="(plain debug debugoptimized minsize release)"
+local __meson_wrap_modes="(WrapMode.{default,nofallback,nodownload,forcefallback})"
+local __meson_dist_formats=("xztar" "gztar" "zip")
+local __meson_cd='-C[change into this directory before running]:target dir:_directories'
+local -a __meson_common=(
+  '--prefix=[installation prefix]: :_directories'
+  '--bindir=[executable directory]: :_directories'
+  '--datadir=[data file directory]: :_directories'
+  '--includedir=[header file directory]: :_directories'
+  '--infodir=[info page directory]: :_directories'
+  '--libdir=[library directory]: :_directories'
+  '--libexecdir=[library executable directory]: :_directories'
+  '--localedir=[locale data directory]: :_directories'
+  '--localstatedir=[local state data directory]: :_directories'
+  '--mandir=[manual page directory]: :_directories'
+  '--sbindir=[system executable directory]: :_directories'
+  '--sharedstatedir=[arch-independent data directory]: :_directories'
+  '--sysconfdir=[system configuration directory]: :_directories'
+  '--auto-features=[default value for auto features]:auto features types:(auto disabled enabled)'
+  '--backend=[backend to use]:Meson backend:'"$__meson_backends"
+  '--buildtype=[build type to use]:Meson build type:'"$__meson_build_types"
+  '--debug[turn on building with debug]'
+  '--default-library=[default library type]:default library type:(shared static both)'
+  '--errorlogs[prints the logs from failing tests]'
+  '--install-umask=[default umask for permissions of all installed files]'
+  '--layout=[build directory layout]:build directory layout:(flat mirror)'
+  '--optimization=[optimization level for compiled targets]:optimization:(0 g 1 2 3 s)'
+  '--stdsplit=[split stdout and stderr in test logs]'
+  '--strip[strip targets on install]'
+  '--unity=[unity builds on/off]:whether to do unity builds:(on off subprojects)'
+  '--warnlevel=[compiler warning level]:compiler warning level:warning level:(1 2 3)'
+  '--werror[treat warnings as errors]'
+  '--wrap-mode=[special wrap mode]:wrap mode:'"$__meson_wrap_modes"
+  '--force-fallback-for=[force fallback for listed subprojects]'
+  '--pkg-config-path=[extra paths for HOST pkg-config to search]:paths:_dir_list -s ,'
+  '--build.pkg-config-path=[extra paths for BUILD pkg-config to search]:paths:_dir_list -s ,'
+  '--cmake-prefix-path=[extra prefixes for HOST cmake to search]:paths:_dir_list -s ,'
+  '--build.cmake-prefix-path=[extra prefix for BUILD cmake to search]:paths:_dir_list -s ,'
+)
+
+local -a meson_commands=(
+'configure:configure a project'
+'dist:generate release archive'
+'init:create a new project'
+'install:install one or more targets'
+'introspect:query project properties'
+'setup:set up a build directory'
+'test:run tests'
+'wrap:manage source dependencies'
+'subprojects:manage subprojects'
+'compile:Build the project'
+)
+
+(( $+functions[__meson_is_build_dir] )) || __meson_is_build_dir() {
+  local mpd="${1:-$PWD}/meson-private"
+  [[ -f "$mpd/build.dat" && -f "$mpd/coredata.dat" ]]
+  return $?
+}
+
+# TODO: implement build option completion
+(( $+functions[__meson_build_options] )) || __meson_build_options() {}
+
+# `meson introspect` currently can provide that information in JSON.
+# We can:
+# 1) pipe its output to python3 -m json.tool | grep "$alovelyregex" | cut <...>
+# 2) teach mintro.py to use a different output format
+#    (or perhaps just to select the fields printed)
+
+(( $+functions[__meson_test_names] )) || __meson_test_names() {
+  local rtests
+  if rtests="$(_call_program meson meson test ${opt_args[-C]:+-C "$opt_args[-C]"} --list)";
+  then
+    local -a tests=(${(@f)rtests})
+    _describe -t "tests" "Meson tests" tests
+  else
+    _message -r "current working directory is not a build directory"
+    _message -r 'use -C $build_dir or cd $build_dir'
+  fi
+}
+
+(( $+functions[__meson_wrap_names] )) || __meson_wrap_names() {
+  local rwraps
+  rwraps="$(_call_program meson meson wrap list)"
+  local -a wraps=(${(@f)rwraps})
+  _describe -t wraps "Meson wraps" wraps
+}
+
+(( $+functions[__meson_installed_wraps] )) || __meson_installed_wraps() {
+  local rwraps
+  if rwraps="$(ls subprojects/ | grep '\.wrap$' | cut -d . -f 1)"; then
+    local -a wraps=(${(@f)rwraps})
+    _describe -t wraps "Meson wraps" wraps
+  fi
+}
+
+(( $+functions[_meson_commands] )) || _meson_commands() {
+    _describe -t commands "Meson subcommands" meson_commands
+}
+
+(( $+functions[_meson-setup] )) || _meson-setup() {
+  local firstd secondd
+  if [[ -f "meson.build" ]]; then
+    # if there's no second argument on the command line
+    # cwd will implicitly be substituted:
+    # - as the source directory if it has a file with the name "meson.build";
+    # - as the build directory otherwise
+    # more info in mesonbuild/mesonmain.py
+    firstd="build"
+    secondd="source"
+  else
+    firstd="source"
+    secondd="build"
+  fi
+
+  _arguments \
+  '*-D-[set the value of a build option]:build option:__meson_build_options' \
+  '--cross-file=[cross-compilation environment description]:cross file:_files' \
+  '--native-file=[build machine compilation environment description]:native file:_files' \
+  '--clearcache[clear cached state]' \
+  '--fatal-meson-warnings=[exit when any meson warnings are encountered]' \
+  '(-v --version)'{'-v','--version'}'[print the meson version and exit]' \
+  '--reconfigure=[re-run build configuration]' \
+  '--wipe=[delete saved state and restart using saved command line options]' \
+  ":$firstd directory:_directories" \
+  "::$secondd directory:_directories" \
+  "${(@)__meson_common}"
+}
+
+(( $+functions[_meson-configure] )) || _meson-configure() {
+  local curcontext="$curcontext"
+  # TODO: implement 'mesonconf @file'
+  local -a specs=(
+  '*-D-[set the value of a build option]:build option:__meson_build_options'
+  '::build directory:_directories'
+  )
+
+  _arguments \
+    '(: -)'{'--help','-h'}'[show a help message and quit]' \
+    "${(@)specs}" \
+    "${(@)__meson_common}"
+}
+
+(( $+functions[_meson-test] )) || _meson-test() {
+  local curcontext="$curcontext"
+
+  # TODO: complete test suites
+  local -a specs=(
+  '--repeat[number of times to run the tests]:number of times to repeat: '
+  '--no-rebuild[do not rebuild before running tests]'
+  '--gdb[run tests under gdb]'
+  '--gdb-path=[program to run for gdb (can be wrapper or compatible program)]:program:_path_commands'
+  '--list[list available tests]'
+  '(--wrapper --wrap)'{'--wrapper=','--wrap='}'[wrapper to run tests with]:wrapper program:_path_commands'
+  "$__meson_cd"
+  '(--suite)--no-suite[do not run tests from this suite]:test suite: '
+  '(--no-suite)--suite[only run tests from this suite]:test suite: '
+  '--no-stdsplit[do not split stderr and stdout in logs]'
+  '--print-errorlogs[print logs for failing tests]'
+  '--benchmark[run benchmarks instead of tests]'
+  '--logbase[base name for log file]:filename: '
+  '--num-processes[how many threads to use]:number of processes: '
+  '(--verbose -v)'{'--verbose','-v'}'[do not redirect stdout and stderr]'
+  '(--quiet -q)'{'--quiet','-q'}'[produce less output to the terminal]'
+  '(--timeout-multiplier -t)'{'--timeout-multiplier','-t'}'[a multiplier for test timeouts]:Python floating-point number: '
+  '--setup[which test setup to use]:test setup: '
+  '--test-args[arguments to pass to the tests]: : '
+  '*:Meson tests:__meson_test_names'
+  )
+
+  _arguments \
+    '(: -)'{'--help','-h'}'[show a help message and quit]' \
+    "${(@)specs}"
+}
+
+(( $+functions[_meson-install] )) || _meson-install() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    "$__meson_cd"
+    '--no-rebuild[Do not rebuild before installing]'
+    '--only-changed[Do not overwrite files that are older than the copied file]'
+    '--quiet[Do not print every file that was installed]'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-introspect] )) || _meson-introspect() {
+  local curcontext="$curcontext"
+  local -a specs=(
+  '--ast[dump the ASK of the meson file]'
+  '--benchmarks[list all benchmarks]'
+  '--buildoptions[list all build options]'
+  '--buildsystem-files[list files that belong to the build system]'
+  '--dependencies[list external dependencies]'
+  '--installed[list all installed files and directories]'
+  '--projectinfo[show project information]'
+  '--targets[list top level targets]'
+  '--tests[list all unit tests]'
+  '--backend=[backend to use]:Meson backend:'"$__meson_backends"
+  '::build directory:_directories'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-init] )) || _meson-init() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    "$__meson_cd"
+    '(-n --name)'{'-n','--name'}'=[the name of the project (defaults to directory name)]'
+    '(-e --executable)'{'-e','--executable'}'=[the name of the executable target to create (defaults to project name)]'
+    '(-d --deps)'{'-d','--deps'}'=[comma separated list of dependencies]'
+    '(-l --language)'{'-l','--language'}'=[comma separated list of languages (autodetected based on sources if unset)]:languages:_values , (c cpp cs cuda d fortran java objc objcpp rust)'
+    '(-b --build)'{'-b','--build'}'[build the project immediately after generation]'
+    '--builddir=[directory for building]:directory:_directories'
+    '(-f --force)'{'-f','--force'}'[overwrite any existing files and directories]'
+    '(-t --type)'{'-t','--type'}'=[project type, defaults to executable]:type:(executable library)'
+    '(-v --version)'{'-v','--version'}'[print the meson version and exit]'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-wrap] )) || _meson-wrap() {
+  local -a commands=(
+    'list:list all available wraps'
+    'search:search the db by name'
+    'install:install the specified project'
+    'update:Update a project to its newest available version'
+    'info:Show info about a wrap'
+    'status:Show the status of your subprojects'
+  )
+
+  if (( CURRENT == 2 )); then
+    _describe -t commands "Meson wrap subcommands" commands
+  else
+    local curcontext="$curcontext"
+    cmd="${${commands[(r)$words[2]:*]%%:*}}"
+    if (( $#cmd )); then
+      if [[ $cmd == status ]]; then
+        _message "no options"
+      elif [[ $cmd == "list" ]]; then
+        _arguments '*:meson wraps'
+      elif [[ $cmd == "search" ]]; then
+        _arguments '*:meson wraps'
+      elif [[ $cmd == "install" ]]; then
+        _arguments '*:meson wraps:__meson_wrap_names'
+      elif [[ $cmd == "update" ]]; then
+        _arguments '*:meson wraps:__meson_installed_wraps'
+      elif [[ $cmd == "info" ]]; then
+        _arguments '*:meson wraps:__meson_wrap_name'
+      elif [[ $cmd == "status" ]]; then
+        _arguments '*:'
+      elif [[ $cmd == "promote" ]]; then
+        # TODO: how do you figure out what wraps are provided by subprojects if
+        # they haven't been fetched yet?
+        _arguments '*:'
+      fi
+    else
+      _message "unknown meson wrap command: $words[2]"
+    fi
+  fi
+
+}
+
+(( $+functions[_meson-dist] )) || _meson-dist() {
+  local curcontext="$curcontext"
+  local -a specs=(
+  '--allow-dirty[Allow even when repository contains uncommitted changes]'
+  '--formats=[comma separated list of archive types to create]:archive formats:_values -s , format '"$__meson_dist_formats"
+  '--include-subprojects[Include source code of subprojects that have been used for the build]'
+  '--no-tests[Do not build and test generated packages]'
+  "$__meson_cd"
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-subprojects-update] )) || _meson-subprojects-update() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    "--rebase[rebase your branch on top of wrap's revision (git only)]"
+    '--sourcedir=[path to source directory]:_directories'
+    '*:subprojects:__meson_installed_wraps'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-subprojects-checkout] )) || _meson-subprojects-checkout() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    '-b[create a new branch]'
+    '--sourcedir=[path to source directory]:_directories'
+    # FIXME: this doesn't work exactly right, but I can't figure it out
+    ':branch name'
+    '*:subprojects:__meson_installed_wraps'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-subprojects-download] )) || _meson-subprojects-download() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    '--sourcedir=[path to source directory]:_directories'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-subprojects-foreach] )) || _meson-subprojects-foreach() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    '--sourcedir=[path to source directory]:_directories'
+    '*:command:_command_names -e'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+(( $+functions[_meson-subprojects] )) || _meson-subprojects() {
+  local -a commands=(
+    'update:update all subprojects from wrap files'
+    'checkout:checkout a branch (git only)'
+    'download:ensure subprojects are fetched, even if not in use. Already downloaded subprojects are not modified.'
+    'foreach:execute a command in each subproject directory'
+  )
+
+  if (( CURRENT == 2 )); then
+    _describe -t commands "Meson subproject subcommands" commands
+  else
+    local curcontext="$curcontext"
+    cmd="${${commands[(r)$words[2]:*]%%:*}}"
+    if (( $#cmd )); then
+      if [[ $cmd == status ]]; then
+        _message "no options"
+      else
+        _meson-subprojects-$cmd
+      fi
+    else
+      _message "unknown meson subproject command: $words[2]"
+    fi
+  fi
+
+}
+
+(( $+functions[_meson-compile] )) || _meson-compile() {
+  local curcontext="$curcontext"
+  local -a specs=(
+    "$__meson_cd"
+    '--clean[Clean the build directory]'
+    '(-j --jobs)'{'-j','--jobs'}'=[the number fo work jobs to run (if supported)]:_guard "[0-9]#" "number of jobs"'
+    '(-l --load-average)'{'-l','--load-average'}'=[the system load average to try to maintain (if supported)]:_guard "[0-9]#" "load average"'
+    '(-v --verbose)'{'-v','--verbose'}'[Show more output]'
+    '--ninja-args=[Arguments to pass to ninja (only when using ninja)]'
+    '--vs-args=[Arguments to pass to vs (only when using msbuild)]'
+  )
+_arguments \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  "${(@)specs}"
+}
+
+if [[ $service != meson ]]; then
+  _call_function ret _$service
+  return ret
+fi
+
+_arguments -C -R \
+  '(: -)'{'--help','-h'}'[show a help message and quit]' \
+  '(: -)'{'--version','-v'}'[show version information and quit]' \
+  '(-): :_meson_commands' \
+  '*:: :->post-command' \
+#
+ret=$?
+
+[[ $ret = 300 ]] && case "$state" in
+  post-command)
+    service="meson-$words[1]"
+    curcontext=${curcontext%:*:*}:$service:
+    _call_function ret _$service
+    ;;
+esac
+
+return ret
--- a/devtools/meson/data/syntax-highlighting/vim/README
+++ b/devtools/meson/data/syntax-highlighting/vim/README
@ -0,0 +1,4 @@
+ftdetect sets the filetype
+ftplugin sets Meson indentation rules
+indent does Meson indentation
+syntax does Meson syntax highlighting
--- a/devtools/meson/data/syntax-highlighting/vim/ftdetect/meson.vim
+++ b/devtools/meson/data/syntax-highlighting/vim/ftdetect/meson.vim
@ -0,0 +1,4 @@
+au BufNewFile,BufRead meson.build set filetype=meson
+au BufNewFile,BufRead meson.options set filetype=meson
+au BufNewFile,BufRead meson_options.txt set filetype=meson
+au BufNewFile,BufRead *.wrap set filetype=dosini
--- a/devtools/meson/data/syntax-highlighting/vim/ftplugin/meson.vim
+++ b/devtools/meson/data/syntax-highlighting/vim/ftplugin/meson.vim
@ -0,0 +1,39 @@
+" Vim filetype plugin file
+" Language:	meson
+" License:	VIM License
+" Maintainer:   Liam Beguin <liambeguin@gmail.com>
+" Original Author:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+" Last Change:		2018 Nov 27
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+setlocal commentstring=#\ %s
+setlocal comments=:#
+setlocal formatoptions+=croql formatoptions-=t
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+if get(g:, "meson_recommended_style", 1)
+  setlocal expandtab
+  setlocal shiftwidth=2
+  setlocal softtabstop=2
+  let b:undo_ftplugin .= " | setl et< sts< sw<"
+endif
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words = '\<if\>:\<elif\>:\<else\>:\<endif\>,' .
+	\             '\<foreach\>:\<break\>:\<continue\>:\<endforeach\>'
+  let b:undo_ftplugin .= " | unlet! b:match_words"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Meson Build Files (meson.build)\tmeson.build\n" .
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
--- a/devtools/meson/data/syntax-highlighting/vim/indent/meson.vim
+++ b/devtools/meson/data/syntax-highlighting/vim/indent/meson.vim
@ -0,0 +1,183 @@
+" Vim indent file
+" Language:		Meson
+" License:		VIM License
+" Maintainer:		Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
+"	        	Liam Beguin <liambeguin@gmail.com>
+" Original Authors:	David Bustos <bustos@caltech.edu>
+"			Bram Moolenaar <Bram@vim.org>
+" Last Change:		2015 Feb 23
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+" Some preliminary settings
+setlocal nolisp		" Make sure lisp indenting doesn't supersede us
+setlocal autoindent	" indentexpr isn't much help otherwise
+
+setlocal indentexpr=GetMesonIndent(v:lnum)
+setlocal indentkeys+==elif,=else,=endforeach,=endif,0)
+
+let b:undo_indent = "setl ai< inde< indk< lisp<"
+
+" Only define the function once.
+if exists("*GetMesonIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Come here when loading the script the first time.
+
+let s:maxoff = 50	" maximum number of lines to look backwards for ()
+
+function GetMesonIndent(lnum)
+  echom getline(line("."))
+
+  " If this line is explicitly joined: If the previous line was also joined,
+  " line it up with that one, otherwise add two 'shiftwidth'
+  if getline(a:lnum - 1) =~ '\\$'
+    if a:lnum > 1 && getline(a:lnum - 2) =~ '\\$'
+      return indent(a:lnum - 1)
+    endif
+    return indent(a:lnum - 1) + (exists("g:mesonindent_continue") ? eval(g:mesonindent_continue) : (shiftwidth() * 2))
+  endif
+
+  " If the start of the line is in a string don't change the indent.
+  if has('syntax_items')
+	\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
+    return -1
+  endif
+
+  " Search backwards for the previous non-empty line.
+  let plnum = prevnonblank(v:lnum - 1)
+
+  if plnum == 0
+    " This is the first non-empty line, use zero indent.
+    return 0
+  endif
+
+  " If the previous line is inside parenthesis, use the indent of the starting
+  " line.
+  " Trick: use the non-existing "dummy" variable to break out of the loop when
+  " going too far back.
+  call cursor(plnum, 1)
+  let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
+	  \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
+	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+	  \ . " =~ '\\(Comment\\|Todo\\|String\\)$'")
+  if parlnum > 0
+    let plindent = indent(parlnum)
+    let plnumstart = parlnum
+  else
+    let plindent = indent(plnum)
+    let plnumstart = plnum
+  endif
+
+
+  " When inside parenthesis: If at the first line below the parenthesis add
+  " a 'shiftwidth', otherwise same as previous line.
+  " i = (a
+  "       + b
+  "       + c)
+  call cursor(a:lnum, 1)
+  let p = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
+	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
+	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+	  \ . " =~ '\\(Comment\\|Todo\\|String\\)$'")
+  if p > 0
+    if p == plnum
+      " When the start is inside parenthesis, only indent one 'shiftwidth'.
+      let pp = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
+	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
+	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+	  \ . " =~ '\\(Comment\\|Todo\\|String\\)$'")
+      if pp > 0
+	return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : shiftwidth())
+      endif
+      return indent(plnum) + (exists("g:pyindent_open_paren") ? eval(g:pyindent_open_paren) : shiftwidth())
+    endif
+    if plnumstart == p
+      return indent(plnum)
+    endif
+    return plindent
+  endif
+
+
+  " Get the line and remove a trailing comment.
+  " Use syntax highlighting attributes when possible.
+  let pline = getline(plnum)
+  let pline_len = strlen(pline)
+  if has('syntax_items')
+    " If the last character in the line is a comment, do a binary search for
+    " the start of the comment.  synID() is slow, a linear search would take
+    " too long on a long line.
+    if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)$"
+      let min = 1
+      let max = pline_len
+      while min < max
+	let col = (min + max) / 2
+	if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)$"
+	  let max = col
+	else
+	  let min = col + 1
+	endif
+      endwhile
+      let pline = strpart(pline, 0, min - 1)
+    endif
+  else
+    let col = 0
+    while col < pline_len
+      if pline[col] == '#'
+	let pline = strpart(pline, 0, col)
+	break
+      endif
+      let col = col + 1
+    endwhile
+  endif
+
+  " If the previous line ended the conditional/loop
+  if getline(plnum) =~ '^\s*\(endif\|endforeach\)\>\s*'
+    " Maintain indent
+    return -1
+  endif
+
+  " If the previous line ended with a builtin, indent this line
+  if pline =~ '^\s*\(foreach\|if\|else\|elif\)\>\s*'
+    return plindent + shiftwidth()
+  endif
+
+  " If the current line begins with a header keyword, deindent
+  if getline(a:lnum) =~ '^\s*\(else\|elif\|endif\|endforeach\)'
+
+    " Unless the previous line was a one-liner
+    if getline(plnumstart) =~ '^\s*\(foreach\|if\)\>\s*'
+      return plindent
+    endif
+
+    " Or the user has already dedented
+    if indent(a:lnum) <= plindent - shiftwidth()
+      return -1
+    endif
+
+    return plindent - shiftwidth()
+  endif
+
+  " When after a () construct we probably want to go back to the start line.
+  " a = (b
+  "       + c)
+  " here
+  if parlnum > 0
+    return plindent
+  endif
+
+  return -1
+
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2
--- a/devtools/meson/data/syntax-highlighting/vim/syntax/meson.vim
+++ b/devtools/meson/data/syntax-highlighting/vim/syntax/meson.vim
@ -0,0 +1,162 @@
+" Vim syntax file
+" Language:	Meson
+" License:	VIM License
+" Maintainer:	Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
+"		Liam Beguin <liambeguin@gmail.com>
+" Last Change:	2021 Aug 16
+" Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
+"		Neil Schemenauer <nas@meson.ca>
+"		Dmitry Vasiliev
+"
+"		This version is copied and edited from python.vim
+"		It's very basic, and doesn't do many things I'd like it to
+"		For instance, it should show errors for syntax that is valid in
+"		Python but not in Meson.
+"
+" Optional highlighting can be controlled using these variables.
+"
+"   let meson_space_error_highlight = 1
+"
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" We need nocompatible mode in order to continue lines with backslashes.
+" Original setting will be restored.
+let s:cpo_save = &cpo
+set cpo&vim
+
+" http://mesonbuild.com/Syntax.html
+syn keyword mesonConditional	elif else if endif
+syn keyword mesonRepeat		foreach endforeach
+syn keyword mesonOperator	and not or in
+syn keyword mesonStatement	continue break
+
+syn match   mesonComment	"#.*$" contains=mesonTodo,@Spell
+syn keyword mesonTodo		FIXME NOTE NOTES TODO XXX contained
+
+" Strings can either be single quoted or triple counted across multiple lines,
+" but always with a '
+syn region  mesonString
+      \ start="\z('\)" end="\z1" skip="\\\\\|\\\z1"
+      \ contains=mesonEscape,@Spell
+syn region  mesonString
+      \ start="\z('''\)" end="\z1" keepend
+      \ contains=mesonEscape,mesonSpaceError,@Spell
+
+syn match   mesonEscape	"\\[abfnrtv'\\]" contained
+syn match   mesonEscape	"\\\o\{1,3}" contained
+syn match   mesonEscape	"\\x\x\{2}" contained
+syn match   mesonEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
+" Meson allows case-insensitive Unicode IDs: http://www.unicode.org/charts/
+syn match   mesonEscape	"\\N{\a\+\%(\s\a\+\)*}" contained
+syn match   mesonEscape	"\\$"
+
+" Meson only supports integer numbers
+" http://mesonbuild.com/Syntax.html#numbers
+syn match   mesonNumber	"\<\d\+\>"
+syn match   mesonNumber	"\<0x\x\+\>"
+syn match   mesonNumber	"\<0o\o\+\>"
+
+" booleans
+syn keyword mesonBoolean	false true
+
+" Built-in functions
+syn keyword mesonBuiltin
+  \ add_global_arguments
+  \ add_global_link_arguments
+  \ add_languages
+  \ add_project_arguments
+  \ add_project_dependencies
+  \ add_project_link_arguments
+  \ add_test_setup
+  \ alias_target
+  \ assert
+  \ benchmark
+  \ both_libraries
+  \ build_machine
+  \ build_target
+  \ configuration_data
+  \ configure_file
+  \ custom_target
+  \ declare_dependency
+  \ dependency
+  \ disabler
+  \ environment
+  \ error
+  \ executable
+  \ files
+  \ find_library
+  \ find_program
+  \ generator
+  \ get_option
+  \ get_variable
+  \ gettext
+  \ host_machine
+  \ import
+  \ include_directories
+  \ install_data
+  \ install_headers
+  \ install_man
+  \ install_subdir
+  \ install_symlink
+  \ install_emptydir
+  \ is_disabler
+  \ is_variable
+  \ jar
+  \ join_paths
+  \ library
+  \ meson
+  \ message
+  \ option
+  \ project
+  \ run_command
+  \ run_target
+  \ set_variable
+  \ shared_library
+  \ shared_module
+  \ static_library
+  \ structured_sources
+  \ subdir
+  \ subdir_done
+  \ subproject
+  \ summary
+  \ target_machine
+  \ test
+  \ unset_variable
+  \ vcs_tag
+  \ warning
+  \ range
+  \ debug
+
+if exists("meson_space_error_highlight")
+  " trailing whitespace
+  syn match   mesonSpaceError	display excludenl "\s\+$"
+  " mixed tabs and spaces
+  syn match   mesonSpaceError	display " \+\t"
+  syn match   mesonSpaceError	display "\t\+ "
+endif
+
+" The default highlight links.  Can be overridden later.
+hi def link mesonStatement	Statement
+hi def link mesonConditional	Conditional
+hi def link mesonRepeat		Repeat
+hi def link mesonOperator	Operator
+hi def link mesonComment	Comment
+hi def link mesonTodo		Todo
+hi def link mesonString		String
+hi def link mesonEscape		Special
+hi def link mesonNumber		Number
+hi def link mesonBuiltin	Function
+hi def link mesonBoolean	Boolean
+if exists("meson_space_error_highlight")
+  hi def link mesonSpaceError	Error
+endif
+
+let b:current_syntax = "meson"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2 ts=8 noet:
--- a/devtools/meson/data/test.schema.json
+++ b/devtools/meson/data/test.schema.json
@ -0,0 +1,180 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "env": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "installed": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file",
+              "python_file",
+              "dir",
+              "exe",
+              "shared_lib",
+              "python_lib",
+              "python_bytecode",
+              "pdb",
+              "implib",
+              "py_implib",
+              "implibempty",
+              "expr"
+            ]
+          },
+          "platform": {
+            "type": "string",
+            "enum": [
+              "msvc",
+              "gcc",
+              "cygwin",
+              "!cygwin"
+            ]
+          },
+          "version": {
+            "type": "string"
+          },
+          "language": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "file",
+          "type"
+        ]
+      }
+    },
+    "matrix": {
+      "type": "object",
+      "properties": {
+        "options": {
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "val": {
+                  "type": ["string", "boolean", "null", "array"],
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "compilers": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                },
+                "skip_on_env": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "skip_on_jobname": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "skip_on_os": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              },
+              "required": [
+                "val"
+              ]
+            }
+          },
+          "exclude": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "additionalProperties": {
+                "type": ["string", "boolean", "array"],
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "do_not_set_opts": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "libdir",
+          "prefix"
+        ]
+      }
+    },
+    "tools": {
+      "type": "object"
+    },
+    "stdout": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "line": {
+            "type": "string"
+          },
+          "match": {
+            "type": "string",
+            "enum": [
+              "literal",
+              "re"
+            ]
+          },
+          "count": {
+            "type": "integer"
+          },
+          "comment": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "line"
+        ]
+      }
+    },
+    "skip_on_env": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "skip_on_jobname": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "skip_on_os": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}
--- a/devtools/meson/graphics/meson_logo.svg
+++ b/devtools/meson/graphics/meson_logo.svg
@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg1769"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="meson_logo.svg">
+  <defs
+     id="defs1763">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker4405"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4403"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2389"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path2392"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="369.10197"
+     inkscape:cy="819.78077"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1226"
+     inkscape:window-height="910"
+     inkscape:window-x="536"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1766">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       transform="matrix(0.20036166,0,0,0.20036166,28.277456,17.580208)"
+       id="g1745-3">
+      <path
+         sodipodi:nodetypes="cccccscscccccccccsccscsccc"
+         inkscape:connector-curvature="0"
+         id="path904-6-67"
+         d="m 33.334478,102.25658 -1.276087,23.80689 -0.0061,0.003 c -0.08934,1.57587 -0.55403,1.79754 -0.644545,1.88447 -0.420443,0.40386 -0.969288,0.27991 -1.431912,0.32133 -0.189719,0.0171 -0.274798,1.15962 0.04972,1.15962 0.403098,0 2.284665,-0.0926 2.707616,-0.0918 0.34244,5.3e-4 2.446519,0.0918 2.947819,0.0918 0.243445,0 0.370705,-1.03417 0.105626,-1.06723 -0.334434,-0.0417 -1.200125,-0.31005 -1.274063,-0.75434 -0.01017,-0.0614 -0.02059,-0.35182 -0.02945,-0.91973 l 0.703497,-13.30253 10.175621,17.27235 9.996785,-19.87488 1.204659,15.57675 c 0.0199,0.79989 -0.03947,1.50889 -0.07995,1.58096 -0.158144,0.28144 -0.595899,0.45144 -1.099501,0.58649 -0.3945,0.10571 -0.411138,0.90798 0.161424,0.90798 1.064556,0 2.202444,-0.25797 2.625396,-0.25717 0.342437,5.3e-4 3.41059,0.24547 4.337927,0.21604 0.374592,-0.0113 0.485723,-0.78623 0.09622,-0.87103 -0.660138,-0.14372 -1.863341,-0.68218 -2.085916,-1.20514 -0.04562,-0.10717 -0.451347,-1.17783 -0.52673,-1.76188 L 56.99415,102.32777 45.888836,124.45753 Z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccscccccccsccccscccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path906-7-5"
+         d="m 66.900973,102.70528 c -0.312317,-0.0246 -0.418637,0.62952 -0.05394,0.71112 1.198705,0.26826 1.543521,1.04959 1.766094,1.57255 0.04894,0.11494 0.445239,1.36695 0.44487,1.85292 -0.0047,6.12333 0.345802,12.15388 0.135426,18.22902 0.100256,1.2438 -0.193648,2.39 -0.509132,2.93519 -0.18505,0.31978 -0.884081,0.66664 -1.440569,0.67016 -0.227745,0.001 -0.331782,0.75651 -0.0072,0.75651 4.310608,-0.025 8.883044,0.006 12.816334,-0.002 l 2.7e-4,-0.0188 c 0.43124,-0.43502 1.5967,-2.08483 1.82958,-3.27069 0.18948,-0.52535 0.18474,-0.98124 -0.50683,-0.0127 -0.4636,0.64927 -0.59031,0.90175 -1.32429,1.151 -1.82289,0.3852 -4.59972,0.38331 -6.355561,0.0383 -0.986536,-0.19387 -1.839515,-0.67769 -1.853692,-2.07823 v -7.99646 h 5.990643 c 0.739256,0 1.31716,1.03942 1.3397,1.60391 0.0185,0.46295 0.74548,0.48307 0.75459,0.008 l 0.026,-4.50003 c 0.004,-0.53369 -0.7806,-0.56271 -0.7806,0.008 0,0.73447 -0.921892,0.73171 -1.42577,0.76963 -1.94137,0 -3.97512,0.0127 -5.953786,0.0127 v -9.80142 h 7.151596 l -2.7e-4,0.008 c 0.85429,0.46268 1.26608,1.01883 1.29024,1.6238 0.0185,0.46295 0.62893,0.48309 0.63805,0.008 l 0.0264,-3.43815 h -1.88473 -7.235748 c -0.478738,-0.0866 -0.972265,-0.15524 -1.413794,-0.20809 -1.617876,-0.19366 -2.63534,-0.4144 -3.398684,-0.6258 -0.02257,-0.006 -0.04421,-0.01 -0.06502,-0.0113 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccccccscsccccccc"
+         inkscape:connector-curvature="0"
+         id="path908-5-3"
+         d="m 94.757975,103.02543 c -0.11408,2e-4 -0.22964,0.003 -0.34695,0.006 -2.58595,0.0843 -6.698092,2.61617 -6.539972,6.86354 0.08677,2.33091 2.746652,5.60719 5.031322,7.5844 2.17308,1.88065 5.586685,3.44697 5.546319,6.10751 -0.051,2.28483 -1.805601,4.27404 -5.270909,4.27404 -2.16525,-0.11423 -3.141615,-0.16572 -4.533845,-1.52671 -0.56065,-0.552 -0.693139,-1.85564 -0.705019,-2.51927 l -1.239776,-0.008 -0.0264,4.0512 c 1.89697,1.15258 4.30363,1.78611 6.4362,1.74849 5.35562,-0.13555 7.674295,-3.30385 7.756735,-6.55447 0.20533,-4.55913 -3.157431,-6.63582 -5.844601,-8.78074 -2.23068,-1.78054 -4.734939,-3.06638 -4.734939,-6.03352 0,-1.27234 2.035285,-3.41774 4.601495,-3.57283 1.467869,-4.8e-4 2.663536,0.16339 3.582067,1.19225 0.523978,0.58691 0.91614,1.19386 0.92798,1.8575 l 0.983328,0.0553 -0.0352,-4.07423 c -0.581995,0.0175 -1.212055,-0.0524 -1.771445,-0.16946 -0.0364,-0.008 -0.0666,-0.01 -0.0969,-0.0127 -0.97967,-0.18924 -2.20726,-0.49013 -3.71961,-0.4877 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ssscsssccs"
+         inkscape:connector-curvature="0"
+         id="path910-3-5"
+         d="m 119.7033,102.99102 c -7.99363,0 -13.58284,5.8792 -13.58284,14.60148 0,6.01803 5.49465,12.43311 14.00323,12.43311 9.22108,0 13.84717,-7.21361 13.81967,-13.4888 -0.0281,-6.41474 -4.43284,-13.54579 -14.24006,-13.54579 z m 10.30799,14.57345 c -0.12272,8.03534 -4.17824,10.62033 -9.57356,10.69443 -6.14582,0.0844 -10.59665,-6.47237 -10.61036,-12.01292 -0.12109,-10.12036 6.15743,-11.49973 9.07137,-11.58569 8.43605,0.16046 11.18568,8.11371 11.11255,12.90418 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsccscscccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path917-5-62"
+         d="m 139.89961,102.70719 -0.37324,23.7168 c -0.014,0.89103 -0.17468,1.31752 -0.31805,1.554 -0.24039,0.39655 -0.86073,0.68583 -1.47275,0.6826 -0.26436,-0.001 -0.30089,0.82643 0.0236,0.82643 0.75747,0 2.67875,-0.21072 3.1017,-0.20992 0.34242,5.3e-4 1.8727,0.15573 3.08741,0.15657 0.61256,0 0.41837,-0.76043 0.095,-0.81871 -0.27055,-0.0488 -1.24066,-0.44168 -1.31459,-0.82412 -0.0284,-0.1467 -0.15685,-1.69371 -0.16868,-2.66273 -0.059,-4.83509 -0.071,-9.53141 -0.0523,-14.44595 l 21.14337,19.71286 -0.0541,-23.80413 c 0,-0.68938 0.17375,-1.20182 0.37143,-1.55761 0.28835,-0.51901 0.91397,-0.60476 1.40691,-0.64762 0.25291,-0.022 0.36676,-0.86034 -0.0658,-0.86034 -0.53725,0 -2.50677,0.0341 -3.07048,0.0331 -0.45641,-7.3e-4 -2.79852,-0.16948 -3.46655,-0.18148 -0.59648,-0.01 -0.51589,0.90058 0.0537,0.89521 1.1222,-0.01 1.47204,0.66995 1.7443,1.68232 0.0443,0.16517 0.21934,0.83734 0.29759,2.23392 l 0.13745,15.66736 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:#39207c;fill-opacity:1;stroke:none;stroke-width:1.71902049;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 181.30469 74.429688 C 161.46687 85.630004 149.15002 106.61558 149.03711 129.41016 C 169.79161 140.72574 194.16258 140.33981 213.04883 129.5293 C 213.05119 129.47468 213.05406 129.41962 213.05859 129.36523 C 213.03478 106.69297 200.93117 85.75333 181.30469 74.429688 z M 191.98438 98.699219 C 194.92554 100.69787 194.48939 105.50984 194.01562 108.80469 C 193.41277 112.43416 189.93299 118.40107 185.41211 122.29492 C 185.99691 123.1334 186.3389 124.16595 186.33398 125.26758 C 183.53249 126.68366 180.75263 125.08608 177.39062 122.20703 C 174.02862 119.32795 170.40256 113.55973 169.19922 107.63086 C 168.13189 107.74388 167.03897 107.50536 166.10156 106.91406 C 166.3464 103.58956 169.87486 101.6149 173.00195 100.44922 C 176.12905 99.283537 184.18515 98.888979 189.86523 100.9082 C 190.30813 99.978311 191.04179 99.196513 191.98438 98.701172 L 191.98438 98.699219 z "
+       transform="scale(0.26458333)"
+       id="path817-6-2-9-7-9-93-9-8-1" />
+    <g
+       transform="matrix(0.20036166,0,0,0.20036166,99.991867,3.1795752)"
+       id="g1745-3-3">
+      <path
+         sodipodi:nodetypes="cccccscscccccccccsccscsccc"
+         inkscape:connector-curvature="0"
+         id="path904-6-67-6"
+         d="m 33.334478,102.25658 -1.276087,23.80689 -0.0061,0.003 c -0.08934,1.57587 -0.55403,1.79754 -0.644545,1.88447 -0.420443,0.40386 -0.969288,0.27991 -1.431912,0.32133 -0.189719,0.0171 -0.274798,1.15962 0.04972,1.15962 0.403098,0 2.284665,-0.0926 2.707616,-0.0918 0.34244,5.3e-4 2.446519,0.0918 2.947819,0.0918 0.243445,0 0.370705,-1.03417 0.105626,-1.06723 -0.334434,-0.0417 -1.200125,-0.31005 -1.274063,-0.75434 -0.01017,-0.0614 -0.02059,-0.35182 -0.02945,-0.91973 l 0.703497,-13.30253 10.175621,17.27235 9.996785,-19.87488 1.204659,15.57675 c 0.0199,0.79989 -0.03947,1.50889 -0.07995,1.58096 -0.158144,0.28144 -0.595899,0.45144 -1.099501,0.58649 -0.3945,0.10571 -0.411138,0.90798 0.161424,0.90798 1.064556,0 2.202444,-0.25797 2.625396,-0.25717 0.342437,5.3e-4 3.41059,0.24547 4.337927,0.21604 0.374592,-0.0113 0.485723,-0.78623 0.09622,-0.87103 -0.660138,-0.14372 -1.863341,-0.68218 -2.085916,-1.20514 -0.04562,-0.10717 -0.451347,-1.17783 -0.52673,-1.76188 L 56.99415,102.32777 45.888836,124.45753 Z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccscccccccsccccscccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path906-7-5-7"
+         d="m 66.900973,102.70528 c -0.312317,-0.0246 -0.418637,0.62952 -0.05394,0.71112 1.198705,0.26826 1.543521,1.04959 1.766094,1.57255 0.04894,0.11494 0.445239,1.36695 0.44487,1.85292 -0.0047,6.12333 0.345802,12.15388 0.135426,18.22902 0.100256,1.2438 -0.193648,2.39 -0.509132,2.93519 -0.18505,0.31978 -0.884081,0.66664 -1.440569,0.67016 -0.227745,0.001 -0.331782,0.75651 -0.0072,0.75651 4.310608,-0.025 8.883044,0.006 12.816334,-0.002 l 2.7e-4,-0.0188 c 0.43124,-0.43502 1.5967,-2.08483 1.82958,-3.27069 0.18948,-0.52535 0.18474,-0.98124 -0.50683,-0.0127 -0.4636,0.64927 -0.59031,0.90175 -1.32429,1.151 -1.82289,0.3852 -4.59972,0.38331 -6.355561,0.0383 -0.986536,-0.19387 -1.839515,-0.67769 -1.853692,-2.07823 v -7.99646 h 5.990643 c 0.739256,0 1.31716,1.03942 1.3397,1.60391 0.0185,0.46295 0.74548,0.48307 0.75459,0.008 l 0.026,-4.50003 c 0.004,-0.53369 -0.7806,-0.56271 -0.7806,0.008 0,0.73447 -0.921892,0.73171 -1.42577,0.76963 -1.94137,0 -3.97512,0.0127 -5.953786,0.0127 v -9.80142 h 7.151596 l -2.7e-4,0.008 c 0.85429,0.46268 1.26608,1.01883 1.29024,1.6238 0.0185,0.46295 0.62893,0.48309 0.63805,0.008 l 0.0264,-3.43815 h -1.88473 -7.235748 c -0.478738,-0.0866 -0.972265,-0.15524 -1.413794,-0.20809 -1.617876,-0.19366 -2.63534,-0.4144 -3.398684,-0.6258 -0.02257,-0.006 -0.04421,-0.01 -0.06502,-0.0113 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccccccscsccccccc"
+         inkscape:connector-curvature="0"
+         id="path908-5-3-5"
+         d="m 94.757975,103.02543 c -0.11408,2e-4 -0.22964,0.003 -0.34695,0.006 -2.58595,0.0843 -6.698092,2.61617 -6.539972,6.86354 0.08677,2.33091 2.746652,5.60719 5.031322,7.5844 2.17308,1.88065 5.586685,3.44697 5.546319,6.10751 -0.051,2.28483 -1.805601,4.27404 -5.270909,4.27404 -2.16525,-0.11423 -3.141615,-0.16572 -4.533845,-1.52671 -0.56065,-0.552 -0.693139,-1.85564 -0.705019,-2.51927 l -1.239776,-0.008 -0.0264,4.0512 c 1.89697,1.15258 4.30363,1.78611 6.4362,1.74849 5.35562,-0.13555 7.674295,-3.30385 7.756735,-6.55447 0.20533,-4.55913 -3.157431,-6.63582 -5.844601,-8.78074 -2.23068,-1.78054 -4.734939,-3.06638 -4.734939,-6.03352 0,-1.27234 2.035285,-3.41774 4.601495,-3.57283 1.467869,-4.8e-4 2.663536,0.16339 3.582067,1.19225 0.523978,0.58691 0.91614,1.19386 0.92798,1.8575 l 0.983328,0.0553 -0.0352,-4.07423 c -0.581995,0.0175 -1.212055,-0.0524 -1.771445,-0.16946 -0.0364,-0.008 -0.0666,-0.01 -0.0969,-0.0127 -0.97967,-0.18924 -2.20726,-0.49013 -3.71961,-0.4877 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ssscsssccs"
+         inkscape:connector-curvature="0"
+         id="path910-3-5-3"
+         d="m 119.7033,102.99102 c -7.99363,0 -13.58284,5.8792 -13.58284,14.60148 0,6.01803 5.49465,12.43311 14.00323,12.43311 9.22108,0 13.84717,-7.21361 13.81967,-13.4888 -0.0281,-6.41474 -4.43284,-13.54579 -14.24006,-13.54579 z m 10.30799,14.57345 c -0.12272,8.03534 -4.17824,10.62033 -9.57356,10.69443 -6.14582,0.0844 -10.59665,-6.47237 -10.61036,-12.01292 -0.12109,-10.12036 6.15743,-11.49973 9.07137,-11.58569 8.43605,0.16046 11.18568,8.11371 11.11255,12.90418 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsccscscccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path917-5-62-5"
+         d="m 139.89961,102.70719 -0.37324,23.7168 c -0.014,0.89103 -0.17468,1.31752 -0.31805,1.554 -0.24039,0.39655 -0.86073,0.68583 -1.47275,0.6826 -0.26436,-0.001 -0.30089,0.82643 0.0236,0.82643 0.75747,0 2.67875,-0.21072 3.1017,-0.20992 0.34242,5.3e-4 1.8727,0.15573 3.08741,0.15657 0.61256,0 0.41837,-0.76043 0.095,-0.81871 -0.27055,-0.0488 -1.24066,-0.44168 -1.31459,-0.82412 -0.0284,-0.1467 -0.15685,-1.69371 -0.16868,-2.66273 -0.059,-4.83509 -0.071,-9.53141 -0.0523,-14.44595 l 21.14337,19.71286 -0.0541,-23.80413 c 0,-0.68938 0.17375,-1.20182 0.37143,-1.55761 0.28835,-0.51901 0.91397,-0.60476 1.40691,-0.64762 0.25291,-0.022 0.36676,-0.86034 -0.0658,-0.86034 -0.53725,0 -2.50677,0.0341 -3.07048,0.0331 -0.45641,-7.3e-4 -2.79852,-0.16948 -3.46655,-0.18148 -0.59648,-0.01 -0.51589,0.90058 0.0537,0.89521 1.1222,-0.01 1.47204,0.66995 1.7443,1.68232 0.0443,0.16517 0.21934,0.83734 0.29759,2.23392 l 0.13745,15.66736 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:#39207c;fill-opacity:1;stroke:none;stroke-width:0.99843764;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 373.3418 81.814453 C 361.82049 88.32 354.6691 100.50911 354.60352 113.74805 C 366.6581 120.32034 380.81178 120.09534 391.78125 113.81641 C 391.78261 113.78466 391.78414 113.75422 391.78516 113.72266 C 391.77004 100.55476 384.7423 88.391622 373.34375 81.814453 L 373.3418 81.814453 z M 379.54688 95.910156 C 381.25515 97.071012 381.00171 99.865586 380.72656 101.7793 C 380.37643 103.88736 378.35627 107.35361 375.73047 109.61523 C 376.0701 110.10224 376.26642 110.70195 376.26367 111.3418 C 374.63651 112.16428 373.02302 111.23666 371.07031 109.56445 C 369.1176 107.89224 367.01143 104.54125 366.3125 101.09766 C 365.69258 101.1633 365.05814 101.02509 364.51367 100.68164 C 364.65588 98.75071 366.70521 97.602831 368.52148 96.925781 C 370.33776 96.248751 375.01731 96.020561 378.31641 97.193359 C 378.57364 96.653261 378.99941 96.199807 379.54688 95.912109 L 379.54688 95.910156 z "
+       transform="scale(0.26458333)"
+       id="path817-6-2-9-7-9-93-9-8-1-2" />
+    <rect
+       style="fill:#05030c;fill-opacity:1;stroke:#a6a6a6;stroke-width:0.75042528;stroke-miterlimit:4;stroke-dasharray:0.75042529, 3.00170116;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1921"
+       width="114.10837"
+       height="46.072655"
+       x="34.699532"
+       y="83.369179" />
+    <g
+       id="g2039"
+       transform="translate(-52.349702,9.4494047)">
+      <path
+         sodipodi:nodetypes="cccccscscccccccccsccscsccc"
+         inkscape:connector-curvature="0"
+         id="path904-6-67-2"
+         d="m 94.6371,104.71582 -0.255679,4.76999 -0.0012,6e-4 c -0.0179,0.31574 -0.111006,0.36016 -0.129142,0.37758 -0.08424,0.0809 -0.194208,0.0561 -0.2869,0.0644 -0.03801,0.003 -0.05506,0.23234 0.01,0.23234 0.08076,0 0.457759,-0.0186 0.542502,-0.0184 0.06861,1e-4 0.490189,0.0184 0.59063,0.0184 0.04878,0 0.07428,-0.20721 0.02116,-0.21383 -0.06701,-0.008 -0.240459,-0.0621 -0.255274,-0.15114 -0.002,-0.0123 -0.0041,-0.0705 -0.0059,-0.18428 l 0.140953,-2.66532 2.038805,3.46072 2.002972,-3.98216 0.241368,3.12098 c 0.004,0.16027 -0.0079,0.30232 -0.01602,0.31676 -0.03169,0.0564 -0.119396,0.0905 -0.220298,0.11751 -0.07904,0.0212 -0.08238,0.18193 0.03234,0.18193 0.213296,0 0.441285,-0.0517 0.526029,-0.0515 0.06861,1.1e-4 0.683354,0.0492 0.869154,0.0433 0.075,-0.002 0.0973,-0.15753 0.0193,-0.17452 -0.13227,-0.0288 -0.37334,-0.13669 -0.41794,-0.24147 -0.009,-0.0215 -0.09043,-0.23599 -0.105534,-0.35301 l -0.600761,-4.65456 -2.22508,4.43396 z"
+         style="fill:#fffff1;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccscccccccsccccscccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path906-7-5-0"
+         d="m 101.36254,104.80572 c -0.0626,-0.005 -0.0839,0.12614 -0.0108,0.14248 0.24017,0.0538 0.30926,0.2103 0.35386,0.31508 0.01,0.023 0.0892,0.27389 0.0891,0.37126 -9.5e-4,1.22688 0.0693,2.43517 0.0271,3.65239 0.0201,0.24921 -0.0388,0.47887 -0.10201,0.5881 -0.0371,0.0641 -0.17714,0.13357 -0.28864,0.13428 -0.0456,2e-4 -0.0665,0.15157 -0.001,0.15157 0.86368,-0.005 1.77982,10e-4 2.5679,-4e-4 l 6e-5,-0.004 c 0.0864,-0.0872 0.31992,-0.41772 0.36658,-0.65532 0.038,-0.10526 0.037,-0.19661 -0.10155,-0.003 -0.0929,0.13009 -0.11828,0.18068 -0.26534,0.23062 -0.36524,0.0772 -0.92161,0.0768 -1.27341,0.008 -0.19767,-0.0388 -0.36857,-0.13578 -0.37141,-0.4164 v -1.60218 h 1.20029 c 0.14812,0 0.26391,0.20826 0.26843,0.32136 0.004,0.0928 0.14936,0.0968 0.15119,0.002 l 0.005,-0.90163 c 8e-4,-0.10693 -0.1564,-0.11274 -0.1564,0.002 0,0.14716 -0.18471,0.14661 -0.28567,0.15421 -0.38898,0 -0.79646,0.003 -1.19291,0.003 v -1.96383 h 1.4329 l -5e-5,0.002 c 0.17117,0.0927 0.25367,0.20413 0.25851,0.32534 0.004,0.0928 0.12602,0.0968 0.12785,0.002 l 0.005,-0.68888 h -0.37763 -1.44977 c -0.0959,-0.0173 -0.1948,-0.0311 -0.28327,-0.0417 -0.32416,-0.0388 -0.52802,-0.083 -0.68096,-0.12539 -0.005,-10e-4 -0.009,-0.002 -0.013,-0.002 z"
+         style="fill:#fffff1;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccccccscsccccccc"
+         inkscape:connector-curvature="0"
+         id="path908-5-3-2"
+         d="m 106.94401,104.86987 c -0.0229,4e-5 -0.046,6e-4 -0.0695,10e-4 -0.51812,0.0169 -1.34204,0.52418 -1.31036,1.37519 0.0174,0.46703 0.55033,1.12347 1.00809,1.51962 0.4354,0.37681 1.11936,0.69065 1.11127,1.22372 -0.0102,0.45779 -0.36178,0.85635 -1.05609,0.85635 -0.43383,-0.0229 -0.62946,-0.0332 -0.90841,-0.30589 -0.11233,-0.1106 -0.13888,-0.3718 -0.14126,-0.50477 l -0.2484,-0.002 -0.005,0.8117 c 0.38008,0.23094 0.86228,0.35787 1.28957,0.35033 1.07306,-0.0272 1.53763,-0.66196 1.55415,-1.31326 0.0411,-0.91348 -0.63263,-1.32957 -1.17104,-1.75933 -0.44694,-0.35675 -0.9487,-0.61438 -0.9487,-1.20888 0,-0.25493 0.4078,-0.68479 0.92197,-0.71586 0.2941,-1e-4 0.53367,0.0327 0.71771,0.23888 0.10498,0.1176 0.18356,0.23921 0.18593,0.37217 l 0.19702,0.0111 -0.007,-0.81632 c -0.11661,0.004 -0.24285,-0.0105 -0.35493,-0.034 -0.007,-0.002 -0.0133,-0.002 -0.0194,-0.003 -0.19629,-0.0379 -0.44225,-0.0982 -0.74527,-0.0977 z"
+         style="fill:#fffff1;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ssscsssccs"
+         inkscape:connector-curvature="0"
+         id="path910-3-5-37"
+         d="m 111.9421,104.86297 c -1.60162,0 -2.72148,1.17797 -2.72148,2.92558 0,1.20578 1.10092,2.49112 2.80571,2.49112 1.84755,0 2.77444,-1.44533 2.76893,-2.70264 -0.006,-1.28527 -0.88817,-2.71406 -2.85316,-2.71406 z m 2.06533,2.91997 c -0.0246,1.60997 -0.83716,2.1279 -1.91818,2.14275 -1.23138,0.0169 -2.12316,-1.29682 -2.12591,-2.40693 -0.0243,-2.02773 1.23372,-2.3041 1.81756,-2.32133 1.69026,0.0322 2.24118,1.62568 2.22653,2.58551 z"
+         style="fill:#fffff1;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsccscscccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path917-5-62-59"
+         d="m 115.98867,104.80611 -0.0748,4.75193 c -0.003,0.17853 -0.035,0.26398 -0.0637,0.31137 -0.0482,0.0795 -0.17246,0.13741 -0.29509,0.13676 -0.053,-2e-4 -0.0603,0.16559 0.005,0.16559 0.15177,0 0.53672,-0.0422 0.62147,-0.0421 0.0686,1e-4 0.37521,0.0312 0.61859,0.0314 0.12274,0 0.0838,-0.15236 0.019,-0.16404 -0.0542,-0.01 -0.24858,-0.0885 -0.26339,-0.16512 -0.006,-0.0294 -0.0314,-0.33936 -0.0338,-0.53351 -0.0118,-0.96877 -0.0142,-1.90973 -0.0105,-2.89442 l 4.23632,3.94971 -0.0108,-4.76944 c 0,-0.13812 0.0348,-0.2408 0.0744,-0.31208 0.0578,-0.10399 0.18312,-0.12118 0.28189,-0.12976 0.0507,-0.004 0.0735,-0.17238 -0.0132,-0.17238 -0.10764,0 -0.50226,0.007 -0.61521,0.007 -0.0915,-1.5e-4 -0.56071,-0.034 -0.69456,-0.0364 -0.11951,-0.002 -0.10336,0.18044 0.0108,0.17936 0.22485,-0.002 0.29494,0.13424 0.34949,0.33708 0.009,0.0331 0.0439,0.16777 0.0596,0.44759 l 0.0275,3.13914 z"
+         style="fill:#fffff1;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path817-6-2-9-7-9-93-9-8-1-22"
+         d="m 107.65089,86.340169 c -5.24875,2.963417 -8.507587,8.515851 -8.537461,14.546921 5.491291,2.99391 11.939451,2.8918 16.936431,0.0315 5.3e-4,-0.0144 0.001,-0.029 0.003,-0.0434 -0.006,-5.998704 -3.20866,-11.538984 -8.4015,-14.535031 z m 2.82567,6.421313 c 0.77818,0.52881 0.66278,1.801977 0.53743,2.67374 -0.1595,0.960297 -1.08019,2.539037 -2.27634,3.569287 0.15473,0.22185 0.24521,0.49505 0.24391,0.78652 -0.74123,0.374671 -1.47673,-0.048 -2.36626,-0.80977 -0.88953,-0.76176 -1.84893,-2.287933 -2.16731,-3.856613 -0.2824,0.0299 -0.57157,-0.03321 -0.81959,-0.189654 0.0648,-0.879607 0.99835,-1.402069 1.82573,-1.710489 0.82737,-0.30842 2.95888,-0.412813 4.46174,0.121439 0.11718,-0.246033 0.3113,-0.452884 0.56069,-0.583943 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.45482418;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.20036166,0,0,0.20036166,28.237911,51.343593)"
+       id="g1745-3-8">
+      <path
+         sodipodi:nodetypes="cccccscscccccccccsccscsccc"
+         inkscape:connector-curvature="0"
+         id="path904-6-67-9"
+         d="m 33.334478,102.25658 -1.276087,23.80689 -0.0061,0.003 c -0.08934,1.57587 -0.55403,1.79754 -0.644545,1.88447 -0.420443,0.40386 -0.969288,0.27991 -1.431912,0.32133 -0.189719,0.0171 -0.274798,1.15962 0.04972,1.15962 0.403098,0 2.284665,-0.0926 2.707616,-0.0918 0.34244,5.3e-4 2.446519,0.0918 2.947819,0.0918 0.243445,0 0.370705,-1.03417 0.105626,-1.06723 -0.334434,-0.0417 -1.200125,-0.31005 -1.274063,-0.75434 -0.01017,-0.0614 -0.02059,-0.35182 -0.02945,-0.91973 l 0.703497,-13.30253 10.175621,17.27235 9.996785,-19.87488 1.204659,15.57675 c 0.0199,0.79989 -0.03947,1.50889 -0.07995,1.58096 -0.158144,0.28144 -0.595899,0.45144 -1.099501,0.58649 -0.3945,0.10571 -0.411138,0.90798 0.161424,0.90798 1.064556,0 2.202444,-0.25797 2.625396,-0.25717 0.342437,5.3e-4 3.41059,0.24547 4.337927,0.21604 0.374592,-0.0113 0.485723,-0.78623 0.09622,-0.87103 -0.660138,-0.14372 -1.863341,-0.68218 -2.085916,-1.20514 -0.04562,-0.10717 -0.451347,-1.17783 -0.52673,-1.76188 L 56.99415,102.32777 45.888836,124.45753 Z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccscccccccsccccscccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path906-7-5-73"
+         d="m 66.900973,102.70528 c -0.312317,-0.0246 -0.418637,0.62952 -0.05394,0.71112 1.198705,0.26826 1.543521,1.04959 1.766094,1.57255 0.04894,0.11494 0.445239,1.36695 0.44487,1.85292 -0.0047,6.12333 0.345802,12.15388 0.135426,18.22902 0.100256,1.2438 -0.193648,2.39 -0.509132,2.93519 -0.18505,0.31978 -0.884081,0.66664 -1.440569,0.67016 -0.227745,0.001 -0.331782,0.75651 -0.0072,0.75651 4.310608,-0.025 8.883044,0.006 12.816334,-0.002 l 2.7e-4,-0.0188 c 0.43124,-0.43502 1.5967,-2.08483 1.82958,-3.27069 0.18948,-0.52535 0.18474,-0.98124 -0.50683,-0.0127 -0.4636,0.64927 -0.59031,0.90175 -1.32429,1.151 -1.82289,0.3852 -4.59972,0.38331 -6.355561,0.0383 -0.986536,-0.19387 -1.839515,-0.67769 -1.853692,-2.07823 v -7.99646 h 5.990643 c 0.739256,0 1.31716,1.03942 1.3397,1.60391 0.0185,0.46295 0.74548,0.48307 0.75459,0.008 l 0.026,-4.50003 c 0.004,-0.53369 -0.7806,-0.56271 -0.7806,0.008 0,0.73447 -0.921892,0.73171 -1.42577,0.76963 -1.94137,0 -3.97512,0.0127 -5.953786,0.0127 v -9.80142 h 7.151596 l -2.7e-4,0.008 c 0.85429,0.46268 1.26608,1.01883 1.29024,1.6238 0.0185,0.46295 0.62893,0.48309 0.63805,0.008 l 0.0264,-3.43815 h -1.88473 -7.235748 c -0.478738,-0.0866 -0.972265,-0.15524 -1.413794,-0.20809 -1.617876,-0.19366 -2.63534,-0.4144 -3.398684,-0.6258 -0.02257,-0.006 -0.04421,-0.01 -0.06502,-0.0113 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccccccscsccccccc"
+         inkscape:connector-curvature="0"
+         id="path908-5-3-6"
+         d="m 94.757975,103.02543 c -0.11408,2e-4 -0.22964,0.003 -0.34695,0.006 -2.58595,0.0843 -6.698092,2.61617 -6.539972,6.86354 0.08677,2.33091 2.746652,5.60719 5.031322,7.5844 2.17308,1.88065 5.586685,3.44697 5.546319,6.10751 -0.051,2.28483 -1.805601,4.27404 -5.270909,4.27404 -2.16525,-0.11423 -3.141615,-0.16572 -4.533845,-1.52671 -0.56065,-0.552 -0.693139,-1.85564 -0.705019,-2.51927 l -1.239776,-0.008 -0.0264,4.0512 c 1.89697,1.15258 4.30363,1.78611 6.4362,1.74849 5.35562,-0.13555 7.674295,-3.30385 7.756735,-6.55447 0.20533,-4.55913 -3.157431,-6.63582 -5.844601,-8.78074 -2.23068,-1.78054 -4.734939,-3.06638 -4.734939,-6.03352 0,-1.27234 2.035285,-3.41774 4.601495,-3.57283 1.467869,-4.8e-4 2.663536,0.16339 3.582067,1.19225 0.523978,0.58691 0.91614,1.19386 0.92798,1.8575 l 0.983328,0.0553 -0.0352,-4.07423 c -0.581995,0.0175 -1.212055,-0.0524 -1.771445,-0.16946 -0.0364,-0.008 -0.0666,-0.01 -0.0969,-0.0127 -0.97967,-0.18924 -2.20726,-0.49013 -3.71961,-0.4877 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ssscsssccs"
+         inkscape:connector-curvature="0"
+         id="path910-3-5-1"
+         d="m 119.7033,102.99102 c -7.99363,0 -13.58284,5.8792 -13.58284,14.60148 0,6.01803 5.49465,12.43311 14.00323,12.43311 9.22108,0 13.84717,-7.21361 13.81967,-13.4888 -0.0281,-6.41474 -4.43284,-13.54579 -14.24006,-13.54579 z m 10.30799,14.57345 c -0.12272,8.03534 -4.17824,10.62033 -9.57356,10.69443 -6.14582,0.0844 -10.59665,-6.47237 -10.61036,-12.01292 -0.12109,-10.12036 6.15743,-11.49973 9.07137,-11.58569 8.43605,0.16046 11.18568,8.11371 11.11255,12.90418 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsccscscccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path917-5-62-2"
+         d="m 139.89961,102.70719 -0.37324,23.7168 c -0.014,0.89103 -0.17468,1.31752 -0.31805,1.554 -0.24039,0.39655 -0.86073,0.68583 -1.47275,0.6826 -0.26436,-0.001 -0.30089,0.82643 0.0236,0.82643 0.75747,0 2.67875,-0.21072 3.1017,-0.20992 0.34242,5.3e-4 1.8727,0.15573 3.08741,0.15657 0.61256,0 0.41837,-0.76043 0.095,-0.81871 -0.27055,-0.0488 -1.24066,-0.44168 -1.31459,-0.82412 -0.0284,-0.1467 -0.15685,-1.69371 -0.16868,-2.66273 -0.059,-4.83509 -0.071,-9.53141 -0.0523,-14.44595 l 21.14337,19.71286 -0.0541,-23.80413 c 0,-0.68938 0.17375,-1.20182 0.37143,-1.55761 0.28835,-0.51901 0.91397,-0.60476 1.40691,-0.64762 0.25291,-0.022 0.36676,-0.86034 -0.0658,-0.86034 -0.53725,0 -2.50677,0.0341 -3.07048,0.0331 -0.45641,-7.3e-4 -2.79852,-0.16948 -3.46655,-0.18148 -0.59648,-0.01 -0.51589,0.90058 0.0537,0.89521 1.1222,-0.01 1.47204,0.66995 1.7443,1.68232 0.0443,0.16517 0.21934,0.83734 0.29759,2.23392 l 0.13745,15.66736 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.45482418;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 47.930655,53.45624 c -5.248756,2.963417 -8.507589,8.51585 -8.537463,14.546917 5.491294,2.993913 11.939447,2.891803 16.936434,0.03152 5.29e-4,-0.01445 0.0013,-0.02902 0.0026,-0.04341 -0.0063,-5.9987 -3.208668,-11.53898 -8.401507,-14.535027 z m 2.825668,6.421313 c 0.778182,0.52881 0.662784,1.801977 0.537433,2.673739 -0.159504,0.960298 -1.080196,2.539043 -2.276346,3.569291 0.154729,0.221847 0.245213,0.495043 0.243912,0.786516 -0.741228,0.374671 -1.476732,-0.04802 -2.366264,-0.809771 -0.889529,-0.761756 -1.848925,-2.287931 -2.167308,-3.856611 -0.282398,0.0299 -0.571566,-0.03321 -0.819589,-0.189654 0.06478,-0.879607 0.998352,-1.402069 1.825728,-1.710489 0.827378,-0.30842 2.958888,-0.412813 4.461743,0.121439 0.117184,-0.246033 0.311298,-0.452884 0.560691,-0.583943 z"
+       id="path817-6-2-9-7-9-93-9-8-1-9" />
+    <g
+       transform="matrix(0.20036166,0,0,0.20036166,98.564859,40.45489)"
+       id="g1745-3-3-3">
+      <path
+         sodipodi:nodetypes="cccccscscccccccccsccscsccc"
+         inkscape:connector-curvature="0"
+         id="path904-6-67-6-1"
+         d="m 33.334478,102.25658 -1.276087,23.80689 -0.0061,0.003 c -0.08934,1.57587 -0.55403,1.79754 -0.644545,1.88447 -0.420443,0.40386 -0.969288,0.27991 -1.431912,0.32133 -0.189719,0.0171 -0.274798,1.15962 0.04972,1.15962 0.403098,0 2.284665,-0.0926 2.707616,-0.0918 0.34244,5.3e-4 2.446519,0.0918 2.947819,0.0918 0.243445,0 0.370705,-1.03417 0.105626,-1.06723 -0.334434,-0.0417 -1.200125,-0.31005 -1.274063,-0.75434 -0.01017,-0.0614 -0.02059,-0.35182 -0.02945,-0.91973 l 0.703497,-13.30253 10.175621,17.27235 9.996785,-19.87488 1.204659,15.57675 c 0.0199,0.79989 -0.03947,1.50889 -0.07995,1.58096 -0.158144,0.28144 -0.595899,0.45144 -1.099501,0.58649 -0.3945,0.10571 -0.411138,0.90798 0.161424,0.90798 1.064556,0 2.202444,-0.25797 2.625396,-0.25717 0.342437,5.3e-4 3.41059,0.24547 4.337927,0.21604 0.374592,-0.0113 0.485723,-0.78623 0.09622,-0.87103 -0.660138,-0.14372 -1.863341,-0.68218 -2.085916,-1.20514 -0.04562,-0.10717 -0.451347,-1.17783 -0.52673,-1.76188 L 56.99415,102.32777 45.888836,124.45753 Z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccscccccccsccccscccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path906-7-5-7-9"
+         d="m 66.900973,102.70528 c -0.312317,-0.0246 -0.418637,0.62952 -0.05394,0.71112 1.198705,0.26826 1.543521,1.04959 1.766094,1.57255 0.04894,0.11494 0.445239,1.36695 0.44487,1.85292 -0.0047,6.12333 0.345802,12.15388 0.135426,18.22902 0.100256,1.2438 -0.193648,2.39 -0.509132,2.93519 -0.18505,0.31978 -0.884081,0.66664 -1.440569,0.67016 -0.227745,0.001 -0.331782,0.75651 -0.0072,0.75651 4.310608,-0.025 8.883044,0.006 12.816334,-0.002 l 2.7e-4,-0.0188 c 0.43124,-0.43502 1.5967,-2.08483 1.82958,-3.27069 0.18948,-0.52535 0.18474,-0.98124 -0.50683,-0.0127 -0.4636,0.64927 -0.59031,0.90175 -1.32429,1.151 -1.82289,0.3852 -4.59972,0.38331 -6.355561,0.0383 -0.986536,-0.19387 -1.839515,-0.67769 -1.853692,-2.07823 v -7.99646 h 5.990643 c 0.739256,0 1.31716,1.03942 1.3397,1.60391 0.0185,0.46295 0.74548,0.48307 0.75459,0.008 l 0.026,-4.50003 c 0.004,-0.53369 -0.7806,-0.56271 -0.7806,0.008 0,0.73447 -0.921892,0.73171 -1.42577,0.76963 -1.94137,0 -3.97512,0.0127 -5.953786,0.0127 v -9.80142 h 7.151596 l -2.7e-4,0.008 c 0.85429,0.46268 1.26608,1.01883 1.29024,1.6238 0.0185,0.46295 0.62893,0.48309 0.63805,0.008 l 0.0264,-3.43815 h -1.88473 -7.235748 c -0.478738,-0.0866 -0.972265,-0.15524 -1.413794,-0.20809 -1.617876,-0.19366 -2.63534,-0.4144 -3.398684,-0.6258 -0.02257,-0.006 -0.04421,-0.01 -0.06502,-0.0113 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccccccscsccccccc"
+         inkscape:connector-curvature="0"
+         id="path908-5-3-5-4"
+         d="m 94.757975,103.02543 c -0.11408,2e-4 -0.22964,0.003 -0.34695,0.006 -2.58595,0.0843 -6.698092,2.61617 -6.539972,6.86354 0.08677,2.33091 2.746652,5.60719 5.031322,7.5844 2.17308,1.88065 5.586685,3.44697 5.546319,6.10751 -0.051,2.28483 -1.805601,4.27404 -5.270909,4.27404 -2.16525,-0.11423 -3.141615,-0.16572 -4.533845,-1.52671 -0.56065,-0.552 -0.693139,-1.85564 -0.705019,-2.51927 l -1.239776,-0.008 -0.0264,4.0512 c 1.89697,1.15258 4.30363,1.78611 6.4362,1.74849 5.35562,-0.13555 7.674295,-3.30385 7.756735,-6.55447 0.20533,-4.55913 -3.157431,-6.63582 -5.844601,-8.78074 -2.23068,-1.78054 -4.734939,-3.06638 -4.734939,-6.03352 0,-1.27234 2.035285,-3.41774 4.601495,-3.57283 1.467869,-4.8e-4 2.663536,0.16339 3.582067,1.19225 0.523978,0.58691 0.91614,1.19386 0.92798,1.8575 l 0.983328,0.0553 -0.0352,-4.07423 c -0.581995,0.0175 -1.212055,-0.0524 -1.771445,-0.16946 -0.0364,-0.008 -0.0666,-0.01 -0.0969,-0.0127 -0.97967,-0.18924 -2.20726,-0.49013 -3.71961,-0.4877 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ssscsssccs"
+         inkscape:connector-curvature="0"
+         id="path910-3-5-3-7"
+         d="m 119.7033,102.99102 c -7.99363,0 -13.58284,5.8792 -13.58284,14.60148 0,6.01803 5.49465,12.43311 14.00323,12.43311 9.22108,0 13.84717,-7.21361 13.81967,-13.4888 -0.0281,-6.41474 -4.43284,-13.54579 -14.24006,-13.54579 z m 10.30799,14.57345 c -0.12272,8.03534 -4.17824,10.62033 -9.57356,10.69443 -6.14582,0.0844 -10.59665,-6.47237 -10.61036,-12.01292 -0.12109,-10.12036 6.15743,-11.49973 9.07137,-11.58569 8.43605,0.16046 11.18568,8.11371 11.11255,12.90418 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsccscscccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path917-5-62-5-8"
+         d="m 139.89961,102.70719 -0.37324,23.7168 c -0.014,0.89103 -0.17468,1.31752 -0.31805,1.554 -0.24039,0.39655 -0.86073,0.68583 -1.47275,0.6826 -0.26436,-0.001 -0.30089,0.82643 0.0236,0.82643 0.75747,0 2.67875,-0.21072 3.1017,-0.20992 0.34242,5.3e-4 1.8727,0.15573 3.08741,0.15657 0.61256,0 0.41837,-0.76043 0.095,-0.81871 -0.27055,-0.0488 -1.24066,-0.44168 -1.31459,-0.82412 -0.0284,-0.1467 -0.15685,-1.69371 -0.16868,-2.66273 -0.059,-4.83509 -0.071,-9.53141 -0.0523,-14.44595 l 21.14337,19.71286 -0.0541,-23.80413 c 0,-0.68938 0.17375,-1.20182 0.37143,-1.55761 0.28835,-0.51901 0.91397,-0.60476 1.40691,-0.64762 0.25291,-0.022 0.36676,-0.86034 -0.0658,-0.86034 -0.53725,0 -2.50677,0.0341 -3.07048,0.0331 -0.45641,-7.3e-4 -2.79852,-0.16948 -3.46655,-0.18148 -0.59648,-0.01 -0.51589,0.90058 0.0537,0.89521 1.1222,-0.01 1.47204,0.66995 1.7443,1.68232 0.0443,0.16517 0.21934,0.83734 0.29759,2.23392 l 0.13745,15.66736 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26416996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.353009,58.922056 c -3.04835,1.721259 -4.94049,4.946295 -4.95784,8.449097 3.18944,1.738919 6.93427,1.679388 9.836611,0.0181 2.7e-4,-0.0084 7.9e-4,-0.01646 0.001,-0.02479 -0.004,-3.484006 -1.86342,-6.70217 -4.879291,-8.442379 z m 1.64176,3.729488 c 0.45198,0.307143 0.38492,1.046541 0.31212,1.552878 -0.0926,0.557757 -0.62713,1.474869 -1.32188,2.073256 0.0899,0.128855 0.14181,0.287528 0.14108,0.456822 -0.43052,0.217614 -0.85742,-0.02782 -1.37408,-0.470257 -0.51665,-0.442439 -1.07391,-1.329055 -1.25884,-2.240172 -0.16402,0.01736 -0.33188,-0.01921 -0.47594,-0.110072 0.0376,-0.510892 0.57985,-0.814601 1.0604,-0.993738 0.48056,-0.17913 1.71869,-0.239506 2.59158,0.0708 0.0681,-0.142901 0.18071,-0.262877 0.32556,-0.338997 z"
+       id="path817-6-2-9-7-9-93-9-8-1-2-4" />
+    <g
+       id="g2084"
+       transform="translate(-9.8273809,24.379464)">
+      <path
+         sodipodi:nodetypes="cccccscscccccccccsccscsccc"
+         inkscape:connector-curvature="0"
+         id="path904-6-67-6-1-0"
+         d="m 114.69321,80.219973 -0.25568,4.769988 -10e-4,6.01e-4 c -0.0179,0.315744 -0.11101,0.360158 -0.12914,0.377576 -0.0842,0.08092 -0.19421,0.05608 -0.2869,0.06438 -0.038,0.0034 -0.0551,0.232343 0.01,0.232343 0.0808,0 0.45776,-0.01855 0.5425,-0.01839 0.0686,1.06e-4 0.49019,0.01839 0.59063,0.01839 0.0488,0 0.0743,-0.207208 0.0212,-0.213832 -0.067,-0.0084 -0.24046,-0.06212 -0.25528,-0.15114 -0.002,-0.0123 -0.004,-0.07049 -0.006,-0.184279 l 0.14096,-2.665317 2.0388,3.460717 2.00297,-3.982164 0.24137,3.120983 c 0.004,0.160267 -0.008,0.302324 -0.016,0.316764 -0.0317,0.05639 -0.11939,0.09045 -0.2203,0.11751 -0.079,0.02118 -0.0824,0.181924 0.0323,0.181924 0.21329,0 0.44128,-0.05169 0.52602,-0.05153 0.0686,1.07e-4 0.68336,0.04918 0.86916,0.04329 0.0751,-0.0023 0.0973,-0.157531 0.0193,-0.174521 -0.13227,-0.0288 -0.37334,-0.136683 -0.41794,-0.241464 -0.009,-0.02147 -0.0904,-0.235992 -0.10554,-0.353014 l -0.60076,-4.654553 -2.22508,4.433955 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccscccccccsccccscccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path906-7-5-7-9-3"
+         d="m 121.41865,80.309875 c -0.0626,-0.0049 -0.0839,0.126132 -0.0108,0.142482 0.24018,0.05375 0.30926,0.210297 0.35386,0.315078 0.01,0.02303 0.0892,0.273885 0.0891,0.371254 -9.4e-4,1.226881 0.0693,2.435172 0.0271,3.652397 0.0201,0.24921 -0.0388,0.478865 -0.10201,0.5881 -0.0371,0.06407 -0.17714,0.133569 -0.28864,0.134274 -0.0456,2e-4 -0.0665,0.151576 -0.001,0.151576 0.86368,-0.005 1.77982,0.0012 2.5679,-4.01e-4 l 6e-5,-0.0038 c 0.0864,-0.08716 0.31991,-0.41772 0.36657,-0.655321 0.038,-0.10526 0.037,-0.196603 -0.10154,-0.0025 -0.0929,0.130088 -0.11828,0.180676 -0.26534,0.230616 -0.36524,0.07718 -0.92161,0.0768 -1.27341,0.0077 -0.19767,-0.03884 -0.36857,-0.135783 -0.37141,-0.416398 v -1.602184 h 1.20029 c 0.14812,0 0.26391,0.20826 0.26843,0.321362 0.004,0.09276 0.14936,0.09679 0.15119,0.0016 l 0.005,-0.901633 c 8e-4,-0.106931 -0.1564,-0.112746 -0.1564,0.0016 0,0.147159 -0.18472,0.146606 -0.28567,0.154204 -0.38898,0 -0.79646,0.0025 -1.19291,0.0025 v -1.963828 h 1.4329 l -5e-5,0.0016 c 0.17117,0.0927 0.25367,0.204134 0.25851,0.325347 0.004,0.09276 0.12602,0.09679 0.12784,0.0016 l 0.005,-0.688874 h -0.37762 -1.44977 c -0.0959,-0.01735 -0.19481,-0.0311 -0.28327,-0.04169 -0.32416,-0.0388 -0.52802,-0.08303 -0.68097,-0.125386 -0.005,-0.0012 -0.009,-0.002 -0.013,-0.0023 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccccccscsccccccc"
+         inkscape:connector-curvature="0"
+         id="path908-5-3-5-4-6"
+         d="m 127.00013,80.374021 c -0.0229,4e-5 -0.046,6.01e-4 -0.0695,0.0012 -0.51813,0.01689 -1.34204,0.524181 -1.31036,1.375191 0.0174,0.467025 0.55032,1.123466 1.00808,1.519623 0.43541,0.37681 1.11936,0.69064 1.11127,1.22371 -0.0102,0.457793 -0.36177,0.856354 -1.05608,0.856354 -0.43384,-0.02289 -0.62946,-0.0332 -0.90841,-0.305894 -0.11234,-0.1106 -0.13888,-0.371799 -0.14126,-0.504765 l -0.24841,-0.0016 -0.005,0.811705 c 0.38008,0.230933 0.86228,0.357868 1.28956,0.350331 1.07306,-0.02716 1.53764,-0.661965 1.55416,-1.313265 0.0411,-0.913475 -0.63263,-1.329564 -1.17104,-1.759324 -0.44694,-0.356752 -0.9487,-0.614385 -0.9487,-1.208886 0,-0.254928 0.40779,-0.684784 0.92196,-0.715858 0.29411,-9.6e-5 0.53367,0.03274 0.71771,0.238881 0.10499,0.117595 0.18356,0.239204 0.18593,0.372172 l 0.19703,0.01108 -0.007,-0.816319 c -0.11661,0.0035 -0.24285,-0.0105 -0.35493,-0.03395 -0.007,-0.0016 -0.0133,-0.002 -0.0194,-0.0025 -0.19629,-0.03792 -0.44225,-0.0982 -0.74527,-0.09772 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ssscsssccs"
+         inkscape:connector-curvature="0"
+         id="path910-3-5-3-7-1"
+         d="m 131.99821,80.367127 c -1.60162,0 -2.72148,1.177966 -2.72148,2.925577 0,1.205782 1.10092,2.491118 2.80571,2.491118 1.84755,0 2.77444,-1.445331 2.76893,-2.702638 -0.006,-1.285268 -0.88817,-2.714057 -2.85316,-2.714057 z m 2.06533,2.91996 c -0.0246,1.609974 -0.83716,2.127907 -1.91818,2.142754 -1.23138,0.01691 -2.12316,-1.296815 -2.12591,-2.406928 -0.0243,-2.027733 1.23372,-2.304105 1.81756,-2.321329 1.69026,0.03215 2.24118,1.625677 2.22653,2.585503 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsccscscccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path917-5-62-5-8-0"
+         d="m 136.04478,80.310258 -0.0748,4.751938 c -0.003,0.178528 -0.035,0.26398 -0.0637,0.311362 -0.0482,0.07945 -0.17246,0.137414 -0.29508,0.136766 -0.053,-2e-4 -0.0603,0.165585 0.005,0.165585 0.15176,0 0.53671,-0.04222 0.62146,-0.04206 0.0686,1.07e-4 0.37522,0.0312 0.6186,0.03137 0.12273,0 0.0838,-0.152361 0.019,-0.164038 -0.0542,-0.0098 -0.24858,-0.0885 -0.26339,-0.165122 -0.006,-0.02939 -0.0314,-0.339355 -0.0338,-0.533509 -0.0118,-0.968767 -0.0142,-1.909729 -0.0105,-2.894415 l 4.23632,3.949702 -0.0108,-4.769435 c 0,-0.138126 0.0348,-0.240799 0.0744,-0.312086 0.0578,-0.103989 0.18313,-0.12117 0.28189,-0.129758 0.0507,-0.0044 0.0735,-0.172379 -0.0132,-0.172379 -0.10764,0 -0.50226,0.0068 -0.61521,0.0066 -0.0914,-1.46e-4 -0.56071,-0.03396 -0.69456,-0.03636 -0.11951,-0.002 -0.10336,0.180442 0.0108,0.179366 0.22484,-0.002 0.29494,0.134232 0.34949,0.337072 0.009,0.03309 0.0439,0.167771 0.0596,0.447592 l 0.0275,3.139139 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.05301235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26416996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 96.975039,102.57831 c -3.04835,1.72126 -4.94049,4.94629 -4.95784,8.44909 3.18944,1.73892 6.93427,1.67939 9.836611,0.0181 2.6e-4,-0.008 7.9e-4,-0.0165 0.001,-0.0248 -0.004,-3.484 -1.863431,-6.70217 -4.879301,-8.44238 z m 1.64176,3.72948 c 0.45198,0.30715 0.38492,1.04655 0.31212,1.55288 -0.0926,0.55776 -0.62713,1.47487 -1.32188,2.07326 0.0899,0.12885 0.14181,0.28753 0.14108,0.45682 -0.43052,0.21761 -0.85742,-0.0278 -1.37408,-0.47026 -0.51665,-0.44244 -1.07391,-1.32905 -1.25884,-2.24017 -0.16403,0.0174 -0.33188,-0.0192 -0.47594,-0.11007 0.0376,-0.51089 0.57985,-0.8146 1.0604,-0.99374 0.48056,-0.17913 1.71868,-0.2395 2.59158,0.0708 0.0681,-0.1429 0.18071,-0.26288 0.32556,-0.339 z"
+       id="path817-6-2-9-7-9-93-9-8-1-2-4-6" />
+  </g>
+</svg>
--- a/devtools/meson/graphics/meson_logo_big.png
+++ b/devtools/meson/graphics/meson_logo_big.png
--- a/devtools/meson/graphics/wrap_logo.svg
+++ b/devtools/meson/graphics/wrap_logo.svg
@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="wrap_logo.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="357.33594"
+     inkscape:cy="840.95374"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="901"
+     inkscape:window-height="504"
+     inkscape:window-x="196"
+     inkscape:window-y="73"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3755" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#d0c719;fill-opacity:1;stroke:none;stroke-opacity:1"
+       d="m 434.2897,70.235258 c 17.21481,0 47.14006,0.84934 60.97457,13.17571 13.83451,12.32637 16.84556,17.452272 19.09172,35.519332 2.08905,16.80337 2.6481,33.71944 1.49162,50.37795 -3.07225,20.81514 -5.13462,47.62599 -12.05413,67.63597 -6.23548,30.42038 -13.58284,55.16492 -25.9691,83.71647 -5.06527,13.28778 -16.76769,22.55743 -30.27757,25.94896 -15.50334,3.30801 -29.68022,2.91134 -46.74465,1.2459 -14.78626,-1.27468 -30.83798,-17.06625 -32.88238,-34.59782 -2.02303,-17.34845 -1.73385,-22.0552 -3.2728,-37.6258 0.19443,-8.76313 -6.34424,-22.76616 -16.45974,-22.40304 -9.56867,0.34349 -16.48036,12.71843 -17.51509,20.93495 -2.35599,18.70837 0.6551,19.81684 -2.94334,37.3491 -3.59844,17.53227 -14.18885,33.04354 -30.48873,36.54073 -16.26809,2.12031 -28.63094,2.71731 -46.02053,-0.49697 -18.07396,-3.34079 -26.93793,-12.81813 -33.62878,-26.59299 -6.73685,-13.86957 -10.49571,-27.84178 -16.21017,-43.09018 -4.88864,-13.04479 -8.56125,-29.18305 -10.94268,-42.92889 -3.32552,-15.18288 -3.65237,-21.38717 -6.77781,-36.57323 -0.77923,-16.65538 -4.45192,-19.80725 -5.02299,-35.71533 -0.35582,-9.91195 0.29524,-39.12315 2.43742,-46.76046 2.93782,-13.52423 7.12707,-26.026872 16.79636,-33.209232 12.64781,-8.53102 33.08952,-11.60259 47.55104,-12.32486 18.33849,-0.12627 30.65715,-1.24014 48.96624,1.08017 14.10098,2.78518 21.50029,13.82094 20.71192,29.392272 -1.06365,21.00843 -21.00671,22.03777 -35.65227,22.0668 -14.64556,0.029 -35.24942,0.73393 -37.06929,19.42192 -2.88023,18.22229 -0.38467,36.76259 2.58508,54.95764 2.30841,16.30474 8.74904,35.18114 15.47418,50.2434 1.96378,11.35395 19.50871,15.47996 23.80866,4.84187 5.41476,-8.88335 4.61169,-19.77502 7.41008,-29.84512 2.83889,-10.21585 1.44479,-19.7209 5.44492,-32.54371 4.76333,-15.2693 4.62217,-18.45204 20.66557,-24.86079 15.69676,-2.99362 39.52174,-2.95141 55.28152,-0.43903 14.06764,2.44948 22.74154,14.03686 24.98313,27.54206 3.16922,11.4823 2.40407,23.59284 4.92263,35.45854 2.5605,12.06331 6.37931,35.47294 22.0005,29.70058 11.4991,-4.24916 17.39709,-28.66089 22.07262,-43.97384 4.41,-20.15236 9.59637,-40.99697 6.08472,-61.67032 2.34204,-29.06652 -17.85275,-26.14283 -32.49264,-29.17728 -12.50724,0 -38.93213,-0.75389 -40.84562,-17.16664 -1.14528,-9.823532 -1.53864,-23.623812 11.36782,-30.993272 9.67605,-5.54646 25.93319,-4.16152 43.14799,-4.16152 z M 261.22203,247.09904 c 1.14992,1.69089 -1.64273,-0.31937 0,0 z"
+       id="path3783-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzscccccscsszcsssccsccccszccccsscccsscccsczcc"
+       inkscape:export-filename="/home/jpakkane/workspace/meson/graphics/meson_logo_big.png"
+       inkscape:export-xdpi="300"
+       inkscape:export-ydpi="300" />
+  </g>
+</svg>
--- a/devtools/meson/man/meson.1
+++ b/devtools/meson/man/meson.1
@ -0,0 +1,238 @@
+.TH MESON "1" "September 2023" "meson 1.2.2" "User Commands"
+.SH NAME
+meson - a high productivity build system
+.SH DESCRIPTION
+
+Meson is a build system designed to optimize programmer
+productivity. It aims to do this by providing simple, out-of-the-box
+support for modern software development tools and practices, such as
+unit tests, coverage reports, Valgrind, Ccache and the like.
+
+The main Meson executable provides many subcommands to access all
+the functionality.
+
+.SH The setup command
+
+Using Meson is simple and follows the common two-phase
+process of most build systems. First you run Meson to
+configure your build:
+
+.B meson setup [
+.I options
+.B ] [
+.I build directory
+.B ] [
+.I source directory
+.B ]
+
+Note that the build directory must be different from the source
+directory. Meson does not support building inside the source directory
+and attempting to do that leads to an error.
+
+After a successful configuration step you can build the source by
+running the actual build command in the build directory. The default
+backend of Meson is Ninja, which can be invoked like this.
+
+\fBninja [\fR \fItarget\fR \fB]\fR
+
+You only need to run the Meson command once: when you first configure
+your build dir. After that you just run the build command. Meson will
+autodetect changes in your source tree and regenerate all files
+needed to build the project.
+
+The setup command is the default operation. If no actual command is
+specified, Meson will assume you meant to do a setup. That means
+that you can set up a build directory without the setup command
+like this:
+
+.B meson [
+.I options
+.B ] [
+.I build directory
+.B ] [
+.I source directory
+.B ]
+
+.SS "options:"
+.TP
+\fB\-\-version\fR
+print version number
+.TP
+\fB\-\-help\fR
+print command line help
+
+.SH The configure command
+
+.B meson configure
+provides a way to configure a Meson project from the command line.
+Its usage is simple:
+
+.B meson configure [
+.I build directory
+.B ] [
+.I options to set
+.B ]
+
+If build directory is omitted, the current directory is used instead.
+
+If no parameters are set,
+.B meson configure
+will print the value of all build options to the console.
+
+To set values, use the \-D command line argument like this.
+
+.B meson configure \-Dopt1=value1 \-Dopt2=value2
+
+.SH The introspect command
+
+Meson introspect is a command designed to make it simple to  integrate with
+other tools, such as IDEs. The output of this command is in JSON.
+
+.B meson introspect [
+.I build directory
+.B ] [
+.I option
+.B ]
+
+If build directory is omitted, the current directory is used instead.
+
+.SS "options:"
+.TP
+\fB\-\-targets\fR
+print all top level targets (executables, libraries, etc)
+.TP
+\fB\-\-target\-files\fR
+print the source files of the given target
+.TP
+\fB\-\-buildsystem\-files\fR
+print all files that make up the build system (meson.build, meson.options, meson_options.txt etc)
+.TP
+\fB\-\-tests\fR
+print all unit tests
+.TP
+\fB\-\-help\fR
+print command line help
+
+.SH The test command
+
+.B meson test
+is a helper tool for running test suites of projects using Meson.
+The default way of running tests is to invoke the default build command:
+
+\fBninja [\fR \fItest\fR \fB]\fR
+
+.B meson test
+provides a richer set of tools for invoking tests.
+
+.B meson test
+automatically rebuilds the necessary targets to run tests when used with the Ninja backend.
+Upon build failure,
+.B meson test
+will return an exit code of 125.
+This return code tells
+.B git bisect run
+to skip the current commit.
+Thus bisecting using git can be done conveniently like this.
+
+.B git bisect run meson test -C build_dir
+
+.SS "options:"
+.TP
+\fB\-\-repeat\fR
+run tests as many times as specified
+.TP
+\fB\-\-gdb\fR
+run tests under gdb
+.TP
+\fB\-\-list\fR
+list all available tests
+.TP
+\fB\-\-wrapper\fR
+invoke all tests via the given wrapper (e.g. valgrind)
+.TP
+\fB\-C\fR
+Change into the given directory before running tests (must be root of build directory).
+.TP
+\fB\-\-suite\fR
+run tests in this suite
+.TP
+\fB\-\-no\-suite\fR
+do not run tests in this suite
+.TP
+\fB\-\-no\-stdsplit\fR
+do not split stderr and stdout in test logs
+.TP
+\fB\-\-benchmark\fR
+run benchmarks instead of tests
+.TP
+\fB\-\-logbase\fR
+base of file name to use for writing test logs
+.TP
+\fB\-\-num-processes\fR
+how many parallel processes to use to run tests
+.TP
+\fB\-\-verbose\fR
+do not redirect stdout and stderr
+.TP
+\fB\-t\fR
+a multiplier to use for test timeout values (usually something like 100 for Valgrind)
+.TP
+\fB\-\-setup\fR
+use the specified test setup
+
+.SH The wrap command
+
+Wraptool is a helper utility to manage source dependencies
+using the online wrapdb service.
+
+.B meson wrap <
+.I command
+.B > [
+.I options
+.B ]
+
+You should run this command in the top level source directory
+of your project.
+
+.SS "Commands:"
+.TP
+\fBlist\fR
+list all available projects
+.TP
+\fBsearch\fR
+search projects by name
+.TP
+\fBinstall\fR
+install a project with the given name
+.TP
+\fBupdate\fR
+update the specified project to latest available version
+.TP
+\fBinfo\fR
+show available versions of the specified project
+.TP
+\fBstatus\fR
+show installed and available versions of currently used subprojects
+
+.SH EXIT STATUS
+
+.TP
+.B 0
+Successful.
+.TP
+.B 1
+Usage error, or an error parsing or executing meson.build.
+.TP
+.B 2
+Internal error.
+.TP
+.B 125
+.B meson test
+could not rebuild the required targets.
+.TP
+
+.SH SEE ALSO
+
+http://mesonbuild.com/
+
+https://wrapdb.mesonbuild.com/
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,12 @@
+#include<sqlite3.h>
+#include<stdio.h>
+
+int main(void) {
+    sqlite3 *db;
+    if(sqlite3_open(":memory:", &db) != SQLITE_OK) {
+        printf("Sqlite failed.\n");
+        return 1;
+    }
+    sqlite3_close(db);
+    return 0;
+}
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,13 @@
+project('downloader', 'c')
+
+cc = meson.get_compiler('c')
+
+s = subproject('sqlite').get_variable('sqlite_dep')
+th = dependency('threads')
+
+libdl = cc.find_library('dl', required : false)
+
+e = executable('dtest', 'main.c',
+  dependencies : [th, libdl, s])
+
+test('dltest', e)
--- a/wrap/subprojects/sqlite.wrap
+++ b/wrap/subprojects/sqlite.wrap
@ -0,0 +1,10 @@
+[wrap-file]
+directory = sqlite-amalgamation-3080802
+
+source_url = http://sqlite.com/2015/sqlite-amalgamation-3080802.zip
+source_filename = sqlite-amalgamation-3080802.zip
+source_hash = 5ebeea0dfb75d090ea0e7ff84799b2a7a1550db3fe61eb5f6f61c2e971e57663
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/sqlite/3080802/5/get_zip
+patch_filename = sqlite-3080802-5-wrap.zip
+patch_hash = d66469a73fa1344562d56a1d7627d5d0ee4044a77b32d16cf4bbb85741d4c9fd
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,10 @@
+project('Subversion outchecker', 'c')
+
+sp = subproject('samplesubproject')
+
+exe = executable('gitprog', 'prog.c',
+include_directories : sp.get_variable('subproj_inc'),
+link_with : sp.get_variable('subproj_lib'),
+)
+
+test('maintest', exe)
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,6 @@
+#include"subproj.h"
+
+int main(void) {
+    subproj_function();
+    return 0;
+}
--- a/wrap/subprojects/samplesubproject.wrap
+++ b/wrap/subprojects/samplesubproject.wrap
@ -0,0 +1,4 @@
+[wrap-svn]
+directory=samplesubproject
+url=https://svn.code.sf.net/p/mesonsubproject/code/trunk
+revision=head
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,8 @@
+project('evil URL')
+# showing that new Meson wrap.py code tries to stop imposter WrapDB URLs
+# a WrapException is raised.
+#
+# ERROR: https://wrapdb.mesonbuild.com.invalid/v1/projects/zlib/1.2.11/4/get_zip may be a WrapDB-impersonating URL
+#
+
+subproject('zlib')
--- a/imposter/subprojects/zlib.wrap
+++ b/imposter/subprojects/zlib.wrap
@ -0,0 +1,10 @@
+[wrap-file]
+directory = zlib-1.2.8
+
+source_url = https://zlib.net/zlib-1.2.11.tar.gz
+source_filename = zlib-1.2.11.tar.gz
+source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+
+patch_url = https://wrapdb.mesonbuild.com.invalid/v1/projects/zlib/1.2.11/4/get_zip
+patch_filename = zlib-1.2.11-4-wrap.zip
+patch_hash = 886b67480dbe73b406ad83a1dd6d9596f93089d90c220ccfc91944c95f1c68c4
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,4 @@
+project('downloader')
+# this test will timeout, showing that a subdomain isn't caught as masquerading url
+
+subproject('zlib')
--- a/mirror/subprojects/zlib.wrap
+++ b/mirror/subprojects/zlib.wrap
@ -0,0 +1,10 @@
+[wrap-file]
+directory = zlib-1.2.8
+
+source_url = https://zlib.net/zlib-1.2.11.tar.gz
+source_filename = zlib-1.2.11.tar.gz
+source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+
+patch_url = https://mirror1.wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/4/get_zip
+patch_filename = zlib-1.2.11-4-wrap.zip
+patch_hash = 886b67480dbe73b406ad83a1dd6d9596f93089d90c220ccfc91944c95f1c68c4
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    printf("Hello world!\n");
+    return 0;
+}
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,9 @@
+#if defined _WIN32 || defined __CYGWIN__
+#define DLL_PUBLIC __declspec(dllexport)
+#else
+#define DLL_PUBLIC
+#endif
+
+int DLL_PUBLIC foo(void) {
+  return 0;
+}
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,21 @@
+project('check old builddirs in a stable release', 'c')
+
+lib = both_libraries('lib', 'lib.c')
+exe = executable('foo', 'foo.c', link_with: lib, install: true)
+test('exe', exe)
+
+install_data('data/foo.dat', install_dir: get_option('datadir') / 'foo')
+install_man('foo.1')
+
+py = import('python').find_installation()
+py.install_sources('mod.py', subdir: 'foo')
+install_subdir('data', install_dir: py.get_install_dir())
+
+custom_target(
+  input: 'mod.py',
+  output: 'hello.dat',
+  command: [py, '@INPUT@'],
+  capture: true,
+  install: true,
+  install_dir: get_option('localstatedir') / 'foo',
+)
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1 @@
+print('Hello world!')
--- a/multiwrap/meson.build
+++ b/multiwrap/meson.build
@ -0,0 +1,12 @@
+project('multiwrap', 'c',
+  default_options : 'c_std=c99')
+
+# Using multiple downloaded projects for great justice.
+
+cc = meson.get_compiler('c')
+
+luadep = dependency('lua', fallback : ['lua', 'lua_dep'])
+pngdep = dependency('libpng', fallback : ['libpng', 'png_dep'])
+
+executable('prog', 'prog.c',
+  dependencies : [pngdep, luadep])
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,66 @@
+#include<lua.h>
+#include<stdio.h>
+#include<stdlib.h>
+#include<png.h>
+#include<string.h>
+#if !defined(_MSC_VER)
+#include<unistd.h>
+#endif
+
+static void *l_alloc (void *ud, void *ptr, size_t osize,
+        size_t nsize) {
+    (void)ud;
+    (void)osize;
+    if (nsize == 0) {
+        free(ptr);
+        return NULL;
+    } else {
+        return realloc(ptr, nsize);
+    }
+}
+
+void open_image(const char *fname) {
+    png_image image;
+
+    memset(&image, 0, (sizeof image));
+    image.version = PNG_IMAGE_VERSION;
+
+    if(png_image_begin_read_from_file(&image, fname) != 0) {
+        png_bytep buffer;
+
+        image.format = PNG_FORMAT_RGBA;
+        buffer = malloc(PNG_IMAGE_SIZE(image));
+
+        if(png_image_finish_read(&image, NULL, buffer, 0, NULL) != 0) {
+            printf("Image %s read failed: %s\n", fname, image.message);
+        }
+//        png_free_image(&image);
+        free(buffer);
+    } else {
+        printf("Image %s open failed: %s", fname, image.message);
+    }
+}
+
+int printer(lua_State *l) {
+    if(!lua_isstring(l, 1)) {
+        fprintf(stderr, "Incorrect call.\n");
+        return 0;
+    }
+    open_image(lua_tostring(l, 1));
+    return 0;
+}
+
+
+int main(int argc, char **argv) {
+    lua_State *l = lua_newstate(l_alloc, NULL);
+    if(!l) {
+        printf("Lua state allocation failed.\n");
+        return 1;
+    }
+    lua_register(l, "printer", printer);
+    lua_getglobal(l, "printer");
+    lua_pushliteral(l, "foobar.png");
+    lua_call(l, 1, 0);
+    lua_close(l);
+    return 0;
+}
--- a/multiwrap/subprojects/libpng.wrap
+++ b/multiwrap/subprojects/libpng.wrap
@ -0,0 +1,10 @@
+[wrap-file]
+directory = libpng-1.6.34
+
+source_url = ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-1.6.34.tar.xz
+source_filename = libpng-1.6.34.tar.xz
+source_hash = 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.34/1/get_zip
+patch_filename = libpng-1.6.34-1-wrap.zip
+patch_hash = 2123806eba8180c164e33a210f2892bbeb2473b69e56aecc786574e9221e6f20
--- a/multiwrap/subprojects/lua.wrap
+++ b/multiwrap/subprojects/lua.wrap
@ -0,0 +1,11 @@
+[wrap-file]
+directory = lua-5.3.0
+
+source_url = http://www.lua.org/ftp/lua-5.3.0.tar.gz
+source_filename = lua-5.3.0.tar.gz
+source_hash = ae4a5eb2d660515eb191bfe3e061f2b8ffe94dce73d32cfd0de090ddcc0ddb01
+
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/lua/5.3.0/5/get_zip
+patch_filename = lua-5.3.0-5-wrap.zip
+patch_hash = 439038309a0700adfb67d764b3fe935ed8601b31f819fc369e1438c6e79334dd
--- a/multiwrap/subprojects/zlib.wrap
+++ b/multiwrap/subprojects/zlib.wrap
@ -0,0 +1,10 @@
+[wrap-file]
+directory = zlib-1.2.8
+
+source_url = http://zlib.net/fossils/zlib-1.2.8.tar.gz
+source_filename = zlib-1.2.8.tar.gz
+source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/8/get_zip
+patch_filename = zlib-1.2.8-8-wrap.zip
+patch_hash = 17c52a0e0c59ce926d3959005d5cd8178c6c7e2c9a4a1304279a8320c955ac60
--- a/devtools/meson/manual
+++ b/devtools/meson/manual
@ -0,0 +1,10 @@
+project('git outchecker', 'c')
+
+sp = subproject('samplesubproject')
+
+exe = executable('gitprog', 'prog.c',
+include_directories : sp.get_variable('subproj_inc'),
+link_with : sp.get_variable('subproj_lib'),
+)
+
+test('maintest', exe)
--- a/Show more
+++ b/Show more