From patchwork Wed Aug 30 12:09:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 4896 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp448207jao; Wed, 30 Aug 2017 05:10:08 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7lxQ1HbzUVRPsbP2rLhJqHWNCmBkv6ZAUP6zETfZctIluQd58b7T3pmkXrLZyFySUzTdkx X-Received: by 10.28.58.14 with SMTP id h14mr1173277wma.120.1504095008068; Wed, 30 Aug 2017 05:10:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095008; cv=none; d=google.com; s=arc-20160816; b=uxFxSjqOKOhV9mkydFv8swLbRjINlr03eqZz49hHq8IyPXOmz+4Ndff9uFBGtXlqZC JZFfCCfwnkjAAvpiIjwycVVeAnnGy+wb4PwN74hf4iZAe3WmEmzGWhtWc1Pr5KvyohFr xokm0qIVkGXaaIgavlF4ZV80S0POHDB4BDMMMIk1w5ddewwAp8BFXswsTuQAATEdwmNV pKuWRcB7T5KbBF91MnDlnf3XZZ+aYBNHCKkj/CjYJ1Z7UrutqYlmzCeWgYACjlXDlUGo nohH5qWdE+uH6hEm89+z5ZHQt1wz3vyoFg924Qt4x9kvNH6ARjfFi/eKGu4s7wQyV6nu kZ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:domainkey-signature:dkim-signature :delivered-to:arc-authentication-results; bh=XtOajEgJur97zqDaksZ2YTjam31YCpacfkGCb18JvMQ=; b=JwO675NtESg1icFfKMM4AN23SrRYXS3nqq7O+WHFVEaKiEeCNTN6+5hw2IbhMYkkB1 knyY+2xSnYvp5nQD8R3VWrP3tMgSqmCBbYZG/xL9urxNDpZL7FeriEY0rteJKzcdsrVb AHinT3c3RS0JLU+auAITgVGgvrQpP1VI2ez67ZyLT4GfK3pH+CDdH1BwOP/ool0StSEM LD8fC1lESUspRavM575UbcjyK1789Fru6q4KfGlv4AjWLRejol1JcY85LMIAw5KlrNF7 JVOFDS/vtNB3CGnH3/WUpKnJ7f0TqSvLz4KfsUbh9stGJNVqx4OBMapY5jO4ftPE3r0B jaFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=otgmg56Z; 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 t67si1514445wme.226.2017.08.30.05.10.07; Wed, 30 Aug 2017 05:10:08 -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=@pkh.me header.s=selector1 header.b=otgmg56Z; 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 7789F68A2CB; Wed, 30 Aug 2017 15:09:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9279B68A2C2 for ; Wed, 30 Aug 2017 15:09:27 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 9fa0f1e4; Wed, 30 Aug 2017 12:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=selector1; bh=nU1qeR2 zn4Akr8yHQP94HwWqE3w=; b=otgmg56ZsTNJlK89i2acfRKnT3nRj+VudviQpb7 a4U1wuGTiaScVBQiajAoGhDWdpzrC8pqdbCDRUExcdr7H4nB92LXsHxpWbbINxBy V0xhBr9KvZ0QJV3KnmWSyBH4wzLlr4sdrXwTJy/s9jOJ5jPK8arRl6ZikepIvq/e kriwKFxYXTF2O+sYpLWM4eOMZay8P6c6BP3wOL2xu0pew5CmiHJSREBbYHfHYiXN 0UIHA99pkRlxR9LD4d/OLWd3BZA0jZ50Qrc9G6fP3Eeq5kYuTSSQPxBCvhOuwd8x mSEkA99vXKa/AqlEiGUQw1DOAmVjJBms5U7SPlRwdPLRo3w== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=selector1; b=e MUQ0M2Yr/AYWoYXDk/bt+QhzVhUvKGgpoTI/C9H1z66VyLow2GVYzAM2unXVlFaa cvaFkKNQJ3bN6M3yL6TE2RXfXWq/jfE+e2QBs3UQ+5wkXN9QlMs9rH3jMk0j9dtt 2CQ2t3zavfl5bK6l1B0lw23wXqDocV//p/Y465RPDBX7XFT2FYGdZJtENXNTez8e KW0nJqhzEAmRRLA5bNekeqAu2kzMLMweIrMFvCyLuxEvXUpUaY1i3FSdp88/k8p8 vsIjsQEi7i/vWjuk5uJKf19RyDp38bRVMHDPmhRDAmWMQP2ZaO06YAkr3KHql8RX YOKBdHjMLNn2pzoj8jz7g== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 6b5694c1; Wed, 30 Aug 2017 12:09:17 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Aug 2017 14:09:03 +0200 Message-Id: <20170830120915.13050-5-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170830120915.13050-1-u@pkh.me> References: <20170830120915.13050-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/16] build: treat libxcb like other autodetected libraries 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: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Clément Bœsch --- configure | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/configure b/configure index b4b1288722..e73773fb74 100755 --- a/configure +++ b/configure @@ -3598,7 +3598,7 @@ enable_weak audiotoolbox # Enable hwaccels by default. enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc -enable_weak xlib +enable_weak xlib libxcb libxcb_shm libxcb_shape libxcb_xfixes enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder @@ -6118,31 +6118,17 @@ if enabled libcdio; then die "ERROR: No usable libcdio/cdparanoia found" fi -if ! disabled libxcb; then - check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || { - enabled libxcb && die "ERROR: libxcb >= 1.4 not found"; - } && enable libxcb +enabled libxcb && check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || disable libxcb if enabled libxcb; then - disabled libxcb_shm || { - check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || { - enabled libxcb_shm && die "ERROR: libxcb_shm not found"; - } && check_header sys/shm.h && enable libxcb_shm; } - disabled libxcb_xfixes || { - check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || { - enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found"; - } && enable libxcb_xfixes; } - - disabled libxcb_shape || { - check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || { - enabled libxcb_shape && die "ERROR: libxcb_shape not found"; - } && enable libxcb_shape; } + enabled libxcb_shm && check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || disable libxcb_shm + enabled libxcb_shape && check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || disable libxcb_shape + enabled libxcb_xfixes && check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs fi -fi check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"