From 641a1efade67ed4057c163cf8fcaadbec91cda70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Tue, 17 Jan 2023 05:49:49 +0100 Subject: [PATCH] libwebp: make sharpyuv a private dependency --- mingw-w64-libwebp/0002-sharpyuv-dep.patch | 11 +++++++++++ mingw-w64-libwebp/PKGBUILD | 9 ++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-libwebp/0002-sharpyuv-dep.patch diff --git a/mingw-w64-libwebp/0002-sharpyuv-dep.patch b/mingw-w64-libwebp/0002-sharpyuv-dep.patch new file mode 100644 index 0000000000..e628edbe95 --- /dev/null +++ b/mingw-w64-libwebp/0002-sharpyuv-dep.patch @@ -0,0 +1,11 @@ +--- libwebp-1.3.0/src/libwebp.pc.in.orig 2022-12-20 01:23:35.000000000 +0100 ++++ libwebp-1.3.0/src/libwebp.pc.in 2023-01-16 12:46:48.183625800 +0100 +@@ -6,7 +6,7 @@ + Name: libwebp + Description: Library for the WebP graphics format + Version: @PACKAGE_VERSION@ +-Requires: libsharpyuv ++Requires.private: libsharpyuv + Cflags: -I${includedir} + Libs: -L${libdir} -l@webp_libname_prefix@webp + Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ diff --git a/mingw-w64-libwebp/PKGBUILD b/mingw-w64-libwebp/PKGBUILD index efae4cd7df..785eb17772 100644 --- a/mingw-w64-libwebp/PKGBUILD +++ b/mingw-w64-libwebp/PKGBUILD @@ -5,7 +5,7 @@ _realname=libwebp pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library to encode and decode images in WebP format (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -19,15 +19,18 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") source=(${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libwebp/archive/v${pkgver}.tar.gz - 0001-mingw-cmake-output.patch) + 0001-mingw-cmake-output.patch + 0002-sharpyuv-dep.patch) sha256sums=('dc9860d3fe06013266c237959e1416b71c63b36f343aae1d65ea9c94832630e1' - '30ed42b782af427f57049abada30ce6d4d62318ee13014585cb352b570c68e3d') + '30ed42b782af427f57049abada30ce6d4d62318ee13014585cb352b570c68e3d' + '05f10d429598226f323edbb717527d75ef092168cc5ca46c8a3b91c54217f884') validpgpkeys=('6B0E6B70976DE303EDF2F601F9C3D6BDB8232B5D') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}"/0001-mingw-cmake-output.patch + patch -Np1 -i "${srcdir}"/0002-sharpyuv-dep.patch } build() {