[packages/libjpeg-turbo] - added patch from upstream for bug 901 (krita build fails without it) - rel 2
witekfl
witekfl at pld-linux.org
Mon Jul 27 17:46:58 CEST 2026
commit 49180a261bdff64b3f0ee20501bee7dacb0f6951
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Mon Jul 27 17:45:48 2026 +0200
- added patch from upstream for bug 901 (krita build fails without it)
- rel 2
bug901.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
libjpeg-turbo.spec | 4 +++-
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 5326782..149c4fc 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -11,13 +11,14 @@ Summary: SIMD accelerated library for manipulating JPEG image files
Summary(pl.UTF-8): Biblioteka do obróbki plików obrazów JPEG z akceleracją SIMD
Name: libjpeg-turbo
Version: 3.2.0
-Release: 1
+Release: 2
# more specifically: IJG, modified-BSD or Zlib
License: BSD-like
Group: Libraries
Source0: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: a80f9f1c735b57d3cdd66daed1ba6bb4
Patch0: %{name}-x32-java.patch
+Patch1: bug901.patch
URL: https://libjpeg-turbo.org/
BuildRequires: cmake >= 3.15
%if %{with java}
@@ -183,6 +184,7 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%build
export JAVA_HOME="%{java_home}"
diff --git a/bug901.patch b/bug901.patch
new file mode 100644
index 0000000..a59296d
--- /dev/null
+++ b/bug901.patch
@@ -0,0 +1,45 @@
+commit 95156233739078e7d4de0aeeacc4b0595630f393
+Author: DRC <information at libjpeg-turbo.org>
+Date: Wed Jul 15 13:03:38 2026 -0400
+
+ Build: Fix CMake pkg config file if WITH_SYSTEM_*
+
+ If WITH_SYSTEM_ZLIB or WITH_SYSTEM_SPNG is defined, then the generated
+ CMake package config file will include (respectively)
+
+ INTERFACE_LINK_LIBRARIES "ZLIB::ZLIB"
+
+ or
+
+ INTERFACE_LINK_LIBRARIES "PkgConfig::spng"
+
+ in the libjpeg-turbo::turbojpeg and libjpeg-turbo::turbojpeg-static
+ target properties. Thus, our CMake package config file needs to find
+ those dependencies.
+
+ Fixes #901
+
+diff --git a/release/Config.cmake.in b/release/Config.cmake.in
+index 0c1ba8aa..04c147ef 100644
+--- a/release/Config.cmake.in
++++ b/release/Config.cmake.in
+@@ -1,4 +1,19 @@
+ @PACKAGE_INIT@
+
++set(WITH_SYSTEM_SPNG @WITH_SYSTEM_SPNG@)
++set(WITH_SYSTEM_ZLIB @WITH_SYSTEM_ZLIB@)
++
++if(WITH_SYSTEM_SPNG OR WITH_SYSTEM_ZLIB)
++ include(CMakeFindDependencyMacro)
++ if(WITH_SYSTEM_SPNG)
++ find_dependency(PkgConfig)
++ if(PkgConfig_FOUND)
++ pkg_check_modules(spng REQUIRED spng IMPORTED_TARGET)
++ endif()
++ else()
++ find_dependency(ZLIB)
++ endif()
++endif()
++
+ include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME at Targets.cmake")
+ check_required_components("@CMAKE_PROJECT_NAME@")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libjpeg-turbo.git/commitdiff/49180a261bdff64b3f0ee20501bee7dacb0f6951
More information about the pld-cvs-commit
mailing list