From de8c3fd295c7a3183cb46face3106e02fcdcfdf1 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Mon, 25 Aug 2014 14:44:14 +0400
Subject: [PATCH] libjpeg-turbo: Remove som patches.

---
 .../0001-header-compat.mingw.patch            | 34 +++++++++++++++++++
 mingw-w64-libjpeg-turbo/PKGBUILD              | 25 +++++++-------
 2 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch

diff --git a/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch b/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch
new file mode 100644
index 0000000000..7938e56235
--- /dev/null
+++ b/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch
@@ -0,0 +1,34 @@
+--- 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
+@@ -154,14 +154,18 @@
+ /* INT16 must hold at least the values -32768..32767. */
+ 
+ #ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
++#ifndef _BASETSD_H_		/* basestd.h from mingw-w64 defines INT16 */
+ typedef short INT16;
+ #endif
++#endif
+ 
+ /* INT32 must hold at least signed 32-bit values. */
+ 
+ #ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
++#ifndef _BASETSD_H_		/* basestd.h from mingw-w64 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/mingw-w64-libjpeg-turbo/PKGBUILD b/mingw-w64-libjpeg-turbo/PKGBUILD
index 0f774b1f56..0a43f75ab2 100644
--- a/mingw-w64-libjpeg-turbo/PKGBUILD
+++ b/mingw-w64-libjpeg-turbo/PKGBUILD
@@ -4,44 +4,38 @@ _realname=libjpeg-turbo
 
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)"
 arch=('any')
 url="http://libjpeg-turbo.virtualgl.org"
 license=("GPL, custom")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 groups=("${MINGW_PACKAGE_PREFIX}")
-makedepends=("nasm" "${MINGW_PACKAGE_PREFIX}-gcc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-nasm" "${MINGW_PACKAGE_PREFIX}-gcc")
 provides=("${MINGW_PACKAGE_PREFIX}-libjpeg")
 conflicts=("${MINGW_PACKAGE_PREFIX}-libjpeg")
 replaces=("${MINGW_PACKAGE_PREFIX}-libjpeg")
 options=('staticlibs' 'strip')
 source=("http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz"
-        "libjpeg-turbo-match-autoconf-behavior.patch"
-        "jpeg-7-tiff-ojpeg.patch"
+        "0001-header-compat.mingw.patch"
         "jpeg-typedefs.patch"
-        "libjpeg-buf-oflo.patch"
         "libjpeg-turbo-1.3.1-libmng-compatibility.patch")
 md5sums=('2c3a68129dac443a72815ff5bb374b05'
-         '6b00863ecdd729cb757e7f3672324f6f'
-         '4f927780387c77244c2f89b2c6a66eb2'
+         '4cd30dbda4e54a6875e74ed437e41b49'
          'b758ab3ac6a0604c6ed5fb9d850c9a73'
-         '8835de1a830ae9979460f14f79e90630'
          'b54c2ab69837e1b72605184364360af0')
 
 prepare() {
   cd "$srcdir/libjpeg-turbo-$pkgver"
-  patch -p1 -i ${srcdir}/libjpeg-turbo-match-autoconf-behavior.patch
-  patch -p1 -i ${srcdir}/jpeg-7-tiff-ojpeg.patch
-  patch -p1 -i ${srcdir}/jpeg-typedefs.patch
-  patch -p1 -i ${srcdir}/libjpeg-buf-oflo.patch
+  patch -p1 -i ${srcdir}/0001-header-compat.mingw.patch
+  #patch -p1 -i ${srcdir}/jpeg-typedefs.patch
   patch -p1 -i ${srcdir}/libjpeg-turbo-1.3.1-libmng-compatibility.patch
 }
 
 build() {
   mkdir -p "${srcdir}/build-${CARCH}"
   cd "${srcdir}/build-${CARCH}"
-  "${srcdir}"/${_realname}-${pkgver}/configure \
+  ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -51,6 +45,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/build-${CARCH}"
+  make test
+}
+
 package() {
   cd "${srcdir}/build-${CARCH}"
   make DESTDIR="$pkgdir" install