136 lines
6.2 KiB
Diff
136 lines
6.2 KiB
Diff
Binary files sunshine.orig/.git/index and sunshine/.git/index differ
|
|
diff '--color=auto' -rub sunshine.orig/third-party/inputtino/CMakeLists.txt sunshine/third-party/inputtino/CMakeLists.txt
|
|
--- sunshine.orig/third-party/inputtino/CMakeLists.txt 2025-08-16 19:33:46.469630833 -0300
|
|
+++ sunshine/third-party/inputtino/CMakeLists.txt 2025-08-17 22:06:18.591308905 -0300
|
|
@@ -44,13 +44,13 @@
|
|
endif ()
|
|
|
|
# Make an automatic library - will be static or dynamic based on user setting
|
|
-add_library(libinputtino)
|
|
-add_library(inputtino::libinputtino ALIAS libinputtino)
|
|
+add_library(inputtino)
|
|
+add_library(inputtino::libinputtino ALIAS inputtino)
|
|
|
|
# All users of this library will need at least C++17
|
|
-target_compile_features(libinputtino PUBLIC cxx_std_17)
|
|
-set_target_properties(libinputtino PROPERTIES LINKER_LANGUAGE CXX)
|
|
-target_compile_definitions(libinputtino PUBLIC "$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:INPUTTINO_STATIC_DEFINE>")
|
|
+target_compile_features(inputtino PUBLIC cxx_std_17)
|
|
+set_target_properties(inputtino PROPERTIES LINKER_LANGUAGE CXX)
|
|
+target_compile_definitions(inputtino PUBLIC "$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:INPUTTINO_STATIC_DEFINE>")
|
|
|
|
#----------------------------------------------------------------------------------------------------------------------
|
|
# Export symbols
|
|
@@ -65,7 +65,7 @@
|
|
|
|
message(STATUS "Export file name: ${export_file_name}")
|
|
|
|
-generate_export_header(libinputtino EXPORT_FILE_NAME include/inputtino/${export_file_name})
|
|
+generate_export_header(inputtino EXPORT_FILE_NAME include/inputtino/${export_file_name})
|
|
|
|
|
|
#----------------------------------------------------------------------------------------------------------------------
|
|
@@ -84,12 +84,12 @@
|
|
option(LIBEVDEV_CUSTOM_INCLUDE_DIR "Location to a custom libevdev source" OFF)
|
|
option(LIBEVDEV_CUSTOM_LIBRARY "Location to a custom libevdev library" OFF)
|
|
if (LIBEVDEV_CUSTOM_INCLUDE_DIR AND LIBEVDEV_CUSTOM_LIBRARY)
|
|
- target_include_directories(libinputtino PUBLIC "${LIBEVDEV_CUSTOM_INCLUDE_DIR}")
|
|
- target_link_libraries(libinputtino PUBLIC "${LIBEVDEV_CUSTOM_LIBRARY}")
|
|
+ target_include_directories(inputtino PUBLIC "${LIBEVDEV_CUSTOM_INCLUDE_DIR}")
|
|
+ target_link_libraries(inputtino PUBLIC "${LIBEVDEV_CUSTOM_LIBRARY}")
|
|
else ()
|
|
find_package(PkgConfig)
|
|
pkg_check_modules(LIBEVDEV REQUIRED IMPORTED_TARGET libevdev)
|
|
- target_link_libraries(libinputtino PUBLIC PkgConfig::LIBEVDEV)
|
|
+ target_link_libraries(inputtino PUBLIC PkgConfig::LIBEVDEV)
|
|
endif ()
|
|
endif ()
|
|
|
|
@@ -120,19 +120,19 @@
|
|
if (USE_UHID)
|
|
message("Using uhid implementation for DualSense controller")
|
|
list(APPEND SRC_LIST "src/uhid/joypad_ps5.cpp")
|
|
- target_include_directories(libinputtino PUBLIC "src/uhid/include/")
|
|
+ target_include_directories(inputtino PUBLIC "src/uhid/include/")
|
|
else ()
|
|
message("Using uinput implementation for DualSense controller")
|
|
list(APPEND SRC_LIST "src/uinput/joypad_ps.cpp")
|
|
endif ()
|
|
|
|
- target_sources(libinputtino PRIVATE ${SRC_LIST})
|
|
- target_include_directories(libinputtino PUBLIC "src/uinput/include")
|
|
+ target_sources(inputtino PRIVATE ${SRC_LIST})
|
|
+ target_include_directories(inputtino PUBLIC "src/uinput/include")
|
|
endif ()
|
|
|
|
if (BUILD_C_BINDINGS)
|
|
file(GLOB C_SRC_FILES SRCS src/c-bindings/*.cpp)
|
|
- target_sources(libinputtino PRIVATE
|
|
+ target_sources(inputtino PRIVATE
|
|
src/c-bindings/helpers.hpp
|
|
${C_SRC_FILES})
|
|
endif ()
|
|
@@ -155,18 +155,18 @@
|
|
set_if_undefined(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
|
|
|
|
if (LIBINPUTTINO_INSTALL AND NOT CMAKE_SKIP_INSTALL_RULES)
|
|
- install(TARGETS libinputtino
|
|
- EXPORT libinputtino_export
|
|
- RUNTIME COMPONENT libinputtino
|
|
- LIBRARY COMPONENT libinputtino
|
|
- NAMELINK_COMPONENT libinputtino-dev
|
|
- ARCHIVE COMPONENT libinputtino-dev
|
|
+ install(TARGETS inputtino
|
|
+ EXPORT inputtino_export
|
|
+ RUNTIME COMPONENT inputtino
|
|
+ LIBRARY COMPONENT inputtino
|
|
+ NAMELINK_COMPONENT inputtino-dev
|
|
+ ARCHIVE COMPONENT inputtino-dev
|
|
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
install(DIRECTORY include/
|
|
TYPE INCLUDE
|
|
- COMPONENT libinputtino-dev)
|
|
+ COMPONENT inputtino-dev)
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/inputtino/${export_file_name}"
|
|
- COMPONENT libinputtino-dev
|
|
+ COMPONENT inputtino-dev
|
|
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/inputtino")
|
|
configure_file(
|
|
${CMAKE_CURRENT_SOURCE_DIR}/share/pkgconfig/libinputtino.pc.in
|
|
@@ -178,10 +178,10 @@
|
|
endif ()
|
|
endif ()
|
|
|
|
-target_include_directories(libinputtino PUBLIC
|
|
+target_include_directories(inputtino PUBLIC
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
|
|
-set_target_properties(libinputtino PROPERTIES
|
|
+set_target_properties(inputtino PROPERTIES
|
|
VERSION ${PROJECT_VERSION}
|
|
PUBLIC_HEADER "${PUBLIC_HEADERS}")
|
|
-set_target_properties(libinputtino PROPERTIES OUTPUT_NAME "libinputtino")
|
|
+set_target_properties(inputtino PROPERTIES OUTPUT_NAME "inputtino")
|
|
diff '--color=auto' -rub sunshine.orig/third-party/libdisplaydevice/src/common/CMakeLists.txt sunshine/third-party/libdisplaydevice/src/common/CMakeLists.txt
|
|
--- sunshine.orig/third-party/libdisplaydevice/src/common/CMakeLists.txt 2025-08-16 19:33:46.497966931 -0300
|
|
+++ sunshine/third-party/libdisplaydevice/src/common/CMakeLists.txt 2025-08-17 22:11:02.512077090 -0300
|
|
@@ -1,5 +1,5 @@
|
|
# A global identifier for the library
|
|
-set(MODULE libdisplaydevice_common)
|
|
+set(MODULE displaydevice_common)
|
|
set(MODULE_ALIAS libdisplaydevice::common)
|
|
|
|
# Globing headers (so that they appear in some IDEs) and sources
|
|
@@ -11,6 +11,11 @@
|
|
add_library(${MODULE} ${HEADER_LIST} ${HEADER_DETAIL_LIST} ${SOURCE_LIST})
|
|
add_library(${MODULE_ALIAS} ALIAS ${MODULE})
|
|
|
|
+set_target_properties(${MODULE} PROPERTIES
|
|
+ VERSION ${PROJECT_VERSION}
|
|
+ SOVERSION 0.0.0
|
|
+)
|
|
+
|
|
# Provide the includes together with this library
|
|
target_include_directories(${MODULE} PUBLIC include)
|
|
|