-
Notifications
You must be signed in to change notification settings - Fork 8
/
Copy path10637.diff
243 lines (229 loc) · 7.56 KB
/
10637.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
commit f5f6591df6196296b2b8395ae726946eac1f9942
Merge: 349b814515 fd8de52aa8
Author: Even Rouault <[email protected]>
Date: Mon Sep 24 09:54:06 2018 +0200
Merge pull request #939 from osmfj/vagrant-tweaks-20180923
Vagrant: install dependency from PPA
diff --git a/Vagrantfile b/Vagrantfile
index 6b13b21af1..f19b39f1d4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,190 +9,191 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# specify memory size in MiB
vm_ram = ENV['VAGRANT_VM_RAM'] || 2048
vm_cpu = ENV['VAGRANT_VM_CPU'] || 2
vm_ram_bytes = vm_ram * 1024 * 1024
config.vm.hostname = "gdal-vagrant"
config.vm.host_name = "gdal-vagrant"
# proxy configurations.
# these options are also specified by environment variables;
# VAGRANT_HTTP_PROXY, VAGRANT_HTTPS_PROXY, VAGRANT_FTP_PROXY
# VAGRANT_NO_PROXY, VAGRANT_SVN_PROXY, VAGRANT_GIT_PROXY
# if you want to set these on Vagrantfile, edit the following:
if Vagrant.has_plugin?("vagrant-proxyconf")
config.proxy.enabled = false # true|false
#config.proxy.http = "http://192.168.0.2:3128"
#config.proxy.ftp = "http://192.168.0.2:3128"
#config.proxy.https = "DIRECT"
#config.proxy.no_proxy = "localhost,127.0.0.1,.example.com"
#config.svn_proxy.http = ""
#config.git_proxy.http = ""
end
config.vm.provider :virtualbox do |vb,ovrd|
ovrd.vm.network :forwarded_port, guest: 80, host: 8080
ovrd.vm.box = "ubuntu/trusty64"
vb.customize ["modifyvm", :id, "--memory", vm_ram]
vb.customize ["modifyvm", :id, "--cpus", vm_cpu]
vb.customize ["modifyvm", :id, "--ioapic", "on"]
vb.name = "gdal-vagrant"
end
config.vm.provider :lxc do |lxc,ovrd|
ovrd.vm.box = "cultuurnet/ubuntu-14.04-64-puppet"
lxc.backingstore = 'dir'
lxc.customize 'cgroup.memory.limit_in_bytes', vm_ram_bytes
lxc.customize 'aa_allow_incomplete', 1
lxc.container_name = "gdal-vagrant"
# allow android adb connection from guest
#ovrd.vm.synced_folder('/dev/bus', '/dev/bus')
# allow runnng wine inside lxc
ovrd.vm.synced_folder('/tmp/.X11-unix/', '/tmp/.X11-unix/')
end
config.vm.provider :hyperv do |hyperv,ovrd|
ovrd.vm.box = "withinboredom/Trusty64"
ovrd.ssh.username = "vagrant"
hyperv.cpus = vm_cpu
hyperv.memory = vm_ram
# If you want to avoid copying an entire image with
# differencing disk feature, uncomment a following line.
# hyperv.differencing_disk = true
hyperv.vmname = "gdal-vagrant"
end
ppaRepos = [
"ppa:openjdk-r/ppa",
"ppa:ubuntugis/ubuntugis-unstable",
"ppa:miurahr/gdal-depends"
]
packageList = [
"autoconf",
"automake",
"libtool",
"subversion",
"python-numpy",
"python-dev",
"python-lxml",
"postgis",
"postgresql-server-dev-9.3",
"postgresql-9.3-postgis-2.2",
"postgresql-9.3-postgis-scripts",
"libmysqlclient-dev",
"libpq-dev",
"libpng12-dev",
"libjpeg-dev",
"libgif-dev",
"liblzma-dev",
"libgeos-dev",
"libcurl4-gnutls-dev",
"libproj-dev",
"libxml2-dev",
"libexpat-dev",
"libxerces-c-dev",
"libnetcdf-dev",
"netcdf-bin",
"libpoppler-dev",
"libpoppler-private-dev",
"gpsbabel",
"libboost-all-dev",
"libgmp-dev",
"libmpfr-dev",
"libkml-dev",
"swig",
"libhdf4-dev",
"libhdf5-dev",
"poppler-utils",
"libfreexl-dev",
"unixodbc-dev",
"libwebp-dev",
"openjdk-8-jdk",
"libepsilon-dev",
"libgta-dev",
"liblcms2-2",
"libjasper-dev",
"libarmadillo-dev",
"libcrypto++-dev",
"libdap-dev",
"libogdi3.2-dev",
"libcfitsio3-dev",
"libfyba-dev",
-# "libsfcgal-dev", # 1.2.2
+ "libsfcgal-dev",
"couchdb",
"libmongo-client-dev",
"libqhull-dev",
"make",
"g++",
"bison",
"flex",
"doxygen",
"texlive-latex-base",
"vim",
"ant",
"unzip",
"mono-mcs",
"libmono-system-drawing4.0-cil",
"libjson-c-dev",
"libtiff5-dev",
"libopenjp2-7-dev",
+ "libopenjpip7",
+ "libopenjp3d7",
"clang-3.9",
"cmake3",
"git",
"wine",
"ccache",
"curl",
"mingw32",
"mingw-w64",
"mingw-w64-i686-dev",
"mingw-w64-x86-64-dev",
"mingw-w64-tools",
"cmake3-curses-gui",
"gdb",
"gdbserver",
"gdb-mingw-w64-target",
"ninja-build",
"openjdk-8-jdk",
"ghostscript",
# "grass-dev",
"libcharls-dev",
"libgeotiff-dev",
"sqlite3-pcre",
"libpcre3-dev",
"libspatialite-dev",
"librasterlite2-dev",
- "libkea-dev"
+ "libkea-dev",
+ "libzstd-dev"
];
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :box
config.cache.enable :generic, {
"wget" => { cache_dir: "/var/cache/wget" },
}
end
if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
pkg_cmd = "sed -i 's#deb http[s]?://.*archive.ubuntu.com/ubuntu/#deb mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; "
pkg_cmd << 'echo "deb mirror://mirrors.ubuntu.com/mirrors.txt trusty universe" > /etc/apt/sources.list.d/official-ubuntu-trusty-universe.list; '
pkg_cmd << 'echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.4.list; '
pkg_cmd << 'curl -Ls https://www.mongodb.org/static/pgp/server-3.4.asc | apt-key add -; '
pkg_cmd << "apt-get update -qq; apt-get install -q -y python-software-properties; "
pkg_cmd << "dpkg --add-architecture i386; "
if ppaRepos.length > 0
ppaRepos.each { |repo| pkg_cmd << "add-apt-repository -y " << repo << " ; " }
pkg_cmd << "apt-get update -qq; "
end
# install packages we need we need
pkg_cmd << "apt-get --no-install-recommends install -q -y " + packageList.join(" ") << " ; "
config.vm.provision :shell, :inline => pkg_cmd
scripts = [
- "sfcgal.sh",
- "openjpeg.sh",
"gdal.sh",
"postgis.sh"
];
scripts.each { |script| config.vm.provision :shell, :privileged => false, :path => "gdal/scripts/vagrant/" << script }
end
diff --git a/gdal/scripts/vagrant/openjpeg.sh b/gdal/scripts/vagrant/openjpeg.sh
deleted file mode 100755
index 0f70a08a1b..0000000000
--- a/gdal/scripts/vagrant/openjpeg.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# abort install if any errors occur and enable tracing
-set -o errexit
-set -o xtrace
-
-wget -c -nc -nv -P /var/cache/wget https://github.com/uclouvain/openjpeg/releases/download/v2.3.0/openjpeg-v2.3.0-linux-x86_64.tar.gz
-tar xzf /var/cache/wget/openjpeg-v2.3.0-linux-x86_64.tar.gz
-sudo cp -r openjpeg-v2.3.0-linux-x86_64/include/* /usr/local/include
-sudo cp -r openjpeg-v2.3.0-linux-x86_64/lib/* /usr/local/lib
-
diff --git a/gdal/scripts/vagrant/sfcgal.sh b/gdal/scripts/vagrant/sfcgal.sh
deleted file mode 100755
index 3d10694c03..0000000000
--- a/gdal/scripts/vagrant/sfcgal.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# Build CGAL
-wget -nc -c -nv -P /var/cache/wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.3/CGAL-4.11.3.tar.xz
-tar xf /var/cache/wget/CGAL-4.11.3.tar.xz
-(cd CGAL-4.11.3 && cmake . && make && sudo make install)
-
-# Build SFCGAL
-wget -nc -c -nv -P /var/cache/wget https://codeload.github.com/Oslandia/SFCGAL/tar.gz/v1.3.5 -O /var/cache/wget/SFCGAL1.3.5.tar.gz
-tar xf /var/cache/wget/SFCGAL1.3.5.tar.gz
-(cd SFCGAL-1.3.5 && cmake . && make && sudo make install)
-sudo ldconfig