From fa8a73e4fc34e537fda792a98d74e82f6c6a5844 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: Sat, 30 Nov 2024 21:24:29 +0100 Subject: [PATCH] libultrahdr: tweak pc cflags (#22696) * libultrahdr: tweak pc cflags * link upstream issue --------- Co-authored-by: Christoph Reiter --- mingw-w64-libultrahdr/001-pkg-config.patch | 13 +++++++++++++ mingw-w64-libultrahdr/PKGBUILD | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-libultrahdr/001-pkg-config.patch diff --git a/mingw-w64-libultrahdr/001-pkg-config.patch b/mingw-w64-libultrahdr/001-pkg-config.patch new file mode 100644 index 0000000000..cf0ece43dc --- /dev/null +++ b/mingw-w64-libultrahdr/001-pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/libuhdr.pc.in b/cmake/libuhdr.pc.in +index 920d1cf51..99d4673f5 100644 +--- a/cmake/libuhdr.pc.in ++++ b/cmake/libuhdr.pc.in +@@ -6,6 +6,7 @@ Name: @PROJECT_NAME@ + Description: @CMAKE_PROJECT_DESCRIPTION@ + Version: @PROJECT_VERSION@ + Requires.private: libjpeg +-Cflags: -I${includedir} ++Cflags: -I${includedir} -DUHDR_USING_SHARED_LIBRARY ++Cflags.private: -UUHDR_USING_SHARED_LIBRARY + Libs: -L${libdir} -l@UHDR_TARGET_NAME@ + Libs.private: @CMAKE_THREAD_LIBS_INIT@ @UHDR_GL_DEPS@ diff --git a/mingw-w64-libultrahdr/PKGBUILD b/mingw-w64-libultrahdr/PKGBUILD index 7a892e35f7..0966ba29ec 100644 --- a/mingw-w64-libultrahdr/PKGBUILD +++ b/mingw-w64-libultrahdr/PKGBUILD @@ -4,7 +4,7 @@ _realname=libultrahdr pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for encoding and decoding ultrahdr images (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -19,8 +19,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-pkgconf" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-winpthreads") -source=("${_realname}-${pkgver}.tar.gz::https://github.com/google/libultrahdr/archive/v${pkgver}.tar.gz") -sha512sums=('9a00b977d4b6721ed2b4919ca11b22158b3b96cf7a23de8f043c0057fd6e0cbb18311c3a08e36f7dcb2ab9d0bfad337d205bbeb1ef3090b92f9cf3017500b4ff') +source=("${_realname}-${pkgver}.tar.gz::https://github.com/google/libultrahdr/archive/v${pkgver}.tar.gz" + "001-pkg-config.patch") +sha512sums=('9a00b977d4b6721ed2b4919ca11b22158b3b96cf7a23de8f043c0057fd6e0cbb18311c3a08e36f7dcb2ab9d0bfad337d205bbeb1ef3090b92f9cf3017500b4ff' + 'ccaa15bc71c0c4a88044bd35ab929b88763cf20838f6e3b0bf7b3623ea851649e97fb0dac633a1160af805d63634a1f98e4f5f19415a7647d589f23c63f08add') + +prepare() { + cd "${_realname}-${pkgver}" + + # https://github.com/google/libultrahdr/issues/289 + patch -Np1 -i "${srcdir}"/001-pkg-config.patch +} build() { declare -a extra_config