vlc | branch: master | Sean McGovern <[email protected]> | Mon Jul 28 19:59:21 2014 -0400| [6299f6fcce8f70e57b50e89b0c35f9354805d73c] | committer: Felix Paul Kühne
contrib: jpeg: remove OS X patch It has been resolved differently as of jpeglib v9a. Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6299f6fcce8f70e57b50e89b0c35f9354805d73c --- 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
