diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake index a2cc3c323e4..b2f524d68d7 100644 --- a/cmake/compile_definitions/linux.cmake +++ b/cmake/compile_definitions/linux.cmake @@ -225,6 +225,11 @@ endif() if(${SUNSHINE_USE_LEGACY_INPUT}) # TODO: Remove this legacy option after the next stable release list(APPEND PLATFORM_TARGET_FILES "${CMAKE_SOURCE_DIR}/src/platform/linux/input/legacy_input.cpp") else() + if(EVDEV_INCLUDE_DIR AND EVDEV_LIBRARY) + # These two needs to be set before adding the inputtino subdirectory in order for them to be picked up + set(LIBEVDEV_CUSTOM_INCLUDE_DIR ${EVDEV_INCLUDE_DIR}) + set(LIBEVDEV_CUSTOM_LIBRARY ${EVDEV_LIBRARY}) + endif () add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/inputtino") list(APPEND SUNSHINE_EXTERNAL_LIBRARIES inputtino::libinputtino) file(GLOB_RECURSE INPUTTINO_SOURCES diff --git a/packaging/sunshine.rb b/packaging/sunshine.rb index dbb028295bc..00fb06597a6 100644 --- a/packaging/sunshine.rb +++ b/packaging/sunshine.rb @@ -64,6 +64,10 @@ def install -DSUNSHINE_ENABLE_TRAY=OFF -DTESTS_ENABLE_PYTHON_TESTS=OFF ] + # On Linux we have to first build the evdev target manually since the library is not available on homebrew + on_linux do + system "cmake", "-S", ".", "-B", "build", *std_cmake_args, "--target", "libevdev" + end system "cmake", "-S", ".", "-B", "build", *std_cmake_args, *args cd "build" do diff --git a/third-party/inputtino b/third-party/inputtino index 8f2190e1255..68f51dd1fe9 160000 --- a/third-party/inputtino +++ b/third-party/inputtino @@ -1 +1 @@ -Subproject commit 8f2190e1255705327622348c62bf013616f3cc50 +Subproject commit 68f51dd1fe9d2ac74c2800fe43f0c065b648efb6