Re: [PATCH] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 10/21/20 9:23 AM, Thomas Huth wrote:
> We do not support SDL1 in QEMU anymore. Use SDL2 instead.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/docker/dockerfiles/centos7.docker | 2 +-
>   tests/docker/dockerfiles/centos8.docker | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
> index 8b273725ee..6f11af1989 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -31,7 +31,7 @@ ENV PACKAGES \
>       perl-Test-Harness \
>       pixman-devel \
>       python3 \
> -    SDL-devel \
> +    SDL2-devel \
>       spice-glib-devel \
>       spice-server-devel \
>       tar \
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index 585dfad9be..f86931f955 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -2,7 +2,7 @@ FROM centos:8.1.1911
>   
>   RUN dnf -y update
>   ENV PACKAGES \
> -    SDL-devel \
> +    SDL2-devel \
>       bzip2 \
>       bzip2-devel \
>       dbus-daemon \

I wonder if we are having docker image caching issues...

build-system-centos job passed but then in check-system-centos:

FAILED: libcommon.fa.p/ui_sdl2-input.c.o
ui/sdl2.h:7:10: fatal error: SDL.h: No such file or directory
  #include
           ^~~~~~~

And then in acceptance-system-centos:

./qemu-system-x86_64: error while loading shared libraries: 
libSDL2-2.0.so.0: cannot open shared object file: No such file or directory