From patchwork Fri Dec 29 04:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 45377 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp4582442pzh; Thu, 28 Dec 2023 20:28:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8jTbqs9bzAPgOWkuRNkXbUMR/nTxG0WIHD83cYcNdJlFqxzTBLwk0V7X6c3Pe73SMBK5L X-Received: by 2002:a05:6512:144:b0:50e:1bf3:628d with SMTP id m4-20020a056512014400b0050e1bf3628dmr3773189lfo.81.1703824117503; Thu, 28 Dec 2023 20:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703824117; cv=none; d=google.com; s=arc-20160816; b=B2BnhSQuLC8yf492HuOZxcct/FLFAf+3bgDi3Cdf3dK4AbayzDaw9n0hVTbFsrWqoY eN0A3N9IxuxffZ08l7HBUyViZtgZg0qbMgeYKUvjp7lGG6ayfJ+s4L3KFyXGDTqfq4fi s7XdwSWWHf1/2qDc6Gaow1qYBz4CX95+QHh6rmLjhd/NWL5V2hV1qS8namhXCAEKyH5K C0fC1WAm2StnZvsB+k7F03mqMQBV6PLYFiPvuUzwa4xax+WXxcsu7LMQ/QH8vZDgJPcp oUg2fSGeF8eOOtaapwuBKBbN9XJ2s7TCTVttNgFvPR4XTynw9si06Z0DCHgodVw0R69y Um3w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=+HzcCjFjq7YLH+nIGBK6KAL/2p0MiiBpeTS8iXPiLmM=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=YoQ1+tRxGr37z16DgB1MU+ecf9+Xt7hDJrdDbofJHHrlWHiWcHUOp6+NCh3MUQN7aF /fNhXG76pKV84nWqnEZKEZZeKi3OEaNNP6R13CCbDlsEgsHXlic/23horqNUKF0vVqDW 7iLJ1K2KeQolWTNaYwMqd7p1Cqayvz0cN9StoncFAT8t4PNsBIBxKKoqObgmwiLUZJbV QOPRRbiMPPuoJUy/RJMmgmAqxv9NLt3Pqo5ZV3sOs06sflF9Dg4XjAd4sNhSjag+kbsD wVebpotx7g9dpBVsxMdodlfBm8r/IwHylukYVhHuGCDMLDL3kShZaS8XOJVwTHqaVwbO Noxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=jqnoi+zD; 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 m14-20020a50d7ce000000b005536a182c03si7824342edj.569.2023.12.28.20.28.37; Thu, 28 Dec 2023 20:28:37 -0800 (PST) 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=@intel.com header.s=Intel header.b=jqnoi+zD; 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 47C9268CC3D; Fri, 29 Dec 2023 06:28:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30FB368CC3D for ; Fri, 29 Dec 2023 06:28:26 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703824112; x=1735360112; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Eci9OLr4Wr88ErLlu5zVBHOL0qpY/7B44LapAqFlhJM=; b=jqnoi+zDX6bPffXaB8v5fzCY+koVkfevDVb1n7JDewRhC+zedh2/d2NJ H892BCZ/H82kpOPNiwk4clOuawAxZSVUwnFy3nkjostPJ2Z5HV8QnabYo 7fxo9xmQc/TDx8vBzmC7Fz2gCfzIkUyAPVUDGA7MxpuAbCBxKrDTFLW7/ 2QJesJ3/nmzXTZfcJfo+jet22KnMfKgpMVjonklz6OnwzSD+rw0Kgdb5/ 1RC3iwZZPy+3FiC7GeiH0rN9HHC/UXkaxbpQHhG+e5Poc3OQffRuY73RL c6gDAbsADonOUqm9gmEaCOBc16G+I+iMiZTdBtpYdAtf5mHOarLjXNTx+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10937"; a="10007450" X-IronPort-AV: E=Sophos;i="6.04,314,1695711600"; d="scan'208";a="10007450" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2023 20:23:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10937"; a="869306562" X-IronPort-AV: E=Sophos;i="6.04,314,1695711600"; d="scan'208";a="869306562" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2023 20:23:44 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Dec 2023 12:23:26 +0800 Message-Id: <20231229042326.3703625-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: autodetect libdrm X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pKAKKSUka17g From: Haihao Xiang option kernel_driver for vaapi device creation can be used to choose the desired device on Linux, which is more convenient than DRM render node in a multiple-device system (e.g. Intel iGPU + AMD dGPU or inverse), but this option requires libdrm works. vaapi is autodetected at configuration time, let's make libdrm autodetected too. Signed-off-by: Haihao Xiang --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index cd66e42850..1f7d3ef11e 100755 --- a/configure +++ b/configure @@ -339,7 +339,7 @@ External library support: --disable-d3d12va disable Microsoft Direct3D 12 video acceleration code [autodetect] --disable-dxva2 disable Microsoft DirectX 9 video acceleration code [autodetect] --disable-ffnvcodec disable dynamically linked Nvidia code [autodetect] - --enable-libdrm enable DRM code (Linux) [no] + --disable-libdrm disable DRM code (Linux) [autodetect] --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no] --enable-libvpl enable Intel oneVPL code via libvpl if libmfx is not used [no] --enable-libnpp enable Nvidia Performance Primitives-based code [no] @@ -1855,7 +1855,6 @@ EXTERNAL_LIBRARY_LIST=" libcodec2 libdav1d libdc1394 - libdrm libflite libfontconfig libfreetype @@ -1931,6 +1930,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" d3d12va dxva2 ffnvcodec + libdrm nvdec nvenc vaapi @@ -6749,7 +6749,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new -enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion +enabled libdrm && check_pkg_config libdrm libdrm xf86drm.h drmGetVersion enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && warn "using libfdk without pkg-config"; } }