From: Christopher Degawa <ccom@randomderp.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Christopher Degawa <ccom@randomderp.com>
Subject: [FFmpeg-devel] [PATCH v2] configure: add check for sdl2 >= 2.23.0
Date: Wed, 11 May 2022 00:22:57 -0500
Message-ID: <20220511052257.174499-1-ccom@randomderp.com> (raw)
In-Reply-To: <20220510224829.143890-1-ccom@randomderp.com>
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 <ccom@randomderp.com>
---
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)
--
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".
next prev parent reply other threads:[~2022-05-11 5:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 22:48 [FFmpeg-devel] [PATCH] " Christopher Degawa
2022-05-11 4:30 ` Gyan Doshi
2022-05-11 5:22 ` Christopher Degawa [this message]
2022-05-11 5:58 ` [FFmpeg-devel] [PATCH v2] " Hendrik Leppkes
2022-05-11 20:11 ` [FFmpeg-devel] [PATCH] configure: extend check to less than 3.0.0 Christopher Degawa
2022-05-12 5:05 ` Gyan Doshi
2022-05-12 6:23 ` Gyan Doshi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220511052257.174499-1-ccom@randomderp.com \
--to=ccom@randomderp.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git