From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 130AB4133D for ; Thu, 21 Dec 2023 21:27:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1201468D16E; Thu, 21 Dec 2023 23:27:56 +0200 (EET) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6151168CDD9 for ; Thu, 21 Dec 2023 23:27:49 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50e587fb62fso1908915e87.2 for ; Thu, 21 Dec 2023 13:27:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1703194068; x=1703798868; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=E+De6IqJ0yl7VxMqMX6e+TWjKmOeIWF11aVe3kUoY2c=; b=FTicRqYWNdNFqoHGOsEInjwmYueP6qH1z/WdgojCtFFk4D0rhlhFi73HAFg72UXhnk fv808DbFXqaL1VVTQNMVviQxFcfxENciyy7CNrULPKXd/L2EzgHQf0HEwkxyREkxEaY6 hpFNjgNqy8JmqOHjE+VtZC++mu5UjCGkTFjAI5BCGRUs1kkMI0AbkuA5BaVqamPpImgc Z4s6zaa29Ru4wCYCIi/SyP0P12aE4MeoMXRuLNJyCuRk1D7cXTN0lH3yS8MG2muN2B4z +whkBfQtnT6m4csHDSIUj9SEGkG+mguY1+LfirQnXaazp6UvicFr0BDOx7uL/S2dXDMU dgDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703194068; x=1703798868; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=E+De6IqJ0yl7VxMqMX6e+TWjKmOeIWF11aVe3kUoY2c=; b=lbmB3RsFbucY1F1hMjPVBmVxgHz5QXNkPQ5j+4v1zQ6+uee72n6AM8KVaioeMY98/T 6HHujxBaqKrlCL/6LxkU7A8QZk81a//LTY/B/GUObFqj+kda5gMGucOKjjGh7FX+taae Enxq2iHpdgnFd+nQFVXzrHL1w9aoC9Xx+KXJA/RARiqiepKec7TlzZl3tfXMMahyVgZr jb981lX6MDf8ol3YhHzpG26oakWPtZxfZynCs/mNOWXuENUQDZTuLgsxEg0jyDpgGft8 jJxOdvgV+YRDWI2ZjZVCH91Kdcnd6pF6bLKzy2soiz5jgztZ7hjTMOov79dzVFiKQRvb VLaA== X-Gm-Message-State: AOJu0Yxoc0ilQjRDEJafpYyb1qdKmuPGxxv0hSp27pAJgF0P+xskI5i3 wL8cE1gKo8I0ecGOT9XbFppFXQX2cA/JkOBkeSzq3DVfvEJk X-Google-Smtp-Source: AGHT+IF2tPmP7Qs0UtG8lpjTJxAWU67Tr6lcWsZcy3Az2bHGWXyPCPOfvBbeQXPkWO0bL+tIZ/EW6A== X-Received: by 2002:ac2:4890:0:b0:50e:2d00:4d2b with SMTP id x16-20020ac24890000000b0050e2d004d2bmr139608lfc.80.1703194068311; Thu, 21 Dec 2023 13:27:48 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id q28-20020ac246fc000000b0050be9c8b108sm367487lfo.60.2023.12.21.13.27.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 13:27:48 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Dec 2023 23:27:46 +0200 Message-Id: <20231221212747.278886-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The check for UWP mode was duplicated from right above, in d54127c41a81cf2078a3504f78e0e4232cfe11b7. Also, instead of several lines with "enabled uwp && ...", make one "if enabled uwp; then" block. --- configure | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/configure b/configure index af0bebc1ac..69b755f274 100755 --- a/configure +++ b/configure @@ -7102,9 +7102,8 @@ fi check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs" -# d3d11va requires linking directly to dxgi and d3d11 if not building for -# the desktop api partition -test_cpp < #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) @@ -7117,23 +7116,16 @@ test_cpp < -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#error desktop, not uwp -#else -// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP -#endif -#else -#error no family set -#endif -EOF +mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids" -# mediafoundation requires linking directly to mfplat if building for uwp target -enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids" +if enabled uwp; then + # In UWP mode, we can't use LoadLibrary+GetProcAddress to conditionally + # try to load these APIs at runtime, like we do in regular desktop mode - + # therefore, we need to link directly against these APIs. + d3d11va_extralibs="-ldxgi -ld3d11" + vaapi_win32_extralibs="-ldxgi" + mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs" +fi enabled libdrm && check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2 -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".