From patchwork Wed May 11 05:22:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Degawa X-Patchwork-Id: 35720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3732630pzb; Tue, 10 May 2022 22:23:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFcN9C3zbHvj1ehObTZ6cyagxKXXZm8NXLa7QRPQYwmmjOE8hQtXRYr+bM9n+LQycUDfBF X-Received: by 2002:a17:906:9749:b0:6f5:6cd:5bd9 with SMTP id o9-20020a170906974900b006f506cd5bd9mr23256114ejy.523.1652246600948; Tue, 10 May 2022 22:23:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652246600; cv=none; d=google.com; s=arc-20160816; b=GHgoQ4+ZmHwdx5m58HSULQNdjP4oqX0dxG1f73WShJC3ter9f5NSM7z2sk+vQfbzx3 ncOQiOwoFX2EapBF1RMJoQh/IbZGesr7RM6TCP9WhLiEaQMuSZpUSdjveq2Kren24vtx b93io4dfJ7ShkCxjaOM2K70t2HfD99MNysyog6NrkzoB5o/kwev2XHjjydEz+TK2E7h1 tUcE2mRqLGiCAT7BPE2OJ6QhnDvCGQTx8I+uC3mW8JSm/UC6bxn9tJoFSRClnnwSukvZ gwKzdJGF0MpoVIK739m2zROxVdVdAFMlOXtS7mC+D6HsMQZDACC9r50/aPoKfuWzzNEH yj8w== 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:dkim-signature:delivered-to; bh=oGE7S7TItBT4D/boppytKB6q2ebrNgzc9vESbtoXFyY=; b=iUFzdAv3/1d0btpTu8Vh5qmzqZs0UlYqulmTwOzXCKXhXpzfsknTJCeozjJKR8ZRw2 Y1UhjXafc93vujl0iYmCN0C7zjJ6YCLPhydVtVIJDrtVu9dTcc2d8PUYPpfTLowmqlmk z6mQeHCjeJMEuqQOqWTZGtnWbD1RDJqQFTLBZ1ffeAVbVm35rEx6fCbRtT3mAPTr5r/Z b5ALOy9trsPViImdCPz8Fmq68irmyEWeDRwQnHdtJ/2vnKBg5f+vgIIaTIL5cSHjtqAI G5bGYuIhiabaSw60YdWjRnqZh9wepDnyx9CYAWv51SS5cQBOU/yFsIwHeGqAybQNgRBj Ybwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@randomderp.com header.s=default header.b=B9+gsdMP; 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=randomderp.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ba9-20020a0564021ac900b00425bcf86b66si1196000edb.381.2022.05.10.22.23.19; Tue, 10 May 2022 22:23:20 -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=@randomderp.com header.s=default header.b=B9+gsdMP; 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=randomderp.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5118E68B373; Wed, 11 May 2022 08:23:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from degawa.com (unknown [174.127.109.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4B1368B236 for ; Wed, 11 May 2022 08:23:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomderp.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=RkdtyqVhMxmMmeHrk+baxVKsyDCcRTSX7FCCAwMkpqY=; b=B9+gsdMPCJ4EOl4gfTjbRD9h5+ ewUzrRtRzyjEjYujB5uRApW86Tp8c0LRQatVXy+6pO1CUKKqNXOdfVCMAhi8voMGZPtaLy64nyK3M g6y55wcMMevwCllf194HgTzMjBPzxocRg2U/zQtxM3ozr4BWqJmu0x6DniilLHUJhrdzCd/XP8tKK dEvDkhntgI6292UAzDOADSNNXqW5Un541an4q97OSu1dZmdtnfI1wvwGLH3vMCduEmAzViw1QHS6j 7brsr/8ADOROTznDtEQy/j3w8MxQcHWEwSJSEVKm1mp+hPlFVIPHqbtB4+Tc4nOHvDAJXCNlXWHUh uSXMGzJQ==; Received: from 108-216-168-194.lightspeed.mmphtn.sbcglobal.net ([108.216.168.194]:54248 helo=localhost.localdomain) by slmp-550-1.slc.westdc.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1noeoW-00048J-Jr; Tue, 10 May 2022 23:23:08 -0600 From: Christopher Degawa To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 May 2022 00:22:57 -0500 Message-Id: <20220511052257.174499-1-ccom@randomderp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220510224829.143890-1-ccom@randomderp.com> References: <20220510224829.143890-1-ccom@randomderp.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - slmp-550-1.slc.westdc.net X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - randomderp.com X-Get-Message-Sender-Via: slmp-550-1.slc.westdc.net: authenticated_id: ccom/from_h X-Authenticated-Sender: slmp-550-1.slc.westdc.net: ccom@randomderp.com X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH v2] configure: add check for sdl2 >= 2.23.0 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: Christopher Degawa Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: h5toojOsPrlZ sdl2 recently changed their versioning, moving the patch level to minor level https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff trac: https://trac.ffmpeg.org/ticket/9768 Signed-off-by: Christopher Degawa --- configure | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure b/configure index 4d2f4d9112..0fdab7391e 100755 --- a/configure +++ b/configure @@ -6743,6 +6743,13 @@ fi if enabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent + # sdl2 changed their versioning scheme to match GLib and flatpack moving the patch to + # minor instead in + # https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff + # which obviously breaks the previous check, so go ahead and check for the new version + if disabled sdl2; then + test_pkg_config sdl2 "sdl2 >= 2.23.0 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent + fi if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then sdl2_cflags=$("${SDL2_CONFIG}" --cflags) sdl2_extralibs=$("${SDL2_CONFIG}" --libs)