Thanks, applied as 6419cfbbe80f8db9fa4e94e25f1222760eab6da2. Michael
[sent from post-receive hook] On Mon, 05 Dec 2022 13:53:54 +0100, Christian Melki <[email protected]> wrote: > Coming in hot on the last update. > 2.26.x is probably the last stable series before SDL 3.0. > Actually not that many new features that a new series would indicate. > > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 > Changed/explicitly specified a few config opts. > > * Add missing global largefile opt. > * Allow an older x86 compiler to tune for mmx, but > disable mmx completely for x86_64. > * Allow older x86 to tune for sse, and x86_64 to tune for sse > (since x86_64 includes x86 arch),sse2 and sse3. > Runtime has instruction detection with enable-cpuinfo. > * Allow arch ppc compiler to tune for altivec when specified. > * Explicitly disable lsx, lasx instructions for loongson arch. > * Explicitly disable xfixes xorg protocol. > * Enable offscreen rendering capability. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/sdl2.make b/rules/sdl2.make > index 1fec56d41b84..c33199ccfc65 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.24.2 > -SDL2_MD5 := 84c71cb2a14aa0d9504513c0b9fcb17c > +SDL2_VERSION := 2.26.0 > +SDL2_MD5 := 35bc58cfe41b8fb6c8e6646be26fa47e > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) > @@ -27,12 +27,16 @@ SDL2_LICENSE := zlib > # Prepare > # > ---------------------------------------------------------------------------- > > +# Only x86, not x86-64. > +OLDER_X86 := $(if $(PTXCONF_ARCH_X86_64),,$(PTXCONF_ARCH_X86)) > + > # > # autoconf > # > SDL2_CONF_TOOL := autoconf > SDL2_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > --enable-shared \ > --disable-static \ > --enable-libtool-lock \ > @@ -55,13 +59,15 @@ SDL2_CONF_OPT := \ > --enable-loadso \ > --enable-cpuinfo \ > --enable-assembly \ > - --disable-ssemath \ > - --disable-mmx \ > + --$(call ptx/endis,PTXCONF_ARCH_X86)-ssemath \ > + --$(call ptx/endis,OLDER_X86)-mmx \ > --disable-3dnow \ > - --disable-sse \ > - --disable-sse2 \ > - --disable-sse3 \ > - --disable-altivec \ > + --$(call ptx/endis,PTXCONF_ARCH_X86)-sse \ > + --$(call ptx/endis,PTXCONF_ARCH_X86_64)-sse2 \ > + --$(call ptx/endis,PTXCONF_ARCH_X86_64)-sse3 \ > + --$(call ptx/endis,PTXCONF_ARCH_PPC_ALTIVEC)-altivec \ > + --disable-lsx \ > + --disable-lasx \ > --$(call ptx/endis,PTXCONF_SDL2_OSS)-oss \ > --$(call ptx/endis,PTXCONF_SDL2_ALSA)-alsa \ > --disable-alsatest \ > @@ -100,6 +106,7 @@ SDL2_CONF_OPT := \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-xcursor \ > --disable-video-x11-xdbe \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-xinput \ > + --disable-video-x11-xfixes \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-xrandr \ > --disable-video-x11-scrnsaver \ > --disable-video-x11-xshape \ > @@ -112,6 +119,7 @@ SDL2_CONF_OPT := \ > --$(call ptx/endis,PTXCONF_SDL2_KMS)-video-kmsdrm \ > --$(call ptx/endis,PTXCONF_SDL2_KMS)-kmsdrm-shared \ > --enable-video-dummy \ > + --enable-video-offscreen \ > --$(call ptx/endis,PTXCONF_SDL2_OPENGL)-video-opengl \ > --$(call ptx/endis,PTXCONF_SDL2_OPENGLES)-video-opengles \ > --$(call ptx/endis,PTXCONF_SDL2_OPENGLES1)-video-opengles1 \
