11# /bin/sh
22
3- # Gphoto2 2.5.7 compiler and installer script v0.4.1
3+ # Gphoto2 2.5.8 compiler and installer script v0.4.1
44#
55# This script is specifically created for Raspbian http://www.raspbian.org
66# and Raspberry Pi http://www.raspberrypi.org but should work over any
1313# Updated for gphoto2 2.5.5 by Mihai Doarna
1414# Updated for gphoto2 2.5.6 by Mathias Peter
1515# Updated for gphoto2 2.5.7 by Sijawusz Pur Rahnama
16+ # Updated for gphoto2 2.5.8 by scribblemaniac
1617
1718# This program is free software: you can redistribute it and/or modify
1819# it under the terms of the GNU General Public License as published by
@@ -55,7 +56,11 @@ echo "Installing dependencies"
5556echo " -----------------------"
5657echo
5758
59+ <<< <<< < HEAD
5860apt-get install -y libltdl-dev libusb-dev libexif-dev libpopt-dev libudev-dev make bzip2
61+ =======
62+ apt-get install -y build-essential libltdl-dev libusb-dev libexif-dev libpopt-dev libudev-dev
63+ >>>>>>> scribblemaniac-gonzalo-patch-libusbx-1.0.17
5964
6065echo
6166echo " -------------------------"
@@ -71,23 +76,23 @@ echo "gphoto2-temp-folder created"
7176
7277echo
7378echo " -------------------------"
74- echo " Downloading libusb 1.0.17 "
79+ echo " Downloading libusb 1.0.18 "
7580echo " -------------------------"
7681echo
7782
78- if wget -q https ://download.nus.edu.sg/mirror/ubuntu/pool/main/libu /libusbx/libusbx_1 .0.17.orig. tar.bz2
83+ 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 ' ]
7984 then
80- tar xjvf libusbx_1 .0.17.orig .tar.bz2
81- cd libusbx-1.0.17 /
85+ tar xjvf libusbx-1 .0.18 .tar.bz2
86+ cd libusbx-1.0.18 /
8287 else
83- echo " Unable to get libusbx_1.0.17 "
88+ echo " Unable to get libusbx_1.0.18 "
8489 echo " Cleaning and exiting..."
8590 exit 1
8691fi
8792
8893echo
8994echo " --------------------------------------"
90- echo " Compiling and installing libusb 1.0.17 "
95+ echo " Compiling and installing libusb 1.0.18 "
9196echo " --------------------------------------"
9297
9398./configure
@@ -98,24 +103,24 @@ cd ..
98103
99104echo
100105echo " ----------------------------"
101- echo " Downloading libgphoto2 2.5.7 "
106+ echo " Downloading libgphoto2 2.5.8 "
102107echo " ----------------------------"
103108echo
104109
105- if wget -q http://downloads.sourceforge.net/project/gphoto/libgphoto/2.5.7 /libgphoto2-2.5.7 .tar.bz2
110+ 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 ' ]
106111 then
107- tar xjf libgphoto2-2.5.7 .tar.bz2
108- cd libgphoto2-2.5.7
112+ tar xjf libgphoto2-2.5.8 .tar.bz2
113+ cd libgphoto2-2.5.8
109114 else
110- echo " Unable to get libgphoto2-2.5.7 "
115+ echo " Unable to get libgphoto2-2.5.8 "
111116 echo " Cleaning and exiting..."
112117 exit 1
113118fi
114119
115120
116121echo
117122echo " -----------------------------------------"
118- echo " Compiling and installing libgphoto2 2.5.7 "
123+ echo " Compiling and installing libgphoto2 2.5.8 "
119124echo " -----------------------------------------"
120125echo
121126
@@ -126,16 +131,16 @@ cd ..
126131
127132echo
128133echo " -------------------------"
129- echo " Downloading gphoto2 2.5.6 "
134+ echo " Downloading gphoto2 2.5.8 "
130135echo " -------------------------"
131136echo
132137
133- if wget -q http://downloads.sourceforge.net/project/gphoto/gphoto/2.5.6 /gphoto2-2.5.6 .tar.gz
138+ 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 ' ]
134139 then
135- tar xzvf gphoto2-2.5.6 .tar.gz
136- cd gphoto2-2.5.6
140+ tar xzvf gphoto2-2.5.8 .tar.gz
141+ cd gphoto2-2.5.8
137142 else
138- echo " Unable to get gphoto2-2.5.6 "
143+ echo " Unable to get gphoto2-2.5.8 "
139144 echo " Cleaning and exiting..."
140145 exit 1
141146fi
0 commit comments