vlc | branch: master | Rafaël Carré <[email protected]> | Wed Dec 25 22:19:07 2013 +0100| [061c07bd85034c109fff42e3268aadadf0506e19] | committer: Felix Paul Kühne
contrib: jpeg: do not redefine FALSE/TRUE on OSX Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=061c07bd85034c109fff42e3268aadadf0506e19 --- contrib/src/jpeg/osx.patch | 14 ++++++++++++++ contrib/src/jpeg/rules.mak | 1 + 2 files changed, 15 insertions(+) diff --git a/contrib/src/jpeg/osx.patch b/contrib/src/jpeg/osx.patch new file mode 100644 index 0000000..0346b20 --- /dev/null +++ b/contrib/src/jpeg/osx.patch @@ -0,0 +1,14 @@ +--- 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 736a4cc..f55b51e 100644 --- a/contrib/src/jpeg/rules.mak +++ b/contrib/src/jpeg/rules.mak @@ -12,6 +12,7 @@ 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
