Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 May 2016 08:50:33 +0000 (UTC)
From:      Bartek Rutkowski <robak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r414634 - in head/devel/godot: . files
Message-ID:  <201605050850.u458oXHM040295@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: robak
Date: Thu May  5 08:50:33 2016
New Revision: 414634
URL: https://svnweb.freebsd.org/changeset/ports/414634

Log:
  devel/godot: update 1.1 -> 2.0
  
  PR:		209067
  Submitted by:	Shane Ambler <FreeBSD@ShaneWare.Biz> (maintainer)

Modified:
  head/devel/godot/Makefile
  head/devel/godot/distinfo
  head/devel/godot/files/patch-SConstruct
  head/devel/godot/files/patch-platform_x11_detect.py
  head/devel/godot/pkg-plist

Modified: head/devel/godot/Makefile
==============================================================================
--- head/devel/godot/Makefile	Thu May  5 08:06:09 2016	(r414633)
+++ head/devel/godot/Makefile	Thu May  5 08:50:33 2016	(r414634)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	godot
-PORTVERSION=	1.1
+PORTVERSION=	2.0
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel games
 
@@ -23,6 +23,7 @@ USE_GL=		glu
 USE_OPENSSL=	yes
 
 MAKE_ARGS+=	platform=x11
+CXXFLAGS+=	-DRTAUDIO_ENABLED
 
 OPTIONS_DEFINE=	EXAMPLES TOOLS
 OPTIONS_DEFAULT=	EXAMPLES TOOLS

Modified: head/devel/godot/distinfo
==============================================================================
--- head/devel/godot/distinfo	Thu May  5 08:06:09 2016	(r414633)
+++ head/devel/godot/distinfo	Thu May  5 08:50:33 2016	(r414634)
@@ -1,2 +1,2 @@
-SHA256 (okamstudio-godot-1.1-stable_GH0.tar.gz) = 64281f4fa485cac13ff5b0bc00449a62b19198fc072260d3fb01aa5aad2be8a5
-SIZE (okamstudio-godot-1.1-stable_GH0.tar.gz) = 54744842
+SHA256 (okamstudio-godot-2.0-stable_GH0.tar.gz) = 5947331b210f046f7cbd0b88aba1cc4216a50347983662c46b1e91ae581e5a7c
+SIZE (okamstudio-godot-2.0-stable_GH0.tar.gz) = 54214296

Modified: head/devel/godot/files/patch-SConstruct
==============================================================================
--- head/devel/godot/files/patch-SConstruct	Thu May  5 08:06:09 2016	(r414633)
+++ head/devel/godot/files/patch-SConstruct	Thu May  5 08:50:33 2016	(r414634)
@@ -1,46 +1,35 @@
---- SConstruct.orig	2015-05-21 18:03:21 UTC
+--- SConstruct.orig	2016-02-29 11:52:09 UTC
 +++ SConstruct
-@@ -60,7 +60,7 @@ elif (os.name=="nt"):
-     if (os.getenv("VSINSTALLDIR")==None):
- 	custom_tools=['mingw']
+@@ -63,7 +63,7 @@ elif (os.name=="nt"):
+ 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
+ 		custom_tools=['mingw']
  
 -env_base=Environment(tools=custom_tools,ENV = {'PATH' : os.environ['PATH']});
 +env_base=Environment(tools=custom_tools,ENV = os.environ);
+ 
  #env_base=Environment(tools=custom_tools);
  env_base.global_defaults=global_defaults
