From 7e874c6abca1380ac800bdc13a111126437f53c4 Mon Sep 17 00:00:00 2001 From: Ctibor Date: Thu, 29 Jan 2015 00:06:20 +0100 Subject: sci-astronomy/ccd now installs helper scripts to /usr/libexec/ccd --- .../files/ccd-1.2.9-fix_helper_scripts_paths.patch | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 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 7f962b1..cd01cda 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,48 +1,60 @@ +diff -ruN ccd/src/devices/cam_gphoto.cpp ccd.new/src/devices/cam_gphoto.cpp +--- ccd/src/devices/cam_gphoto.cpp 2015-01-29 00:01:59.743670552 +0100 ++++ ccd.new/src/devices/cam_gphoto.cpp 2015-01-29 00:03:52.200487268 +0100 +@@ -678,7 +678,7 @@ + else + if( pid == 0 ) + { +- execl( "./shutter", "shutter", cmd == open_shutter ? "1" : "0", m_high_params.use_mirror_lock ? "1" : "0", NULL ); ++ execl( "/usr/libexec/ccd/shutter", "shutter", cmd == open_shutter ? "1" : "0", m_high_params.use_mirror_lock ? "1" : "0", NULL ); + _exit( 127 ); + } + else 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 ++++ ccd.new/src/devices/cam_qhy6.cpp 2015-01-29 00:03:26.818528628 +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" ); ++ int res = system( "/usr/libexec/ccd/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 ++++ ccd.new/src/devices/cam_qhy8.cpp 2015-01-29 00:03:13.501550331 +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" ); ++ int res = system( "/usr/libexec/ccd/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 ++++ ccd.new/src/devices/cam_qhy8l.cpp 2015-01-29 00:03:16.166545988 +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" ); ++ int res = system( "/usr/libexec/ccd/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 ++++ ccd.new/src/devices/cam_qhy9.cpp 2015-01-29 00:03:17.622543615 +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" ); ++ int res = system( "/usr/libexec/ccd/qhy9reset.sh" ); if( res < 0 ) { log_e( "Failed to reset camera by script... '%s'", strerror(errno) ); -- cgit v1.2.3