summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2024-04-19 14:24:14 +0200
committerYorhel <git@yorhel.nl>2024-04-19 14:24:29 +0200
commitc2cf50f70ad31fbe6bc85830b095b3677e4c4908 (patch)
tree5b1861b120e78750a35387037aef37abf72a8099
parentae556b840732623dabcb8d751448cd8e2f79cd79 (diff)
imgproc-custom: Update jpegli to fix loading certain jpeg filesHEADmaster
Was about to open a bug report for this, but then saw a fix had been committed yesterday. \o/
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5e3eceda..b179f899 100644
--- a/Makefile
+++ b/Makefile
@@ -113,8 +113,11 @@ ${GEN}/imgproc: util/imgproc.c
$Q ${CC} ${CFLAGS} $< -DDISABLE_SECCOMP `pkg-config --cflags --libs vips` -o $@
VIPS_VER := 8.15.2
-# TODO: switch to a proper release when it includes this commit
-JXL_VER := 5e7560d9e431b40159cf688b9d9be6c0f2e229a1
+# We need at least:
+# 5e7560d9e431b40159cf688b9d9be6c0f2e229a1 - to fix loading jpeg with libvips
+# 8928c7a0eb6421af470d3753464e9d42f8d1fc4a - to fix loading certain jpeg files
+# TODO: switch to a proper release when it includes these commits.
+JXL_VER := 8928c7a0eb6421af470d3753464e9d42f8d1fc4a
VIPS_DIR := ${GEN}/build/vips-${VIPS_VER}
JXL_DIR := ${GEN}/build/libjxl-${JXL_VER}
@@ -172,7 +175,7 @@ ${JXL_DIR}/done:
cd ${JXL_DIR} && cmake --install .
@# jxl doesn't install a libjpeg.pc
@# It doesn't even install a static libjpeg.a at all, so we'll just grab it from the build dir directly.
- @( \
+ ( \
echo "Name: libjpeg"; \
echo "Description: Actually jpegli"; \
echo "Version: 1.0"; \