Merge pull request #13934 from lazka/pixman0.42.2

pixman: Update to 0.42.2

mingw-w64-pixman/PKGBUILD

@@ -4,27 +4,23 @@
 _realname=pixman
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.42.0
-pkgrel=2
+pkgver=0.42.2
+pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://gitlab.freedesktop.org/pixman/pixman"
-license=(MIT)
+license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-libpng"
              "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-options=('staticlibs' 'strip')
-source=("https://xorg.freedesktop.org/releases/individual/lib/pixman-${pkgver}.tar.xz"
-        https://gitlab.freedesktop.org/pixman/pixman/-/raw/pixman-${pkgver}/a64-neon-test.S)
-sha256sums=('04bcbff1c6de0a2b7efea4816add7d2854c9a7a3542a21ed73fb438859822ab5'
-            '90ad34b4d08f3923a5fe326453699ba879f7ecf7e74a0f6aaf15464dacf3b551')
+source=("https://xorg.freedesktop.org/releases/individual/lib/pixman-${pkgver}.tar.xz")
+sha256sums=('5747d2ec498ad0f1594878cc897ef5eb6c29e91c53b899f7f71b506785fc1376')
 
 prepare() {
-  cp a64-neon-test.S "${_realname}-${pkgver}"
   cd "${srcdir}/${_realname}-${pkgver}"
 }
 
@@ -33,7 +29,7 @@ build() {
   cd "${srcdir}/build-${MINGW_CHOST}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
+  meson \
     --prefix="${MINGW_PREFIX}" \
     --buildtype plain \
     -Ddefault_library=both \
@@ -41,26 +37,19 @@ build() {
     -Da64-neon=disabled \
     ../${_realname}-${pkgver}
 
-  ${MINGW_PREFIX}/bin/ninja
+  meson compile
 }
 
 check() {
   cd "${srcdir}/build-${MINGW_CHOST}"
 
-  ${MINGW_PREFIX}/bin/ninja test
+  meson test
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
 
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
-
-  for pcfile in  "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do
-    # https://github.com/mesonbuild/meson/issues/3934
-    sed -s "s|-lpixman-mmx||g" -i "${pcfile}"
-    sed -s "s|-lpixman-sse2||g" -i "${pcfile}"
-    sed -s "s|-lpixman-ssse3||g" -i "${pcfile}"
-  done
+  DESTDIR="${pkgdir}" meson install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }