Update Irrlicht from SVN trunk r6731 to r6738, with Bridge Command customisations applied.

src/libs/Irrlicht/changesForBC.txt

@@ -1,7 +1,7 @@
 Notes on Irrlicht as used in Bridge Command
 ===========================================
 
-Irrlicht updated to r6731 from SVN trunk
+Irrlicht updated to r6738 from SVN trunk
 
 The following changes are applied for Bridge Command from 
 Irrlicht trunk, and all changes marked in source with //JAMES:

src/libs/Irrlicht/irrlicht-svn/changes.txt

@@ -456,6 +456,8 @@ Changes in 1.9 (not yet released)
 
 --------------------------
 Changes in 1.8.6
+- Update libpng to 1.6.54 (from 1.6.37)
+- Avoid compile warnings with newer compilers like gcc 14
 - Fix CGUIPanel (in Gui Editor) so horizontal scrollbar can get focus (Feature request #163). Thanks @yybbwc for reporting.
 - CXMeshFileLoader: fix buffer overreads with text format. Thanks @sfan5 for report and patch.
   Patch (commit 6f4f7c4 to Minetest): https://github.com/minetest/irrlicht/commit/6f4f7c4d75c9d563e98d3936ed8bc6e248dc14a8

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/CImageLoaderJPG.cpp

@@ -210,7 +210,7 @@ IImage* CImageLoaderJPG::loadImage(io::IReadFile* file) const
 	jpeg_read_header(&cinfo, TRUE);
 
 	bool useCMYK=false;
-	if (cinfo.jpeg_color_space==JCS_CMYK)
+	if (cinfo.jpeg_color_space==JCS_CMYK || cinfo.jpeg_color_space==JCS_YCCK)
 	{
 		cinfo.out_color_space=JCS_CMYK;
 		cinfo.out_color_components=4;

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/COpenGLCoreCacheHandler.h

@@ -148,9 +148,7 @@ class COpenGLCoreCacheHandler
 			{
 				if (Texture[i] == texture)
 				{
-					Texture[i] = 0;
-
-					texture->drop();
+					set(i, nullptr);
 				}
 			}
 		}
@@ -161,11 +159,7 @@ class COpenGLCoreCacheHandler
 			{
 				if (Texture[i])
 				{
-					const TOpenGLTexture* prevTexture = Texture[i];
-
-					Texture[i] = 0;
-
-					prevTexture->drop();
+					set(i, nullptr);
 				}
 			}
 		}
@@ -415,7 +409,7 @@ class COpenGLCoreCacheHandler
 
 	// Color Mask.
 
-	void getColorMask(u8& mask)
+	void getColorMask(u8& mask) const
 	{
 		mask = ColorMask[0];
 	}
@@ -470,6 +464,11 @@ class COpenGLCoreCacheHandler
 
 	// Depth calls.
 
+	void getDepthFunc(GLenum& mode) const
+	{
+		mode = DepthFunc;
+	}
+
 	void setDepthFunc(GLenum mode)
 	{
 		if (DepthFunc != mode)
@@ -479,7 +478,7 @@ class COpenGLCoreCacheHandler
 		}
 	}
 
-	void getDepthMask(bool& depth)
+	void getDepthMask(bool& depth) const
 	{
 		depth = DepthMask;
 	}
@@ -497,7 +496,7 @@ class COpenGLCoreCacheHandler
 		}
 	}
 
-    void getDepthTest(bool& enable)
+    void getDepthTest(bool& enable) const
     {
         enable = DepthTest;
     }

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/COpenGLCoreTexture.h

@@ -262,6 +262,7 @@ class COpenGLCoreTexture : public ITexture
 #if 1
 				IImage* tmpImage = LockImage;	// not sure yet if the size required by glGetTexImage is always correct, if not we might have to allocate a different tmpImage and convert colors later on.
 
+				const COpenGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
 				Driver->getCacheHandler()->getTextureCache().set(0, this);
 				Driver->testGLError(__LINE__);
 
@@ -297,6 +298,9 @@ class COpenGLCoreTexture : public ITexture
 
 					delete[] tmpBuffer;
 				}
+
+				Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
+
 #else	// Alternative method working with copies to memory, still here for quick testing when things break, hope we can remove that before 1.9 release.
 				COpenGLCoreTexture* tmpTexture = new COpenGLCoreTexture("OGL_CORE_LOCK_TEXTURE", Size, ETT_2D, ColorFormat, Driver);
 

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht-gcc.cbp

@@ -129,6 +129,9 @@
 					<Add directory="C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Include" />
 				</Compiler>
 				<Linker>
+					<Add option="-static-libstdc++" />
+					<Add option="-static-libgcc" />
+					<Add option="-static" />
 					<Add library="kernel32" />
 					<Add library="user32" />
 					<Add library="gdi32" />
@@ -1340,6 +1343,7 @@
 		<Unit filename="libpng/pngset.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="libpng/pngstruct.h" />
 		<Unit filename="libpng/pngtrans.c">
 			<Option compilerVar="CC" />
 		</Unit>

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht17.0.vcxproj

