Add libd265, openjpeg, poppler for Tropy

Author: inukshuk

.github/workflows/build-release.yml

@@ -31,12 +31,12 @@ jobs:
           - 'ubuntu-24.04'
         platform:
           - 'linux-x64'
-          - 'linux-armv6'
-          - 'linuxmusl-x64'
-          - 'linuxmusl-arm64v8'
-          - 'linux-ppc64le'
-          - 'linux-s390x'
-          - 'wasm32'
+          #- 'linux-armv6'
+          #- 'linuxmusl-x64'
+          #- 'linuxmusl-arm64v8'
+          #- 'linux-ppc64le'
+          #- 'linux-s390x'
+          #- 'wasm32'
           - 'win32-ia32'
           - 'win32-x64'
           - 'win32-arm64v8'

LIBVIPS_VERSION

@@ -1 +1 @@
-8.16.0
+8.15.3

THIRD-PARTY-NOTICES.json

@@ -0,0 +1,163 @@
+[
+  {
+    "name": "aom",
+    "license": "BSD 2-Clause + Alliance for Open Media Patent License 1.0",
+    "licenseURL": [
+      "https://aomedia.googlesource.com/aom/+/refs/heads/master/LICENSE?format=TEXT",
+      "https://aomedia.googlesource.com/aom/+/refs/heads/master/PATENTS?format=TEXT"
+    ]
+  },
+  {
+    "name": "cairo",
+    "license": "MPL-2.0",
+    "licenseURL": "https://gitlab.freedesktop.org/cairo/cairo/-/raw/master/COPYING-MPL-1.1"
+  },
+  {
+    "name": "cgif",
+    "license": "MIT License",
+    "licenseURL": "https://raw.githubusercontent.com/dloebl/cgif/refs/heads/main/LICENSE"
+  },
+  {
+    "name": "expat",
+    "license": "MIT",
+    "licenseURL": "https://raw.githubusercontent.com/libexpat/libexpat/master/expat/COPYING"
+  },
+  {
+    "name": "fontconfig",
+    "license": "fontconfig Licence",
+    "licenseURL": "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/raw/main/COPYING"
+  },
+  {
+    "name": "freetype",
+    "license": "freetype Licence",
+    "licenseURL": "https://gitlab.freedesktop.org/freetype/freetype/-/raw/master/LICENSE.TXT"
+  },
+  {
+    "name": "fribidi",
+    "license": "LGPL-2.1",
+    "licenseURL": "https://raw.githubusercontent.com/fribidi/fribidi/master/COPYING"
+  },
+  {
+    "name": "glib",
+    "license": "LGPL-2.1",
+    "licenseURL": "https://gitlab.gnome.org/GNOME/glib/-/raw/master/COPYING"
+  },
+  {
+    "name": "harfbuzz",
+    "license": "MIT",
+    "licenseURL": "https://raw.githubusercontent.com/harfbuzz/harfbuzz/master/COPYING"
+  },
+  {
+    "name": "highway",
+    "license": "BSD 3-Clause",
+    "licenseURL": "https://raw.githubusercontent.com/google/highway/refs/heads/master/LICENSE"
+  },
+  {
+    "name": "lcms",
+    "license": "MIT",
+    "licenseURL": "https://raw.githubusercontent.com/mm2/Little-CMS/master/COPYING"
+  },
+  {
+    "name": "libarchive",
+    "license": "BSD 2-Clause",
+    "licenseURL": "https://raw.githubusercontent.com/libarchive/libarchive/refs/heads/master/COPYING"
+  },
+  {
+    "name": "libexif",
+    "license": "LGPL-2.1",
+    "licenseURL": "https://raw.githubusercontent.com/libexif/libexif/master/COPYING"
+  },
+  {
+    "name": "libde265",
+    "license": "LGPL-3.0",
+    "licenseURL": "https://raw.githubusercontent.com/strukturag/libde265/master/COPYING"
+  },
+  {
+    "name": "libffi",
+    "license": "MIT",
+    "licenseURL": "https://raw.githubusercontent.com/libffi/libffi/master/LICENSE"
+  },
+  {
+    "name": "libheif",
+    "license": "LGPL-3.0",
+    "licenseURL": "https://raw.githubusercontent.com/strukturag/libheif/master/COPYING"
+  },
+  {
+    "name": "libimagequant",
+    "license": "BSD 2-Clause",
+    "licenseURL": "https://raw.githubusercontent.com/lovell/libimagequant/main/COPYRIGHT"
+  },
+  {
+    "name": "mozjpeg",
+    "license": "zlib License, IJG License, BSD-3-Clause",
+    "licenseURL": "https://raw.githubusercontent.com/mozilla/mozjpeg/master/LICENSE.md"
+  },
+  {
+    "name": "libpng",
+    "license": "libpng License",
+    "licenseURL": "https://raw.githubusercontent.com/glennrp/libpng/libpng16/LICENSE"
+  },
+  {
+    "name": "librsvg",
+    "license": "LGPL-2.1",
+    "licenseURL": "https://gitlab.gnome.org/GNOME/librsvg/-/raw/main/COPYING.LIB"
+  },
+  {
+    "name": "libspng",
+    "license": "BSD 2-Clause, libpng License",
+    "licenseURL": "https://raw.githubusercontent.com/randy408/libspng/master/LICENSE"
+  },
+  {
+    "name": "libtiff",
+    "license": "libtiff License",
+    "licenseURL": "https://gitlab.com/libtiff/libtiff/-/raw/master/COPYRIGHT"
+  },
+  {
+    "name": "libvips",
+    "license": "LGPL-2.1",
+    "licenseURL": "https://raw.githubusercontent.com/libvips/libvips/master/COPYING"
+  },
+  {
+    "name": "libwebp",
+    "license": "BSD-3-Clause",
+    "licenseURL": [
+      "https://chromium.googlesource.com/webm/libwebp/+/refs/heads/main/COPYING?format=TEXT",
+      "https://chromium.googlesource.com/webm/libwebp/+/refs/heads/main/PATENTS?format=TEXT"
+    ]
+  },
+  {
+    "name": "libxml2",
+    "license": "MIT",
+    "licenseURL": "https://gitlab.gnome.org/GNOME/libxml2/-/raw/master/Copyright"
+  },
+  {
+    "name": "openjpeg",
+    "license": "BDS 2-Clause",
+    "licenseURL": "https://raw.githubusercontent.com/uclouvain/openjpeg/master/LICENSE"
+  },
+  {
+    "name": "pango",
+    "license": "GPL-2.0",
+    "licenseURL": "https://gitlab.gnome.org/GNOME/pango/-/raw/master/COPYING"
+  },
+  {
+    "name": "pixman",
+    "license": "MIT",
+    "licenseURL": "https://gitlab.freedesktop.org/pixman/pixman/-/raw/master/COPYING"
+  },
+  {
+    "name": "poppler",
+    "license": "GPL-2.0",
+    "licenseURL": "https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/COPYING"
+  },
+  {
+    "name": "proxy-libintl",
+    "license": "LGPL-2.0",
+    "licenseURL": "https://raw.githubusercontent.com/frida/proxy-libintl/master/COPYING"
+  },
+  {
+    "name": "zlib-ng",
+    "license": "zlib Licence",
+    "licenseURL": "https://raw.githubusercontent.com/zlib-ng/zlib-ng/develop/LICENSE.md"
+  }
+]

