From patchwork Wed Aug 30 12:09:06 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: 4905 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp449811jao; Wed, 30 Aug 2017 05:12:04 -0700 (PDT) X-Google-Smtp-Source: ADKCNb55Huwjgrzxg+X8KkupuVxKXBpE2JO9QdYSYG4lHl2kMF+x6lwofhTKT5m46SITsjc42eLo X-Received: by 10.223.174.81 with SMTP id u17mr1091887wrd.317.1504095124038; Wed, 30 Aug 2017 05:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095124; cv=none; d=google.com; s=arc-20160816; b=HpKlLRYZuvnlx9UCW+fn/Cm3ytsusWLiAr/or+K4DaMS0mGfNHDs5c6/Gw7eG98KqG vPCnAxa7WSnK2MzfgvtuJQVerblgPBvJvxzp+++FUDhyz3a6DG++v3HgUIQPZmCVz7nt s+JIvq2yJ62Vfuo3MxJyvyyHQ2zxYXlR2gDprhHPbAteyTVE78MulTi9CLvQcaWYKpzI Q9y/H51tMNd33qXOJ6Sc3TYpMsy6cc2ENu+OiHs2XstQSS0aHyFoEFuWmq6CbBTn2ef8 qBN6RYyzW16Hfqa0aV17xYoNmpPH9XrUbQ1gaHsF3F43gqUtHq43ZxyqVkXgtSOca+9D VmlQ== 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=YFp22Fdd1Qi1TxmvGvrC6s8/QZoCidv/MpNL/0EF7e0=; b=r81fCYBoWKguSGm8H2vPytHIvCYnkIW9A5oR7jgcICXFDlbNdZqOPpnesSHLC7CaSS 4CoUoQxRnG5UrH2flAJiG8vxl6JRCq/uzl6IZVUveu9hU8ZCrcxRLM1eotXrXbUDJJhC 3g2Pdr3jgs3HkpRGn99f5+rDVUq6SQ4jN8JocE+u/aq7oakru2exY0L1A7+VGCizIl4I LKiApqo2AIqLp+aLBNNJZWYZZG/2H7D3KZJI+G4QWRv+wfL2uRKwciPHWCRzucqEccY9 XaLsduUAAiqTlWkshXtRvdDkEbEQsOSiKFs7NeNsKEpNxu22mpNAXEuocinkMQ3TOOBA IivA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=h0VzAtUF; 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 q8si4106291wrd.349.2017.08.30.05.12.03; Wed, 30 Aug 2017 05:12:03 -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=h0VzAtUF; 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 CBBF668A35D; Wed, 30 Aug 2017 15:09:41 +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 92F0168A2D9 for ; Wed, 30 Aug 2017 15:09:32 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 304bddfc; 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=lwZ392Z 54a2npVIIbKBbFTVAHfs=; b=h0VzAtUF4KNE9q7ie7U2iBYfvRr21YpppO4rj48 wDW1asqdufeXs1IImomxRBpcAfzcFWiNWlNcENZCmpu9dwcDiJ+Ix/HJRIs4DJ1+ em1jFtiD2hFnBL5lF2PvgQb6fQ+TZeSYXoaUzJxZBhN8qX+f8O2bEqZeDG6WaMUh LbVhSDh0qJpHH01Gwr/MzaiXkvekNMjhusvwBA8hmWMfI/Fv9avD0HFMA18JUbY1 Mokdm3gjKFRxwCR1egsYIXOZ7EhfWb2WkBuOYS1gCdRk9uWCNQcRVo+lXD+VtF4n TpIR/lxb8UyfundBjnnXzd4wNUx/PNjkaj6p+mKO71UPkTw== 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=G XOBr47HvSsnlZ7/5frNxay7Ridsav8KU5J7IyuTXqCkXtgaVzJ5iCdsZySqBmMwY xV9h3Fzq6FzjUwkarCAZpmZIht5uyzVKZlKF0tScnTjOe4E/wVaTu3EfKvgE6S0C ksltiTSc6wqDMNcwZTTR6N827Ua3JoLERkPNlPfsuM11FGjDHofywShzvzasoH7F uYib4oAkkygBNSMqjGjQf0kTar+6S6asX4l1DwJDiGAnMLZp2NuZzxTn3dfWti8b D0aIwA0nMFpT8kHGdS87hf+tqXxaVLhXTOe9AmBv9W7J2+LenjnmwpcF7uv5mK7L th1m0ZsPAMhMKAXZP9CUw== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 709fea0f; 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:06 +0200 Message-Id: <20170830120915.13050-8-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 07/16] build: treat sdl2 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 94b95f2df7..911b9ae569 100755 --- a/configure +++ b/configure @@ -6026,20 +6026,22 @@ if enabled gcrypt; then fi fi -if ! disabled sdl2; then +if enabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then 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 SDL_Init $sdl2_extralibs $sdl2_cflags && enable sdl2 - else - if "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + check_func SDL_Init $sdl2_extralibs $sdl2_cflags || + disable sdl2 + elif "${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 SDL_Init $sdl2_extralibs $sdl2_cflags && enable sdl2 - fi + check_func SDL_Init $sdl2_extralibs $sdl2_cflags || + disable sdl2 + else + disable sdl2 fi if test $target_os = "mingw32"; then sdl2_extralibs="$sdl2_extralibs -mconsole"