Added patch to sci-astronomy/ccd that fixes paths to helper scripts for QHY cameras.

3 files changed, 100 insertions, 1 deletions

diff --git a/sci-astronomy/ccd/Manifest b/sci-astronomy/ccd/Manifest
index abfc6a9..f1d9f46 100644
--- a/sci-astronomy/ccd/Manifest
+++ b/sci-astronomy/ccd/Manifest
@@ -1,2 +1,3 @@
+AUX ccd-1.2.9-fix_helper_scripts_paths.patch 3360 SHA256 94e129a304a9bd6fdfe9222b570c3ad29c5dfe060ba56c8a9f14a06941f7af5a SHA512 f4917293d9d001ca212bd8410cd8494daa483d9d63718be83504740df4a5ca0f4b6b685ab2977b883090e7f4b29aa3995adaa3953f254272ca1a6c1063ee56e2 WHIRLPOOL fca2a42ecb002cb34faca45cd15bb84468a3d958bb3bb3ea91761d28eac6e4bfefb1e482b4bd970738a31cab75d2aeaceab54c001132b0a26eddd2707f682795
 DIST ccd-1.2.9.tar.bz2 114821 SHA256 b09ab4c0c0d06ecddfbf3efc7c6e82b8a47711555f61daf37f56e9b078a72f9d SHA512 5f0098e4c5c927e7bf9938e4ce790ddacba63240955fcaecae7a8422ef7963b9f28fa61ed534beb2c8bbb9b68eb593c3c31705b02429511b576163e2513ee8b3 WHIRLPOOL 88373a05dfa1ff7992b33f5c1680ed7ea347b01ce6f94b18202fee43a7929349d596874754192f584913b27f44fb4180d6f7d8e4de6d36ff90912185f1e1202e
-EBUILD ccd-1.2.9.ebuild 1079 SHA256 c631b1e2ed85e6ce4a7bf942e47ca245af59e3e91f139e338ce32ae7ff40fdbf SHA512 a096dbe3697698b32d7edfe9f3dfffff94b1d20857c45074d31652762ca4cbfb47c9da10a6c39a7ebc52bc9bf9ec35894acbcfea7a53e5df72a6495a41ef35f6 WHIRLPOOL ef41f71905b885ed980b85592bbb2db06e8b8310c45e59b795a203596612da5447b91fa6cf92c81ee7b4b121e28f1199b17689f76e8f62e1d399868cfae35576
+EBUILD ccd-1.2.9.ebuild 1146 SHA256 f3368ae5b131e1af957d0c6606ff089b842eb838ccff26b61c786ae57e591de6 SHA512 d34c454809eb2d540a0eb70b6071eff3155d90555bb1ec9eba56a60abb830a4c9126a5ab70871e93d59ca71a375bf1a3aff5a7da789b431d097165df849a8963 WHIRLPOOL ecea0eecaa4f5d63d40d248a8b6bd78507f9ec4a53b2dd31923742a4d4a1632961043700e3abcca92f7699dfb56e2ad0430ac4077b721900f2c8a4fa5aab9b27
diff --git a/sci-astronomy/ccd/ccd-1.2.9.ebuild b/sci-astronomy/ccd/ccd-1.2.9.ebuild
index 1455440..685c137 100644
--- a/sci-astronomy/ccd/ccd-1.2.9.ebuild
+++ b/sci-astronomy/ccd/ccd-1.2.9.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=( "${FILESDIR}/ccd-1.2.9-fix_helper_scripts_paths.patch")
+
 src_compile() {
   qt4-r2_src_compile
   cd ${S}/shutter_procs/
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
new file mode 100644
index 0000000..8e1f886
--- /dev/null
+++ b/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch
@@ -0,0 +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 @@
+ #  exit 0

+ #fi

+ 

+-fw="/lib/firmware/QHY9.HEX"

++fw="/lib/firmware/ccd/qhy9.hex"

+ 

+ bdir="/dev/bus/usb"

+