build/lin.sh

@@ -129,6 +129,10 @@ VERSION_AOM=3.11.0
 VERSION_HEIF=1.19.5
 VERSION_CGIF=0.4.1
 
+VERSION_DE265=1.0.15
+VERSION_OPENJPEG=2.5.3
+VERSION_POPPLER=24.04.0
+
 # Check for newer versions
 # Skip by setting the VERSION_LATEST_REQUIRED environment variable to "false"
 ALL_AT_VERSION_LATEST=true
@@ -177,6 +181,9 @@ version_latest "rsvg" "$VERSION_RSVG" "5420"
 version_latest "aom" "$VERSION_AOM" "17628"
 version_latest "heif" "$VERSION_HEIF" "64439"
 version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif"
+version_latest "de265" "$VERSION_DE265" "11239"
+version_latest "openjpeg" "$VERSION_OPENJPEG" "2550"
+#version_latest "poppler" "$VERSION_POPPLER" "3686"
 if [ "$ALL_AT_VERSION_LATEST" = "false" ]; then exit 1; fi
 
 # Download and build dependencies from source
@@ -259,14 +266,22 @@ AOM_AS_FLAGS="${FLAGS}" cmake -G"Unix Makefiles" \
   ..
 make install/strip
 
+mkdir ${DEPS}/de265
+$CURL https://github.com/strukturag/libde265/releases/download/v${VERSION_DE265}/libde265-${VERSION_DE265}.tar.gz | tar xzC ${DEPS}/de265 --strip-components=1
+cd ${DEPS}/de265
+CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \
+  -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
+  -DBUILD_SHARED_LIBS=FALSE -DENABLE_ENCODER=FALSE -DENABLE_DECODER=FALSE
+make install/strip
+
 mkdir ${DEPS}/heif
 $CURL https://github.com/strukturag/libheif/releases/download/v${VERSION_HEIF}/libheif-${VERSION_HEIF}.tar.gz | tar xzC ${DEPS}/heif --strip-components=1
 cd ${DEPS}/heif
 # Downgrade minimum required CMake version to 3.12 - https://github.com/strukturag/libheif/issues/975
 sed -i'.bak' "/^cmake_minimum_required/s/3.16.3/3.12/" CMakeLists.txt
 CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \
   -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_PLUGIN_LOADING=0 -DWITH_EXAMPLES=0 -DWITH_LIBDE265=0 -DWITH_X265=0
