Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libvips: remove libjxl patch merged upstream (#5847) 

+ update libjxl's git location.
This commit is contained in:
Kleis Auke Wolthuizen 2021-05-26 22:37:43 +02:00 committed by GitHub
parent d1aef8b7a6
commit dc4297c38d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/libvips/Dockerfile
View File

@ -40,7 +40,7 @@ RUN git clone --depth 1 https://chromium.googlesource.com/webm/libwebp
RUN git clone --depth 1 https://gitlab.com/libtiff/libtiff
RUN git clone --depth 1 https://aomedia.googlesource.com/aom
RUN git clone --depth 1 https://github.com/strukturag/libheif
RUN git clone --depth 1 --recursive https://gitlab.com/wg1/jpeg-xl.git
RUN git clone --depth 1 --recursive https://github.com/libjxl/libjxl.git
WORKDIR libvips
COPY build.sh $SRC/

5
projects/libvips/build.sh
View File

@ -145,13 +145,10 @@ make install
popd
# jpeg-xl (libjxl)
pushd $SRC/jpeg-xl
pushd $SRC/libjxl
sed -i'.bak' "/add_subdirectory(tools)/d" CMakeLists.txt
# Don't overwrite our linker flags
sed -i'.bak' "/set(CMAKE_EXE_LINKER_FLAGS/{N;d;}" CMakeLists.txt
# Ensure pkg-config file is installed when -DJPEGXL_STATIC=1, see:
# https://gitlab.com/wg1/jpeg-xl/-/issues/224
curl -Ls https://gist.github.com/kleisauke/d54b5e62367d20e66dd58ca19a2234c9/raw/1dfd4398de87e1997f21a216a1c28de730deb2d9/jpeg-xl-pkg-config.patch | patch -p1 || true
cmake -G "Unix Makefiles" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER=$CC \