From add39f471c57aa27b6c9327d7ac336bf2d728b42 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Thu, 1 Feb 2024 04:09:35 +0100 Subject: [PATCH] libjpeg-turbo: update to 3.0.2 --- releases.json | 1 + subprojects/libjpeg-turbo.wrap | 8 ++++---- .../packagefiles/libjpeg-turbo/meson.build | 17 +++++++++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/releases.json b/releases.json index 1997cb1f3..b0135e99b 100644 --- a/releases.json +++ b/releases.json @@ -1482,6 +1482,7 @@ "libturbojpeg" ], "versions": [ + "3.0.2-1", "3.0.1-1", "3.0.0-5", "3.0.0-4", diff --git a/subprojects/libjpeg-turbo.wrap b/subprojects/libjpeg-turbo.wrap index 59c3b7cf3..9d545ba8f 100644 --- a/subprojects/libjpeg-turbo.wrap +++ b/subprojects/libjpeg-turbo.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory = libjpeg-turbo-3.0.1 -source_url = https://sourceforge.net/projects/libjpeg-turbo/files/3.0.1/libjpeg-turbo-3.0.1.tar.gz -source_filename = libjpeg-turbo-3.0.1.tar.gz -source_hash = 22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75 +directory = libjpeg-turbo-3.0.2 +source_url = https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2.tar.gz +source_filename = libjpeg-turbo-3.0.2.tar.gz +source_hash = c2ce515a78d91b09023773ef2770d6b0df77d674e144de80d63e0389b3a15ca6 patch_directory = libjpeg-turbo [provide] diff --git a/subprojects/packagefiles/libjpeg-turbo/meson.build b/subprojects/packagefiles/libjpeg-turbo/meson.build index 3d9ad0de8..2ee2dce09 100644 --- a/subprojects/packagefiles/libjpeg-turbo/meson.build +++ b/subprojects/packagefiles/libjpeg-turbo/meson.build @@ -1,5 +1,5 @@ project('libjpeg-turbo', 'c', - version : '3.0.1', + version : '3.0.2', license : 'bsd-like', meson_version : '>= 0.64.0') @@ -108,6 +108,13 @@ else cdata.set('THREAD_LOCAL', '__thread') endif +cdata.set( + 'HIDDEN', + cc.has_function_attribute('visibility:hidden') + ? '__attribute__((visibility("hidden")))' + : '', +) + if get_option('force_inline') if cc.get_id() == 'msvc' cdata.set('INLINE', '__forceinline') @@ -160,7 +167,13 @@ sources = [ 'jcphuff.c', 'jctrans.c', 'jdapimin.c', 'jdatadst.c', 'jdatasrc.c', 'jdhuff.c', 'jdicc.c', 'jdinput.c', 'jdlhuff.c', 'jdmarker.c', 'jdmaster.c', 'jdphuff.c', 'jdtrans.c', 'jerror.c', 'jfdctflt.c', - 'jmemmgr.c', 'jmemnobs.c', 'jaricom.c', 'jcarith.c', 'jdarith.c', + 'jmemmgr.c', 'jmemnobs.c', 'jpeg_nbits.c', + # TODO: `with_arith_dec` / `with_arith_enc` only. + 'jaricom.c', + # TODO: `with_arith_enc` only + 'jcarith.c', + # TODO: `with_arith_dec` only + 'jdarith.c', ] jpeg12 = static_library('jpeg12', jpeg12_sources,