contrib: jpeg: remove OS X patch

It has been resolved differently as of jpeglib v9a.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

diff --git a/contrib/src/jpeg/osx.patch b/contrib/src/jpeg/osx.patch
deleted file mode 100644 (file)
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 be80435e392879c3befd3b2878f28cb7604abf61..9f94e4178312f2cfaaa0b40f12a50c70109403eb 100644 (file)
--- 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