diff options
| author | Ctibor Brančík <ctibor@brancik.cz> | 2017-12-27 18:37:18 +0100 |
|---|---|---|
| committer | Ctibor Brančík <ctibor@brancik.cz> | 2017-12-27 18:37:18 +0100 |
| commit | f104496891932c2bd7667560697e7462f55e981a (patch) | |
| tree | da0d92a850391d3ccdf5a5a7e1d54948bc6a0eb2 /sci-libs/libqhy | |
| parent | d1ec4e7dbcfe03bb5beb2f8ff3dd602b9e3f3b31 (diff) | |
| download | brancik-overlay-f104496891932c2bd7667560697e7462f55e981a.tar.gz brancik-overlay-f104496891932c2bd7667560697e7462f55e981a.tar.bz2 | |
Update patches for libqhy and libsbig from git
Diffstat (limited to 'sci-libs/libqhy')
| -rw-r--r-- | sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch index 39fc0f1..3e479d7 100644 --- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch +++ b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch @@ -1,25 +1,27 @@ ---- CMakeLists.txt 2016-11-05 13:55:27.257074822 +0100 -+++ CMakeLists.txt.new 2016-11-05 13:56:06.675022408 +0100 -@@ -33,12 +33,6 @@ - ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") - ENDIF(UNIX AND NOT WIN32) +diff -urN libqhy-9999/3rdparty/libqhy/CMakeLists.txt libqhy-9999.new/3rdparty/libqhy/CMakeLists.txt +--- libqhy-9999/3rdparty/libqhy/CMakeLists.txt 2017-12-27 18:31:01.871867597 +0100 ++++ libqhy-9999.new/3rdparty/libqhy/CMakeLists.txt 2017-12-27 18:32:35.406606201 +0100 +@@ -43,21 +43,16 @@ --# Make sure symbolic links are installed + install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) + install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) +- + # Make sure symbolic links are installed -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n -") -- - install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h DESTINATION include/libqhy) - install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) -@@ -48,6 +42,8 @@ - file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})" - ) - --install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake) -+# Make sure symbolic links are installed +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) ENDIF (APPLE) + + install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h qhycam.h DESTINATION include/libqhy) + +-install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake) + install( + CODE " + file(GLOB QHY_FIRMWARE ${CMAKE_CURRENT_SOURCE_DIR}/firmware/*) \n + file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})" + ) +- |