diff options
| -rw-r--r-- | graphics/libjpeg-turbo/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libjpeg-turbo/PLIST | 6 | ||||
| -rw-r--r-- | graphics/libjpeg-turbo/distinfo | 13 | ||||
| -rw-r--r-- | graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c (renamed from graphics/libjpeg-turbo/patches/patch-simd_arm_jsimd.c) | 16 | ||||
| -rw-r--r-- | graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c | 36 |
5 files changed, 56 insertions, 19 deletions
diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile index 4353201d1a3..bf33a55a765 100644 --- a/graphics/libjpeg-turbo/Makefile +++ b/graphics/libjpeg-turbo/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2020/11/17 08:46:47 adam Exp $ +# $NetBSD: Makefile,v 1.22 2021/04/26 08:18:48 adam Exp $ -DISTNAME= libjpeg-turbo-2.0.6 +DISTNAME= libjpeg-turbo-2.1.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/} diff --git a/graphics/libjpeg-turbo/PLIST b/graphics/libjpeg-turbo/PLIST index 2ff165f50b5..4cf51c2da98 100644 --- a/graphics/libjpeg-turbo/PLIST +++ b/graphics/libjpeg-turbo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2020/04/12 06:17:06 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2021/04/26 08:18:48 adam Exp $ bin/cjpeg bin/djpeg bin/jpegtran @@ -10,6 +10,10 @@ include/jerror.h include/jmorecfg.h include/jpeglib.h include/turbojpeg.h +lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake +lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake +lib/cmake/libjpeg-turbo/libjpeg-turboTargets-release.cmake +lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake lib/libjpeg.a lib/libjpeg.so lib/libjpeg.so.8 diff --git a/graphics/libjpeg-turbo/distinfo b/graphics/libjpeg-turbo/distinfo index 856d42f14ed..5a6d5f40340 100644 --- a/graphics/libjpeg-turbo/distinfo +++ b/graphics/libjpeg-turbo/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.16 2021/03/31 22:26:51 gdt Exp $ +$NetBSD: distinfo,v 1.17 2021/04/26 08:18:48 adam Exp $ -SHA1 (libjpeg-turbo-2.0.6.tar.gz) = 5406c7676d7df89fb4da791ad5af51202910fb25 -RMD160 (libjpeg-turbo-2.0.6.tar.gz) = efc242b0c43fd245093939f45bc6cc2fb951ba6e -SHA512 (libjpeg-turbo-2.0.6.tar.gz) = 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c -Size (libjpeg-turbo-2.0.6.tar.gz) = 2192315 bytes +SHA1 (libjpeg-turbo-2.1.0.tar.gz) = 6bf63c869105d341011cd4915816de888338231a +RMD160 (libjpeg-turbo-2.1.0.tar.gz) = cdb947d63425a8d17b1d83e478f4581ab090a74e +SHA512 (libjpeg-turbo-2.1.0.tar.gz) = 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605 +Size (libjpeg-turbo-2.1.0.tar.gz) = 2255497 bytes SHA1 (patch-jpeglib.h) = 22f69b5fed1882c33f4a8a6e42b8aca5ed195de3 -SHA1 (patch-simd_arm_jsimd.c) = 84334f912576b18de7936ebe7b52c7d605fd6aed +SHA1 (patch-simd_arm__aarch32_jsimd.c) = 914632a76343b75869d2ca736c4c48f13cb2b54e +SHA1 (patch-simd_arm__aarch64_jsimd.c) = 0e8fac36a9abc70e8526370237c7cdd28be519ef diff --git a/graphics/libjpeg-turbo/patches/patch-simd_arm_jsimd.c b/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c index c303afebff8..8cf2d550201 100644 --- a/graphics/libjpeg-turbo/patches/patch-simd_arm_jsimd.c +++ b/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c @@ -1,12 +1,8 @@ -$NetBSD: patch-simd_arm_jsimd.c,v 1.2 2021/03/31 22:26:51 gdt Exp $ +$NetBSD: patch-simd_arm__aarch32_jsimd.c,v 1.1 2021/04/26 08:18:48 adam Exp $ -\todo Explain this patch. - -\todo File upstream. - ---- simd/arm/jsimd.c.orig 2019-12-31 07:10:30.000000000 +0000 -+++ simd/arm/jsimd.c -@@ -28,6 +28,10 @@ +--- simd/arm/aarch32/jsimd.c.orig 2021-04-23 16:42:40.000000000 +0000 ++++ simd/arm/aarch32/jsimd.c +@@ -29,6 +29,10 @@ #include <string.h> #include <ctype.h> @@ -17,7 +13,7 @@ $NetBSD: patch-simd_arm_jsimd.c,v 1.2 2021/03/31 22:26:51 gdt Exp $ static unsigned int simd_support = ~0; static unsigned int simd_huffman = 1; -@@ -108,6 +112,9 @@ init_simd(void) +@@ -109,6 +113,9 @@ init_simd(void) #endif #if !defined(__ARM_NEON__) && (defined(__linux__) || defined(ANDROID) || defined(__ANDROID__)) int bufsize = 1024; /* an initial guess for the line buffer size limit */ @@ -27,7 +23,7 @@ $NetBSD: patch-simd_arm_jsimd.c,v 1.2 2021/03/31 22:26:51 gdt Exp $ #endif if (simd_support != ~0U) -@@ -126,6 +133,10 @@ init_simd(void) +@@ -127,6 +134,10 @@ init_simd(void) if (bufsize > SOMEWHAT_SANE_PROC_CPUINFO_SIZE_LIMIT) break; } diff --git a/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c b/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c new file mode 100644 index 00000000000..8ad3474637a --- /dev/null +++ b/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c @@ -0,0 +1,36 @@ +$NetBSD: patch-simd_arm__aarch64_jsimd.c,v 1.1 2021/04/26 08:18:48 adam Exp $ + +--- simd/arm/aarch64/jsimd.c.orig 2021-04-23 16:42:40.000000000 +0000 ++++ simd/arm/aarch64/jsimd.c +@@ -33,6 +33,10 @@ + #define JSIMD_FASTST3 2 + #define JSIMD_FASTTBL 4 + ++#if defined(__NetBSD__) ++#include <sys/sysctl.h> ++#endif ++ + static unsigned int simd_support = ~0; + static unsigned int simd_huffman = 1; + static unsigned int simd_features = JSIMD_FASTLD3 | JSIMD_FASTST3 | +@@ -129,6 +133,9 @@ init_simd(void) + #endif + #if defined(__linux__) || defined(ANDROID) || defined(__ANDROID__) + int bufsize = 1024; /* an initial guess for the line buffer size limit */ ++#elif defined(__NetBSD__) ++ int neon_present; ++ size_t len; + #endif + + if (simd_support != ~0U) +@@ -143,6 +150,10 @@ init_simd(void) + if (bufsize > SOMEWHAT_SANE_PROC_CPUINFO_SIZE_LIMIT) + break; + } ++#elif defined(__NetBSD__) ++ if (sysctlbyname("machdep.neon_present", &neon_present, &len, NULL, 0) == 0 ++ && neon_present != 0) ++ simd_support |= JSIMD_NEON; + #endif + + #ifndef NO_GETENV |