CVS commit: pkgsrc/graphics/libjpeg-turbo

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul  6 17:27:14 UTC 2026

Modified Files:
        pkgsrc/graphics/libjpeg-turbo: Makefile buildlink3.mk

Log Message:
libjpeg-turbo: fix linking; use system libz; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libjpeg-turbo/buildlink3.mk

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.45 pkgsrc/graphics/libjpeg-turbo/Makefile:1.46
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.45 Tue Jun 30 20:07:32 2026
+++ pkgsrc/graphics/libjpeg-turbo/Makefile      Mon Jul  6 17:27:14 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2026/06/30 20:07:32 adam Exp $
+# $NetBSD: Makefile,v 1.46 2026/07/06 17:27:14 adam Exp $
 
 DISTNAME=      libjpeg-turbo-3.2.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libjpeg-turbo/}
 
@@ -34,11 +35,15 @@ TEST_ENV+=  LD_LIBRARY_PATH=${WRKSRC}/${C
 TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
 TEST_TARGET=   test
 
+# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/898
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 # Ask for compatibility with jpeg 8, to get the highest ABI that
 # libjpeg-turbo supports.
 CMAKE_CONFIGURE_ARGS+= -DWITH_JPEG8=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEM_ZLIB=ON
 
 CHECK_PORTABILITY_SKIP+=       release/makemacpkg.in
 
 .include "../../devel/cmake/build.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libjpeg-turbo/buildlink3.mk
diff -u pkgsrc/graphics/libjpeg-turbo/buildlink3.mk:1.2 pkgsrc/graphics/libjpeg-turbo/buildlink3.mk:1.3
--- pkgsrc/graphics/libjpeg-turbo/buildlink3.mk:1.2     Sun Jan 15 10:11:53 2012
+++ pkgsrc/graphics/libjpeg-turbo/buildlink3.mk Mon Jul  6 17:27:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/01/15 10:11:53 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2026/07/06 17:27:14 adam Exp $
 
 BUILDLINK_TREE+=       libjpeg-turbo
 
@@ -7,6 +7,8 @@ LIBJPEG_TURBO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libjpeg-turbo+=  libjpeg-turbo>=1.1.0
 BUILDLINK_PKGSRCDIR.libjpeg-turbo?=    ../../graphics/libjpeg-turbo
+
+.include "../../devel/zlib/buildlink3.mk"
 .endif # LIBJPEG_TURBO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libjpeg-turbo