diff options
| author | Ctibor Brančík <ctibor@brancik.cz> | 2017-12-27 18:28:50 +0100 |
|---|---|---|
| committer | Ctibor Brančík <ctibor@brancik.cz> | 2017-12-27 18:28:50 +0100 |
| commit | d1ec4e7dbcfe03bb5beb2f8ff3dd602b9e3f3b31 (patch) | |
| tree | 007e12d3976c70cd9bdca88ff2f48ca07ff7ef20 /sci-libs/libqhy | |
| parent | 52ca9cf86828923e5dfdac7e2bc2e82f533fd264 (diff) | |
| download | brancik-overlay-d1ec4e7dbcfe03bb5beb2f8ff3dd602b9e3f3b31.tar.gz brancik-overlay-d1ec4e7dbcfe03bb5beb2f8ff3dd602b9e3f3b31.tar.bz2 | |
Revert "Remove unneeded patches for libqhy and libsbig"
This reverts commit 52ca9cf86828923e5dfdac7e2bc2e82f533fd264.
Diffstat (limited to 'sci-libs/libqhy')
| -rw-r--r-- | sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch | 25 | ||||
| -rw-r--r-- | sci-libs/libqhy/libqhy-9999.ebuild | 2 |
2 files changed, 27 insertions, 0 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 new file mode 100644 index 0000000..39fc0f1 --- /dev/null +++ b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch @@ -0,0 +1,25 @@ +--- 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) + +-# 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 +-") +- + 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) diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild index 29799d8..fba661f 100644 --- a/sci-libs/libqhy/libqhy-9999.ebuild +++ b/sci-libs/libqhy/libqhy-9999.ebuild @@ -18,6 +18,8 @@ KEYWORDS="" SLOT="0" +PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" ) + DEPEND="virtual/libusb:1 media-libs/opencv" |