[MPlayer-cvslog] r38004 - trunk/configure

[al]

Author: al
Date: Sun Nov  5 11:51:38 2017
New Revision: 38004

Log:
configure: Detect and use libopenjpeg2 only

Since FFmpeg commit 279dc40716 only supports OpenJPEG >= 2.1

As MPlayer only looked for OpenJPEG 1, that would lead
to a build failure if OpenJPEG 1 was found.

The new check uses pkg-config and does not #define OPJ_STATIC
anymore. I am not 100% sure about the latter, because I don't
really understand why we did this. It seems rather weird though.

If anyone understands when and why we need OPJ_STATIC it can
of course be brought back. Though I believe it is a rather
wrong concept to begin with.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri Nov  3 02:15:52 2017	(r38003)
+++ trunk/configure	Sun Nov  5 11:51:38 2017	(r38004)
@@ -5331,12 +5331,30 @@ fi
 echocheck "OpenJPEG (JPEG 2000) support"
 if test "$libopenjpeg" = auto ; then
   libopenjpeg=no
-  define_statement_check OPJ_STATIC openjpeg.h 'opj_dparameters_t dec_params; opj_set_default_decoder_parameters(&dec_params);opj_decode_with_info(0,0,0)' -lopenjpeg && libopenjpeg=yes
+  if test "$ffmpeg_a" = no ; then
+    res_comment="dynamic linking to libopenjpeg is irrelevant when using dynamic FFmpeg"
+  else
+    cat > $TMPC << EOF
+#include <openjpeg.h>
+
+int main(void) {
+  opj_dparameters_t dec_params; opj_set_default_decoder_parameters(&dec_params);
+  return opj_decode(0,0,0);
+}
+EOF
+    if $_pkg_config --exists "libopenjp2 >= 2.1.0" ; then
+      inc_libopenjpeg=$($_pkg_config --silence-errors --cflags libopenjp2)
+      ld_libopenjpeg=$($_pkg_config --silence-errors --libs libopenjp2)
+      cc_check $inc_libopenjpeg $ld_libopenjpeg        &&
+        libopenjpeg=yes                                &&
+        extra_cflags="$extra_cflags $inc_libopenjpeg"  &&
+        extra_ldflags="$extra_ldflags $ld_libopenjpeg"
+    fi
+  fi
 fi
 echores "$libopenjpeg"
 if test "$libopenjpeg" = yes ; then
   def_libopenjpeg='#define CONFIG_LIBOPENJPEG 1'
-  extra_ldflags="$extra_ldflags -lopenjpeg"
   libavdecoders="$libavdecoders LIBOPENJPEG_DECODER"
   libavencoders="$libavencoders LIBOPENJPEG_ENCODER"
   codecmodules="OpenJPEG $codecmodules"