From patchwork Mon May 14 18:58:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 8959 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp490568jad; Mon, 14 May 2018 12:04:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqkpOQ2ZoS+QWegq5b+wsKM4XvdMQ8MCCt3HD+kpXmeLyKbDMIb8Jo6rspJ2/x8sM42WINV X-Received: by 2002:adf:b850:: with SMTP id u16-v6mr8044633wrf.64.1526324659582; Mon, 14 May 2018 12:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526324659; cv=none; d=google.com; s=arc-20160816; b=vunxrleMI0Ywiv4mzxc7DsSYae8UBPJFieTfxe9ePljm6LJAkdv8So/HFgTV78gKEM QbZLMiuV1roeilxSZzY9s1MD7t1olsmW7tMdQMlnisss9zhj3EwV3x4eFTGO0U5zYrBN BUwCwhFcstOdFjtenu2pMpBiAmpW1ukbM0Va2h4SECmn2VAyiCD5lNjHXlU0Bu9nUlgB 4GNQ0pnjbMyDjuNgXzq/GHb864YK0ZG1mCHYLwIzAc42BWXIixNqessCtSEHb+f6szC0 cVXeke8PW/2zr6iElaGGHt4SpE/xGWk6AJ04HRrOxKGr/4HtCzA4XYkorKz/Hwx6OtVH tR6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=Mp7OEyQLyqsbMdeHdIvRne5TkBL6m9jYqs7vKhYbcEA=; b=GLKiRusej8doBDkNlTOs1dpWxSMKWr+l+oUpwIOpKzPi7HJFIPqGq4dsNy47uyfAI3 qdYVHPWPQaivxsoP6ziJrQMd5OWp/Vo0UNx4I0Br2Hy0DlQx4SYPx/gy6QrhBiPtLpnV 66xqyNf7/EUpNjQzb1X6jASreIb4NNbCVe5dV8m69N/txXJv1w6g93J8ouGndSJG1o+Z k5bciawryr5Hu1JAOcgJiGgkA4EyCbME6Ihu77wZe8ksG/RRIKd+z0vAeZ/b45N0KPBr hE1m5GCHURsY+vrTN3F3/QvSKuRrGUCQzP/djEOVQs5RrT+4XCiIKnE49ycvOCDoloi5 aQjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=F5lE2pIW; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s5-v6si5598778wmf.81.2018.05.14.12.04.19; Mon, 14 May 2018 12:04:19 -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=@gmail.com header.s=20161025 header.b=F5lE2pIW; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E836E689F10; Mon, 14 May 2018 22:03:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C324689975 for ; Mon, 14 May 2018 22:03:33 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id c5-v6so9528520itj.1 for ; Mon, 14 May 2018 12:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=fVxD+6avfnQfpgYUjJrRl4C5TbMpDbazIT1BBCAGjeE=; b=F5lE2pIWoG041uMxHIRlcAz4detrlvZRK84MKsBzbY6eUHAawcMHnMFlPLnNhjd496 TwI9exOzmKBtJELblnGFQSa/1ee/n0EU3TtYR8y0eKsw+URtnqnFKLmGpqa971MAWKpG PbCiELxlyNwjfh90E1LFDuExfKU+e4GYatbITtPq0Zg1eNtpKGwvaQErxnZOvwTZs1vf 98OxIblcW33WBkm9L+Tj4HJmF744nCC2HhLR+NV/wx8UMCIL/Y9FIkdcYLLvDo5ovt4j kzFszoAQF5p6CJLFBK1tnGA0oEbrYRFojbP8UAzBqnUXW1w6RLDDWu/x//U3fM2C/gNt 99Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=fVxD+6avfnQfpgYUjJrRl4C5TbMpDbazIT1BBCAGjeE=; b=X3L2xbjfXVDZ7IkHVIm/cqzuNoNbzqamk/o+YiaEd67fliVtkqtYUqU0z2R2TGMK7g FPMl85Vk4RgNvlSJ5Qy/p4FCesUKJ15AgE1PrimSBB2CxdSywzNhql1ecDIqEaGC7Yxq kAZpUx0LjJVJvH6nNopkAgyv5GU62smx9x62DeD3P8M+YlIlNHypmDrIaX06ScelOGKB K0LbV3E+mFhimS969U6ZT1S49a7GLPEnp2VCTeESCGlLP2e/sR1RAKmWFlKaH5dBcOfh g1X5ZEq68m66v3+aflRwwrfVwbcq5JypGQ5cpdVvb+41ELUFEK3nvVfFEab48XCIglsl NNQA== X-Gm-Message-State: ALKqPwcKAjf8d00MnQXS+9ZxY6oE+GnpPPGRbVABZBodTv4ACm862dm4 BtA3J0Px0X0oQG0bAn2tKAql8V1olSsW2TePZs8= X-Received: by 2002:a24:2706:: with SMTP id g6-v6mr11463772ita.5.1526324319857; Mon, 14 May 2018 11:58:39 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:81c6:0:0:0:0:0 with HTTP; Mon, 14 May 2018 11:58:39 -0700 (PDT) From: Carl Eugen Hoyos Date: Mon, 14 May 2018 20:58:39 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]configure: Support libxml2 on systems without pkg-config 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" Hi! Attached patch allows to easily enable the dash demuxer on systems without pkg-config. Please comment, Carl Eugen From 896d75ec2c78580fbf65bc6718f205060afac215 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 14 May 2018 20:56:37 +0200 Subject: [PATCH] configure: Support libxml2 on systems without pkg-config. --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 6a9d516..b1fca23 100755 --- a/configure +++ b/configure @@ -6101,7 +6101,8 @@ enabled libzmq && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && { test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } -enabled libxml2 && require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion +enabled libxml2 && { check_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion || + require libxml2 "libxml/parser.h" xmlReadMemory -lxml2 $zlib_extralibs; } enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; } enabled mmal && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host || { ! enabled cross_compile && -- 1.7.10.4