From patchwork Tue Oct 11 18:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 960 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp52283vsd; Tue, 11 Oct 2016 11:37:48 -0700 (PDT) X-Received: by 10.28.69.90 with SMTP id s87mr117566wma.85.1476211068335; Tue, 11 Oct 2016 11:37:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h6si6460092wjo.22.2016.10.11.11.37.47; Tue, 11 Oct 2016 11:37:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CD6C689B74; Tue, 11 Oct 2016 21:37:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 045FB689944 for ; Tue, 11 Oct 2016 21:37:36 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id 123so123766wmb.2 for ; Tue, 11 Oct 2016 11:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=BZR2KLDbZuBMaAGulQY8LUBY2iwJ9YeB9yCPrgtXak8=; b=DHuW1pkM5G5a+akEQjkWN0viuOE6ipB3EkoPSB5NK6XQYf5zh6PjXZPbMkmKNRvtif 19JRZekA9yh1a48kqiO5tmeCsP+LfvC9pAy+XaDE1PYh7yNlEwSYDIsnq35vtMpU1aqo yebFg8r804nJcb8CF4Y1JBVr2CbKQrBgMja/laV+tmcCVJPghDYiBs7EHGzPMwyAgy8u x4tgVfhyGKTJD5aE/njNEG14pAPb3PHtAdaktw1RmHWnUs24TruwZnnmfZq9MxdKrYmi OippYtM/OGsShzBPAJuIwfGWY3F6iboZjWsD9SjHSaQrSEKssCet78xvDH6BFR8ecO3E bYRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=BZR2KLDbZuBMaAGulQY8LUBY2iwJ9YeB9yCPrgtXak8=; b=DUPqtGAKUZt7lQZKde56E3NKEtq7Qcqw9O8ZLsm89US/mHwd/8xViBUhzszpC87jDJ e+oS7bK0Dtzo9Hqq2/A9/MwFez+hx1EdXkaxjG+pB+6j64xjxuWH1eOCjtso/Omz5I6C tdcZRzGhgKYzkUtktaHOCTVZ5IHPV28j0EjzymuMUjBX8Nq4ro3VDtNKLZZxquUEs4wS FOcrN9oUvjvreLFUEWrYri/QwDB/CwsNpujMUtFAszvZh1D0tPVu4bjwZXbUO6pBtVDH gp2xP/lNIGv+XS1Jq7GfNq2YpbPVXNJmRPIcdowTPGFJsb2I8wy3JntPS6NiFrMCO1eq aHLg== X-Gm-Message-State: AA6/9RkputQv8MDaEghL3V6BBSRHpWoDLPnqf0WZbanEjuwM/8K7X96O/JutcZPChMZO7A== X-Received: by 10.194.43.74 with SMTP id u10mr6702509wjl.12.1476211056404; Tue, 11 Oct 2016 11:37:36 -0700 (PDT) Received: from [192.168.2.21] (p5B095A9A.dip0.t-ipconnect.de. [91.9.90.154]) by smtp.googlemail.com with ESMTPSA id e2sm8425365wjw.14.2016.10.11.11.37.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2016 11:37:35 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <31250a9b-0390-c0b9-eec4-a44489eb9cba@googlemail.com> Date: Tue, 11 Oct 2016 20:37:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: fix detection of libopenjpeg X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use check_lib2 to test the header together with the function. This is necessary, because '-DOPJ_STATIC' changes what the included header does. Also add '-DOPJ_STATIC' to CFLAGS, so that it isn't necessary to hardcode this in libavcodec/libopenjpeg{dec,enc}.c. Finally, check for non-static libopenjpeg, too. Signed-off-by: Andreas Cadhalpun --- configure | 9 ++++++--- libavcodec/libopenjpegdec.c | 2 -- libavcodec/libopenjpegenc.c | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 8fc71fb..ff743cb 100755 --- a/configure +++ b/configure @@ -5710,9 +5710,12 @@ enabled libopencv && { check_header opencv2/core/core_c.h && require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion -enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || - check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || - check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || +enabled libopenjpeg && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cflags -DOPJ_STATIC; } || + check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || + { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cflags -DOPJ_STATIC; } || + check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 || + { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cflags -DOPJ_STATIC; } || + check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || die "ERROR: libopenjpeg not found"; } enabled libopenmpt && require_pkg_config "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 65167e6..b4ce834 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -24,8 +24,6 @@ * JPEG 2000 decoder using libopenjpeg */ -#define OPJ_STATIC - #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 1443551..5042507 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -24,8 +24,6 @@ * JPEG 2000 encoder using libopenjpeg */ -#define OPJ_STATIC - #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h"