On 02/04/26 04:40PM, Martijn van Duren wrote: > This misses an make update-plist. SDL_dlopennote.h is not packaged. > Needed for SDL3-mixer. > > martijn@ > > On 1/15/26 23:46, Matthew wrote: > > Hi, > > > > It seems check_include_file in SDL3's build system doesn't work for > > usbhid.h. This patch updates to 3.4.0 and gets gamepads working. > > > > Best, > > Matthew
Thanks, here is the diff with updated plist and using the upstream patch for the issue: https://github.com/libsdl-org/SDL/commit/3a54ca75cf9f9c98d79a4f61e6ed52124fe17cab commit - 4ef976c041c1b0052f559410e44148021c4990d5 blob - 5d9db2c0aef27ff2d8f6e3c16c0a589f3c8ad4e6 file + devel/sdl3/Makefile --- devel/sdl3/Makefile +++ devel/sdl3/Makefile @@ -1,6 +1,6 @@ COMMENT = cross-platform multimedia library -V = 3.2.20 +V = 3.4.0 DISTNAME = SDL3-${V} PKGNAME = ${DISTNAME:L} commit - 4ef976c041c1b0052f559410e44148021c4990d5 blob - 9986baa65140aea444d514694a2031fbf3cdea11 file + devel/sdl3/distinfo --- devel/sdl3/distinfo +++ devel/sdl3/distinfo @@ -1,2 +1,2 @@ -SHA256 (SDL3-3.2.20.tar.gz) = RnYArgkN0oYW+jc2n69OMUMZj/HaN3KbVSE35H91Gmc= -SIZE (SDL3-3.2.20.tar.gz) = 15895143 +SHA256 (SDL3-3.4.0.tar.gz) = CCy/X0KeDYCCD2jcK1B6lNTMG05wgXsRm7uOxqaVhLg= +SIZE (SDL3-3.4.0.tar.gz) = 15567602 commit - 4ef976c041c1b0052f559410e44148021c4990d5 blob - 5aa73a15732669fcfc8cdfa35db4b8d7a8e794bd file + devel/sdl3/patches/patch-CMakeLists_txt --- devel/sdl3/patches/patch-CMakeLists_txt +++ devel/sdl3/patches/patch-CMakeLists_txt @@ -1,8 +1,16 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -376,7 +376,7 @@ dep_option(SDL_RENDER_D3D12 "Enable the Direct3 - dep_option(SDL_RENDER_METAL "Enable the Metal render driver" ON "SDL_RENDER;${APPLE}" OFF) +@@ -46,6 +46,7 @@ endif() + + include(CheckLibraryExists) + include(CheckIncludeFile) ++include(CheckIncludeFiles) + include(CheckLanguage) + include(CheckSymbolExists) + include(CheckCSourceCompiles) +@@ -367,7 +368,7 @@ dep_option(SDL_RENDER_D3D12 "Enable the Direct3 + dep_option(SDL_RENDER_METAL "Enable the Metal render driver" ON "SDL_RENDER;APPLE" OFF) dep_option(SDL_RENDER_GPU "Enable the SDL_GPU render driver" ON "SDL_RENDER;SDL_GPU" OFF) dep_option(SDL_VIVANTE "Use Vivante EGL video driver" ON "${UNIX_SYS};SDL_CPU_ARM32" OFF) -dep_option(SDL_VULKAN "Enable Vulkan support" ON "SDL_VIDEO;ANDROID OR APPLE OR LINUX OR FREEBSD OR WINDOWS" OFF) commit - 4ef976c041c1b0052f559410e44148021c4990d5 blob - /dev/null file + devel/sdl3/patches/patch-cmake_sdlchecks_cmake (mode 644) --- /dev/null +++ devel/sdl3/patches/patch-cmake_sdlchecks_cmake @@ -0,0 +1,30 @@ +Index: cmake/sdlchecks.cmake +--- cmake/sdlchecks.cmake.orig ++++ cmake/sdlchecks.cmake +@@ -1113,22 +1113,22 @@ macro(CheckUSBHID) + cmake_push_check_state() + check_library_exists(usbhid hid_init "" LIBUSBHID) + if(LIBUSBHID) +- check_include_file(usbhid.h HAVE_USBHID_H) ++ check_include_files("stdint.h;usbhid.h" HAVE_USBHID_H) + if(HAVE_USBHID_H) + set(USB_CFLAGS "-DHAVE_USBHID_H") + endif() + +- check_include_file(libusbhid.h HAVE_LIBUSBHID_H) ++ check_include_files("stdint.h;libusbhid.h" HAVE_LIBUSBHID_H) + if(HAVE_LIBUSBHID_H) + string(APPEND USB_CFLAGS " -DHAVE_LIBUSBHID_H") + endif() + set(USB_LIBS ${USB_LIBS} usbhid) + else() +- check_include_file(usb.h HAVE_USB_H) ++ check_include_files("stdint.h;usb.h" HAVE_USB_H) + if(HAVE_USB_H) + set(USB_CFLAGS "-DHAVE_USB_H") + endif() +- check_include_file(libusb.h HAVE_LIBUSB_H) ++ check_include_files("stdint.h;libusb.h" HAVE_LIBUSB_H) + if(HAVE_LIBUSB_H) + string(APPEND USB_CFLAGS " -DHAVE_LIBUSB_H") + endif() commit - 4ef976c041c1b0052f559410e44148021c4990d5 blob - 227a765780f896209d76acec8d150c307208ffbc file + devel/sdl3/pkg/PLIST --- devel/sdl3/pkg/PLIST +++ devel/sdl3/pkg/PLIST @@ -13,6 +13,7 @@ include/SDL3/SDL_close_code.h include/SDL3/SDL_copying.h include/SDL3/SDL_cpuinfo.h include/SDL3/SDL_dialog.h +include/SDL3/SDL_dlopennote.h include/SDL3/SDL_egl.h include/SDL3/SDL_endian.h include/SDL3/SDL_error.h @@ -84,6 +85,7 @@ include/SDL3/SDL_tray.h include/SDL3/SDL_version.h include/SDL3/SDL_video.h include/SDL3/SDL_vulkan.h +lib/cmake/ lib/cmake/SDL3/ lib/cmake/SDL3/SDL3Config.cmake lib/cmake/SDL3/SDL3ConfigVersion.cmake
