From patchwork Fri Jun 28 04:46:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp34238vqv; Thu, 27 Jun 2024 22:02:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4gjr0l2UDyTwbPkic0UhXv0mYhDPo+JVnHngX7e9YUTEl0uWNaV7+G+QqEF+0so6hO0IlTAubBzemQpBnOtWZ7+O4/Aj1sbT/XA== X-Google-Smtp-Source: AGHT+IGM+Uq5J7fE8kMSUNPKJCVPziKMuoCp9KXSFY+9cjelntROYwfSCBeeIZR6H63AMya7iEDn X-Received: by 2002:a17:906:c014:b0:a6f:af8e:b75d with SMTP id a640c23a62f3a-a7245b851d1mr1332920166b.8.1719550969199; Thu, 27 Jun 2024 22:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719550969; cv=none; d=google.com; s=arc-20160816; b=jXHjeeHkavmRxVhd3Rm2R68p7BRJLtNMK6RjZqT8n0T12gSJvg9MKYJtnkjNv/DSnl 5nbtS9Zk2uHN4LynntFU+DI8VSop2mld3S8C/lPGXtXuxfUAgbURsHwC3e4HEI00n6a8 PbQa/DgL6PpZS34L3+ZO334OagXhZZ1FOyvHv671mmwODo6HqxoiaxH8tU7G8jlO1QnV hfHj8PWQXxSf7AIzWw79yPCmdXAvV6NTPSHfSRZWlJ8KJnE05nQrr0jTXK4O+/8wpmoH N/w0BBvoj2JTJFUgUJ0Hm2UTnSSO9M/VKfqtD8Jl18jsE8IjeMYTcTo2dLoNfKKPaEW8 rVyQ== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=G+EhllmS7u/mjtKJVsgG+UBNl7fGtWjcSGkwVtXAml8=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=icTO38nrmSO4xCSj6t2/xa7Sb6kcIjx+taBD/ScBrzu6///TLk1yZD5dtI5Jn5yh1p hMJbe2fSJbsprnmtVZRf2fBTsTLLl10JY5i+3UO3lNty+ohQznIfd0FntJJljfcFlp9f 1USiqJuna9DY3UWzQuw9mR0IYh8FCf6WflyqZpLsjXfx80aje2dInFi6qb8S80kDrbzT D9Aa3KE5denpwEqx1REFb9iC8okcROcuHgy1638HOKzkwdd0P3ALKxlgbSpOKSOCfelR ZIQSXZN+b3Wn2/caSVxH9IvcdvQ9XTSd18xUEgxwlHu/t7/m97YC4s62SlfFGCKqD9X9 GwLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="f/5g1WLM"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72ab04bfbcsi42820166b.329.2024.06.27.22.02.48; Thu, 27 Jun 2024 22:02:49 -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=@foxmail.com header.s=s201512 header.b="f/5g1WLM"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFEBB68D62B; Fri, 28 Jun 2024 07:46:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-73.mail.qq.com (out203-205-251-73.mail.qq.com [203.205.251.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1475268D595 for ; Fri, 28 Jun 2024 07:46:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719549965; bh=fM5PBzSttWIrQCQQfLvCJxutr/XOIGsCmkKJD6YN/xk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=f/5g1WLMqGlOHdJVz8apm0jLL0jNCq/rrTH5JrkeovLRlhRn+VBHQWqfSyxN2K9yC ap3qppI0cU9NZeWs/6TRW2EYWEJyBwQUvOkKo+P4l8Kmd3svUrMsab5cmAyGhwIilO yix0UW3i7zKtUSduoy0zvFrzpgxsYLZxkS9tHU8I= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.207]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id B823745B; Fri, 28 Jun 2024 12:46:02 +0800 X-QQ-mid: xmsmtpt1719549964t1h0ow33l Message-ID: X-QQ-XMAILINFO: MB5+LsFw85No6ssUuVlQDPLc8sjCZDGbfv63acPwz9A9XYHRXNlVmFsP3qBHDb SR+lbWBL4seo3izIIo5Qcb7VIlVA0dhiaCGwJuOCeC5iGV9z0SiLp9OksMEc0HNpPhauaGjabAjF jX7/HSTmZ8qq+195HtSZK/0vqJsgRBY8J6taqIpL5E3azdBwpsmQJ1q1+8KRrZ4ylPnzOvy2s6qt ahR3sT3NOSwuh9+9J8LBCHtGAfJXqeIeii16gvZ++9ceyYL9hDmKErZm5NmG6wXx0Uu/HF+OnI9P Np8KBUst+lCBgBDcMAjccUBg2t44TBU8n7XWta1xPvd8ygMX9uEdeE2UTOAHYZuWG/j4bXvW5chL gvdG0DAkyaNfl/B/+NthNanOy5qXVsd8yfm56uPZ65Cc2cBC/d8uG9jLgBy8y9RRECLKTOqEO77w +MTxrOBRHy4Ixpykx54AYuNYqG3kvQn6EYW/dzC6bAj3OrVTCZZHW3xr8nlsyJE0jjnt34zhubOS tHixcYka51w4+hpWq1JfdT6RYGE0fa1ENNxFzL8ILKowwrXjdG7ZYVNR9pYYjE7d389iCpwKMLb7 EVKa+aew7EdVZdRKDgbVcjs3TIJpvBZrlXdpaIx1VWiJ0fhJkpXBYBi8OVd2AZ0aAoqxXe2kEqV9 y0HEBIQRiBMUunpYX4r9laclrGLDpbuJjk4RHmrGnmqvMVkxbeFygSZHfGVxrYqGjuNHhOg+Zt6C WepLEeu9r1yE5u9BwKevcs2mYuzv0wLBs6blHfzfgIHN6zVhZzFC8dSbq1zFoomkOQcofxo2RF4r u6VpTxDz1HG1OBEAHavU/vcxqh9pAAQndTEHmbvcEXzud2+N2BGzAcvmguntfs94Suf+BjShUrFS 3OLoUNK5BRQ8o5C6VAf9pv53Lmy1Jy40d6wP37VINM8+AOJS1rTLmKoN80GOCDpFSFa7B60nybnl MKWdD5ylmzQj9NHbOTWSunlYQI0itKJvuonE3izqwWtU8cFXjY6Q== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2024 12:46:00 +0800 X-OQ-MSGID: <20240628044601.60376-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240628044601.60376-1-quinkblack@foxmail.com> References: <20240628044601.60376-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: Fix Apple framework dependencies in .pc file 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1e72k0GuoMW4 From: Zhao Zhili configure use "-Wl,-framework,foo" and "-framework foo" to specify dependencies on Apple frameworks. These two styles essentially do the same thing when build ffmpeg. However, they do make difference when generate pkg-config files. Some tools interact with pkg-config cannot handle "-Wl,-framework,foo" in Libs field, e.g., cmake with pkg_check_modules. Signed-off-by: Zhao Zhili --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 3bca638459..a09c92cfb2 100755 --- a/configure +++ b/configure @@ -7033,7 +7033,7 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h" { test_cpp_condition "AL/al.h" "defined(AL_VERSION_1_1)" || die "ERROR: openal must be installed and version must be 1.1 or compatible"; } enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel || - check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || + check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel "-framework OpenCL" || check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL || die "ERROR: opencl not found"; } && { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || @@ -7041,8 +7041,8 @@ enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueN die "ERROR: opencl must be installed and version must be 1.2 or compatible"; } enabled opengl && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL" || check_lib opengl windows.h wglGetProcAddress "-lopengl32 -lgdi32" || - check_lib opengl OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" || - check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" || + check_lib opengl OpenGL/gl3.h glGetError "-framework OpenGL" || + check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -framework OpenGLES" || die "ERROR: opengl not found." } enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame || @@ -7110,12 +7110,12 @@ if enabled decklink; then fi enabled securetransport && - check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && - check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" || + check_func SecIdentityCreate "-framework CoreFoundation -framework Security" && + check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext" "-framework CoreFoundation -framework Security" || disable securetransport enabled securetransport && - check_func SecItemImport "-Wl,-framework,CoreFoundation -Wl,-framework,Security" + check_func SecItemImport "-framework CoreFoundation -framework Security" enabled schannel && check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 &&