summaryrefslogtreecommitdiff
path: root/sci-libs/sbig/files
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/sbig/files')
-rw-r--r--sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch (renamed from sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch)15
-rw-r--r--sci-libs/sbig/files/sbig-9999-fix-symlink.patch16
2 files changed, 8 insertions, 23 deletions
diff --git a/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch b/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch
index 48d34c9..f4948f0 100644
--- a/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch
+++ b/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch
@@ -1,15 +1,16 @@
---- CMakeLists.txt 2015-01-04 22:22:44.188535235 +0100
-+++ CMakeLists.txt.new 2015-01-04 23:01:47.350482273 +0100
-@@ -33,13 +33,6 @@
- exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv32.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION})
- endif(LIB_ARMHF)
+--- libindi_3rdparty/sbig/CMakeLists.txt 2015-02-15 09:56:33.000000000 +0100
++++ libindi_3rdparty.new/sbig/CMakeLists.txt 2015-02-18 21:00:30.751151635 +0100
+@@ -23,12 +23,9 @@
+ ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
--# Make sure symbolic links are installed
+ # Make sure symbolic links are installed
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake "
-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n
-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n
-")
--
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION}\" )" )
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\" )" )
+
install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR})
install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
diff --git a/sci-libs/sbig/files/sbig-9999-fix-symlink.patch b/sci-libs/sbig/files/sbig-9999-fix-symlink.patch
deleted file mode 100644
index 19db487..0000000
--- a/sci-libs/sbig/files/sbig-9999-fix-symlink.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt 2015-01-21 19:32:21.000000000 +0100
-+++ CMakeLists.txt.new 2015-01-21 22:55:15.423084164 +0100
-@@ -33,13 +33,6 @@
- exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv32.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION})
- endif(LIB_ARMHF)
-
--# Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n
--")
--
- install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
- install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR})
- install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
--install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake)