From 81f80f81bfb1ff9252f725cad65f818fca5e7264 Mon Sep 17 00:00:00 2001 From: Romain TISSERAND Date: Fri, 10 Jan 2025 20:56:37 +0100 Subject: [PATCH] Enable HIDAPI in SDL2 builds, bump SDL2_image, SDL2_ttf --- package/sdl2/sdl2.mk | 5 ----- package/sdl2_image/sdl2_image.hash | 2 +- package/sdl2_image/sdl2_image.mk | 3 ++- package/sdl2_ttf/sdl2_ttf.hash | 2 +- package/sdl2_ttf/sdl2_ttf.mk | 3 ++- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index a9ff130aab6..02c7b2daf79 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -34,8 +34,6 @@ SDL2_CONF_OPTS += \ --disable-directx \ --disable-xinput \ --disable-wasapi \ - --disable-hidapi-joystick \ - --disable-hidapi-libusb \ --disable-joystick-virtual \ --disable-render-d3d @@ -99,9 +97,6 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static -# batocera - disable hidapi -SDL2_CONF_OPTS += --disable-hidapi - # batocera - Used in screen rotation (SDL and Retroarch) ifeq ($(BR2_PACKAGE_ROCKCHIP_RGA),y) SDL2_DEPENDENCIES += rockchip-rga diff --git a/package/sdl2_image/sdl2_image.hash b/package/sdl2_image/sdl2_image.hash index 53a887c6f9a..9d5ae395cdc 100644 --- a/package/sdl2_image/sdl2_image.hash +++ b/package/sdl2_image/sdl2_image.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc SDL2_image-2.8.2.tar.gz +sha256 f7c06a8783952cfe960adccdd3d8472b63ab31475b4390d10cfdcc1aea61238f SDL2_image-2.8.4.tar.gz sha256 a0e8ce06504966e45088ee1cc7583cc8af9aac615d4cf56d47d847da9cb15139 LICENSE.txt diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk index 40b9e3c9151..40f01a868d6 100644 --- a/package/sdl2_image/sdl2_image.mk +++ b/package/sdl2_image/sdl2_image.mk @@ -4,7 +4,8 @@ # ################################################################################ -SDL2_IMAGE_VERSION = 2.8.2 +# REG bump +SDL2_IMAGE_VERSION = 2.8.4 SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL2_IMAGE_INSTALL_STAGING = YES diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 7693aeba6bf..24d9050f810 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d48cbd1ce475b9e178206bf3b72d56b66d84d44f64ac05803328396234d67723 SDL2_ttf-2.22.0.tar.gz +sha256 0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd SDL2_ttf-2.24.0.tar.gz sha256 a0e8ce06504966e45088ee1cc7583cc8af9aac615d4cf56d47d847da9cb15139 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index f4f293cec1a..67384db606a 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,8 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.22.0 +# REG bump +SDL2_TTF_VERSION = 2.24.0 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib