libjpeg-turbo: Update to 2.0.0

6 files changed, 45 insertions, 30 deletions

diff --git a/pkg/libjpeg-turbo/README.md b/pkg/libjpeg-turbo/README.md
new file mode 100644
index 00000000..ce067c8c
--- /dev/null
+++ b/pkg/libjpeg-turbo/README.md
@@ -0,0 +1,6 @@
+# libjpeg-turbo
+
+# `jconfig.h` and `jconfigint.h`
+Generated with
+
+	cmake -DENABLE_SHARED=0 -DWITH_SIMD=0 -DWITH_JPEG8=1 ..
diff --git a/pkg/libjpeg-turbo/gen.lua b/pkg/libjpeg-turbo/gen.lua
index f6673c8e..99667887 100644
--- a/pkg/libjpeg-turbo/gen.lua
+++ b/pkg/libjpeg-turbo/gen.lua
@@ -1,14 +1,14 @@
 cflags{'-I $dir'}
 
 lib('libjpeg-turbo.a', [[
-	jcapimin.c jcapistd.c jccoefct.c jccolor.c
-	jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c
-	jcomapi.c jcparam.c jcphuff.c jcprepct.c jcsample.c jctrans.c
-	jdapimin.c jdapistd.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c
-	jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c
-	jdmerge.c jdphuff.c jdpostct.c jdsample.c jdtrans.c jerror.c
-	jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c
-	jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c
+	jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c
+	jcicc.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c
+	jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdatadst.c
+	jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c
+	jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c
+	jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c
+	jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c
+
 	jaricom.c jcarith.c jdarith.c jsimd_none.c
 ]])
 
diff --git a/pkg/libjpeg-turbo/jconfig.h b/pkg/libjpeg-turbo/jconfig.h
index 853f129e..d80ff382 100644
--- a/pkg/libjpeg-turbo/jconfig.h
+++ b/pkg/libjpeg-turbo/jconfig.h
@@ -1,22 +1,22 @@
-#define JPEG_LIB_VERSION 80
-#define LIBJPEG_TURBO_VERSION 1.5.3
-#define LIBJPEG_TURBO_VERSION_NUMBER 1005003
-#define C_ARITH_CODING_SUPPORTED 1
-#define D_ARITH_CODING_SUPPORTED 1
-#define BITS_IN_JSAMPLE  8      /* use 8 or 12 */
-#define HAVE_LOCALE_H 1
-#define HAVE_STDDEF_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_UNSIGNED_CHAR 1
-#define HAVE_UNSIGNED_SHORT 1
-/* #undef INCOMPLETE_TYPES_BROKEN */
+#define JPEG_LIB_VERSION  80
+#define LIBJPEG_TURBO_VERSION  2.0.0
+#define LIBJPEG_TURBO_VERSION_NUMBER  2000000
+#define C_ARITH_CODING_SUPPORTED
+#define D_ARITH_CODING_SUPPORTED
 /* #undef MEM_SRCDST_SUPPORTED */
+/* #undef WITH_SIMD */
+#define BITS_IN_JSAMPLE  8      /* use 8 or 12 */
+#define HAVE_LOCALE_H
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#define NEED_SYS_TYPES_H
 /* #undef NEED_BSD_STRINGS */
-#define NEED_SYS_TYPES_H 1
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #undef INCOMPLETE_TYPES_BROKEN */
 /* #undef RIGHT_SHIFT_IS_UNSIGNED */
-/* #undef WITH_SIMD */
 #ifndef __CHAR_UNSIGNED__
-/* # undef __CHAR_UNSIGNED__ */
+/* #undef __CHAR_UNSIGNED__ */
 #endif
 /* #undef const */
 /* #undef size_t */
diff --git a/pkg/libjpeg-turbo/jconfigint.h b/pkg/libjpeg-turbo/jconfigint.h
index fb5ad064..5a6e433f 100644
--- a/pkg/libjpeg-turbo/jconfigint.h
+++ b/pkg/libjpeg-turbo/jconfigint.h
@@ -1,6 +1,15 @@
-#define BUILD "20171214"
-/* #undef inline */
-#define INLINE inline __attribute__((always_inline))
-#define PACKAGE_NAME "libjpeg-turbo"
-#define VERSION "1.5.3"
-#define SIZEOF_SIZE_T 8
+#define BUILD  "20180907"
+#undef inline
+#define INLINE  __inline__ __attribute__((always_inline))
+#define PACKAGE_NAME  "libjpeg-turbo"
+#define VERSION  "2.0.0"
+#define SIZEOF_SIZE_T  8
+#define HAVE_BUILTIN_CTZL
+/* #undef HAVE_INTRIN_H */
+#if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
+#if (SIZEOF_SIZE_T == 8)
+#define HAVE_BITSCANFORWARD64
+#elif (SIZEOF_SIZE_T == 4)
+#define HAVE_BITSCANFORWARD
+#endif
+#endif
diff --git a/pkg/libjpeg-turbo/rev b/pkg/libjpeg-turbo/rev
index 00750edc..b8626c4c 100644
--- a/pkg/libjpeg-turbo/rev
+++ b/pkg/libjpeg-turbo/rev
@@ -1 +1 @@
-3
+4
diff --git a/pkg/libjpeg-turbo/src b/pkg/libjpeg-turbo/src
-Subproject bf6c774305c9feb30cff7b99e1a475df61bfa00
+Subproject 574f3a772c96dc9db2c98ef24706feb3f6dbda9