@@ -362,7 +362,7 @@
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/SConstruct

@@ -43,7 +43,7 @@ def createEnvironment() :
     vars.Add(PathVariable("installdir", "install directory for the library", os.path.join("bin"),  PathVariable.PathIsDirCreate))
     vars.Add(EnumVariable("buildtarget", "type of the library", "shared", allowed_values=("shared", "static")))
     vars.Add(EnumVariable("buildtype", "name of target build type", "release", allowed_values=("debug", "release")))
-    vars.Add(EnumVariable("platform", "build platform", "", allowed_values=("", "linux", "osx-library", "osx-framework", "win32-mingw", "win32-msvc", "win64-msvc")))
+    vars.Add(EnumVariable("platform", "build platform", "", allowed_values=("", "linux", "osx-library", "osx-framework", "win32-mingw", "win32-msvc", "win64-msvc", "win64-mingw")))
     vars.Add(BoolVariable("package", "creates of the compiled library a package (header & binary) as a zip file", False))
 
     vars.Add(BoolVariable("opengl", "build with Open GL support", True))
@@ -60,15 +60,21 @@ def createEnvironment() :
 
     if env["platform"] in ["linux", "osx-library", "osx-framework"] :
         env.Tool("default")
+        # add CMake compile_commands
+        env.Tool('compilation_db')
+        env.CompilationDatabase()
 
-    elif env["platform"] in ["win32-msvc", "win64-mvc"] :
+    elif env["platform"] in ["win32-msvc", "win64-msvc"] :
         env.Tool("msvc")
         env.Tool("mslink")
         env.Tool("msvs")
         env.Tool("mssdk")
 
     elif env["platform"] in ["win32-mingw", "win64-mingw"] :
         env.Tool("mingw")
+        # add CMake compile_commands
+        env.Tool('compilation_db')
+        env.CompilationDatabase()
 
     else :
         raise SCons.Errors.StopError("platform is not set")
@@ -83,11 +89,12 @@ def createEnvironment() :
     # read first Irrlicht SDK version from the file include/IrrCompileConfig.h
     irrlichtversion = None
     try :
-        configfile = open( os.path.join("include", "IrrCompileConfig.h"), "r" )
+        configpath = os.path.join("include", "IrrCompileConfig.h")
+        configfile = open( configpath, "r" )
         irrlichtversion = re.search("#define(.*)IRRLICHT_SDK_VERSION(.*)", configfile.read())
         configfile.close()
     except :
-	    pass
+        pass
     if irrlichtversion == None :
         raise SCons.Errors.StopError("can not find Irrlicht SDK version in the configuration header")
 
@@ -99,10 +106,11 @@ def createEnvironment() :
     if env["buildtype"] == "debug" :
         env["irr_libinstallname"] = env["irr_libinstallname"] + "Debug"
 
-    if "CXX" in os.environ :
-        env.Replace(CXX  = os.environ["CXX"])
-    if "CC" in os.environ :
-        env.Replace(CC  = os.environ["CC"])    
+    if env["platform"] not in ["win32-msvc", "win64-msvc"]:
+        if "CXX" in os.environ :
+            env.Replace(CXX  = os.environ["CXX"])
+        if "CC" in os.environ :
+            env.Replace(CC  = os.environ["CC"])    
     if "CPPPATH" in os.environ :
         env.AppendUnique(CPPPATH  = os.environ["CPPPATH"].split(os.pathsep))
     if "CXXFLAGS" in os.environ :
@@ -175,8 +183,11 @@ def getLibraryBuildEnvironment(env) :
 
 
     elif envlib["platform"] in ["win32-msvc", "win64-msvc"] :
+        exeversion = "0.0"
+        if envlib["irr_libversion"] != None:
+            exeversion = ".".join(envlib["irr_libversion"].split('.')[:2]) # /VERSION is major.minor only...
         envlib.AppendUnique(CXXFLAGS        = ["/analyze", "/Gd", "/GF", "/GR-", "/GS", "/Gy", "/Zl"])
-        envlib.AppendUnique(LINKFLAGS       = ["/VERSION:\""+envlib["irr_libversion"]+"\"", "/nologo"])
+        envlib.AppendUnique(LINKFLAGS       = ["/VERSION:\""+exeversion+"\"", "/nologo"])
         envlib.AppendUnique(LIBS            = ["gdi32.lib", "user32.lib", "advapi32.lib"])
 
         if envlib["buildtype"] == "debug" :
@@ -220,7 +231,7 @@ def configDirectX(envlib) :
         if "win32" in envlib["platform"] :
             envlib.AppendUnique(LIBPATH     = [os.path.join(envlib["directxsdk"], "Lib", "x86")])
         elif "win64" in envlib["platform"] :
-            envlib.AppendUnique(LIBPATH     = [os.path.join(envlib["directxsdk"], "Lib", "x84")])
+            envlib.AppendUnique(LIBPATH     = [os.path.join(envlib["directxsdk"], "Lib", "x64")])
     else :
         envlib.AppendUnique(CPPDEFINES      = ["NO_IRR_COMPILE_WITH_DIRECT3D_9_"])
 
