From cbe4f5701fb8c2f38b5c6125a9977facf52ac03d Mon Sep 17 00:00:00 2001 From: Ctibor Date: Wed, 28 Jan 2015 23:53:50 +0100 Subject: Added patch for sci-astronomy/ccd that fixes paths for helper scripts. --- .../files/ccd-1.2.9-fix_helper_scripts_paths.patch | 180 ++++++++++----------- 1 file changed, 90 insertions(+), 90 deletions(-) (limited to 'sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch') diff --git a/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch b/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch index 8e1f886..7f962b1 100644 --- a/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch +++ b/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch @@ -1,96 +1,96 @@ -diff -ru ccd.new/src/devices/cam_qhy6.cpp ccd/src/devices/cam_qhy6.cpp ---- ccd.new/src/devices/cam_qhy6.cpp 2015-01-28 23:23:41.000000000 +0100 -+++ ccd/src/devices/cam_qhy6.cpp 2013-07-31 14:24:53.000000000 +0200 -@@ -321,7 +321,7 @@ - //hardware BREAK - for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) - { -- int res = system( "/usr/bin/qhy6reset.sh" ); -+ int res = system( "utils/qhy6reset.sh" ); - if( res < 0 ) - { - log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); -diff -ru ccd.new/src/devices/cam_qhy8.cpp ccd/src/devices/cam_qhy8.cpp ---- ccd.new/src/devices/cam_qhy8.cpp 2015-01-28 23:23:31.000000000 +0100 -+++ ccd/src/devices/cam_qhy8.cpp 2013-07-31 14:40:11.000000000 +0200 -@@ -380,7 +380,7 @@ - //hardware BREAK - for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) - { -- int res = system( "/usr/bin/qhy8reset.sh" ); -+ int res = system( "utils/qhy8reset.sh" ); - if( res < 0 ) - { - log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); -diff -ru ccd.new/src/devices/cam_qhy8l.cpp ccd/src/devices/cam_qhy8l.cpp ---- ccd.new/src/devices/cam_qhy8l.cpp 2015-01-28 23:23:13.000000000 +0100 -+++ ccd/src/devices/cam_qhy8l.cpp 2013-08-01 18:54:12.000000000 +0200 -@@ -424,7 +424,7 @@ - //hardware BREAK - for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) - { -- int res = system( "/usr/bin/qhy8lreset.sh" ); -+ int res = system( "utils/qhy8lreset.sh" ); - if( res < 0 ) - { - log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); -diff -ru ccd.new/src/devices/cam_qhy9.cpp ccd/src/devices/cam_qhy9.cpp ---- ccd.new/src/devices/cam_qhy9.cpp 2015-01-28 23:23:15.000000000 +0100 -+++ ccd/src/devices/cam_qhy9.cpp 2013-07-31 10:28:44.000000000 +0200 -@@ -424,7 +424,7 @@ - //hardware BREAK - for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) - { -- int res = system( "/usr/bin/qhy9reset.sh" ); -+ int res = system( "utils/qhy9reset.sh" ); - if( res < 0 ) - { - log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); -diff -ru ccd.new/utils/qhy6reset.sh ccd/utils/qhy6reset.sh ---- ccd.new/utils/qhy6reset.sh 2015-01-28 23:11:38.000000000 +0100 -+++ ccd/utils/qhy6reset.sh 2012-03-07 19:17:55.000000000 +0100 -@@ -8,7 +8,7 @@ - # exit 0 - #fi - --fw="/lib/firmware/QHY6.HEX" -+fw="/lib/firmware/ccd/qhy6.hex" - - bdir="/dev/bus/usb" - -diff -ru ccd.new/utils/qhy8lreset.sh ccd/utils/qhy8lreset.sh ---- ccd.new/utils/qhy8lreset.sh 2015-01-28 23:11:54.000000000 +0100 -+++ ccd/utils/qhy8lreset.sh 2012-01-25 20:17:20.000000000 +0100 -@@ -8,7 +8,7 @@ - # exit 0 - #fi - --fw="/lib/firmware/CCD/QHY8L.HEX" -+fw="/lib/firmware/ccd/qhy8l.hex" - - bdir="/dev/bus/usb" - -diff -ru ccd.new/utils/qhy8reset.sh ccd/utils/qhy8reset.sh ---- ccd.new/utils/qhy8reset.sh 2015-01-28 23:12:04.000000000 +0100 -+++ ccd/utils/qhy8reset.sh 2013-07-30 21:54:56.000000000 +0200 -@@ -8,7 +8,7 @@ - # exit 0 - #fi - --fw="/lib/firmware/QHY8.HEX" -+fw="/lib/firmware/ccd/qhy8.hex" - - bdir="/dev/bus/usb" - -diff -ru ccd.new/utils/qhy9reset.sh ccd/utils/qhy9reset.sh ---- ccd.new/utils/qhy9reset.sh 2015-01-28 23:16:37.000000000 +0100 -+++ ccd/utils/qhy9reset.sh 2015-01-28 23:17:15.801043730 +0100 -@@ -8,7 +8,7 @@ +diff -ruN ccd/src/devices/cam_qhy6.cpp ccd.new/src/devices/cam_qhy6.cpp +--- ccd/src/devices/cam_qhy6.cpp 2013-07-31 14:24:53.000000000 +0200 ++++ ccd.new/src/devices/cam_qhy6.cpp 2015-01-28 23:23:41.000000000 +0100 +@@ -321,7 +321,7 @@ + //hardware BREAK + for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) + { +- int res = system( "utils/qhy6reset.sh" ); ++ int res = system( "/usr/bin/qhy6reset.sh" ); + if( res < 0 ) + { + log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); +diff -ruN ccd/src/devices/cam_qhy8.cpp ccd.new/src/devices/cam_qhy8.cpp +--- ccd/src/devices/cam_qhy8.cpp 2013-07-31 14:40:11.000000000 +0200 ++++ ccd.new/src/devices/cam_qhy8.cpp 2015-01-28 23:23:31.000000000 +0100 +@@ -380,7 +380,7 @@ + //hardware BREAK + for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) + { +- int res = system( "utils/qhy8reset.sh" ); ++ int res = system( "/usr/bin/qhy8reset.sh" ); + if( res < 0 ) + { + log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); +diff -ruN ccd/src/devices/cam_qhy8l.cpp ccd.new/src/devices/cam_qhy8l.cpp +--- ccd/src/devices/cam_qhy8l.cpp 2013-08-01 18:54:12.000000000 +0200 ++++ ccd.new/src/devices/cam_qhy8l.cpp 2015-01-28 23:23:13.000000000 +0100 +@@ -424,7 +424,7 @@ + //hardware BREAK + for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) + { +- int res = system( "utils/qhy8lreset.sh" ); ++ int res = system( "/usr/bin/qhy8lreset.sh" ); + if( res < 0 ) + { + log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); +diff -ruN ccd/src/devices/cam_qhy9.cpp ccd.new/src/devices/cam_qhy9.cpp +--- ccd/src/devices/cam_qhy9.cpp 2013-07-31 10:28:44.000000000 +0200 ++++ ccd.new/src/devices/cam_qhy9.cpp 2015-01-28 23:23:15.000000000 +0100 +@@ -424,7 +424,7 @@ + //hardware BREAK + for( int i = 0;i < ccamera_base::try_reset_cnt;i++ ) + { +- int res = system( "utils/qhy9reset.sh" ); ++ int res = system( "/usr/bin/qhy9reset.sh" ); + if( res < 0 ) + { + log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); +diff -ruN ccd/utils/qhy6reset.sh ccd.new/utils/qhy6reset.sh +--- ccd/utils/qhy6reset.sh 2012-03-07 19:17:55.000000000 +0100 ++++ ccd.new/utils/qhy6reset.sh 2015-01-28 23:11:38.000000000 +0100 +@@ -8,7 +8,7 @@ # exit 0 #fi --fw="/lib/firmware/QHY9.HEX" -+fw="/lib/firmware/ccd/qhy9.hex" +-fw="/lib/firmware/ccd/qhy6.hex" ++fw="/lib/firmware/QHY6.HEX" bdir="/dev/bus/usb" +diff -ruN ccd/utils/qhy8lreset.sh ccd.new/utils/qhy8lreset.sh +--- ccd/utils/qhy8lreset.sh 2012-01-25 20:17:20.000000000 +0100 ++++ ccd.new/utils/qhy8lreset.sh 2015-01-28 23:11:54.000000000 +0100 +@@ -8,7 +8,7 @@ + # exit 0 + #fi + +-fw="/lib/firmware/ccd/qhy8l.hex" ++fw="/lib/firmware/CCD/QHY8L.HEX" + + bdir="/dev/bus/usb" + +diff -ruN ccd/utils/qhy8reset.sh ccd.new/utils/qhy8reset.sh +--- ccd/utils/qhy8reset.sh 2013-07-30 21:54:56.000000000 +0200 ++++ ccd.new/utils/qhy8reset.sh 2015-01-28 23:12:04.000000000 +0100 +@@ -8,7 +8,7 @@ + # exit 0 + #fi + +-fw="/lib/firmware/ccd/qhy8.hex" ++fw="/lib/firmware/QHY8.HEX" + + bdir="/dev/bus/usb" + +diff -ruN ccd/utils/qhy9reset.sh ccd.new/utils/qhy9reset.sh +--- ccd/utils/qhy9reset.sh 2015-01-28 23:17:15.801043730 +0100 ++++ ccd.new/utils/qhy9reset.sh 2015-01-28 23:47:27.385068594 +0100 +@@ -8,7 +8,7 @@ + # exit 0 + #fi + +-fw="/lib/firmware/ccd/qhy9.hex" ++fw="/lib/firmware/QHY9.HEX" + + bdir="/dev/bus/usb" + \ No newline at end of file -- cgit v1.2.3