summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCtibor <ctibor.brancik@seznam.cz>2015-01-04 20:57:27 +0100
committerCtibor <ctibor.brancik@seznam.cz>2015-01-04 20:57:27 +0100
commit5fdf17d0900181bc8faba392e931ce27dba8b01e (patch)
tree1562687ec642f0e6d30df5567db4be6e31bf4894
parentfbbed1832b30a0aaedf0f60afcd3688155ded2ea (diff)
downloadbrancik-overlay-5fdf17d0900181bc8faba392e931ce27dba8b01e.tar.gz
brancik-overlay-5fdf17d0900181bc8faba392e931ce27dba8b01e.tar.bz2
Fixing bad patch
-rw-r--r--sci-libs/sbig/Manifest2
-rw-r--r--sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch108
2 files changed, 19 insertions, 91 deletions
diff --git a/sci-libs/sbig/Manifest b/sci-libs/sbig/Manifest
index 05ff5e7..4ce80c7 100644
--- a/sci-libs/sbig/Manifest
+++ b/sci-libs/sbig/Manifest
@@ -1,4 +1,4 @@
-AUX sbig-0.9.9-fix-symlink.patch 4198 SHA256 58832beb7c8c82df1df58f651da6eaf4cd9984202e047e219a00855b3c2b8c1b SHA512 4724d66a164a6b212abfc10c61a4bffd9f520324b72d7babbd3060c51b860e40fdd41c3d6368aafed1c4f6963761b733965f82d786f4df854be0a2fe26a26523 WHIRLPOOL dc7eee0ce35df10aaaf12472014111df7f8ff7b2ad409d2f2a16501e587e97f9f0624f7ca1db033fdf57e6a04f4aeae0f8e75a535e012f33c0200c6aec23da30
+AUX sbig-0.9.9-fix-symlink.patch 1437 SHA256 a7e404f9fa0fe596f2f4e079d646c5161458cbdc319d41ccb4ecaeb809665bd7 SHA512 32622bf3c69b89261a5879e62bb447f4ad8130349f27f6f1e684a0c1710ce431c561ffbae749015140ace842c50fc7c032f776829ab962b2985a455279ca6fca WHIRLPOOL 91a61e4b1e78bea6dde3f0c8bcf418c593cdafbc333ef899a8194c1a1651a27b57d05152514f5b92d9bf703d444124db5ec6e5378c4a2cd8a4886d593eb7bba2
DIST libindi_3rdparty_0.9.9.tar.gz 4161360 SHA256 42309a73f9a359e60e5d23220c9431e2e3eeba72f37e818a6924d0010fa9f5a7 SHA512 3ce4e500533882d2a09291d57d52e8b806ec2c131c1189b535cd60dc9bdc0a9b6893dadefc92377416f66d6f205580cd81d8c7660869c0459f687bf661814318 WHIRLPOOL 0393c90e244782c3001aed109b99c78465707c974c357b03ecedcb4bdc324cafbb01f4768dbfc4f5b730c79d4583965bf9e927c1ae6b1c4cc7ecaef85504afd2
EBUILD sbig-0.9.9.ebuild 530 SHA256 8ec14b2c6182c5047d9a921c79e77718e0d0600e49ae33f1831da0519f213904 SHA512 f873a7f630b4f474d36c1ad24879812578752f806741ef3b4b74bab08d39deba426f70fbd79167e45f931edf5853611d2b8ac252cde9bb2a169b29e82750245b WHIRLPOOL e4233f43981502717c26c6be89aba81a3a129729fb4fd4981cb34f29dcc2196e92fc63842537f60353ac5de59f62d7add97cacb9736e52c510d7a76f98dac56c
EBUILD sbig-9999.ebuild 550 SHA256 27ed7091115d0537119aa95c99f3c67d3b248f87e81688ebe324b559d6d936e8 SHA512 056922e75539308c61fa56aaccb16273528cf3f1821f883e21f3b93c3c76f15502c45e3c79591727aead67c4b5b95414892d0fe7b4abf766beda8f48b3f94dcc WHIRLPOOL e7985f03b880b49014de352d4ce0e345cda5421a313accf0440449ce86b0463d654d0e78763c1134e250f9b16b9c15ecd7c6bb7f988459add7662e3daa4a933e
diff --git a/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch b/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch
index 09d0566..d316843 100644
--- a/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch
+++ b/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch
@@ -1,90 +1,18 @@
---- CMakeLists.txt 2014-08-30 13:02:34.000000000 +0200
-+++ CMakeLists.txt 2015-01-04 20:19:54.806284870 +0100
-@@ -1,45 +1,42 @@
--cmake_minimum_required(VERSION 2.4.7)
--PROJECT(sbig C CXX)
--
--set(SBIG_VERSION "2.0.2")
--set(SBIG_SOVERSION "2")
--
--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")
--
--IF(UNIX AND NOT WIN32 AND NOT APPLE)
-- IF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm.*")
-- SET(LIB_ARMHF TRUE)
-- MARK_AS_ADVANCED(LIB_ARMHF)
-- ELSEIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-- SET(LIB_64 TRUE)
-- MARK_AS_ADVANCED(LIB_64)
-- ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm.*")
--ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
--
--IF(NOT DEFINED LIB_64)
-- SET(LIB_64 "")
--ENDIF(NOT DEFINED LIB_64)
--IF (NOT DEFINED LIB_ARMHF)
-- SET(LIB_ARMHF "")
--ENDIF (NOT DEFINED LIB_ARMHF)
--
--if (LIB_ARMHF)
--exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv_armhf.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION})
--elseif (LIB_64)
--exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv64.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION})
--else ()
--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)
-+cmake_minimum_required(VERSION 2.4.7)
-+PROJECT(sbig C CXX)
-+
-+set(SBIG_VERSION "2.0.2")
-+set(SBIG_SOVERSION "2")
-+
-+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")
-+
-+IF(UNIX AND NOT WIN32 AND NOT APPLE)
-+ IF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm.*")
-+ SET(LIB_ARMHF TRUE)
-+ MARK_AS_ADVANCED(LIB_ARMHF)
-+ ELSEIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+ SET(LIB_64 TRUE)
-+ MARK_AS_ADVANCED(LIB_64)
-+ ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm.*")
-+ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
-+
-+IF(NOT DEFINED LIB_64)
-+ SET(LIB_64 "")
-+ENDIF(NOT DEFINED LIB_64)
-+IF (NOT DEFINED LIB_ARMHF)
-+ SET(LIB_ARMHF "")
-+ENDIF (NOT DEFINED LIB_ARMHF)
-+
-+if (LIB_ARMHF)
-+exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv_armhf.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION})
-+elseif (LIB_64)
-+exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv64.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION})
-+else ()
-+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
-+install( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION}\" \"${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}\" \"${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}) \ No newline at end of file
+--- CMakeLists.txt 2015-01-04 20:39:11.615250675 +0100
++++ CMakeLists.txt.new 2015-01-04 20:39:57.561169925 +0100
+@@ -34,12 +34,10 @@
+ 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( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION}\" \"${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}\" \"${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})
+-install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake)
++