- env_base.android_source_modules=[]
-@@ -115,7 +115,8 @@ opts.Add('etc1','etc1 Texture compressio
- opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes')
- opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no')
- opts.Add('musepack','Musepack Audio (yes/no)','yes')
--opts.Add("CXX", "Compiler");
-+opts.Add("CC", "C Compiler")
-+opts.Add("CXX", "C++ Compiler");
- opts.Add("CCFLAGS", "Custom flags for the C++ compiler");
- opts.Add("CFLAGS", "Custom flags for the C compiler");
- opts.Add("LINKFLAGS", "Custom flags for the linker");
-@@ -202,15 +203,17 @@ if selected_platform in platform_list:
+@@ -223,15 +223,17 @@ if selected_platform in platform_list:
  	if env["extra_suffix"] != '' :
  		env.extra_suffix += '.'+env["extra_suffix"]
  
 -	CCFLAGS = env.get('CCFLAGS', '')
 -	env['CCFLAGS'] = ''
--
--	env.Append(CCFLAGS=string.split(str(CCFLAGS)))
 +	env['CC'] = os.environ['CC']
-+	
 +	env['CXX'] = os.environ['CXX']
- 
--	CFLAGS = env.get('CFLAGS', '')
--	env['CFLAGS'] = ''
++	
 +	CFLAGS = os.environ['CFLAGS']
 +	env['CFLAGS'] = []
-+	env.Append(CFLAGS=string.split(CFLAGS))
++	env.Append(CFLAGS=string.split(str(CFLAGS)))
  
--	env.Append(CFLAGS=string.split(str(CFLAGS)))
 +	CCFLAGS = os.environ['CXXFLAGS']
 +	env['CCFLAGS'] = []
-+	env.Append(CCFLAGS=string.split(CCFLAGS))
+ 	env.Append(CCFLAGS=string.split(str(CCFLAGS)))
+ 
+-	CFLAGS = env.get('CFLAGS', '')
+-	env['CFLAGS'] = ''
+-
+-	env.Append(CFLAGS=string.split(str(CFLAGS)))
  
  	LINKFLAGS = env.get('LINKFLAGS', '')
  	env['LINKFLAGS'] = ''

Modified: head/devel/godot/files/patch-platform_x11_detect.py
==============================================================================
--- head/devel/godot/files/patch-platform_x11_detect.py	Thu May  5 08:06:09 2016	(r414633)
+++ head/devel/godot/files/patch-platform_x11_detect.py	Thu May  5 08:50:33 2016	(r414634)
@@ -1,6 +1,6 @@
---- platform/x11/detect.py.orig	2015-05-21 18:03:21 UTC
+--- platform/x11/detect.py.orig	2016-02-29 16:49:54 UTC
 +++ platform/x11/detect.py
-@@ -29,11 +29,6 @@ def can_build():
+@@ -30,11 +30,6 @@ def can_build():
  		print("X11 not found.. x11 disabled.")
  		return False
  
@@ -12,12 +12,12 @@
  	x11_error=os.system("pkg-config xcursor --modversion > /dev/null ")
  	if (x11_error):
  		print("xcursor not found.. x11 disabled.")
-@@ -126,7 +121,7 @@ def configure(env):
- 	env.ParseConfig('pkg-config x11 --cflags --libs')
- 	env.ParseConfig('pkg-config xinerama --cflags --libs')
+@@ -133,7 +128,7 @@ def configure(env):
  	env.ParseConfig('pkg-config xcursor --cflags --libs')
--	env.ParseConfig('pkg-config openssl --cflags --libs')
-+	env.ParseConfig('echo -lssl -lcrypto')
  
+ 	if (env["openssl"]=="yes"):
+-		env.ParseConfig('pkg-config openssl --cflags --libs')
++		env.ParseConfig('echo -lssl -lcrypto')
  
- 	env.ParseConfig('pkg-config freetype2 --cflags --libs')
+ 
+ 	if (env["freetype"]=="yes"):

Modified: head/devel/godot/pkg-plist
==============================================================================
--- head/devel/godot/pkg-plist	Thu May  5 08:06:09 2016	(r414633)
+++ head/devel/godot/pkg-plist	Thu May  5 08:50:33 2016	(r414634)
@@ -3,9 +3,19 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/box_area.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/circle_area.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/input.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/input.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/.fscache
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/box.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/circle.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/dynamic_colobjs.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/dynamic_colobjs.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/icon.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/poly.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/floor.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.gd
@@ -13,7 +23,6 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.xml
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/icon.png.flags
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/tile_edit.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/troll.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/troll.png
@@ -21,6 +30,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/beach_cave.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/beach_cave.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/ocean_beach.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/ocean_beach.png.flags
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/ocean_cave.png
@@ -239,6 +249,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/faceNormal.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/fire.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/floor_shader.res
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/light2.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/map.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/map.scn
@@ -272,31 +283,36 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/player.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/burano.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/lightmask.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/splat.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/bg.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/caster.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/light.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/light_shadows.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/spot.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/arrow.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/lookat.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/lookat.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/car.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/motion/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/motion.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/motion.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/agent.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/navigation.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/navigation.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/navigation2.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/path.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/diffuse.jpg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/diffuse.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/light.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normal.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normal_material.res
@@ -349,14 +365,10 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/sound_shoot.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/stage.xml
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tiles_demo.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tiles_demo.png.flags
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tileset.xml
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tileset_edit.xml
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/types.cache
-%%EXAMPLES%%%%DATADIR%%/demos/2d/polygon_path_finder_demo/engine.cfg
-%%EXAMPLES%%%%DATADIR%%/demos/2d/polygon_path_finder_demo/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/polygon_path_finder_demo/icon.png.flags
-%%EXAMPLES%%%%DATADIR%%/demos/2d/polygon_path_finder_demo/new_scene_poly_with_holes.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/polygon_path_finder_demo/polygonpathfinder.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/ball.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/icon.png
@@ -390,11 +402,13 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/vignette.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/white.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/screen_shaders.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/screen_shaders.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/KaushanScript-Regular.otf
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/font.fnt
+%%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/sdf.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/bullet.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/bullets.gd
@@ -404,6 +418,42 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/shower.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/shower.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/asteroid.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/asteroid.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/bg_gradient.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/big_star.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/explosion.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/fire.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/game_state.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/icon.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level_tiles.res
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level_tiles.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/main_menu.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/main_menu.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/meteorite.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/parallax.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/rail.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shoot.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shot.gd
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shot.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/small_star.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/sound_explode.wav
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/sound_shoot.wav
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/tile.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/bg.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/bg_layer_1.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/bg_layer_2.png
@@ -411,6 +461,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/button_pressed.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/freesans.fnt
+%%EXAMPLES%%%%DATADIR%%/demos/2d/splash/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash.xml
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash_01.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash_02.png
@@ -423,6 +474,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash_09.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/cubio.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/sprite_shaders.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/block.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/engine.cfg
@@ -436,6 +488,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/bubbles.scn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/burano.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/lens.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/lens.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/fixed_materials/brick_color.png
@@ -467,6 +520,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/3d/mousepick_test/mousepick.gd
 %%EXAMPLES%%%%DATADIR%%/demos/3d/mousepick_test/mousepick.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/navmesh/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/3d/navmesh/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/3d/navmesh/navmesh.gd
 %%EXAMPLES%%%%DATADIR%%/demos/3d/navmesh/navmesh.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/navmesh/particle.png
@@ -487,7 +541,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/osb_right.png
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/osb_up.png
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/player.gd
-%%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/player.xml
+%%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/player.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/robotrigged.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/sb.cube
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/sb_back.png
@@ -502,7 +556,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/sound_hit.wav
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/sound_jump.wav
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/sound_shoot.wav
-%%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/stage.xml
+%%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/stage.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/texture.tex
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/tiles.res
 %%EXAMPLES%%%%DATADIR%%/demos/3d/platformer/tiles.scn
@@ -511,7 +565,8 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/capsule.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/convex.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/engine.cfg
-%%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/sat_test.xml
+%%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/icon.png
+%%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/sat_test.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/shapes.dae
 %%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/shapes.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/sat_test/sphere.scn
@@ -547,6 +602,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/follow_camera.gd
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/grass.tex
+%%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/trailer_truck.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/truck_scene.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/trucktown.scn
@@ -554,15 +610,18 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/drag_and_drop.scn
 %%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/drag_drop_script.gd
 %%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/gui/input_mapping/controls.gd
 %%EXAMPLES%%%%DATADIR%%/demos/gui/input_mapping/controls.scn
 %%EXAMPLES%%%%DATADIR%%/demos/gui/input_mapping/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/gui/input_mapping/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/OFL.txt
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/TitilliumWeb-Bold.ttf
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/TitilliumWeb-BoldItalic.ttf
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/TitilliumWeb-Italic.ttf
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/TitilliumWeb-Regular.ttf
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/rich_text_bbcode.gd
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/rich_text_bbcode.scn
 %%EXAMPLES%%%%DATADIR%%/demos/gui/rich_text_bbcode/titilium-bold.fnt
@@ -576,6 +635,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/flag_japan.png
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/flag_spain.png
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/flag_uk.png
+%%EXAMPLES%%%%DATADIR%%/demos/gui/translation/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/main.gd
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/main.scn
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/noto.fnt
@@ -595,14 +655,22 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/misc/instancing/container.png
 %%EXAMPLES%%%%DATADIR%%/demos/misc/instancing/container.scn
 %%EXAMPLES%%%%DATADIR%%/demos/misc/instancing/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/misc/instancing/icon.png
+%%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/diagram.png
 %%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/icon.png
+%%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/indicators.png
 %%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/joysticks.gd
 %%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/joysticks.scn
+%%EXAMPLES%%%%DATADIR%%/demos/misc/joysticks/jsdiagram.xscn
 %%EXAMPLES%%%%DATADIR%%/demos/misc/pause/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/misc/pause/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/misc/pause/spinpause.gd
 %%EXAMPLES%%%%DATADIR%%/demos/misc/pause/spinpause.scn
+%%EXAMPLES%%%%DATADIR%%/demos/misc/regex/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/misc/regex/icon.png
+%%EXAMPLES%%%%DATADIR%%/demos/misc/regex/regex.gd
+%%EXAMPLES%%%%DATADIR%%/demos/misc/regex/regex.scn
 %%EXAMPLES%%%%DATADIR%%/demos/misc/scene_changer/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/misc/scene_changer/scene_a.gd
 %%EXAMPLES%%%%DATADIR%%/demos/misc/scene_changer/scene_a.scn
@@ -615,7 +683,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/misc/tween/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/misc/tween/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/misc/tween/main.gd
-%%EXAMPLES%%%%DATADIR%%/demos/misc/tween/main.xml
+%%EXAMPLES%%%%DATADIR%%/demos/misc/tween/main.scn
 %%EXAMPLES%%%%DATADIR%%/demos/misc/udp_chat/chat.gd
 %%EXAMPLES%%%%DATADIR%%/demos/misc/udp_chat/chat.scn
 %%EXAMPLES%%%%DATADIR%%/demos/misc/udp_chat/engine.cfg
@@ -623,7 +691,6 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/control.gd
 %%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/icon.png.flags
 %%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/observer/observer.gd
 %%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/observer/observer.scn
 %%EXAMPLES%%%%DATADIR%%/demos/misc/window_management/window_management.scn
@@ -632,15 +699,15 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/left_pallete.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/pong.gd
-%%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/pong.xml
+%%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/pong.scn
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/pong3d.gd
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/pong3d.scn
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/right_pallete.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/2d_in_3d/separator.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/main.scn
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/player.scn
-%%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/player.xml
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/player_2d.scn
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/player_3d.scn
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/3d_in_2d/robot_demo.png
@@ -648,7 +715,9 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/gui_in_3d/gui.scn
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/gui_in_3d/gui_3d.gd
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/gui_in_3d/gui_3d.scn
+%%EXAMPLES%%%%DATADIR%%/demos/viewport/gui_in_3d/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/screen_capture/engine.cfg
+%%EXAMPLES%%%%DATADIR%%/demos/viewport/screen_capture/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/screen_capture/mountains.png
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/screen_capture/screen_capture.gd
 %%EXAMPLES%%%%DATADIR%%/demos/viewport/screen_capture/screen_capture.scn



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605050850.u458oXHM040295>