Update patches for libqhy and libsbig from git

2 files changed, 41 insertions, 38 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})"
+  )
+-
diff --git a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
index 5f7946b..669b371 100644
--- a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
+++ b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
@@ -1,20 +1,21 @@
---- CMakeLists.txt	2015-04-15 21:50:44.060806200 +0200

-+++ CMakeLists.txt.new	2015-04-15 21:52:22.257882425 +0200

-@@ -22,14 +22,10 @@

-  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_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 sbigudrv.h DESTINATION include/libsbig)

- 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)

-+# Make sure symbolic links are installed

-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )

-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )

+diff -urN libsbig-9999/3rdparty/libsbig/CMakeLists.txt libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt
+--- libsbig-9999/3rdparty/libsbig/CMakeLists.txt	2017-12-27 18:34:47.394240953 +0100
++++ libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt	2017-12-27 18:36:05.916025476 +0100
+@@ -27,14 +27,10 @@
+  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_sbig_symlink.cmake "
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink 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 sbigudrv.h DESTINATION include/libsbig)
+ 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)
++# Make sure symbolic links are installed
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )