Merge pull request #249930 from Homebrew/irrlicht-update-patches

irrlicht: update patch URLs

Author: BrewTestBot

Formula/i/irrlicht.rb

@@ -48,13 +48,13 @@ class Irrlicht < Formula
 
   # Use libraries from Homebrew or macOS
   patch do
-    url "https://github.com/Homebrew/formula-patches/raw/69ad57d16cdd4ecdf2dfa50e9ce751b082d78cf9/irrlicht/use-system-libs.patch"
+    url "https://raw.githubusercontent.com/Homebrew/homebrew-core/d16313ce/Patches/irrlicht/use-system-libs.patch"
     sha256 "70d2534506e0e34279c3e9d8eff4b72052cb2e78a63d13ce0bc60999cbdb411b"
   end
 
   # Update Xcode project to use libraries from Homebrew and macOS
   patch do
-    url "https://github.com/Homebrew/formula-patches/raw/69ad57d16cdd4ecdf2dfa50e9ce751b082d78cf9/irrlicht/xcode.patch"
+    url "https://raw.githubusercontent.com/Homebrew/homebrew-core/1cf441a0/Patches/irrlicht/xcode.patch"
     sha256 "2cfcc34236469fcdb24b6a77489272dfa0a159c98f63513781245f3ef5c941c0"
   end
 

Patches/irrlicht/use-system-libs.patch

@@ -3,45 +3,45 @@ WARNING: This patch contains a mix of CRLF and LF line endings.
 --- a/include/IrrCompileConfig.h
 +++ b/include/IrrCompileConfig.h
 @@ -250,6 +250,7 @@ the engine will no longer read .jpeg images. */
- /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
- 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
- #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
-+#define NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
- #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
- #endif
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+ #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++#define NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
 @@ -266,6 +267,7 @@ the engine will no longer read .png images. */
- /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
- 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
- #define _IRR_USE_NON_SYSTEM_LIB_PNG_
-+#define NO_IRR_USE_NON_SYSTEM_LIB_PNG_
- #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
- #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
- #endif
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+ #define _IRR_USE_NON_SYSTEM_LIB_PNG_
++#define NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
 @@ -603,6 +605,7 @@ ones. */
- installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
- defined. */
- #define _IRR_USE_NON_SYSTEM_ZLIB_
-+#define NO_IRR_USE_NON_SYSTEM_ZLIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
- #undef _IRR_USE_NON_SYSTEM_ZLIB_
- #endif
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+ #define _IRR_USE_NON_SYSTEM_ZLIB_
++#define NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
 @@ -624,6 +627,7 @@ library. */
- installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
- defined. */
- #define _IRR_USE_NON_SYSTEM_BZLIB_
-+#define NO_IRR_USE_NON_SYSTEM_BZLIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
- #undef _IRR_USE_NON_SYSTEM_BZLIB_
- #endif
+ installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
+ defined. */
+ #define _IRR_USE_NON_SYSTEM_BZLIB_
++#define NO_IRR_USE_NON_SYSTEM_BZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
+ #undef _IRR_USE_NON_SYSTEM_BZLIB_
+ #endif
 --- a/source/Irrlicht/CImageLoaderJPG.cpp
 +++ b/source/Irrlicht/CImageLoaderJPG.cpp
 @@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
- 	// DO NOTHING
--	return 1;
-+	return TRUE;
- }
- 
- 
+ boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
+ {
+ 	// DO NOTHING
+-	return 1;
++	return TRUE;
+ }
+ 
+