Skip to content

Enable HIDAPI in SDL2 builds, bump SDL2_image, SDL2_ttf #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtissera merged 1 commit into from
Jan 10, 2025
Merged

Enable HIDAPI in SDL2 builds, bump SDL2_image, SDL2_ttf #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions package/sdl2/sdl2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/sdl2_image/sdl2_image.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion package/sdl2_image/sdl2_image.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/sdl2_ttf/sdl2_ttf.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion package/sdl2_ttf/sdl2_ttf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down