[MPlayer-cvslog] r38017 - in trunk: configure libmpdemux/demux_mng.c libvo/vo_mng.c

[al]

Author: al
Date: Tue Jan 16 22:25:23 2018
New Revision: 38017

Log:
demux_mng,vo_mng: Avoid inclusion of jpeg.h

If libmng is compiled with JNG support, it pulls in jpeg.h from
within its public headers. To my knowledge we do not use JNG
directly. This change does not disable the functionality to read
JNG files with demuxer mng.

Primary this helps compilation on current Debian. The header stdio.h
needs to be included before jpeg.h , but that #include is patched out
in Debian's libmng package.

Maybe we should revert this change after Debian (and derived)
packages are fixed.

Modified:
   trunk/configure
   trunk/libmpdemux/demux_mng.c
   trunk/libvo/vo_mng.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Jan  9 23:47:13 2018	(r38016)
+++ trunk/configure	Tue Jan 16 22:25:23 2018	(r38017)
@@ -5304,8 +5304,13 @@ fi
 echocheck "MNG support"
 if test "$_mng" = auto ; then
   _mng=no
+  cat > $TMPC << EOF
+#define MNG_NO_INCLUDE_JNG
+#include <libmng.h>
+int main(void) { return !mng_version_text(); }
+EOF
   for mnglibs in '-lmng -lz' '-lmng -ljpeg -lz' ; do
-    return_statement_check libmng.h 'const char * p_ver = mng_version_text()' '!p_ver || p_ver[0] == 0' $mnglibs && _mng=yes && break
+    cc_check $mnglibs && _mng=yes && break
   done
 fi
 echores "$_mng"

Modified: trunk/libmpdemux/demux_mng.c
==============================================================================
--- trunk/libmpdemux/demux_mng.c	Tue Jan  9 23:47:13 2018	(r38016)
+++ trunk/libmpdemux/demux_mng.c	Tue Jan 16 22:25:23 2018	(r38017)
@@ -33,6 +33,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 
+#define MNG_NO_INCLUDE_JNG
 #define MNG_SUPPORT_READ
 #define MNG_SUPPORT_DISPLAY
 #include <libmng.h>

Modified: trunk/libvo/vo_mng.c
==============================================================================
--- trunk/libvo/vo_mng.c	Tue Jan  9 23:47:13 2018	(r38016)
+++ trunk/libvo/vo_mng.c	Tue Jan 16 22:25:23 2018	(r38017)
@@ -30,6 +30,7 @@
 
 #include <zlib.h>
 
+#define MNG_NO_INCLUDE_JNG
 #define MNG_INCLUDE_WRITE_PROCS
 #define MNG_ACCESS_CHUNKS
 #define MNG_SUPPORT_READ