[vlc-commits] contrib: jpeg: remove OS X patch

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Mon Jul 28 19:59:21 2014 -0400| [c2acfbdd52edb27ee929ededf2c4149bdde321e3] | committer: Jean-Baptiste Kempf

contrib: jpeg: remove OS X patch

It has been resolved differently as of jpeglib v9a.

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit 6299f6fcce8f70e57b50e89b0c35f9354805d73c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c2acfbdd52edb27ee929ededf2c4149bdde321e3
---

 contrib/src/jpeg/osx.patch |   14 --------------
 contrib/src/jpeg/rules.mak |    1 -
 2 files changed, 15 deletions(-)

diff --git a/contrib/src/jpeg/osx.patch b/contrib/src/jpeg/osx.patch
deleted file mode 100644
index 0346b20..0000000
--- a/contrib/src/jpeg/osx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 be80435..9f94e41 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -13,7 +13,6 @@ 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