diff --git a/mingw-w64-libgd/PKGBUILD b/mingw-w64-libgd/PKGBUILD index 7fa1a42d487fb..0de2fe890b6ef 100644 --- a/mingw-w64-libgd/PKGBUILD +++ b/mingw-w64-libgd/PKGBUILD @@ -4,7 +4,7 @@ _realname=libgd pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.3.2 -pkgrel=8 +pkgrel=9 pkgdesc="GD is an open source code library for the dynamic creation of images by programmers (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -22,7 +22,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libheif" "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-fontconfig" - "${MINGW_PACKAGE_PREFIX}-libimagequant" + $([[ "${CARCH}" == "i686" ]] || echo "${MINGW_PACKAGE_PREFIX}-libimagequant") "${MINGW_PACKAGE_PREFIX}-libwebp" "${MINGW_PACKAGE_PREFIX}-xpm-nox" "${MINGW_PACKAGE_PREFIX}-zlib") @@ -55,6 +55,14 @@ prepare() { build() { mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM} + declare -a _extra_config + if [ "${CARCH}" != "i686" ]; then + _extra_config+=( + "-DENABLE_LIQ=ON" + "-DLIQ_INCLUDE_DIR=${MINGW_PREFIX}/include/libimagequant" + ) + fi + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -GNinja \ @@ -70,13 +78,12 @@ build() { -DENABLE_XPM=ON \ -DENABLE_FREETYPE=ON \ -DENABLE_WEBP=ON \ - -DENABLE_LIQ=ON \ -DENABLE_GD_FORMATS=ON \ -DXPM_XPM_INCLUDE_DIR="${MINGW_PREFIX}/include/X11" \ -DWEBP_INCLUDE_DIR="${MINGW_PREFIX}/include/webp/" \ - -DLIQ_INCLUDE_DIR="${MINGW_PREFIX}/include/libimagequant" \ -DFREETYPE_INCLUDE_DIR_freetype2="${MINGW_PREFIX}/include/freetype2" \ -DFREETYPE_INCLUDE_DIRS="${MINGW_PREFIX}/include/freetype2" \ + "${_extra_config[@]}" \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/cmake --build ./