CVS commit: pkgsrc/graphics/libjpeg-turbo

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul  8 09:50:24 UTC 2026

Modified Files:
        pkgsrc/graphics/libjpeg-turbo: Makefile distinfo
Added Files:
        pkgsrc/graphics/libjpeg-turbo/patches:
            patch-cmakescripts_BuildPackages.cmake
            patch-release_Config.cmake.in

Log Message:
libjpeg-turbo: fix config scripts for ZLIB; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/libjpeg-turbo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/libjpeg-turbo/patches/patch-cmakescripts_BuildPackages.cmake \
    pkgsrc/graphics/libjpeg-turbo/patches/patch-release_Config.cmake.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libjpeg-turbo/Makefile
diff -u pkgsrc/graphics/libjpeg-turbo/Makefile:1.46 pkgsrc/graphics/libjpeg-turbo/Makefile:1.47
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.46 Mon Jul  6 17:27:14 2026
+++ pkgsrc/graphics/libjpeg-turbo/Makefile      Wed Jul  8 09:50:24 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2026/07/06 17:27:14 adam Exp $
+# $NetBSD: Makefile,v 1.47 2026/07/08 09:50:24 adam Exp $
 
 DISTNAME=      libjpeg-turbo-3.2.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libjpeg-turbo/}
 

Index: pkgsrc/graphics/libjpeg-turbo/distinfo
diff -u pkgsrc/graphics/libjpeg-turbo/distinfo:1.39 pkgsrc/graphics/libjpeg-turbo/distinfo:1.40
--- pkgsrc/graphics/libjpeg-turbo/distinfo:1.39 Tue Jun 30 20:07:32 2026
+++ pkgsrc/graphics/libjpeg-turbo/distinfo      Wed Jul  8 09:50:24 2026
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.39 2026/06/30 20:07:32 adam Exp $
+$NetBSD: distinfo,v 1.40 2026/07/08 09:50:24 adam Exp $
 
 BLAKE2s (libjpeg-turbo-3.2.0.tar.gz) = c159504a910ac29d4c7775bb3e5c6a59db79e38b77d956df349987a5df0234cb
 SHA512 (libjpeg-turbo-3.2.0.tar.gz) = 1ce063e9e126d55019385da3a6ff4521a9a3958edeab15e2465ae3435026dac6e598277eea066173ada47da37159d0f7812b2227869c10dd141dcfe2ddeab720
 Size (libjpeg-turbo-3.2.0.tar.gz) = 2537858 bytes
 SHA1 (patch-CMakeLists.txt) = ed81aa8def09bd03ff0c0a31ef2d7cac0bf06c8f
+SHA1 (patch-cmakescripts_BuildPackages.cmake) = 829c6140e952c2be59e0f2dc818d2dcdacca605d
+SHA1 (patch-release_Config.cmake.in) = 5ace40786e15b2dda7e7a62dbc7bcef262ebf2cb
 SHA1 (patch-simd_arm__aarch32_jsimdcpu.c) = 6251c6d9cc67980a754de2faaa4abb78eaaa9f1f
 SHA1 (patch-src_jpeglib.h) = 6be231604acd6a55f3a6d135cfaef20897e2926d

Added files:

Index: pkgsrc/graphics/libjpeg-turbo/patches/patch-cmakescripts_BuildPackages.cmake
diff -u /dev/null pkgsrc/graphics/libjpeg-turbo/patches/patch-cmakescripts_BuildPackages.cmake:1.1
--- /dev/null   Wed Jul  8 09:50:24 2026
+++ pkgsrc/graphics/libjpeg-turbo/patches/patch-cmakescripts_BuildPackages.cmake        Wed Jul  8 09:50:24 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmakescripts_BuildPackages.cmake,v 1.1 2026/07/08 09:50:24 adam Exp $
+
+Fix config scripts for ZLIB.
+https://github.com/libjpeg-turbo/libjpeg-turbo/issues/901
+
+--- cmakescripts/BuildPackages.cmake.orig      2026-07-08 09:32:34.411498672 +0000
++++ cmakescripts/BuildPackages.cmake
+@@ -185,6 +185,11 @@ write_basic_package_version_file(
+   pkgscripts/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
+   VERSION ${VERSION} COMPATIBILITY AnyNewerVersion)
+ 
++set(JPEGTURBO_CONFIG_DEPENDENCIES "")
++if(WITH_SYSTEM_ZLIB)
++  string(APPEND JPEGTURBO_CONFIG_DEPENDENCIES "find_dependency(ZLIB)\n")
++endif()
++
+ configure_package_config_file(release/Config.cmake.in
+   pkgscripts/${CMAKE_PROJECT_NAME}Config.cmake
+   INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
Index: pkgsrc/graphics/libjpeg-turbo/patches/patch-release_Config.cmake.in
diff -u /dev/null pkgsrc/graphics/libjpeg-turbo/patches/patch-release_Config.cmake.in:1.1
--- /dev/null   Wed Jul  8 09:50:24 2026
+++ pkgsrc/graphics/libjpeg-turbo/patches/patch-release_Config.cmake.in Wed Jul  8 09:50:24 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-release_Config.cmake.in,v 1.1 2026/07/08 09:50:24 adam Exp $
+
+Fix config scripts for ZLIB.
+https://github.com/libjpeg-turbo/libjpeg-turbo/issues/901
+
+--- release/Config.cmake.in.orig       2026-07-08 09:30:47.358218106 +0000
++++ release/Config.cmake.in
+@@ -1,4 +1,7 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++@JPEGTURBO_CONFIG_DEPENDENCIES@
++
+ include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
+ check_required_components("@CMAKE_PROJECT_NAME@")