diff --git a/mingw-w64-darktable/PKGBUILD b/mingw-w64-darktable/PKGBUILD index a4ece6159a431..325d8cbe1999c 100644 --- a/mingw-w64-darktable/PKGBUILD +++ b/mingw-w64-darktable/PKGBUILD @@ -4,7 +4,7 @@ _realname=darktable pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=5.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="darktable is an open source photography workflow application and raw developer (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-efl/PKGBUILD b/mingw-w64-efl/PKGBUILD index d1fe6a79f6147..236dd9271cac1 100644 --- a/mingw-w64-efl/PKGBUILD +++ b/mingw-w64-efl/PKGBUILD @@ -5,7 +5,7 @@ _realname=efl pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.28.1 -pkgrel=3 +pkgrel=4 pkgdesc="Enlightenment Foundation Libraries - Development version (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') diff --git a/mingw-w64-freeimage/PKGBUILD b/mingw-w64-freeimage/PKGBUILD index a66579d0fe2b5..cef058f63547c 100644 --- a/mingw-w64-freeimage/PKGBUILD +++ b/mingw-w64-freeimage/PKGBUILD @@ -4,7 +4,7 @@ _realname=FreeImage pkgbase=mingw-w64-freeimage pkgname="${MINGW_PACKAGE_PREFIX}-freeimage" pkgver=3.18.0 -pkgrel=16 +pkgrel=17 libver=3 pkgdesc="Library project for developers who would like to support popular graphics image formats (mingw-w64)" arch=('any') diff --git a/mingw-w64-gegl/PKGBUILD b/mingw-w64-gegl/PKGBUILD index 4c0fd608c0891..b901bb0085ce9 100644 --- a/mingw-w64-gegl/PKGBUILD +++ b/mingw-w64-gegl/PKGBUILD @@ -6,7 +6,7 @@ pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-docs") pkgver=0.4.66 -pkgrel=1 +pkgrel=2 pkgdesc="Generic Graphics Library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-imagemagick/PKGBUILD b/mingw-w64-imagemagick/PKGBUILD index 9b8ea22107de7..5d0d6fc9b155b 100644 --- a/mingw-w64-imagemagick/PKGBUILD +++ b/mingw-w64-imagemagick/PKGBUILD @@ -7,7 +7,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" _basever=7.1.2 _rc=-12 pkgver=${_basever}${_rc//-/.} # pkgver doesn't have "," "/", "-" and space. -pkgrel=2 +pkgrel=3 pkgdesc="An image viewing/manipulation program (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -79,12 +79,14 @@ options=('libtool') source=(https://imagemagick.org/archive/releases/ImageMagick-${_basever}${_rc}.tar.xz{,.asc} pathtools.c pathtools.h - 001-7.1.1.39-relocate.patch) + 001-7.1.1.39-relocate.patch + https://gitlab.archlinux.org/archlinux/packaging/packages/imagemagick/-/raw/ca9b35f767e1c4a166847fbfe17c2d715aa80582/libraw-0.22.patch) sha256sums=('e22c5dc6cd3f8e708a2809483fd10f8e37438ef7831ec8d3a07951ccd70eceba' 'SKIP' 'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0' '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90' - 'f3454a7938069f91fbe220dc03e444e7454a4a8a286b2408bbfe6f15a9c8a6dc') + 'f3454a7938069f91fbe220dc03e444e7454a4a8a286b2408bbfe6f15a9c8a6dc' + 'baed7cbfb378734d32d277b6e13882ac541932ef67e6aa8867b185ffef12f986') #Lexie Parsimoniae (ImageMagick code signing key) validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A') @@ -110,6 +112,10 @@ prepare() { apply_patch_with_msg \ 001-7.1.1.39-relocate.patch + # https://github.com/ImageMagick/ImageMagick/issues/8524 + apply_patch_with_msg \ + libraw-0.22.patch + autoreconf -fi } diff --git a/mingw-w64-kimageformats-qt5/PKGBUILD b/mingw-w64-kimageformats-qt5/PKGBUILD index 25331cf5351d0..9a11245ae07a0 100644 --- a/mingw-w64-kimageformats-qt5/PKGBUILD +++ b/mingw-w64-kimageformats-qt5/PKGBUILD @@ -5,7 +5,7 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kimageformats" pkgver=5.116.0 -pkgrel=3 +pkgrel=4 arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') msys2_references=( diff --git a/mingw-w64-kimageformats/PKGBUILD b/mingw-w64-kimageformats/PKGBUILD index a3c672e62e205..fc6502ce6bcf9 100644 --- a/mingw-w64-kimageformats/PKGBUILD +++ b/mingw-w64-kimageformats/PKGBUILD @@ -5,7 +5,7 @@ _realname=kimageformats pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=6.19.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-libraw/0001-libraw-pkgconfig-remove-stdcxx.patch b/mingw-w64-libraw/0001-libraw-pkgconfig-remove-stdcxx.patch index c4ec15931e28c..6c071ae89dc1c 100644 --- a/mingw-w64-libraw/0001-libraw-pkgconfig-remove-stdcxx.patch +++ b/mingw-w64-libraw/0001-libraw-pkgconfig-remove-stdcxx.patch @@ -1,20 +1,22 @@ --- a/libraw.pc.in +++ b/libraw.pc.in -@@ -7,6 +7,6 @@ +@@ -7,6 +7,7 @@ Description: Raw image decoder library (non-thread-safe) Requires: @PACKAGE_REQUIRES@ Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ -+Libs: -L${libdir} -lraw @PC_OPENMP@ ++Libs: -L${libdir} -lraw@PC_OPENMP@ Libs.private: @PACKAGE_LIBS_PRIVATE@ Cflags: -I${includedir}/libraw -I${includedir} ++Cflags.private: -DLIBRAW_NODLL --- a/libraw_r.pc.in +++ b/libraw_r.pc.in -@@ -7,6 +7,6 @@ +@@ -7,6 +7,7 @@ Description: Raw image decoder library (thread-safe) Requires: @PACKAGE_REQUIRES@ Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ -+Libs: -L${libdir} -lraw_r @PC_OPENMP@ ++Libs: -L${libdir} -lraw_r@PC_OPENMP@ Libs.private: @PACKAGE_LIBS_PRIVATE@ Cflags: -I${includedir}/libraw -I${includedir} ++Cflags.private: -DLIBRAW_NODLL diff --git a/mingw-w64-libraw/0003-libraw-win32-dlldefs.patch b/mingw-w64-libraw/0003-libraw-win32-dlldefs.patch new file mode 100644 index 0000000000000..0b84b16d0fb5f --- /dev/null +++ b/mingw-w64-libraw/0003-libraw-win32-dlldefs.patch @@ -0,0 +1,15 @@ +diff --git a/libraw/libraw.h b/libraw/libraw.h +index 50d4276d43..d4363fe01e 100644 +--- a/libraw/libraw.h ++++ b/libraw/libraw.h +@@ -55,8 +55,8 @@ it under the terms of the one of two licenses as you choose: + # define LIBRAW_WIN32_CALLS + # endif + +-/* DLLs: Microsoft or Intel compiler */ +-# if defined(_MSC_VER) || defined(__INTEL_COMPILER) ++/* DLLs: MinGW, Microsoft or Intel compiler */ ++# if defined(__GNUC__) || defined(_MSC_VER) || defined(__INTEL_COMPILER) + # ifndef LIBRAW_WIN32_DLLDEFS + # define LIBRAW_WIN32_DLLDEFS + # endif diff --git a/mingw-w64-libraw/LibRaw_obsolete-macros.patch b/mingw-w64-libraw/LibRaw_obsolete-macros.patch deleted file mode 100644 index bdaac604d9a6a..0000000000000 --- a/mingw-w64-libraw/LibRaw_obsolete-macros.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN LibRaw-0.15.4/configure.ac LibRaw-0.15.4-new/configure.ac ---- LibRaw-0.15.4/configure.ac 2013-08-23 04:55:48.000000000 +0200 -+++ LibRaw-0.15.4-new/configure.ac 2014-01-13 17:32:09.891037432 +0100 -@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4]) - # Tools to use - AC_PROG_CXX - AC_PROG_CC --AC_PROG_LIBTOOL -+LT_INIT - AC_ENABLE_SHARED - AC_ENABLE_STATIC - AC_LIBTOOL_WIN32_DLL diff --git a/mingw-w64-libraw/PKGBUILD b/mingw-w64-libraw/PKGBUILD index 4f525c224e832..779e8b33a22d0 100644 --- a/mingw-w64-libraw/PKGBUILD +++ b/mingw-w64-libraw/PKGBUILD @@ -7,7 +7,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-libraw" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.21.5 +pkgver=0.22.0 pkgrel=1 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)" arch=('any') @@ -20,35 +20,34 @@ url="https://www.libraw.org/" license=("spdx:LGPL-2.1 OR CDDL-1.0") makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc") depends=("${MINGW_PACKAGE_PREFIX}-cc-libs" - "${MINGW_PACKAGE_PREFIX}-jasper" "${MINGW_PACKAGE_PREFIX}-lcms2" "${MINGW_PACKAGE_PREFIX}-libjpeg" - "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-libwinpthread" - "${MINGW_PACKAGE_PREFIX}-omp") + "${MINGW_PACKAGE_PREFIX}-omp" + "${MINGW_PACKAGE_PREFIX}-zlib") source=("https://www.libraw.org/data/${_realname}-${pkgver}.tar.gz" "0001-libraw-pkgconfig-remove-stdcxx.patch" - "LibRaw_obsolete-macros.patch" - "0002-libraw-datastream-utf8-api.patch") -sha256sums=('20ecfa6aad943d383ab3f66d303727ef542b042cbba2bb7ddaeff0bb2e9ff916' - '3b4c6aece23e020bf50a8bf349a25186273a601286fa2bb1f0a7269083277c13' - '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f' - '262c29b7e51d0916340b827fe1810ce1581b267886a98b4d6bccf720bd2789d3') + "0002-libraw-datastream-utf8-api.patch" + "0003-libraw-win32-dlldefs.patch") +sha256sums=('1071e6e8011593c366ffdadc3d3513f57c90202d526e133174945ec1dd53f2a1' + 'f3b9cc8eb9e557ad6298cc05285c7f3a91b15ccbc65577f03505e0a38f62c8e8' + '262c29b7e51d0916340b827fe1810ce1581b267886a98b4d6bccf720bd2789d3' + '4222276a8d5c95ddd5e4c719a8d79e028e611b930dd4fbddeca3631a8624a995') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i "${srcdir}/0001-libraw-pkgconfig-remove-stdcxx.patch" - patch -p1 -i "${srcdir}/LibRaw_obsolete-macros.patch" # https://github.com/LibRaw/LibRaw/issues/632 patch -p1 -i "${srcdir}/0002-libraw-datastream-utf8-api.patch" + # https://github.com/LibRaw/LibRaw/issues/709 + patch -p1 -i "${srcdir}/0003-libraw-win32-dlldefs.patch" + autoreconf -ifv } build() { - mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" - if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then LDFLAGS+=" -lomp" fi @@ -58,17 +57,37 @@ build() { # https://github.com/LibRaw/LibRaw/blob/27144e42000/Changelog.txt#L417 # CPPFLAGS+=" -DUSE_6BY9RPI -DUSE_X3FTOOLS" - CPPFLAGS+=" -DLIBRAW_FORCE_OPENMP" + mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static" + + CPPFLAGS+=" -DLIBRAW_FORCE_OPENMP -DLIBRAW_NODLL" ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} + --host=${MINGW_CHOST} \ + --enable-shared=yes \ + --enable-static=yes + + make + + mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared" + + CPPFLAGS+=" -ULIBRAW_NODLL -DLIBRAW_BUILDLIB" + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --enable-shared=yes \ + --enable-static=no make } package() { - cd "${srcdir}/build-${MSYSTEM}" + cd "${srcdir}/build-${MSYSTEM}-static" + + make install DESTDIR="${pkgdir}" + + cd "${srcdir}/build-${MSYSTEM}-shared" make install DESTDIR="${pkgdir}" diff --git a/mingw-w64-libvips/PKGBUILD b/mingw-w64-libvips/PKGBUILD index 99d386f5703cf..61689f0b7a0fa 100644 --- a/mingw-w64-libvips/PKGBUILD +++ b/mingw-w64-libvips/PKGBUILD @@ -4,7 +4,7 @@ _realname=libvips pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=8.18.0 -pkgrel=1 +pkgrel=2 pkgdesc="A fast image processing library with low memory needs (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index d03501bd516df..dab14b77aecb8 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -4,7 +4,7 @@ _realname=openimageio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.1.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-rawpy/PKGBUILD b/mingw-w64-python-rawpy/PKGBUILD index 5b1cc49363dac..c9dd41c081fce 100644 --- a/mingw-w64-python-rawpy/PKGBUILD +++ b/mingw-w64-python-rawpy/PKGBUILD @@ -4,7 +4,7 @@ _realname=rawpy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.25.1 -pkgrel=2 +pkgrel=3 pkgdesc='RAW image processing for Python, a wrapper for libraw (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')