]> git.pld-linux.org Git - packages/linphone.git/blob - linphone-no-sdk.patch
- spec cleanup
[packages/linphone.git] / linphone-no-sdk.patch
1 --- linphone-desktop-4.2.5/CMakeLists.txt.orig  2020-12-18 19:29:31.000000000 +0100
2 +++ linphone-desktop-4.2.5/CMakeLists.txt       2021-07-17 16:25:54.211678661 +0200
3 @@ -136,28 +136,9 @@
4         set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
5         list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
6  endif()
7 -ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk"
8 -    SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk"
9 -    INSTALL_DIR "${LINPHONE_OUTPUT_DIR}"
10 -    STAMP_DIR "${SDK_BUILD_DIR}/stamp"
11 -    BINARY_DIR "${SDK_BUILD_DIR}"
12 -    STEP_TARGETS build
13 -    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
14 -    INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
15 -    LIST_SEPARATOR | # Use the alternate list separator
16 -    CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
17 -    #BUILD_ALWAYS NO #${DO_BUILD}
18 -)
19 -ExternalProject_Add_Step(sdk force_build
20 -       COMMENT "Forcing build for 'desktop'"
21 -       DEPENDEES configure
22 -       DEPENDERS build
23 -       ALWAYS 1
24 -)
25  include(FindPkgConfig)
26  
27 -set(APP_DEPENDS sdk)
28 -
29 +set(APP_DEPENDS )
30  
31  find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
32  
33 @@ -160,7 +160,6 @@
34                 SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
35                 INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
36                 BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
37 -               DEPENDS ${APP_DEPENDS}
38                 BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
39                 INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project"
40                 LIST_SEPARATOR | # Use the alternate list separator
41 @@ -177,7 +176,6 @@
42         message("Adding Linphone Desktop in an IDE-friendly state")
43         set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
44         add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
45 -       add_dependencies(app-library ${APP_DEPENDS})
46  endif()
47  ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
48      SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
49 --- linphone-desktop-4.2.5/linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig      2021-07-17 20:57:04.230203073 +0200
50 +++ linphone-desktop-4.2.5/linphone-app/cmake_builder/linphone_package/CMakeLists.txt   2021-07-17 21:11:27.315527338 +0200
51 @@ -206,7 +206,9 @@
52                 execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../lib" "${LIBRARY}")
53                 execute_process(COMMAND install_name_tool -addrpath "$ORIGIN/../lib64" "${LIBRARY}")
54         endforeach ()
55 +       if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}")
56         install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS)
57 +       endif()
58  #Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR
59         if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/")
60                 file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib/*.so*")
61 @@ -232,12 +234,16 @@
62                 endif()
63                 install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64")
64         endif()
65 +       if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}")
66         install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS)
67         if(ENABLE_BUILD_VERBOSE)
68                 message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" )
69         endif()
70 +       endif()
71 +       if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
72         file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*")
73         install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" )
74 +       endif()
75  # Install desktop/icon files.
76         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" @ONLY)  
77         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
This page took 0.082003 seconds and 3 git commands to generate.