| Message ID | 20220511201104.196919-1-ccom@randomderp.com |
|---|---|
| State | Accepted |
| Commit | e5163b1d34381a3319214a902ef1df923dd2eeba |
| Headers | show |
| Series | [FFmpeg-devel] configure: extend check to less than 3.0.0 | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 2022-05-12 01:41 am, Christopher Degawa wrote: > sdl2 recently changed their versioning, moving the patch level to minor level > https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff > and have said that they will instead ship sdl3.pc for 3.0.0 Will apply. Regards, Gyan > > trac: https://trac.ffmpeg.org/ticket/9768 > > Signed-off-by: Christopher Degawa <ccom@randomderp.com> > --- > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index 4d2f4d9112..0faf2455b7 100755 > --- a/configure > +++ b/configure > @@ -6742,7 +6742,7 @@ 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 > + test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent > if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then > sdl2_cflags=$("${SDL2_CONFIG}" --cflags) > sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
On 2022-05-12 10:35 am, Gyan Doshi wrote: > > > On 2022-05-12 01:41 am, Christopher Degawa wrote: >> sdl2 recently changed their versioning, moving the patch level to >> minor level >> https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff >> >> and have said that they will instead ship sdl3.pc for 3.0.0 > > Will apply. Adjusted msg and pushed as e5163b1d34381a3319214a902ef1df923dd2eeba Regards, Gyan
diff --git a/configure b/configure index 4d2f4d9112..0faf2455b7 100755 --- a/configure +++ b/configure @@ -6742,7 +6742,7 @@ 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 + test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then sdl2_cflags=$("${SDL2_CONFIG}" --cflags) sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
sdl2 recently changed their versioning, moving the patch level to minor level https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff and have said that they will instead ship sdl3.pc for 3.0.0 trac: https://trac.ffmpeg.org/ticket/9768 Signed-off-by: Christopher Degawa <ccom@randomderp.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)