From patchwork Wed Aug 30 12:09:05 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: 4903 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp449688jao; Wed, 30 Aug 2017 05:11:54 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6utz+GEWLhWdF2m1AAf2B+zfIuAYm9FXZaVQHchHsnarTy565qJV05z52DWZEkXupzdA11 X-Received: by 10.28.27.73 with SMTP id b70mr1179448wmb.161.1504095113937; Wed, 30 Aug 2017 05:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095113; cv=none; d=google.com; s=arc-20160816; b=r/wuI2aVTIgSKqS0EVfCGETgtzkkK7Y5v5+mOfi33Eq0LJn2J1nbBt3HXJ4b7ZBn2l AkIHLrreV42D+/3Ui4L0X1P9S7KS3/KZOd5FVNEAPQVl93pr5amSvPEW/LUwxiSyfmtA aP1Iyi3zECrmvIEQiYO9BUkQaNFE80SpkVNcum7w17gIxxU5Vbmd5SSnYSvUNwsvDD94 HeUy240i+d+8egS7fT6PySOsZuAEL4wtp5huFib9ghM30hzsRKynZ/jULPtmHW+/75t6 KRQlrOXL4OpXHMD+Gv/07shX/KReHNekUB+OHpAf8IySc2XCY3kA7ZpczTpLiuO2zODY oJ7A== 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=W23zy5d5SSXVlJPyb8Dug06wQA85Y708QzSPTR0aFUg=; b=x5CP7/3J3K89QJ2I1YAjKQu0zhPJNZ/OAL3KB56bDItjRvvuLeTN8IHrCgo5kxNa/0 VoNdaXZHQbgPtjmvc/AOvNRmUOJMlTmXN7sF00OvvMG34TYJLivuKbJFzT+eufEy+Rmq xLTx6LdleATTiGekLONtre1YMN067EhCoqpgQYRb3P/KS5H2IeymKJhSl6i55fXWVVo3 O50NKZx4VjIBXVBgHR4Qj0rWCKmRhC04Eax+8G9mMAfh1WV9DB92qaZwOyNn1P09jhyq 44wO0ehMkp/6Mv3zofJlQCY3eIs6p5Mai50TMkVOQCxU3vKpO4ceFugfO+tf1xKjnG4L xyDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=kC8C855n; 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 z190si3101605wmc.105.2017.08.30.05.11.53; Wed, 30 Aug 2017 05:11:53 -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=kC8C855n; 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 5384468A337; 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 057E468A327 for ; Wed, 30 Aug 2017 15:09:31 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 5a912da0; 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=Raxi0fs x2Mf9LtadRTk2DY/aGRs=; b=kC8C855nbYGNn9bIF7zxDsVk2/EwUU0ON2AIKpB u/Z9qdi9L1/GDbIpX/YINiRcK4sL0VV/1EdPrgW07SBeeBn3vfaxYtgMuTViG0P7 ossH/UaaMtkBxMfaXZHg5aBKIM8yoIRCSpb1WljQK+BfXEPxYT11w9TCUeAvR2pD 5yPXisd9l7NBQQww/DXvfonLSi+Qcab+X7ZWPPpvFRxZLoiD637LoHjlbsqnfSiK rCgtY6LM56pUdVfQxJh68B3nAzu/eOmLrfe5LXDm8r1XeXwt8iPLrblpILOMq1rq bxYyCj2SHF2j7TGMtgsFc17IeQBrQZKWgMt84hJwblwoVBw== 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=Q p5IZadRXwkTJTtsw+ULi6d1gIMy1oT9/DLMcyP1hv8xQnNeVNwWssR9DvwIUCtd5 Qoh8FkuPJXqYStvghN3y2Emje1FTvvfGI27+hZFlzixU8xJexsGvGPMBYeAkckM1 2O4rB9bhrslflm5S4Uj0XZaZcz4euUMsofkBeGRNVcZrPoarObx98ZeatZtkwjt9 XPhGMBLP0Ol9cL7JXR3oo4ZwvSLv76X/cKrpVP5KRoyCYwdurjEhrjYBRtPcleM/ fsI1lN9uXtpJQp2MsRxUZu1ByaBDsnKIEjUqH1uXFubkoGO8yvf4iS3xhztPzycq BbFKaERN1CbqMKoDZFHew== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id f20441b1; 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:05 +0200 Message-Id: <20170830120915.13050-7-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 06/16] build: isolate sdl-to-sdl2 aliasing 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 This simplifies incoming SDL related changes by removing potential mismatching states of sdl and sdl2 variables. Since a component can have all kind of states (such as unset, enabled, disabled or requested), keeping these variables in sync manually in random places is not robust. --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5d416d97f4..94b95f2df7 100755 --- a/configure +++ b/configure @@ -1488,7 +1488,6 @@ EXTERNAL_AUTODETECT_LIBRARY_LIST=" libxcb_xfixes lzma schannel - sdl sdl2 securetransport xlib @@ -3524,6 +3523,9 @@ for opt do action=${opt%%-random=*} do_random ${action#--} $optval ;; + --enable-sdl) + enable sdl2 + ;; --enable-*=*|--disable-*=*) eval $(echo "${opt%%=*}" | sed 's/--/action=/;s/-/ thing=/') is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt" @@ -6024,7 +6026,6 @@ if enabled gcrypt; then fi fi -disabled sdl && disable sdl2 if ! disabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then @@ -6044,7 +6045,7 @@ if ! disabled sdl2; then sdl2_extralibs="$sdl2_extralibs -mconsole" fi fi -enabled sdl2 && enable sdl && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs +enabled sdl2 && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs if enabled decklink; then case $target_os in