Update to 2.0.0-1

4 files changed, 18 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e997c0589e0a..93402a516bdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 # Generated by mksrcinfo v8
-# Sun Apr 22 17:56:23 UTC 2018
+# Thu Aug  2 08:55:39 UTC 2018
 pkgbase = mingw-w64-libjpeg-turbo
 	pkgdesc = JPEG image codec with accelerated baseline compression and decompression (mingw-w64)
-	pkgver = 1.5.3
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = http://libjpeg-turbo.virtualgl.org
 	arch = any
 	license = custom
 	license = GPL
-	makedepends = nasm
-	makedepends = mingw-w64-configure
+	makedepends = yasm
+	makedepends = mingw-w64-cmake
 	depends = mingw-w64-crt
 	provides = mingw-w64-libjpeg
 	conflicts = mingw-w64-libjpeg
@@ -17,12 +17,8 @@ pkgbase = mingw-w64-libjpeg-turbo
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.5.3.tar.gz
-	source = 0001-header-compat.mingw.patch
-	source = libjpeg-turbo-1.3.1-libmng-compatibility.patch
-	sha1sums = 87ebf4cab2bb27fcb8e7ccb18ec4eb680e1f2c2d
-	sha1sums = 204f9a62bb7170f54b1a997059fa77b9b02a71ba
-	sha1sums = 35413e30c3ea18839f4a023283a0bd444136839f
+	source = http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-2.0.0.tar.gz
+	sha256sums = 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868
 
 pkgname = mingw-w64-libjpeg-turbo
 
diff --git a/0001-header-compat.mingw.patch b/0001-header-compat.mingw.patch
deleted file mode 100644
index b54267f2323e..000000000000
--- a/0001-header-compat.mingw.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libjpeg-turbo-1.2.90/jmorecfg.h.orig	2013-04-04 15:08:10 +0400
-+++ libjpeg-turbo-1.2.90/jmorecfg.h	2013-04-04 16:23:13 +0400
-@@ -12,6 +12,12 @@
-  * optimizations.  Most users will not need to touch this file.
-  */
- 
-+/* prevents conflicts */
-+#if defined(__MINGW32__)
-+#include <shlwapi.h> /* typedefs INT16 and INT32 */
-+
-+#define HAVE_BOOLEAN
-+#endif
- 
- /*
-  * Define BITS_IN_JSAMPLE as either
-@@ -118,6 +118,7 @@
- #endif /* HAVE_UNSIGNED_CHAR */
- 
- 
-+#ifndef _BASETSD_H_		/* basestd.h from mingw-w64 defines UINT8, UINT16, INT16, INT32 */
- /* These typedefs are used for various table entries and so forth.
-  * They must be at least as wide as specified; but making them too big
-  * won't cost a huge amount of memory, so we don't provide special
-@@ -158,6 +158,7 @@
- #ifndef XMD_H                   /* X11/xmd.h correctly defines INT32 */
- typedef long INT32;
- #endif
-+#endif
- 
- /* Datatype used for image dimensions.  The JPEG standard only supports
-  * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
diff --git a/PKGBUILD b/PKGBUILD
index f52d79943dc3..16581884b042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,27 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgname=mingw-w64-libjpeg-turbo
-pkgver=1.5.3
+pkgver=2.0.0
 pkgrel=1
 arch=(any)
 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)"
 license=("custom" "GPL")
 depends=(mingw-w64-crt)
-makedepends=(nasm mingw-w64-configure)
+makedepends=(yasm mingw-w64-cmake)
 provides=(mingw-w64-libjpeg)
 conflicts=(mingw-w64-libjpeg mingw-w64-libjpeg6-turbo)
 options=(staticlibs !strip !buildflags)
 url="http://libjpeg-turbo.virtualgl.org"
-source=("http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz"
-"0001-header-compat.mingw.patch"
-"libjpeg-turbo-1.3.1-libmng-compatibility.patch")
+source=("http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz")
 validpgpkeys=('7D6293CC6378786E1B5C496885C7044E033FDE16')
-sha1sums=('87ebf4cab2bb27fcb8e7ccb18ec4eb680e1f2c2d'
-          '204f9a62bb7170f54b1a997059fa77b9b02a71ba'
-          '35413e30c3ea18839f4a023283a0bd444136839f')
+sha256sums=('778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-	cd libjpeg-turbo-$pkgver
-	patch -p1 -i ${srcdir}/0001-header-compat.mingw.patch
-  patch -p1 -i ${srcdir}/libjpeg-turbo-1.3.1-libmng-compatibility.patch
-}
-
 build() {
-  cd libjpeg-turbo-$pkgver
+  cd "$srcdir/libjpeg-turbo-$pkgver"
 	for _arch in ${_architectures}; do
-	unset LDFLAGS
-    mkdir "build-${_arch}" && pushd "build-${_arch}"
-    ${_arch}-configure \
-			--with-jpeg8
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DWITH_JPEG8=ON ..
     make
     popd
   done
@@ -41,16 +29,11 @@ build() {
 
 package() {
 	for _arch in ${_architectures}; do
-    cd "${srcdir}/${pkgname#mingw-w64-}-$pkgver/build-${_arch}"
-    make \
-			DESTDIR="$pkgdir" \
-			docdir="/usr/${_arch}/share/doc/libjpeg-turbo" \
-			exampledir="/usr/${_arch}/share/doc/libjpeg-turbo" \
-			install
-    cp "${srcdir}"/libjpeg-turbo-${pkgver}/{jinclude,jpegint,transupp}.h ${pkgdir}/usr/${_arch}/include/
-    find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
+    cd "$srcdir/libjpeg-turbo-$pkgver/build-${_arch}"
+    make DESTDIR="$pkgdir" install
+    ${_arch}-strip "$pkgdir"/usr/${_arch}/bin/*.exe
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
   done
 }
 
diff --git a/libjpeg-turbo-1.3.1-libmng-compatibility.patch b/libjpeg-turbo-1.3.1-libmng-compatibility.patch
deleted file mode 100644
index 51f09e9dde18..000000000000
--- a/libjpeg-turbo-1.3.1-libmng-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur libjpeg-turbo-1.3.1-orig/jpeglib.h libjpeg-turbo-1.3.1/jpeglib.h
---- libjpeg-turbo-1.3.1-orig/jpeglib.h	2013-01-19 03:42:31.000000000 +0400
-+++ libjpeg-turbo-1.3.1/jpeglib.h	2014-06-28 15:36:12.956400000 +0400
-@@ -28,6 +28,7 @@
- #endif
- #include "jmorecfg.h"		/* seldom changed options */
- 
-+#include <stdio.h>
- 
- #ifdef __cplusplus
- #ifndef DONT_USE_EXTERN_C