On Mon, Nov 16, 2020 at 01:07:05PM +0100, Lucas Stach wrote: > Signed-off-by: Lucas Stach <[email protected]> > --- > ...001-sdl-2.0.8-add-egl-cflags-to-test.patch | 55 ------------------- > .../0002-fix-building-with-Mesa-19.2.patch | 37 ------------- > patches/SDL2-2.0.10/autogen.sh | 3 - > patches/SDL2-2.0.10/series | 5 -- > rules/sdl2-test.make | 3 +-
There are patches for sdl2-test as well. Michael > rules/sdl2.make | 7 ++- > 6 files changed, 7 insertions(+), 103 deletions(-) > delete mode 100644 > patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch > delete mode 100644 patches/SDL2-2.0.10/0002-fix-building-with-Mesa-19.2.patch > delete mode 100755 patches/SDL2-2.0.10/autogen.sh > delete mode 100644 patches/SDL2-2.0.10/series > > diff --git a/patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch > b/patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch > deleted file mode 100644 > index dd2ec8400925..000000000000 > --- a/patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch > +++ /dev/null > @@ -1,55 +0,0 @@ > -From: Sergey Zhuravlevich <[email protected]> > -Date: Mon, 16 Jul 2018 12:03:42 +0200 > -Subject: [PATCH] sdl-2.0.8: add egl-cflags to test > - > -- also call aclocal to expand PKG_CHECK_MODULES > - > -Signed-off-by: Sergey Zhuravlevich <[email protected]> > -Signed-off-by: Michael Grzeschik <[email protected]> > ---- > - autogen.sh | 2 +- > - configure.ac | 11 +++++++++++ > - 2 files changed, 12 insertions(+), 1 deletion(-) > - > -diff --git a/autogen.sh b/autogen.sh > -index 9edfb8a7d913..2f1e2ef3d419 100755 > ---- a/autogen.sh > -+++ b/autogen.sh > -@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=. > - cd "$srcdir" > - > - # Regenerate configuration files > --cat acinclude/* >aclocal.m4 > -+aclocal > - found=false > - for autoconf in autoconf autoconf259 autoconf-2.59 > - do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; > fi > -diff --git a/configure.ac b/configure.ac > -index 9e782c653dfd..1e0477d1d0f2 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -2268,6 +2268,14 @@ dnl Find OpenGL ES > - CheckOpenGLESX11() > - { > - if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then > -+ PKG_CHECK_MODULES(EGL, [egl], [have_egl="yes"], [have_egl="no"]) > -+ > -+ save_CFLAGS="$CFLAGS" > -+ if test x$have_egl = xyes; then > -+ CFLAGS="$save_CFLAGS $EGL_CFLAGS" > -+ EXTRA_CFLAGS="$EXTRA_CFLAGS $EGL_CFLAGS" > -+ fi > -+ > - AC_MSG_CHECKING(for EGL support) > - video_opengl_egl=no > - AC_TRY_COMPILE([ > -@@ -2421,6 +2429,9 @@ CheckEmscriptenGLES() > - video_opengl_egl=yes > - ]) > - AC_MSG_RESULT($video_opengl_egl) > -+ > -+ CFLAGS="$save_CFLAGS" > -+ > - if test x$video_opengl_egl = xyes; then > - AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ]) > - fi > diff --git a/patches/SDL2-2.0.10/0002-fix-building-with-Mesa-19.2.patch > b/patches/SDL2-2.0.10/0002-fix-building-with-Mesa-19.2.patch > deleted file mode 100644 > index 0c29e7bd05cb..000000000000 > --- a/patches/SDL2-2.0.10/0002-fix-building-with-Mesa-19.2.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Thu, 10 Oct 2019 18:09:14 +0200 > -Subject: [PATCH] fix building with Mesa 19.2 > - > -With Mesa 19.2 building fails with: > - > -/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr' > - > -The same type is defined in include/SDL_opengl.h for OpenGL and the two > -headers should not be included at the same time. > -This was just never noticed because the same header guard '__gl_h_' was > -used. This was changed in Mesa. The result is this error. > - > -Fix this the same way GLES2 already handles this: Don't include the GLES > -header when the OpenGL header was already included. > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - src/video/SDL_video.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c > -index c63f74631b71..62b9075a3d5f 100644 > ---- a/src/video/SDL_video.c > -+++ b/src/video/SDL_video.c > -@@ -37,9 +37,9 @@ > - #include "SDL_opengl.h" > - #endif /* SDL_VIDEO_OPENGL */ > - > --#if SDL_VIDEO_OPENGL_ES > -+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL > - #include "SDL_opengles.h" > --#endif /* SDL_VIDEO_OPENGL_ES */ > -+#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */ > - > - /* GL and GLES2 headers conflict on Linux 32 bits */ > - #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL > diff --git a/patches/SDL2-2.0.10/autogen.sh b/patches/SDL2-2.0.10/autogen.sh > deleted file mode 100755 > index a430a4eb793e..000000000000 > --- a/patches/SDL2-2.0.10/autogen.sh > +++ /dev/null > @@ -1,3 +0,0 @@ > -#!/bin/sh > - > -./autogen.sh > diff --git a/patches/SDL2-2.0.10/series b/patches/SDL2-2.0.10/series > deleted file mode 100644 > index 9b148ffb87ec..000000000000 > --- a/patches/SDL2-2.0.10/series > +++ /dev/null > @@ -1,5 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-sdl-2.0.8-add-egl-cflags-to-test.patch > -0002-fix-building-with-Mesa-19.2.patch > -# 270a9679587ad5b5f637efc4218d7208 - git-ptx-patches magic > diff --git a/rules/sdl2-test.make b/rules/sdl2-test.make > index 5c92ebf6b583..c90d4d680370 100644 > --- a/rules/sdl2-test.make > +++ b/rules/sdl2-test.make > @@ -38,7 +38,8 @@ SDL2_TEST_ENV := \ > SDL2_TEST_CONF_TOOL := autoconf > SDL2_TEST_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > - --$(call ptx/endis,PTXCONF_SDL2_OPENGL)-opengl > + --enable-sdltest \ > + --without-x > > ifdef PTXCONF_SDL2_PULSEAUDIO > SDL2_TEST_LDFLAGS := \ > diff --git a/rules/sdl2.make b/rules/sdl2.make > index 17314f731195..cfb16c8adff0 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.0.10 > -SDL2_MD5 := 5a2114f2a6f348bdab5bf52b994811db > +SDL2_VERSION := 2.0.12 > +SDL2_MD5 := 783b6f2df8ff02b19bb5ce492b99c8ff > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) > @@ -86,6 +86,8 @@ SDL2_CONF_OPT := \ > --disable-dummyaudio \ > --disable-libsamplerate \ > --disable-libsamplerate-shared \ > + --$(call ptx/endis,PTXCONF_ARCH_ARM_V6)-arm-simd \ > + --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon \ > --$(call ptx/endis,PTXCONF_SDL2_WAYLAND)-video-wayland \ > --disable-video-wayland-qt-touch \ > --$(call ptx/endis,PTXCONF_SDL2_WAYLAND)-wayland-shared \ > @@ -102,6 +104,7 @@ SDL2_CONF_OPT := \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-vm \ > --disable-video-vivante \ > --disable-video-cocoa \ > + --disable-video-metal \ > --disable-render-metal \ > --disable-video-directfb \ > --disable-directfb-shared \ > -- > 2.20.1 > > > _______________________________________________ > ptxdist mailing list > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
