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 BF13440DFE for ; Tue, 10 May 2022 22:48:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E76CB68B3BB; Wed, 11 May 2022 01:48:46 +0300 (EEST) Received: from degawa.com (unknown [174.127.109.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1582E68B354 for ; Wed, 11 May 2022 01:48:41 +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: 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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Lsk7pD2177st2kn3GOhY5Pwk/udc3CLK+ak70nvz7Sc=; b=sKEmxCsUxsBTE+1R36b/E+jQjv SkvbiiEgMZCOrkd1El3TCCEQmIanXDyk6ciMTn0A8s1wTMbCNsPGGl91EV5Zavq5sQ0nqX+/LMcxW iduGJYodHA5qC1/8x+GtMsRxwPaOQMeigg0hSa5Nj/z3hiqcIvXANnn2nXehdG61ePq9TBh3vk3fh kcZQpL+fzpahGemteR5YJf8DrWwOsSOIthJc0JduV0u1pVU1sxwkaacmbigCOWsBk2s4M9osMXr12 w9YXr7M9iDQWgXhFFfB208rludtki6O5EvZYqzmaNPeDvA73G/7BAatdVb0KDFBzWx/KmWd454/y7 vkzwJfpA==; Received: from 108-216-168-194.lightspeed.mmphtn.sbcglobal.net ([108.216.168.194]:54242 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 1noYel-0001oA-3o; Tue, 10 May 2022 16:48:38 -0600 From: Christopher Degawa To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 May 2022 17:48:29 -0500 Message-Id: <20220510224829.143890-1-ccom@randomderp.com> X-Mailer: git-send-email 2.35.1 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] 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 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: 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..88777fed10 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" 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) -- 2.35.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".