Commit c2acfbdd authored by Sean McGovern's avatar Sean McGovern Committed by Jean-Baptiste Kempf

contrib: jpeg: remove OS X patch

It has been resolved differently as of jpeglib v9a.
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 6299f6fcce8f70e57b50e89b0c35f9354805d73c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent acd2b4ef
--- 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
...@@ -13,7 +13,6 @@ jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg ...@@ -13,7 +13,6 @@ jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
$(UNPACK) $(UNPACK)
mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION) mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
$(UPDATE_AUTOCONFIG) $(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/jpeg/osx.patch
$(MOVE) $(MOVE)
.jpeg: jpeg .jpeg: jpeg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment