On 18-10-2017 21:46, Michael Bradshaw <mjbshaw-at-google....@ffmpeg.org>
wrote:
> From fb8334d0cecc889ebce3af968c56a3afbd2f6047 Mon Sep 17 00:00:00 2001
> From: Michael Bradshaw <mjbs...@google.com>
> Date: Wed, 18 Oct 2017 11:34:06 -0700
> Subject: [PATCH] lavc: drop support for OpenJPEG 1.3-2.0
>
> We now require 2.1+ with pkg-config.
>
> Signed-off-by: Michael Bradshaw <mjbs...@google.com>
> ---
> Changelog | 2 +
> configure | 16 +----
> libavcodec/libopenjpegdec.c | 103 ++---------------------------
> libavcodec/libopenjpegenc.c | 156
> +++++++-------------------------------------
> 4 files changed, 34 insertions(+), 243 deletions(-)
> [...]
> -enabled libopenjpeg && { { check_lib libopenjpeg
> openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags
> -DOPJ_STATIC; } ||
> - check_lib libopenjpeg openjpeg-2.3/openjpeg.h
> opj_version -lopenjp2 ||
> - { check_lib libopenjpeg
> openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags
> -DOPJ_STATIC; } ||
> - check_lib libopenjpeg openjpeg-2.2/openjpeg.h
> opj_version -lopenjp2 ||
> - { check_lib libopenjpeg
> openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags
> -DOPJ_STATIC; } ||
> - check_lib libopenjpeg openjpeg-2.1/openjpeg.h
> opj_version -lopenjp2 ||
> - { check_lib libopenjpeg
> openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags
> -DOPJ_STATIC; } ||
> - { check_lib libopenjpeg
> openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags
> -DOPJ_STATIC; } ||
> - { check_lib libopenjpeg openjpeg.h
> opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
> - die "ERROR: libopenjpeg not found"; }
> +enabled libopenjpeg && require_pkg_config libopenjpeg "libopenjp2 >=
> 2.1.0" openjpeg.h opj_version
Is there a reason you left out -DOPJ_STATIC?
'openjpeg_git/src/lib/openjp2/libopenjp2.pc.cmake.in' doesn't put it in.
With this patch ./configure therefor fails over here with:
"test.o:test.c:(.text+0x1): undefined reference to `_imp__opj_version@0'".
enabled libopenjpeg && require_pkg_config libopenjpeg "libopenjp2
>= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC
This line fixes that.
-- Reino
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
