From patchwork Sun Jan 7 21:15:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7186 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1915895jaa; Sun, 7 Jan 2018 13:15:31 -0800 (PST) X-Google-Smtp-Source: ACJfBosu/mfvUZpkyBMl6EdlB7SUEbSnb/pCwiXH4QLBWap+6J0q0kMNbDyRYTidKt6XZ6niKsd2 X-Received: by 10.223.178.66 with SMTP id y2mr7649254wra.150.1515359731711; Sun, 07 Jan 2018 13:15:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515359731; cv=none; d=google.com; s=arc-20160816; b=sVCuFUhhTfP7qImZYi5OtJgQQ/iUieBgk53d39qc1Jcv3BiywXg8U8489Y0Zd5oAAT w7hbOHWUzuso4D5EgXcPT4pPO2pdc4fxubyB4KYgh0MBLmuBtKEb4UpLaam6kTdGr/CV 0DC2f2aWjNwJ9oaHfGZrsJcnGYIOfIAhW2rl/6rluicMt5QEUSfKvo3c9y3NoyZT+csj elVNChL6WgtPdqK9slgn4JY3o0wNssYTfXGr2Se5ETRPCvzVeI6n/PevU5HwFpv7Gs1B 3Rr8J2JadCIKn+T9uT3z/5n1enhyR+swve1K3/hbND6qKTmBvq6bc6OJMeVd7By59zHG mkcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=7fIkyIR78X1onJu9JeAcIUmbsb488gu0KWSVICAEPtI=; b=iluVOyYTk2ZVIvEpL+Re4fXqNyBJOOKMAm5HO2cH6Uhk7YDerML2dFDe1f1FRDeCCJ QXQpz9yRsRAvPh+MQDUNzuTEQ5crlL4W6d27TaG8wh5Wk3vHYYfhkS9ux/ZyqAv1uqWv SjbdCvqh5UcKukxtTS1LnjHx5s09961Q6xOF+n1li4525jV3qx49NO5pmxrA7jkv8TNi irSmblQQln6sUSoJa6tjW99LRGgizu6pRLwIAaZpPbQHBnjxh6dg4NrmMMgrBgS3eGA3 tY1SCLYZo3HPXcM3RlLqhrPdk+NA8me0ZQX6qkFdNGnI4JI8v4Cs96cP+X0Q/51s8l0H 6qLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=S3cqwesC; 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=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 u71si6885438wma.225.2018.01.07.13.15.30; Sun, 07 Jan 2018 13:15:31 -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=@gmail.com header.s=20161025 header.b=S3cqwesC; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3AAB3689DFF; Sun, 7 Jan 2018 23:15:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F2B0689D2F for ; Sun, 7 Jan 2018 23:15:22 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id a8so12009590qkb.8 for ; Sun, 07 Jan 2018 13:15:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=HEeze0m6gGfa1zhX6k4hOEm8g3TSXcKR/LAPVrv6M2E=; b=S3cqwesCifrW4Hl9c4mdYB6au2v8ubDau31YWldit76HnCxPnUncFYgq3o7IpFWoZR 7ANW1WsvdNuNkyEwU4X9nrIwMku9LAfrciF3PgMpfY+xPk77u9y+X+Do7AS26+FFZWC6 9AwGDWiZhLiEWi9ihiXWt1ASSSAHXOwNnWoD/eRuMP0gb7cbWTWkggSurhV/sNX976Yo 0QxAt/iBrFLDJOBkPJeGsPZbrGfJg1+IctJyFUbYTG5skwM5ykbAiMI7QtcHFuDp6LzN KE12bfwdL85t5EEsaUCTkwKVhJtqWuSHyGNvMD2mNo1LLEHXg5ijsF5KB0dHyoRnlcUD qoKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=HEeze0m6gGfa1zhX6k4hOEm8g3TSXcKR/LAPVrv6M2E=; b=mQpk4Y5f9d3hMg6T1OBOUmK9uNrFT8ZQkR3fKgUpp7i4zYSHxjfXkPWtS9H2i/TBe1 HVJfdIsNjCPpn46PrZ3U9DZbzVjtcRsRjzv5dseaumFK4mN3HSRhMnzxl4LRvauiz/4t tu2JzVBXEcbrMSwUd/GYUXQrP/5YeG+m7q9ntK62l60+a/ZDszTL6DGmCH3XuEfHBIgn H2LW2y0WALH8KfBuGLr89aohK0bb4lO/tPzdtPd0Ia15cVBbGUCXtON4tnQppJ+3NOXE MzOHtwCiVQy2CHa9aCljqb05pFI57sGbchcTK9EZZNM5TDv54+Sj5GGgLcZNtaj+b1oI Mzfg== X-Gm-Message-State: AKwxytfqqYqJt3hV3ZQVb8Aee5p6mfsRRMc2hNUA7tUTejcM9ea6zw+3 GzdmbOYzvZMetdgtv9l3R25kgg== X-Received: by 10.55.187.134 with SMTP id l128mr13784954qkf.211.1515359721396; Sun, 07 Jan 2018 13:15:21 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id g35sm6704650qtk.88.2018.01.07.13.15.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jan 2018 13:15:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jan 2018 18:15:00 -0300 Message-Id: <20180107211500.9892-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] configure: don't use SDL.h in check_func_headers when checking for SDL2 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" check_func_headers() defines a main() function, which clashes with a redefinition done by said SDL header. Check for SDL_PollEvent using SDL_events.h only instead, where the redefinition doesn't happen. Fixes a regression since d03c39b46b21c893d6549a532289b7fb9935b3fc. Tested-by: RiCON Signed-off-by: James Almer --- configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ab05b9c7f3..1aea18d300 100755 --- a/configure +++ b/configure @@ -6008,15 +6008,13 @@ fi if enabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" - if test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then - check_func_headers SDL.h SDL_Init $sdl2_extralibs $sdl2_cflags || - disable sdl2 - elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent + if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then sdl2_cflags=$("${SDL2_CONFIG}" --cflags) sdl2_extralibs=$("${SDL2_CONFIG}" --libs) check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags && check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags && - check_func_headers SDL.h SDL_Init $sdl2_extralibs $sdl2_cflags && + check_func_headers SDL_events.h SDL_PollEvent $sdl2_extralibs $sdl2_cflags && enable sdl2 fi if test $target_os = "mingw32"; then