summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2016-09-27 17:53:33 +0100
committerRobin Watts <robin.watts@artifex.com>2016-09-27 18:29:41 +0100
commita059e8c21dd5bf5511b2d2e1202fe0831f8417b6 (patch)
tree20d49f2f3dfb3ffaab030bb662c66b27466d0aec
parent793c13601575967fdad69f15fea8e200a436ba9d (diff)
downloadmupdf-a059e8c21dd5bf5511b2d2e1202fe0831f8417b6.tar.xz
Move thirdparty/openjpeg onto the correct SHA.
Now we use the openjpeg repo automatically generated from the gs repo. Diffing the two shows mostly only whitespace diffs, but just a couple of fixes too. Also change Makefile logic not to check for a file that isn't there any more.
-rw-r--r--Makethird2
m---------thirdparty/openjpeg0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makethird b/Makethird
index 2dd108e9..a3b07fa5 100644
--- a/Makethird
+++ b/Makethird
@@ -370,7 +370,7 @@ endif
# --- OpenJPEG ---
-ifneq "$(wildcard $(OPENJPEG_DIR)/CMakeLists.txt)" ""
+ifneq "$(wildcard $(OPENJPEG_DIR)/openjpeg.h)" ""
OPENJPEG_OUT := $(OUT)/openjpeg
OPENJPEG_SRC := \
diff --git a/thirdparty/openjpeg b/thirdparty/openjpeg
-Subproject 1ae3470ea8c4618fa411e213f1dfcaf3b87378d
+Subproject 933b2c4b6ccbcf3e12796f74dc20f119d6fc460