Skip to content

Commit af36b74

Browse files
committed
Upgrade libpng and correct release-monitoring ID
Ensure only stable verions are considered 'latest' Better multi-OS support for printf instead of echo
1 parent 94f0e45 commit af36b74

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if ! type docker >/dev/null; then
3030
fi
3131

3232
# Update base images
33-
for baseimage in debian:wheezy debian:stretch alpine:edge; do
33+
for baseimage in debian:jessie debian:stretch alpine:edge; do
3434
docker pull $baseimage
3535
done
3636

build/lin.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ VERSION_GSF=1.14.46
2424
VERSION_EXIF=0.6.21
2525
VERSION_LCMS2=2.9
2626
VERSION_JPEG=2.0.2
27-
VERSION_PNG16=1.6.34
27+
VERSION_PNG16=1.6.37
2828
VERSION_WEBP=1.0.2
2929
VERSION_TIFF=4.0.10
3030
VERSION_ORC=0.4.28
@@ -54,7 +54,7 @@ without_patch() {
5454
# Check for newer versions
5555
ALL_AT_VERSION_LATEST=true
5656
version_latest() {
57-
VERSION_LATEST=$(curl -s https://release-monitoring.org/api/project/$3 | jq -r '.version' | tr -d v)
57+
VERSION_LATEST=$(curl -s https://release-monitoring.org/api/project/$3 | jq -r '.versions[]' | grep -E -m1 '^[0-9]+(.[0-9]+)*$')
5858
if [ "$VERSION_LATEST" != "$2" ]; then
5959
ALL_AT_VERSION_LATEST=false
6060
echo "$1 version $2 has been superseded by $VERSION_LATEST"
@@ -68,15 +68,15 @@ version_latest "gsf" "$VERSION_GSF" "1980"
6868
version_latest "exif" "$VERSION_EXIF" "1607"
6969
version_latest "lcms2" "$VERSION_LCMS2" "9815"
7070
version_latest "jpeg" "$VERSION_JPEG" "1648"
71-
version_latest "png" "$VERSION_PNG16" "15294"
71+
version_latest "png" "$VERSION_PNG16" "1705"
7272
version_latest "webp" "$VERSION_WEBP" "1761"
7373
version_latest "tiff" "$VERSION_TIFF" "13521"
7474
version_latest "orc" "$VERSION_ORC" "2573"
7575
version_latest "gettext" "$VERSION_GETTEXT" "898"
7676
#version_latest "gdkpixbuf" "$VERSION_GDKPIXBUF" "9533" # latest version requires meson instead of autotools
7777
version_latest "freetype" "$VERSION_FREETYPE" "854"
7878
version_latest "expat" "$VERSION_EXPAT" "770"
79-
#version_latest "uuid" "$VERSION_UUID" "8179" # latest version in release monitoring is release candidate
79+
version_latest "uuid" "$VERSION_UUID" "8179"
8080
version_latest "fontconfig" "$VERSION_FONTCONFIG" "827"
8181
version_latest "harfbuzz" "$VERSION_HARFBUZZ" "1299"
8282
version_latest "pixman" "$VERSION_PIXMAN" "3648"
@@ -303,7 +303,7 @@ rm -rf pkgconfig .libs *.la libvipsCC*
303303

304304
# Create JSON file of version numbers
305305
cd ${TARGET}
306-
echo "{\n\
306+
printf "{\n\
307307
\"cairo\": \"${VERSION_CAIRO}\",\n\
308308
\"croco\": \"${VERSION_CROCO}\",\n\
309309
\"exif\": \"${VERSION_EXIF}\",\n\
@@ -333,7 +333,7 @@ echo "{\n\
333333
\"zlib\": \"${VERSION_ZLIB}\"\n\
334334
}" >versions.json
335335

336-
echo "\"${PLATFORM}\"" >platform.json
336+
printf "\"${PLATFORM}\"" >platform.json
337337

338338
# Create .tar.gz
339339
tar czf /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz include lib *.json

0 commit comments

Comments
 (0)