[vlc-devel] [PATCH] contrib: jpeg: remove OS X patch

[Sean McGovern]

Ping!

After this patch the only major remaining contrib issues on OS X are ncurses and Sparkle.

-- Sean McG.
-----Original Message-----
From: Sean McGovern <gseanmcg at gmail.com>
Sender: "vlc-devel" <vlc-devel-bounces at videolan.org>Date: Mon, 28 Jul 2014 19:59:21 
To: <vlc-devel at videolan.org>
Reply-To: Mailing list for VLC media player developers <vlc-devel at videolan.org>
Subject: [vlc-devel] [PATCH] contrib: jpeg: remove OS X patch

It has been resolved differently as of jpeglib v9a.
---
 contrib/src/jpeg/osx.patch | 14 --------------
 contrib/src/jpeg/rules.mak |  1 -
 2 files changed, 15 deletions(-)
 delete mode 100644 contrib/src/jpeg/osx.patch

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
-- 
1.8.5.2 (Apple Git-48)

_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
https://mailman.videolan.org/listinfo/vlc-devel