+  -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_PLUGIN_LOADING=0 -DWITH_EXAMPLES=0 -DWITH_LIBDE265=TRUE -DWITH_X265=0
 make install/strip
 
 mkdir ${DEPS}/jpeg
@@ -439,6 +454,51 @@ CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=r
   -Dtests=false
 meson install -C _build --tag devel
 
+mkdir -p ${DEPS}/openjpeg/build
+$CURL https://github.com/uclouvain/openjpeg/archive/v${VERSION_OPENJPEG}.tar.gz | tar xzC ${DEPS}/openjpeg --strip-components=1
+cd ${DEPS}/openjpeg/build
+LDFLAGS=${LDFLAGS/\$/} cmake .. -G"Unix Makefiles" \
+  -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_PREFIX_PATH=${TARGET} -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_BUILD_TYPE=Release \
+  -DBUILD_SHARED_LIBS=FALSE -DBUILD_CODEC=OFF
+make install/strip
+
+mkdir -p ${DEPS}/poppler/build
+$CURL https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-${VERSION_POPPLER}/poppler-poppler-${VERSION_POPPLER}.tar.bz2 | tar xjC ${DEPS}/poppler --strip-components=1
+cd ${DEPS}/poppler/build
+LDFLAGS=${LDFLAGS/\$/} cmake .. -G"Unix Makefiles" \
+  -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake\
+  -DCMAKE_PREFIX_PATH=${TARGET} \
+  -DCMAKE_INSTALL_PREFIX=${TARGET} \
+  -DCMAKE_INSTALL_LIBDIR=lib \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DBUILD_SHARED_LIBS=FALSE \
+  -DBUILD_CPP_TESTS=OFF \
+  -DBUILD_GTK_TESTS=OFF \
+  -DBUILD_QT5_TESTS=OFF \
+  -DBUILD_QT6_TESTS=OFF \
+  -DBUILD_MANUAL_TESTS=OFF \
+  -DENABLE_BOOST=OFF \
+  -DENABLE_CMS=lcms2 \
+  -DENABLE_CPP=OFF \
+  -DENABLE_DCTDECODER=libjpeg \
+  -DENABLE_GLIB=ON \
+  -DENABLE_GOBJECT_INTROSPECTION=OFF \
+  -DENABLE_GPGME=OFF \
+  -DENABLE_GTK_DOC=OFF \
+  -DENABLE_LIBCURL=OFF \
+  -DENABLE_LIBOPENJPEG=openjpeg2 \
+  -DENABLE_LIBPNG=ON \
+  -DENABLE_LIBTIFF=ON \
+  -DENABLE_NSS3=OFF \
+  -DENABLE_QT5=OFF \
+  -DENABLE_QT6=OFF \
+  -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
+  -DENABLE_UTILS=OFF \
+  -DENABLE_ZLIB=ON \
+  -DENABLE_ZLIB_UNCOMPRESS=OFF \
+  -DEXTRA_WARN=OFF
+make install/strip
+
 mkdir ${DEPS}/vips
 $CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-${VERSION_VIPS}.tar.xz | tar xJC ${DEPS}/vips --strip-components=1
 cd ${DEPS}/vips
@@ -464,7 +524,7 @@ sed -i'.bak' "/subdir('man')/{N;N;N;N;d;}" meson.build
 CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" meson setup _build --default-library=shared --buildtype=release --strip --prefix=${TARGET} ${MESON} \
   -Ddeprecated=false -Dexamples=false -Dintrospection=disabled -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled -Djpeg-xl=disabled \
   ${WITHOUT_HIGHWAY:+-Dhighway=disabled} -Dorc=disabled -Dmagick=disabled -Dmatio=disabled -Dnifti=disabled -Dopenexr=disabled \
-  -Dopenjpeg=disabled -Dopenslide=disabled -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled \
+  -Dopenslide=disabled -Dpdfium=disabled -Dquantizr=disabled \
   -Dppm=false -Danalyze=false -Dradiance=false \
   ${LINUX:+-Dcpp_link_args="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--version-script=$DEPS/vips/vips.map $EXCLUDE_LIBS"}
 meson install -C _build --tag runtime,devel
@@ -526,6 +586,7 @@ printf "{\n\
   \"cgif\": \"${VERSION_CGIF}\",\n\
   \"exif\": \"${VERSION_EXIF}\",\n\
   \"expat\": \"${VERSION_EXPAT}\",\n\
+  \"de265\": \"${VERSION_DE265}\",\n\
   \"ffi\": \"${VERSION_FFI}\",\n\
   \"fontconfig\": \"${VERSION_FONTCONFIG}\",\n\
   \"freetype\": \"${VERSION_FREETYPE}\",\n\
@@ -537,9 +598,11 @@ printf "{\n\
   \"imagequant\": \"${VERSION_IMAGEQUANT}\",\n\
   \"lcms\": \"${VERSION_LCMS2}\",\n\
   \"mozjpeg\": \"${VERSION_MOZJPEG}\",\n\
+  \"openjpeg\": \"${VERSION_OPENJPEG}\",\n\
   \"pango\": \"${VERSION_PANGO}\",\n\
   \"pixman\": \"${VERSION_PIXMAN}\",\n\
   \"png\": \"${VERSION_PNG16}\",\n\
+  \"poppler\": \"${VERSION_POPPLER}\",\n\
   \"proxy-libintl\": \"${VERSION_PROXY_LIBINTL}\",\n\
   \"rsvg\": \"${VERSION_RSVG}\",\n\
   \"spng\": \"${VERSION_SPNG}\",\n\
@@ -553,7 +616,7 @@ printf "{\n\
 printf "\"${PLATFORM}\"" >platform.json
 
 # Add third-party notices
-$CURL -O https://raw.githubusercontent.com/lovell/sharp-libvips/main/THIRD-PARTY-NOTICES.md
+$CURL -O https://raw.githubusercontent.com/tropy/sharp-libvips/main/THIRD-PARTY-NOTICES.json
 
 # Create the tarball
 ls -al lib
@@ -562,8 +625,7 @@ mv lib-filtered lib
 tar chzf ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz \
   include \
   lib \
-  *.json \
-  THIRD-PARTY-NOTICES.md
+  *.json
 
 # Allow tarballs to be read outside container
 chmod 644 ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.*

build/win.sh

@@ -22,8 +22,8 @@ case ${PLATFORM} in
     ;;
 esac
 
-FILENAME="vips-dev-${ARCH}-web-${VERSION_VIPS}-static.zip"
-URL="https://github.com/libvips/build-win64-mxe/releases/download/v${VERSION_VIPS}/${FILENAME}"
+FILENAME="vips-dev-${ARCH}-tropy-${VERSION_VIPS}.zip"
+URL="https://github.com/tropy/build-win64-mxe/releases/download/v${VERSION_VIPS}/${FILENAME}"
 echo "Downloading $URL"
 $CURL -O $URL
 unzip $FILENAME
@@ -37,19 +37,18 @@ cp bin/*.dll lib/
 printf "\"${PLATFORM}\"" >platform.json
 
 # Add third-party notices
-$CURL -O https://raw.githubusercontent.com/lovell/sharp-libvips/main/THIRD-PARTY-NOTICES.md
+$CURL -O https://raw.githubusercontent.com/tropy/sharp-libvips/main/THIRD-PARTY-NOTICES.json
 
 echo "Creating tarball"
 tar czf /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz \
   include \
   lib/glib-2.0 \
   lib/libvips.lib \
   lib/*.dll \
-  *.json \
-  THIRD-PARTY-NOTICES.md
+  *.json
 
 # Allow tarballs to be read outside container
 chmod 644 /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.*
 
 # Remove working directories
-rm -rf lib include *.json THIRD-PARTY-NOTICES.md
+rm -rf lib include *.json