From patchwork Sun May 13 15:07:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 8939 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp3051554jad; Sun, 13 May 2018 08:08:24 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoSepS1ydNtud/YYRonoEw0AevKRPeW02heGhexpWRUvLD1SEAvzb1iWnjcxOUoWtvQVWDn X-Received: by 2002:adf:b065:: with SMTP id g34-v6mr4587584wra.25.1526224103933; Sun, 13 May 2018 08:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526224103; cv=none; d=google.com; s=arc-20160816; b=lTMtdzgkJCcmAXDmeK48oiOnNnlQUGtEBUCE5ZRm7KafQZGVE0a1MaiNWoS54HIsH9 /F7O7P0wE/hivf1t1lSEPKqbLRuQZtinvPZLML014+c3mu766Lguj4VoFa0Q0BU+uT2s C60YaOO0OQ4FqWX/lSKvNJQQDjY/8gogDHX4CuRJ0SBSuQK499Ij9MsU8vDiR+PZflmS QXtcv+/msO5AM4ONxNfJyEpkTdoM5Juz89OcGSpm6/bdgbz4LLFh1Mq5qQ73ASfAgtVe dZBfeRcuEvXOdraU6SjfQ7YNqgcKqHauQlGkWJ90gfNBud5w3Hs47FwwDXPKJrwZv8NP nNEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=44aWEVVswCn19xrqDzxq5OfoOmJbRBRpbQfhLnkV++I=; b=f3/Z27HfXMKTt+1YjkhQG72bE2J5muInnVsg+OF+hLIrfyIm8Yv2WnS7D8kOQndCa0 yD6FW1iWiaBBuP+PeopmP1Av+UkopQLW+QZYFE0bH91pGRIDCSJOLfEVsSTx6IcBM6cc u1g2uXAgLetqn6HDVZ6g7q7GxSmtoJkGfPvs0KhOO7HwXS/kQMD/QSxu+8j6ulsd8hM+ DxunDwoiuPe9r9uN/l2KAunmb55qKppKihJKsksw5EEz1Z6n+TXnIDQOheP/PjrGTRyH EjnA2z8Hm2K39gU/vHPbzyEsCS+HTp0lJM6vXeEfvpAEF9Wc1UArfk8XNc2ZrED2lR7T vL+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=HSFq3u0O; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u79-v6si6643202wrb.136.2018.05.13.08.08.22; Sun, 13 May 2018 08:08:23 -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=@haasn.xyz header.s=mail header.b=HSFq3u0O; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D8AE68A517; Sun, 13 May 2018 18:07:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.xyz (haasn.xyz [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75EE068A50D for ; Sun, 13 May 2018 18:07:37 +0300 (EEST) Received: from haasn.xyz (unknown [10.30.0.2]) by haasn.xyz (Postfix) with ESMTP id A6C3340236; Sun, 13 May 2018 17:08:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=haasn.xyz; s=mail; t=1526224093; bh=98twznoftsomtoy2k2+CxT3pDBb6p3avWZyin3lujXs=; h=From:To:Cc:Subject:Date:From; b=HSFq3u0Odl1nLQcLPbbKk9nK+zj39IMfc9IAyITskf5c5iyXNLQ2o+RQ0BQOqh1h3 JWg9FkMAecsPNjUiNkmTuGff5hzXpVNljEHNb7qCzjgnuGYgSXyJIyn6fgePYe5piS Bf8uIzm8WkirQGIbNcMpe5lgec19IFf0yxODHKZk= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 May 2018 17:07:48 +0200 Message-Id: <20180513150748.2106-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] configure: fix configure check for lilv-0 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 Cc: Niklas Haas MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Niklas Haas This should be included as ``, same as is done in af_lv2.c. Forcing the extra lilv-0 breaks platforms where the include dir is `/usr/include/lilv/lilv.h` rather than `/usr/include/lilv-0/lilv/lilv.h`. The new include path works for both, because the `pkg-config --cflags` includes `-I/usr/include/lilv-0`. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index a1f13a7109..451d1937b7 100755 --- a/configure +++ b/configure @@ -5973,7 +5973,7 @@ enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gn enabled jni && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; } enabled ladspa && require_header ladspa.h enabled libaom && require_pkg_config libaom "aom >= 0.1.0" aom/aom_codec.h aom_codec_version -enabled lv2 && require_pkg_config lv2 lilv-0 "lilv-0/lilv/lilv.h" lilv_world_new +enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 enabled libass && require_pkg_config libass libass ass/ass.h ass_library_init enabled libbluray && require_pkg_config libbluray libbluray libbluray/bluray.h bd_open