Skip to content

Commit 6063fac

Browse files
committed
Immich: fix paths to versioned json for image-processing builds
1 parent b01fa88 commit 6063fac

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

install/immich-install.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ cd "$STAGING_DIR"
180180
SOURCE=${SOURCE_DIR}/libjxl
181181
JPEGLI_LIBJPEG_LIBRARY_SOVERSION="62"
182182
JPEGLI_LIBJPEG_LIBRARY_VERSION="62.3.0"
183-
: "${LIBJXL_REVISION:=$(jq -cr '.sources[] | select(.name == "libjxl").revision' $BASE_DIR/server/bin/build-lock.json)}"
183+
: "${LIBJXL_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libjxl.json)}"
184184
$STD git clone https://github.com/libjxl/libjxl.git "$SOURCE"
185185
cd "$SOURCE"
186186
$STD git reset --hard "$LIBJXL_REVISION"
187187
$STD git submodule update --init --recursive --depth 1 --recommend-shallow
188-
$STD git apply "$BASE_DIR"/server/bin/patches/jpegli-empty-dht-marker.patch
189-
$STD git apply "$BASE_DIR"/server/bin/patches/jpegli-icc-warning.patch
188+
$STD git apply "$BASE_DIR"/server/sources/libjxl-patches/jpegli-empty-dht-marker.patch
189+
$STD git apply "$BASE_DIR"/server/sources/libjxl-patches/jpegli-icc-warning.patch
190190
mkdir build
191191
cd build
192192
$STD cmake \
@@ -215,7 +215,7 @@ cd "$STAGING_DIR"
215215
rm -rf "$SOURCE"/{build,third_party}
216216

217217
SOURCE=${SOURCE_DIR}/libheif
218-
: "${LIBHEIF_REVISION:=$(jq -cr '.sources[] | select(.name == "libheif").revision' $BASE_DIR/server/bin/build-lock.json)}"
218+
: "${LIBHEIF_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libheif.json)}"
219219
$STD git clone https://github.com/strukturag/libheif.git "$SOURCE"
220220
cd "$SOURCE"
221221
$STD git reset --hard "$LIBHEIF_REVISION"
@@ -238,7 +238,7 @@ cd "$STAGING_DIR"
238238
rm -rf "$SOURCE"/build
239239

240240
SOURCE=${SOURCE_DIR}/libraw
241-
: "${LIBRAW_REVISION:=$(jq -cr '.sources[] | select(.name == "libraw").revision' $BASE_DIR/server/bin/build-lock.json)}"
241+
: "${LIBRAW_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libraw.json)}"
242242
$STD git clone https://github.com/libraw/libraw.git "$SOURCE"
243243
cd "$SOURCE"
244244
$STD git reset --hard "$LIBRAW_REVISION"
@@ -251,7 +251,7 @@ $STD make clean
251251
cd "$STAGING_DIR"
252252

253253
SOURCE=$SOURCE_DIR/imagemagick
254-
: "${IMAGEMAGICK_REVISION:=$(jq -cr '.sources[] | select(.name == "imagemagick").revision' $BASE_DIR/server/bin/build-lock.json)}"
254+
: "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/imagemagick.json)}"
255255
$STD git clone https://github.com/ImageMagick/ImageMagick.git "$SOURCE"
256256
cd "$SOURCE"
257257
$STD git reset --hard "$IMAGEMAGICK_REVISION"
@@ -263,7 +263,7 @@ $STD make clean
263263
cd "$STAGING_DIR"
264264

265265
SOURCE=$SOURCE_DIR/libvips
266-
: "${LIBVIPS_REVISION:=$(jq -cr '.sources[] | select(.name == "libvips").revision' $BASE_DIR/server/bin/build-lock.json)}"
266+
: "${LIBVIPS_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libvips.json)}"
267267
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"
268268
cd "$SOURCE"
269269
$STD git reset --hard "$LIBVIPS_REVISION"
@@ -312,7 +312,7 @@ cd "$SRC_DIR"
312312
cp -a server/{node_modules,dist,bin,resources,package.json,package-lock.json,start*.sh} "$APP_DIR"/
313313
cp -a web/build "$APP_DIR"/www
314314
cp LICENSE "$APP_DIR"
315-
cp "$BASE_DIR"/server/bin/build-lock.json "$APP_DIR"
315+
# cp "$BASE_DIR"/server/bin/build-lock.json "$APP_DIR"
316316
msg_ok "Installed Immich Web Components"
317317

318318
cd "$SRC_DIR"/machine-learning

0 commit comments

Comments
 (0)