Skip to content

Commit 945e61a

Browse files
authored
libheif: Delegate building to script from upstream repository. (#15015)
Upstream change has landed in strukturag/libheif#1714 Signed-off-by: Joachim Bauch <bauch@struktur.de>
1 parent c0535c2 commit 945e61a

File tree

2 files changed

+2
-109
lines changed

2 files changed

+2
-109
lines changed

projects/libheif/Dockerfile

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,6 @@
1616

1717
FROM gcr.io/oss-fuzz-base/base-builder
1818

19-
20-
RUN apt-get update && apt-get install -y \
21-
autoconf \
22-
automake \
23-
build-essential \
24-
cmake \
25-
libbrotli-dev \
26-
libtool \
27-
make \
28-
mercurial \
29-
pkg-config \
30-
yasm \
31-
zlib1g-dev
32-
33-
RUN git clone \
34-
--depth 1 \
35-
--branch master \
36-
https://github.com/strukturag/libde265.git \
37-
libde265
38-
39-
RUN git clone \
40-
https://bitbucket.org/multicoreware/x265_git/src/stable/ \
41-
x265
42-
43-
RUN git clone \
44-
--depth 1 \
45-
--branch master \
46-
https://aomedia.googlesource.com/aom \
47-
aom
48-
4919
RUN git clone \
5020
--depth 1 \
5121
--branch master \

projects/libheif/build.sh

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -15,82 +15,5 @@
1515
#
1616
################################################################################
1717

18-
# Build dependencies.
19-
export DEPS_PATH=$SRC/deps
20-
mkdir -p $DEPS_PATH
21-
22-
cd $SRC/x265/build/linux
23-
cmake -G "Unix Makefiles" \
24-
-DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
25-
-DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
26-
-DCMAKE_INSTALL_PREFIX="$DEPS_PATH" \
27-
-DENABLE_SHARED:bool=off \
28-
../../source
29-
make clean
30-
make -j$(nproc) x265-static
31-
make install
32-
33-
cd $SRC/libde265
34-
./autogen.sh
35-
./configure \
36-
--prefix="$DEPS_PATH" \
37-
--disable-shared \
38-
--enable-static \
39-
--disable-dec265 \
40-
--disable-sherlock265 \
41-
--disable-hdrcopy \
42-
--disable-enc265 \
43-
--disable-acceleration_speed
44-
make clean
45-
make -j$(nproc)
46-
make install
47-
48-
mkdir -p $SRC/aom/build/linux
49-
cd $SRC/aom/build/linux
50-
cmake -G "Unix Makefiles" \
51-
-DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
52-
-DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
53-
-DCMAKE_INSTALL_PREFIX="$DEPS_PATH" \
54-
-DENABLE_SHARED:bool=off -DCONFIG_PIC=1 \
55-
-DENABLE_EXAMPLES=0 -DENABLE_DOCS=0 -DENABLE_TESTS=0 \
56-
-DCONFIG_SIZE_LIMIT=1 \
57-
-DDECODE_HEIGHT_LIMIT=12288 -DDECODE_WIDTH_LIMIT=12288 \
58-
-DDO_RANGE_CHECK_CLAMP=1 \
59-
-DAOM_MAX_ALLOCABLE_MEMORY=536870912 \
60-
-DAOM_TARGET_CPU=generic \
61-
../../
62-
make clean
63-
make -j$(nproc)
64-
make install
65-
66-
# Remove shared libraries to avoid accidental linking against them.
67-
rm -f $DEPS_PATH/lib/*.so
68-
rm -f $DEPS_PATH/lib/*.so.*
69-
70-
cd $SRC/libheif
71-
mkdir build
72-
cd build
73-
cmake .. --preset=fuzzing \
74-
-DFUZZING_COMPILE_OPTIONS="" \
75-
-DFUZZING_LINKER_OPTIONS="$LIB_FUZZING_ENGINE" \
76-
-DFUZZING_C_COMPILER=$CC -DFUZZING_CXX_COMPILER=$CXX \
77-
-DWITH_DEFLATE_HEADER_COMPRESSION=OFF
78-
79-
make -j$(nproc)
80-
81-
#./autogen.sh
82-
#PKG_CONFIG="pkg-config --static" PKG_CONFIG_PATH="$DEPS_PATH/lib/pkgconfig" ./configure \
83-
# --disable-shared \
84-
# --enable-static \
85-
# --disable-examples \
86-
# --disable-go \
87-
# --enable-libfuzzer="$LIB_FUZZING_ENGINE" \
88-
# CPPFLAGS="-I$DEPS_PATH/include"
89-
#make clean
90-
#make -j$(nproc)
91-
92-
cp fuzzing/*_fuzzer $OUT
93-
cp ../fuzzing/data/dictionary.txt $OUT/box-fuzzer.dict
94-
cp ../fuzzing/data/dictionary.txt $OUT/file-fuzzer.dict
95-
96-
zip -r $OUT/file-fuzzer_seed_corpus.zip ../fuzzing/data/corpus/*.heic
18+
# Delegate actual building to the script provided by libheif.
19+
./scripts/build-oss-fuzz.sh

0 commit comments

Comments
 (0)