From 8f8b58073df47e55a74d1e62453ce17875a0d475 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Sat, 3 Aug 2013 21:58:12 +0200
Subject: [PATCH] Update to 1.3.0 and make jconfig.h more autoconf friendly

---
 .gitignore                                  |  1 +
 libjpeg-turbo-match-autoconf-behavior.patch | 31 +++++++++++++++++++++
 mingw-libjpeg-turbo.spec                    | 13 +++++++--
 sources                                     |  2 +-
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 libjpeg-turbo-match-autoconf-behavior.patch

diff --git a/.gitignore b/.gitignore
index a8f5a68..04e3a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libjpeg-turbo-1.1.1.tar.gz
 /libjpeg-turbo-1.2.1.tar.gz
 /libjpeg-turbo-1.2.90.tar.gz
+/libjpeg-turbo-1.3.0.tar.gz
diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch
new file mode 100644
index 0000000..d18a449
--- /dev/null
+++ b/libjpeg-turbo-match-autoconf-behavior.patch
@@ -0,0 +1,31 @@
+--- libjpeg-turbo-1.3.0/win/jconfig.h.in.orig	2013-08-03 21:52:45.115856655 +0200
++++ libjpeg-turbo-1.3.0/win/jconfig.h.in	2013-08-03 21:53:40.335912080 +0200
+@@ -7,14 +7,14 @@
+ #cmakedefine D_ARITH_CODING_SUPPORTED
+ #cmakedefine MEM_SRCDST_SUPPORTED
+ 
+-#define HAVE_PROTOTYPES
+-#define HAVE_UNSIGNED_CHAR
+-#define HAVE_UNSIGNED_SHORT
++#define HAVE_PROTOTYPES 1
++#define HAVE_UNSIGNED_CHAR 1
++#define HAVE_UNSIGNED_SHORT 1
+ /* #define void char */
+ /* #define const */
+ #undef CHAR_IS_UNSIGNED
+-#define HAVE_STDDEF_H
+-#define HAVE_STDLIB_H
++#define HAVE_STDDEF_H 1
++#define HAVE_STDLIB_H 1
+ #undef NEED_BSD_STRINGS
+ #undef NEED_SYS_TYPES_H
+ #undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
+@@ -25,7 +25,7 @@
+ #ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+ typedef unsigned char boolean;
+ #endif
+-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
++#define HAVE_BOOLEAN 1		/* prevent jmorecfg.h from redefining it */
+ 
+ /* Define "INT32" as int, not long, per Windows custom */
+ #if !(defined(_BASETSD_H_) || defined(_BASETSD_H))   /* don't conflict if basetsd.h already read */
diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec
index ff01818..00cfb85 100644
--- a/mingw-libjpeg-turbo.spec
+++ b/mingw-libjpeg-turbo.spec
@@ -5,8 +5,8 @@
 %global build_programs 0
 
 Name:           mingw-libjpeg-turbo
-Version:        1.2.90
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        MinGW Windows Libjpeg-turbo library
 
 License:        wxWidgets
@@ -14,6 +14,10 @@ URL:            http://libjpeg-turbo.virtualgl.org/
 Group:          Development/Libraries
 Source0:        http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
 
+# Make jconfig.h more autoconf friendly
+# https://bugzilla.redhat.com/show_bug.cgi?id=843193
+Patch0:         libjpeg-turbo-match-autoconf-behavior.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -75,6 +79,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
 
 %prep
 %setup -q -n libjpeg-turbo-%{version}
+%patch0 -p1
 
 
 %build
@@ -145,6 +150,10 @@ chmod -x README-turbo.txt
 
 
 %changelog
+* Sat Aug  3 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.3.0-1
+- Update to 1.3.0
+- Make jconfig.h more autoconf friendly (RHBZ #843193)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.90-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c4fedcc..230c149 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea53fc1e8a00c26e2f501385f887f1f6  libjpeg-turbo-1.2.90.tar.gz
+e1e65cc711a1ade1322c06ad4a647741  libjpeg-turbo-1.3.0.tar.gz