:: commit b843dba729f310cc16c47daa1a5513815645d42f

mintsuki <mintsuki@protonmail.com> — 2024-01-07 01:13

parents: 4b7911ebd5

build: Move to master branch for stb_image

diff --git a/.gitignore b/.gitignore
index fff602a9..5775ffde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 /freestanding-headers
 /libgcc-binaries
 /common/flanterm
-/common/stb/stb_image.h
+/common/stb/stb_image.h*
 /decompressor/tinf
 /ovmf*
 *.o
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8a29d927..6c296b62 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -328,7 +328,7 @@ distclean: clean
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
-	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/stb/stb_image.h decompressor/tinf freestanding-headers libgcc-binaries limine-efi freestanding-toolchain configure build-aux *'~' autom4te.cache aclocal.m4 *.tar.xz *.tar.gz
+	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/stb/stb_image.h* decompressor/tinf freestanding-headers libgcc-binaries limine-efi freestanding-toolchain configure build-aux *'~' autom4te.cache aclocal.m4 *.tar.xz *.tar.gz
 
 .PHONY: common-uefi-x86-64
 common-uefi-x86-64:
diff --git a/README.md b/README.md
index f2e71e08..f103002d 100644
--- a/README.md
+++ b/README.md
@@ -243,7 +243,7 @@ More info on the format of `limine.cfg` can be found in [`CONFIG.md`](https://gi
 ## Acknowledgments
 Limine uses a stripped-down version of [tinf](https://github.com/jibsen/tinf) for early GZIP decompression.
 
-Limine relies on [stb_image](https://github.com/nothings/stb/blob/dev/stb_image.h) for runtime GZIP decompression and image loading.
+Limine relies on [stb_image](https://github.com/nothings/stb/blob/master/stb_image.h) for runtime GZIP decompression and image loading.
 
 ## Discord server
 We have a [Discord server](https://discord.gg/QEeZMz4) if you need support,
diff --git a/bootstrap b/bootstrap
index b968cfe5..f535126d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -12,7 +12,7 @@ if [ -z "$BOOTSTRAP_NO_SHALLOW_CLONES" ]; then
 fi
 
 [ -d common/flanterm ] || git clone https://github.com/mintsuki/flanterm.git common/flanterm $SHALLOW_CLONE_FLAG
-[ -f common/stb/stb_image.h ] || ( curl -Lo common/stb/stb_image.h https://github.com/nothings/stb/raw/dev/stb_image.h && patch -p0 < common/stb_image.patch )
+[ -f common/stb/stb_image.h ] || ( curl -Lo common/stb/stb_image.h https://github.com/nothings/stb/raw/master/stb_image.h && patch -p0 < common/stb_image.patch )
 [ -d decompressor/tinf ] || (
     set -e
     mkdir -p decompressor/tinf
tab: 248 wrap: offon