Update patches for indi 3rd party libs

2 files changed, 19 insertions, 27 deletions

diff --git a/sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch b/sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch
deleted file mode 100644
index 5d713cc..0000000
--- a/sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ruN indi-1.5.0/3rdparty/libinovasdk/CMakeLists.txt indi-1.5.0.new/3rdparty/libinovasdk/CMakeLists.txt
---- indi-1.5.0/3rdparty/libinovasdk/CMakeLists.txt	2017-08-20 11:44:27.000000000 +0200
-+++ indi-1.5.0.new/3rdparty/libinovasdk/CMakeLists.txt	2017-12-26 22:25:12.524888994 +0100
-@@ -6,7 +6,7 @@
- 
- set(FIRMWARE_INSTALL_DIR "/lib/firmware")
- set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
--set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- 
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error")
-@@ -26,12 +26,8 @@
- ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
- 
- # Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so)\n
--")
--
- install( FILES ${CMAKE_BINARY_DIR}/libinovasdk.so.${INOVASDK_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
- install( FILES inovasdk.h DESTINATION include/inovasdk)
- install( FILES 99-inovaplx.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
--install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake)
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_VERSION}\" \"libinovasdk.so.${INOVASDK_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_SOVERSION}\" \"libinovasdk.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
diff --git a/sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch b/sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch
new file mode 100644
index 0000000..827e616
--- /dev/null
+++ b/sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch
@@ -0,0 +1,19 @@
+diff -urN indi-1.6.2/3rdparty/libinovasdk/CMakeLists.txt indi-1.6.2.new/3rdparty/libinovasdk/CMakeLists.txt
+--- indi-1.6.2/3rdparty/libinovasdk/CMakeLists.txt	2018-01-08 14:45:25.000000000 +0100
++++ indi-1.6.2.new/3rdparty/libinovasdk/CMakeLists.txt	2018-01-29 22:13:35.755950489 +0100
+@@ -27,13 +27,8 @@
+  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
+ ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+ 
+-# Make sure symbolic links are installed
+-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake "
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION})\n
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so)\n
+-")
+-
+ install( FILES ${CMAKE_BINARY_DIR}/libinovasdk.so.${INOVASDK_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
+ install( FILES inovasdk.h DESTINATION include/inovasdk)
+ install( FILES 99-inovaplx.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
+-install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake)
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_VERSION}\" \"libinovasdk.so.${INOVASDK_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_SOVERSION}\" \"libinovasdk.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )