[FFmpeg-devel] [PATCH] configure: add check for sdl2 >= 2.23.0

[FFmpeg-devel] [PATCH] configure: add check for sdl2 >= 2.23.0

[Christopher Degawa]

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..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".

Re: [FFmpeg-devel] [PATCH] configure: add check for sdl2 >= 2.23.0

[Gyan Doshi]

On 2022-05-11 04:18 am, Christopher Degawa wrote:
> 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..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

Clamp the new check to be under 3.x and LGTM.

Regards,
Gyan
_______________________________________________
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".

[FFmpeg-devel] [PATCH v2] configure: add check for sdl2 >= 2.23.0

[Christopher Degawa]

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".

Re: [FFmpeg-devel] [PATCH v2] configure: add check for sdl2 >= 2.23.0

[Hendrik Leppkes]

On Wed, May 11, 2022 at 7:23 AM Christopher Degawa <ccom@randomderp.com> wrote:
>
> 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)
> --

There never was an "incompatible" 2.1.0 right? So can't you just
update the previous check to be >= 2.01 < 3.0 instead of introducing a
second one?

- Hendrik
_______________________________________________
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".

[FFmpeg-devel] [PATCH] configure: extend check to less than 3.0.0

[Christopher Degawa]

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(-)

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)
-- 
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".

Re: [FFmpeg-devel] [PATCH] configure: extend check to less than 3.0.0

[Gyan Doshi]

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)

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] configure: extend check to less than 3.0.0

[Gyan Doshi]

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
_______________________________________________
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".