diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2020-11-30 14:02:47 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-04 09:45:37 +0100 |
| commit | e86233ea1b93dd23109f65b85ea8e6ac20dd3eb0 (patch) | |
| tree | b4828777c79433929f978af7f8f71235fe4d1903 /rules | |
| parent | 8940c994da2bf60240b6d0f668f958b3596733ec (diff) | |
| download | ptxdist-e86233ea1b93dd23109f65b85ea8e6ac20dd3eb0.tar.gz ptxdist-e86233ea1b93dd23109f65b85ea8e6ac20dd3eb0.tar.xz | |
sdl2: version bump 2.0.10 -> 2.0.12
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Message-Id: <20201130130247.8680-1-l.stach@pengutronix.de>
[mol: add SDL2_TEST_XORG option]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/sdl2-test.in | 8 | ||||
| -rw-r--r-- | rules/sdl2-test.make | 3 | ||||
| -rw-r--r-- | rules/sdl2.make | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/rules/sdl2-test.in b/rules/sdl2-test.in index 8ed30565c..db7c7cd69 100644 --- a/rules/sdl2-test.in +++ b/rules/sdl2-test.in @@ -12,3 +12,11 @@ config SDL2_TEST library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. + +if SDL2_TEST + +config SDL2_TEST_XORG + bool + default SDL2_XORG + +endif diff --git a/rules/sdl2-test.make b/rules/sdl2-test.make index 5c92ebf6b..8529bf2e7 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 \ + --$(call ptx/wwo,PTXCONF_SDL2_TEST_XORG)-x ifdef PTXCONF_SDL2_PULSEAUDIO SDL2_TEST_LDFLAGS := \ diff --git a/rules/sdl2.make b/rules/sdl2.make index 17314f731..cfb16c8ad 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 \ |