summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/libjpeg-turbo/gen.lua1
-rw-r--r--pkg/libjpeg-turbo/jconfig.h4
-rw-r--r--pkg/libjpeg-turbo/jconfigint.h7
m---------pkg/libjpeg-turbo/src0
-rw-r--r--pkg/libjpeg-turbo/ver2
5 files changed, 9 insertions, 5 deletions
diff --git a/pkg/libjpeg-turbo/gen.lua b/pkg/libjpeg-turbo/gen.lua
index d2cd2a3e..d41756e7 100644
--- a/pkg/libjpeg-turbo/gen.lua
+++ b/pkg/libjpeg-turbo/gen.lua
@@ -4,6 +4,7 @@ cflags{
}
build('cat', '$outdir/jconfigint.h', {
+ '$builddir/probe/HAVE__THREAD_LOCAL',
'$builddir/probe/HAVE___BUILTIN_CTZL',
'$dir/jconfigint.h',
})
diff --git a/pkg/libjpeg-turbo/jconfig.h b/pkg/libjpeg-turbo/jconfig.h
index a8f73651..ce047651 100644
--- a/pkg/libjpeg-turbo/jconfig.h
+++ b/pkg/libjpeg-turbo/jconfig.h
@@ -1,6 +1,6 @@
#define JPEG_LIB_VERSION 80
-#define LIBJPEG_TURBO_VERSION 2.0.4
-#define LIBJPEG_TURBO_VERSION_NUMBER 2000004
+#define LIBJPEG_TURBO_VERSION 2.0.5
+#define LIBJPEG_TURBO_VERSION_NUMBER 2000005
#define C_ARITH_CODING_SUPPORTED 1
#define D_ARITH_CODING_SUPPORTED 1
/* #undef MEM_SRCDST_SUPPORTED */
diff --git a/pkg/libjpeg-turbo/jconfigint.h b/pkg/libjpeg-turbo/jconfigint.h
index 449f82e0..bba81e8d 100644
--- a/pkg/libjpeg-turbo/jconfigint.h
+++ b/pkg/libjpeg-turbo/jconfigint.h
@@ -1,8 +1,11 @@
-#define BUILD "20191231"
+#define BUILD "20200630"
#undef inline
#define INLINE __inline__ __attribute__((always_inline))
+#ifdef HAVE__THREAD_LOCAL
+#define THREAD_LOCAL _Thread_local
+#endif
#define PACKAGE_NAME "libjpeg-turbo"
-#define VERSION "2.0.4"
+#define VERSION "2.0.5"
#define SIZEOF_SIZE_T 8
#ifdef HAVE___BUILTIN_CTZL
#define HAVE_BUILTIN_CTZL
diff --git a/pkg/libjpeg-turbo/src b/pkg/libjpeg-turbo/src
-Subproject 166e34213e4f4e2363ce058a7bcc69fd03e38b7
+Subproject ae87a958613b69628b92088b313ded0d4f59a71
diff --git a/pkg/libjpeg-turbo/ver b/pkg/libjpeg-turbo/ver
index 83f392b7..e84b2a25 100644
--- a/pkg/libjpeg-turbo/ver
+++ b/pkg/libjpeg-turbo/ver
@@ -1 +1 @@
-2.0.4 r0
+2.0.5 r0