From 061c07bd85034c109fff42e3268aadadf0506e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Wed, 25 Dec 2013 22:19:07 +0100
Subject: [PATCH] contrib: jpeg: do not redefine FALSE/TRUE on OSX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
---
 contrib/src/jpeg/osx.patch | 14 ++++++++++++++
 contrib/src/jpeg/rules.mak |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 contrib/src/jpeg/osx.patch

diff --git a/contrib/src/jpeg/osx.patch b/contrib/src/jpeg/osx.patch
new file mode 100644
index 000000000000..0346b2017612
--- /dev/null
+++ b/contrib/src/jpeg/osx.patch
@@ -0,0 +1,14 @@
+--- jpeg/jconfig.cfg.orig	2013-12-25 22:16:42.133723909 +0100
++++ jpeg/jconfig.cfg	2013-12-25 22:16:33.087314469 +0100
+@@ -25,6 +25,11 @@
+ #define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
+ #endif
+ 
++#ifdef __APPLE__
++typedef unsigned char boolean;
++#define HAVE_BOOLEAN
++#endif
++
+ #ifdef JPEG_INTERNALS
+ 
+ #undef RIGHT_SHIFT_IS_UNSIGNED
diff --git a/contrib/src/jpeg/rules.mak b/contrib/src/jpeg/rules.mak
index 736a4cc95b28..f55b51ea4ab1 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -12,6 +12,7 @@ jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
 	$(UNPACK)
 	mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
 	$(UPDATE_AUTOCONFIG)
+	$(APPLY) $(SRC)/jpeg/osx.patch
 	$(MOVE)
 
 .jpeg: jpeg
-- 
GitLab