Skip to content

Commit 5e21f3c

Browse files
authored
tiff: switch to cmake and build from commit (#354)
1 parent abd9a9c commit 5e21f3c

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

build/posix.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,15 @@ cd ${DEPS}/webp
227227
make install-strip bin_PROGRAMS= noinst_PROGRAMS= man_MANS=
228228

229229
mkdir ${DEPS}/tiff
230-
$CURL https://download.osgeo.org/libtiff/tiff-${VERSION_TIFF}.tar.gz | tar xzC ${DEPS}/tiff --strip-components=1
230+
$CURL https://gitlab.com/libtiff/libtiff/-/archive/${VERSION_TIFF}/libtiff-${VERSION_TIFF}.tar.gz | tar xzC ${DEPS}/tiff --strip-components=1
231231
cd ${DEPS}/tiff
232232
# Propagate -pthread into CFLAGS to ensure WebP support
233-
CFLAGS="${CFLAGS} -pthread" ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \
234-
--disable-tools --disable-tests --disable-contrib --disable-docs --disable-mdi --disable-pixarlog --disable-old-jpeg --disable-cxx --disable-lzma --disable-zstd --disable-libdeflate
235-
make install-strip noinst_PROGRAMS= dist_doc_DATA=
233+
cmake -G"Unix Makefiles" \
234+
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=MinSizeRel \
235+
-DBUILD_SHARED_LIBS=FALSE -DCMath_HAVE_LIBC_POW=1 \
236+
-Dtiff-contrib=OFF -Dtiff-cxx=OFF -Dtiff-docs=OFF -Dtiff-tests=OFF -Dtiff-tools=OFF -Dmdi=OFF \
237+
-Djbig=OFF -Dlerc=OFF -Dlibdeflate=OFF -Dlzma=OFF -Dold-jpeg=OFF -Dpixarlog=OFF -Dtiff-opengl=OFF -Dzstd=OFF
238+
make install/strip
236239

237240
if [ -z "$WITHOUT_HIGHWAY" ]; then
238241
mkdir ${DEPS}/hwy

check-latest-versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648"
5353
version_latest "png" "$VERSION_PNG" "1705"
5454
version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl"
5555
version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable"
56-
version_latest "tiff" "$VERSION_TIFF" "1738"
56+
#version_latest "tiff" "$VERSION_TIFF" "1738" # use commit SHA until next tagged release
5757
#version_latest "uhdr" "$VERSION_UHDR" "375187" # use commit SHA until next tagged release
5858
version_latest "webp" "$VERSION_WEBP" "1761"
5959
version_latest "xml2" "$VERSION_XML2" "1783"

versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ VERSION_PIXMAN=0.46.4
2020
VERSION_PNG=1.6.58
2121
VERSION_PROXY_LIBINTL=0.5
2222
VERSION_RSVG=2.62.1
23-
VERSION_TIFF=4.7.1
23+
VERSION_TIFF=179a100
2424
VERSION_UHDR=8cbc983
2525
VERSION_VIPS=8.18.2
2626
VERSION_WEBP=1.6.0

0 commit comments

Comments
 (0)