CVS commit: pkgsrc/graphics/libjpeg-turbo

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 24 15:39:44 UTC 2024

Modified Files:
        pkgsrc/graphics/libjpeg-turbo: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/libjpeg-turbo/patches: patch-src_jpeglib.h
Removed Files:
        pkgsrc/graphics/libjpeg-turbo/patches: patch-jpeglib.h

Log Message:
libjpeg-turbo: updated to 3.1.0

3.1.0

libjpeg-turbo-3.1.0.tar.gz is the official source tarball for this release. The automatically generated "Source code" assets are not supported.
Refer to https://libjpeg-turbo.org/Downloads/DigitalSignatures for information regarding the methods used to sign the files in this release and instructions for verifying the signatures.
Refer to https://libjpeg-turbo.org/Documentation/OfficialBinaries for information regarding the compatibility of the binary packages in this release.

Packaging Changes

The RPM packages now contain SHA-256 header and payload digests. This fixes an issue whereby the RPM signatures could not be verified on Red Hat Enterprise Linux with FIPS mode enabled. The RPM 
packages now require GLIBC 2.17 or later.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/libjpeg-turbo/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/libjpeg-turbo/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/libjpeg-turbo/patches/patch-jpeglib.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/libjpeg-turbo/patches/patch-src_jpeglib.h

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.37 pkgsrc/graphics/libjpeg-turbo/Makefile:1.38
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.37 Sun Sep 15 07:08:10 2024
+++ pkgsrc/graphics/libjpeg-turbo/Makefile      Tue Dec 24 15:39:44 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2024/09/15 07:08:10 adam Exp $
+# $NetBSD: Makefile,v 1.38 2024/12/24 15:39:44 adam Exp $
 
-DISTNAME=      libjpeg-turbo-3.0.4
+DISTNAME=      libjpeg-turbo-3.1.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libjpeg-turbo/}
 
@@ -20,10 +20,11 @@ TOOL_DEPENDS+=      nasm-[0-9]*:../../devel/n
 
 USE_LANGUAGES=         c c++
 PKGCONFIG_OVERRIDE=    release/libturbojpeg.pc.in release/libjpeg.pc.in
-TEST_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
+
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
 # For Darwin
-TEST_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
-TEST_TARGET=           test
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
+TEST_TARGET=   test
 
 # Ask for compatibility with jpeg 8, to get the highest ABI that
 # libjpeg-turbo supports.

Index: pkgsrc/graphics/libjpeg-turbo/PLIST
diff -u pkgsrc/graphics/libjpeg-turbo/PLIST:1.8 pkgsrc/graphics/libjpeg-turbo/PLIST:1.9
--- pkgsrc/graphics/libjpeg-turbo/PLIST:1.8     Wed Jul  5 15:37:35 2023
+++ pkgsrc/graphics/libjpeg-turbo/PLIST Tue Dec 24 15:39:44 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2023/07/05 15:37:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/12/24 15:39:44 adam Exp $
 bin/cjpeg
 bin/djpeg
 bin/jpegtran
@@ -21,7 +21,7 @@ lib/libjpeg.so.8.3.2
 lib/libturbojpeg.a
 lib/libturbojpeg.so
 lib/libturbojpeg.so.0
-lib/libturbojpeg.so.0.3.0
+lib/libturbojpeg.so.0.4.0
 lib/pkgconfig/libjpeg.pc
 lib/pkgconfig/libturbojpeg.pc
 man/man1/cjpeg.1
@@ -35,6 +35,8 @@ share/doc/libjpeg-turbo/README.md
 share/doc/libjpeg-turbo/example.c
 share/doc/libjpeg-turbo/libjpeg.txt
 share/doc/libjpeg-turbo/structure.txt
-share/doc/libjpeg-turbo/tjexample.c
+share/doc/libjpeg-turbo/tjcomp.c
+share/doc/libjpeg-turbo/tjdecomp.c
+share/doc/libjpeg-turbo/tjtran.c
 share/doc/libjpeg-turbo/usage.txt
 share/doc/libjpeg-turbo/wizard.txt

Index: pkgsrc/graphics/libjpeg-turbo/distinfo
diff -u pkgsrc/graphics/libjpeg-turbo/distinfo:1.30 pkgsrc/graphics/libjpeg-turbo/distinfo:1.31
--- pkgsrc/graphics/libjpeg-turbo/distinfo:1.30 Sun Sep 15 07:08:10 2024
+++ pkgsrc/graphics/libjpeg-turbo/distinfo      Tue Dec 24 15:39:44 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2024/09/15 07:08:10 adam Exp $
+$NetBSD: distinfo,v 1.31 2024/12/24 15:39:44 adam Exp $
 
-BLAKE2s (libjpeg-turbo-3.0.4.tar.gz) = 93f1c3851cd3af6fa1bdd92a626dfb20d24f84459f4ed5471c1791d72e0033f6
-SHA512 (libjpeg-turbo-3.0.4.tar.gz) = f43e1b6b9d048e29e381796c71e1c34a04c0f1c52c1f462db9f9930cfc75d69a50861be2570a6a4adc26a4183b6601300fd9d5553c06bc042f0d32fc1e408ed9
-Size (libjpeg-turbo-3.0.4.tar.gz) = 2400356 bytes
-SHA1 (patch-jpeglib.h) = 22f69b5fed1882c33f4a8a6e42b8aca5ed195de3
+BLAKE2s (libjpeg-turbo-3.1.0.tar.gz) = 3fa790d7ffbb4d0513dca9759acbe95dce010ac5461622c6fbffb60b40a248b9
+SHA512 (libjpeg-turbo-3.1.0.tar.gz) = 5712d318e222f1ffcd2f748b0f2c32b3859253a4ed4e13ae134f4445e0ca06efc258c7653b6924b39815ae078f6a9177e098c89684d2c886161a0a4118122e8d
+Size (libjpeg-turbo-3.1.0.tar.gz) = 2507094 bytes
 SHA1 (patch-simd_arm__aarch32_jsimd.c) = 0d35d6f0727709d4e894202a3a297fc66383c377
 SHA1 (patch-simd_arm__aarch64_jsimd.c) = 76c5e81403f70a8ea8bca8ae2266066fff5ec6f9
+SHA1 (patch-src_jpeglib.h) = 6be231604acd6a55f3a6d135cfaef20897e2926d

Added files:

Index: pkgsrc/graphics/libjpeg-turbo/patches/patch-src_jpeglib.h
diff -u /dev/null pkgsrc/graphics/libjpeg-turbo/patches/patch-src_jpeglib.h:1.1
--- /dev/null   Tue Dec 24 15:39:44 2024
+++ pkgsrc/graphics/libjpeg-turbo/patches/patch-src_jpeglib.h   Tue Dec 24 15:39:44 2024
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_jpeglib.h,v 1.1 2024/12/24 15:39:44 adam Exp $
+
+--- src/jpeglib.h.orig 2024-12-12 20:46:51.000000000 +0000
++++ src/jpeglib.h
+@@ -43,6 +43,7 @@
+ #endif
+ #include "jmorecfg.h"           /* seldom changed options */
+ 
++#include <stdio.h>
+ 
+ #ifdef __cplusplus
+ #ifndef DONT_USE_EXTERN_C