Updated to ligphoto & gphoto 2.5.9 version and new libus 1.20 library

gonzalo · Nov 27, 2015 · 3587dcd · 3587dcd
1 parent 0bf7588
commit 3587dcd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@ gphoto2-updater
 Gphoto2 and libGphoto2 compiler and installer script
 http://github.com/gonzalo/gphoto2-updater
 
-Last version: 2.5.8
+Last version: 2.5.9
 
 This script is specifically created for Raspbian http://www.raspbian.org
-and Raspberry Pi http://www.raspberrypi.org but should work over any 
+and Raspberry Pi http://www.raspberrypi.org but should work over any
 Debian-based distribution
 
 Created and mantained by Gonzalo Cao Cabeza de Vaca
@@ -45,5 +45,3 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
diff --git a/gphoto2-updater.sh b/gphoto2-updater.sh
@@ -3,7 +3,7 @@
 # Gphoto2 2.5.8 compiler and installer script v0.4.1
 #
 # This script is specifically created for Raspbian http://www.raspbian.org
-# and Raspberry Pi http://www.raspberrypi.org but should work over any 
+# and Raspberry Pi http://www.raspberrypi.org but should work over any
 # Debian-based distribution
 
 # Created and mantained by Gonzalo Cao Cabeza de Vaca
@@ -14,6 +14,7 @@
 # Updated for gphoto2 2.5.6 by Mathias Peter
 # Updated for gphoto2 2.5.7 by Sijawusz Pur Rahnama
 # Updated for gphoto2 2.5.8 by scribblemaniac
+# Updated for gphoto2 2.5.9 by scribblemaniac
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,23 +73,23 @@ echo "gphoto2-temp-folder created"
 
 echo
 echo "-------------------------"
-echo "Downloading libusb 1.0.18"
+echo "Downloading libusb 1.0.20"
 echo "-------------------------"
 echo
 
-if (wget -q http://downloads.sourceforge.net/project/libusbx/releases/1.0.18/source/libusbx-1.0.18.tar.bz2) && [ "`sha256sum libusbx-1.0.18.tar.bz2 | awk '{print$1;}'`" = 'e16d1b10de69ddd0dcec31b8041b9b3ba4640d530e4851cc83268253b27d1ffb' ]
+if (wget -q http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.tar.bz2)
 	then
-		tar xjvf libusbx-1.0.18.tar.bz2
-		cd libusbx-1.0.18/
+		tar jxf libusb-1.0.20.tar.bz2
+		cd libusb-1.0.20/
 	else
-		echo "Unable to get libusbx_1.0.18"
-		echo "Cleaning and exiting..."
+		echo "Unable to get libusb"
+		echo "Exiting..."
 		exit 1
 fi
 
 echo
 echo "--------------------------------------"
-echo "Compiling and installing libusb 1.0.18"
+echo "Compiling and installing libusb 1.0.20"
 echo "--------------------------------------"
 
 ./configure
@@ -99,24 +100,24 @@ cd ..
 
 echo
 echo "----------------------------"
-echo "Downloading libgphoto2 2.5.8"
+echo "Downloading libgphoto2 2.5.9"
 echo "----------------------------"
 echo
 
-if (wget -q http://downloads.sourceforge.net/project/gphoto/libgphoto/2.5.8/libgphoto2-2.5.8.tar.bz2) && [ "`sha256sum libgphoto2-2.5.8.tar.bz2 | awk '{print$1;}'`" = '031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6' ]
+if (wget http://downloads.sourceforge.net/project/gphoto/libgphoto/2.5.9/libgphoto2-2.5.9.tar.bz2) && [ "`sha1sum libgphoto2-2.5.9.tar.bz2 | awk '{print$1;}'`" = '6da9fe37d7fee12eefea4dc1d97139c7ef694ecf' ]
 	then
-		tar xjf libgphoto2-2.5.8.tar.bz2
-		cd libgphoto2-2.5.8
+		tar xjf libgphoto2-2.5.9.tar.bz2
+		cd libgphoto2-2.5.9
 	else
-		echo "Unable to get libgphoto2-2.5.8"
+		echo "Unable to get libgphoto2-2.5.9"
 		echo "Cleaning and exiting..."
 		exit 1
 fi
 
 
 echo
 echo "-----------------------------------------"
-echo "Compiling and installing libgphoto2 2.5.8"
+echo "Compiling and installing libgphoto2 2.5.9"
 echo "-----------------------------------------"
 echo
 
@@ -127,16 +128,16 @@ cd ..
 
 echo
 echo "-------------------------"
-echo "Downloading gphoto2 2.5.8"
+echo "Downloading gphoto2 2.5.9"
 echo "-------------------------"
 echo
 
-if (wget -q http://downloads.sourceforge.net/project/gphoto/gphoto/2.5.8/gphoto2-2.5.8.tar.gz) && [ "`sha256sum gphoto2-2.5.8.tar.gz | awk '{print$1;}'`" = '1950542253d42fa9898028879b04fdbf09393c095f2c0273b062e897d10790ad' ]
+if (wget http://downloads.sourceforge.net/project/gphoto/gphoto/2.5.9/gphoto2-2.5.9.tar.bz2) && [ "`sha1sum gphoto2-2.5.9.tar.bz2 | awk '{print$1;}'`" = 'b28b5c297652651c4ce1b544a4930c0470e9b419' ]
 	then
-		tar xzvf gphoto2-2.5.8.tar.gz
-		cd gphoto2-2.5.8
+		tar xjf gphoto2-2.5.9.tar.bz2
+		cd gphoto2-2.5.9
 	else
-		echo "Unable to get gphoto2-2.5.8"
+		echo "Unable to get gphoto2-2.5.9"
 		echo "Cleaning and exiting..."
 		exit 1
 fi
@@ -213,4 +214,3 @@ echo "--------------------"
 echo
 
 gphoto2 --version
-