@@ -360,7 +371,6 @@ env         = createEnvironment()
 envlib      = getLibraryBuildEnvironment(env)
 envexamples = getExampleBuildEnvironment(env)
 
-
 # === set the sources (we use similar structure of the Makefile) ====================================================
 # get all header files (for later installation)
 headers = Glob(os.path.join("include", "*.h")) 

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/ANNOUNCE

@@ -1,21 +1,18 @@
-libpng 1.6.37 - April 14, 2019
-==============================
+libpng 1.6.54 - January 12, 2026
+================================
 
 This is a public release of libpng, intended for use in production code.
 
 
 Files available for download
 ----------------------------
 
-Source files with LF line endings (for Unix/Linux):
+Source files:
 
- * libpng-1.6.37.tar.xz (LZMA-compressed, recommended)
- * libpng-1.6.37.tar.gz
-
-Source files with CRLF line endings (for Windows):
-
- * lp1637.7z (LZMA-compressed, recommended)
- * lp1637.zip
+ * libpng-1.6.54.tar.xz (LZMA-compressed, recommended)
+ * libpng-1.6.54.tar.gz (deflate-compressed)
+ * lpng1654.7z (LZMA-compressed)
+ * lpng1654.zip (deflate-compressed)
 
 Other information:
 
@@ -25,21 +22,16 @@ Other information:
  * TRADEMARK.md
 
 
-Changes since the previous public release (version 1.6.36)
-----------------------------------------------------------
-
- * Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free.
- * Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette.
- * Fixed a memory leak in pngtest.c.
- * Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in
-   contrib/pngminus; refactor.
- * Changed the license of contrib/pngminus to MIT; refresh makefile and docs.
-   (Contributed by Willem van Schaik)
- * Fixed a typo in the libpng license v2.
-   (Contributed by Miguel Ojeda)
- * Added makefiles for AddressSanitizer-enabled builds.
- * Cleaned up various makefiles.
+Changes from version 1.6.53 to version 1.6.54
+---------------------------------------------
 
+ * Fixed CVE-2026-22695 (medium severity):
+   Heap buffer over-read in `png_image_read_direct_scaled.
+   (Reported and fixed by Petr Simecek.)
+ * Fixed CVE-2026-22801 (medium severity):
+   Integer truncation causing heap buffer over-read in `png_image_write_*`.
+ * Implemented various improvements in oss-fuzz.
+   (Contributed by Philippe Antoine.)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
 Subscription is required; visit

src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/AUTHORS

@@ -4,7 +4,10 @@ PNG REFERENCE LIBRARY AUTHORS
 This is the list of PNG Reference Library ("libpng") Contributing
 Authors, for copyright and licensing purposes.
 
+ * Adam Richter
+ * Alexander Smorkalov
  * Andreas Dilger
+ * Chris Blume
  * Cosmin Truta
  * Dave Martindale
  * Eric S. Raymond
@@ -15,31 +18,54 @@ Authors, for copyright and licensing purposes.
  * James Yu
  * John Bowler
  * Kevin Bracey
+ * Lucas Chollet
  * Magnus Holmgren
  * Mandar Sahastrabuddhe
+ * Manfred Schlaegl
  * Mans Rullgard
  * Matt Sarett
  * Mike Klein
+ * Pascal Massimino
  * Paul Schmidt
+ * Petr Simecek
+ * Philippe Antoine
+ * Qiang Zhou
  * Sam Bushell
  * Samuel Williams
  * Simon-Pierre Cadieux
  * Tim Wegner
+ * Tobias Stoeckmann
  * Tom Lane
  * Tom Tanner
  * Vadim Barkov
  * Willem van Schaik
  * Zhijie Liang
+ * Apple Inc.
+    - Zixu Wang (王子旭)
  * Arm Holdings
-   - Richard Townsend
- * Google Inc.
-   - Matt Sarett
-   - Mike Klein
+    - Richard Townsend
+ * Google LLC
+    - Dan Field
+    - Dragoș Tiselice
+    - Leon Scroggins III
+    - Matt Sarett
+    - Mike Klein
+    - Sami Boukortt
+    - Wan-Teh Chang
+ * Loongson Technology Corporation Ltd.
+    - GuXiWei (顾希伟)
+    - JinBo (金波)
+    - ZhangLixia (张利霞)
+ * Samsung Group
+    - Filip Wasil
+ * SpacemiT Hangzhou Technology, Co.
+    - Liang Junzhao (梁俊钊)
 
 The build projects, the build scripts, the test scripts, and other
-files in the "projects", "scripts" and "tests" directories, have other
-copyright owners, but are released under the libpng license.
+files in the "projects", "scripts" and "tests" directories, have
+other copyright owners, but are released under the libpng license.
 
-Some files in the "contrib" directory, and some tools-generated files
-that are distributed with libpng, have other copyright owners, and are
-released under other open source licenses.
+Some files in the "ci" and "contrib" directories, as well as some
+of the tools-generated files that are distributed with libpng, have
+other copyright owners, and are released under other open source
+licenses.