diff --git a/debian/patches/install.patch b/debian/patches/install.patch index f49debd..4289d78 100644 --- a/debian/patches/install.patch +++ b/debian/patches/install.patch @@ -1,16 +1,16 @@ -Compile using older version (3.0) of CMake -Index: moonlight-embedded-debian/CMakeLists.txt +Compile using older version (2.8) of CMake +Index: moonlight-embedded/CMakeLists.txt =================================================================== --- moonlight-embedded-debian.orig/CMakeLists.txt +++ moonlight-embedded-debian/CMakeLists.txt @@ -1,5 +1,5 @@ project(moonlight-embedded C) -cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 2.8) SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake) -@@ -82,7 +82,7 @@ add_subdirectory(libgamestream) +@@ -82,12 +82,12 @@ add_subdirectory(libgamestream) add_executable(moonlight ${SRC_LIST}) target_link_libraries(moonlight gamestream) @@ -19,11 +19,61 @@ Index: moonlight-embedded-debian/CMakeLists.txt if (CEC_FOUND) list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC) -Index: moonlight-embedded-debian/libgamestream/CMakeLists.txt + list(APPEND MOONLIGHT_OPTIONS CEC) +- target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS}) ++ include_directories(./third_party/libcec ${CEC_INCLUDE_DIRS}) + target_link_libraries(moonlight ${CEC_LIBRARIES}) + endif() + +@@ -95,7 +95,7 @@ if(BROADCOM_FOUND) + list(APPEND MOONLIGHT_OPTIONS PI) + aux_source_directory(./third_party/ilclient ILCLIENT_SRC_LIST) + add_library(moonlight-pi SHARED ./src/video/pi.c ${ILCLIENT_SRC_LIST}) +- target_include_directories(moonlight-pi PRIVATE ./third_party/ilclient ${BROADCOM_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR}) ++ include_directories(./third_party/ilclient ${BROADCOM_INCLUDE_DIRS}) + target_link_libraries(moonlight-pi gamestream ${BROADCOM_LIBRARIES}) + set_property(TARGET moonlight-pi PROPERTY COMPILE_DEFINITIONS ${BROADCOM_DEFINITIONS}) + install(TARGETS moonlight-pi DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -105,29 +105,29 @@ if(FREESCALE_FOUND) + list(APPEND MOONLIGHT_DEFINITIONS HAVE_IMX) + list(APPEND MOONLIGHT_OPTIONS IMX) + add_library(moonlight-imx SHARED ./src/video/imx.c) +- target_include_directories(moonlight-imx PRIVATE ${FREESCALE_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR}) ++ include_directories(${FREESCALE_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR}) + target_link_libraries(moonlight-imx gamestream ${FREESCALE_LIBRARIES}) + install(TARGETS moonlight-imx DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + if (SOFTWARE_FOUND) +- target_include_directories(moonlight PRIVATE ${SDL_INCLUDE_DIRS} ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS}) ++ include_directories(${SDL_INCLUDE_DIRS} ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS}) + target_link_libraries(moonlight ${SDL_LIBRARIES} ${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES}) + if(VDPAU_FOUND) +- target_include_directories(moonlight PRIVATE ${XLIB_INCLUDE_DIRS} ${LIBVA_INCLUDE_DIRS}) ++ include_directories(${XLIB_INCLUDE_DIRS} ${LIBVA_INCLUDE_DIRS}) + target_link_libraries(moonlight ${XLIB_LIBRARIES} ${LIBVA_LIBRARIES}) + endif() + endif() + + if (PULSE_FOUND) +- target_include_directories(moonlight PRIVATE ${PULSE_INCLUDE_DIRS}) ++ include_directories(${PULSE_INCLUDE_DIRS}) + target_link_libraries(moonlight ${PULSE_LIBRARIES}) + endif() + + configure_file("./src/configuration.h.in" "${PROJECT_BINARY_DIR}/configuration.h") + + set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS}) +-target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS}) ++include_directories(${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS}) + target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS}) + + add_subdirectory(docs) +Index: moonlight-embedded/libgamestream/CMakeLists.txt =================================================================== ---- moonlight-embedded-debian.orig/libgamestream/CMakeLists.txt -+++ moonlight-embedded-debian/libgamestream/CMakeLists.txt -@@ -15,7 +15,7 @@ aux_source_directory(../third_party/moon +--- moonlight-embedded.orig/libgamestream/CMakeLists.txt ++++ moonlight-embedded/libgamestream/CMakeLists.txt +@@ -15,13 +15,13 @@ aux_source_directory(../third_party/moon add_library(moonlight-common SHARED ${MOONLIGHT_COMMON_SRC_LIST}) add_library(gamestream SHARED ${GAMESTREAM_SRC_LIST}) @@ -32,3 +82,10 @@ Index: moonlight-embedded-debian/libgamestream/CMakeLists.txt target_link_libraries(gamestream moonlight-common) set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION}) + set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION}) + +-target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS}) ++include_directories(../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS}) + target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES}) + + target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})