Wykres commitów

43 Commity (master)

Autor SHA1 Wiadomość Data
Piero Toffanin 61d1865bd3 Set PROJ_LIB 2022-10-15 17:06:53 -04:00
Piero Toffanin 093929dd91 Fix snap env var 2022-10-15 10:41:48 -04:00
Piero Toffanin 081d4c8948 Update PYTHONPATH 2022-09-19 23:36:40 -04:00
Piero Toffanin 4cb5d75cfc Snap: do not add snap/local 2022-09-06 11:20:01 -04:00
Dani Llewellyn c6508b3f8b
Update LD_LIBRARY_PATH in snapcraft.yaml
This fixes CVE-2020-27348 where snapcraft/snapd don't set an LD_LIBRARY_PATH upon invoking a snap so including `:$LD_LIBRARY_PATH` at the end of our custom setting we were causing an empty entry to be appended. This causes the ability for someone to potentially load an arbitrary library into our runtime because the empty entry in the search path means the dynamic linker will search the "current working directory" of where the app was launched from outside of confinement.

We also include the SuperBuild `lib` directory in the search path.
2022-08-29 20:51:49 +01:00
Dani Llewellyn 07fcf73a88
Drop snapcraft-preload from snap package
The multiprocessing python module should function correctly with the newer method of using a private shared memory for the snap (see the plug `shared-memory` with `private` set to `true`).
2022-08-29 20:48:12 +01:00
Dani Llewellyn 5ab34603a6
Add PYTHONPATH environment variable to snapcraft.yaml
This fixes #1438: `encodings` module not found

The variable replaces the `sitecustomize.py` file from `snap/local` because it is no-longer functional due to changes in snapcraft.
2022-08-29 20:46:33 +01:00
Piero Toffanin 6da2f91f9d Remove PCL 2022-07-21 12:41:43 -04:00
Piero Toffanin 38bdd13cef Remove pin to proj-data 2021-09-03 14:59:46 +00:00
Piero Toffanin 4f7bb8018f Use core21 for future snapsupport 2021-09-02 18:20:14 -04:00
Piero Toffanin 106be000ae Fix boost on 21.04 2021-09-02 18:16:15 -04:00
Piero Toffanin 539871bac4 Support for Ubuntu 21.04 2021-09-02 18:12:18 -04:00
Piero Toffanin 0cfd3c9a9b Force proj db version 6, remove PROJ_LIB setting 2021-08-14 11:39:24 +02:00
Piero Toffanin 29ab4fd892
Add --copy-to option (#1291)
* Add --copy-to option

* Fix snapcraft

* Remove comment

* remove comment
2021-06-03 15:12:17 -04:00
Piero Toffanin a2df616cc9 Re-add glog 2021-05-16 11:41:13 -04:00
Piero Toffanin 717b6dcb6e Merge master 2021-05-11 10:49:52 -04:00
Piero Toffanin c69b22e99c Remove GRASS dependency 2021-05-07 11:37:28 -04:00
Piero Toffanin 50b258b9e8 odm_orthophoto builds, cleanup superbuild folder structure 2021-04-28 16:06:27 -04:00
Piero Toffanin 22373321b4 Moved odm_orthophoto to separate repo, removed build, modules folders 2021-04-28 14:58:19 -04:00
Piero Toffanin 0d9d65969d merged sansvtk branch, pdal compiles 2021-04-27 15:55:14 -04:00
Piero Toffanin f7dfc98832 dem2points, dem2mesh install targets 2021-04-27 11:43:51 -04:00
Piero Toffanin c256a87920 Removed VTK, odm_cleanmesh module 2021-04-26 11:12:33 -04:00
Piero Toffanin 02fe3fe031 CMake changes 2021-04-19 11:08:32 -04:00
Piero Toffanin a482a57da2
Merge pull request #1217 from pierotofy/231
Entwine/untwine, life's better together
2020-12-10 14:40:47 -05:00
Piero Toffanin d91f4db580 Entwine/untwine, life's better together 2020-12-10 19:23:21 +00:00
Piero Toffanin 050a7ff8cc
Merge pull request #1210 from pierotofy/230
Bug fixes, speed improvements and license change to AGPL
2020-12-07 08:32:46 -05:00
Piero Toffanin a2040b2274 Entwine --> Untwine 2020-12-01 11:28:23 -05:00
Piero Toffanin 8fc2190d75 Setup snap portable builds 2020-11-29 15:44:32 -05:00
Daniel Llewellyn c05035df80 Update to add some missing python packages in Snap
I think this was caused by the release of Snapcraft 4.4 recently which
might have different behaviour. The snap is missing a few python
packages/modules now, which were present when building earlier.

* Add missing Python packages
* Ensure libblas and liblapack can be found with an LD_LIBRARY_PATH
  override.
* Rename reference to `python3.6` to `python3.8`.

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-13 03:15:49 +00:00
Piero Toffanin d8f3874d3c
Merge pull request #1195 from diddledan/missing-webp
Update snapcraft.yaml for missing webp library
2020-11-07 00:33:42 -05:00
Daniel Llewellyn 2c9d16ae9b Update snapcraft.yaml for missing webp library
Snapcraft complains about missing `libwebpdemux2` when building. This
commit adds it as a runtime dependency to fix the warning.

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-07 01:47:34 +00:00
Daniel Llewellyn 7e8c7b8acc Update snapcraft.yaml for core20/snapcraft-preload
It seems that snapcraft-preload[1] installs to a different location when
building with core20 vs core18. This meant the snap builds fail with
being unable to find the executable. This commit changes the reference
to the preload script in the `snapcraft.yaml` to the core20-built
location.

[1] https://github.com/sergiusens/snapcraft-preload

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-07 00:55:15 +00:00
Piero Toffanin 5ec9229736
Merge pull request #1189 from diddledan/ubuntu-20.04
Update builds for Ubuntu 20.04
2020-11-06 15:11:14 -05:00
Piero Toffanin d5dc177220
Merge pull request #1190 from diddledan/mark-snap-stable
Mark Snap as grade: stable
2020-11-06 10:16:24 -05:00
Daniel Llewellyn 5176b4670e Mark Snap as grade: stable
Snap packages marked as `grade: devel` are not permitted to be released
to the `candidate` or `stable` channels in the Snap Store. This commit
changes the grade to `stable` now that everything seems to be working
well. Snaps build from this commit forward will be releasable to the
`candidate` and/or `stable` channels in the Snap Store :-)

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-05 23:00:39 +00:00
Daniel Llewellyn ff5f3ff362 Update builds for Ubuntu 20.04
* Adjust `PYTHONPATH` in Dockerfiles to newer `python3.8`
* Switch to 20.04 base images in Dockerfiles
* Switch snapcraft to use `base20`
* Update APT dependency versions in `snapcraft.yaml` to match those
  available in Ubuntu 20.04
* Bump `pyproj` from version `2.2.2` to `3.0.0`
* Bump `numpy` from version `1.19.2` to `1.19.4`
* Add missing exclusions to `snapcraft.yaml` to reduce the size of snap
  packages
* Add missing exclusions to Dockerfiles to reduce the size of container
  images
* Update `configure.sh` to account for Ubuntu 20.04 instead of 18.04
* Nit: make `configure.sh` executable directly with `./configure.sh`
  instead of `bash configure.sh`

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-05 22:52:59 +00:00
Daniel Llewellyn 788360cb82 Fix incorrect libusb APT package version
* Update dependency on libusb to use `libusb1.0` instead of
  `libusb0.1-4`

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-05 17:32:35 +00:00
Piero Toffanin 9bbf069aa0 Fix CGAL name 2020-11-02 21:59:54 +00:00
Piero Toffanin 4537824e94 Added missing stage-packages key 2020-11-02 21:42:51 +00:00
Piero Toffanin 0e803b9233 Add openmvs deps in snapcraft 2020-11-02 21:26:48 +00:00
Piero Toffanin 314c75ae9a Merged master 2020-11-02 21:04:32 +00:00
Daniel Llewellyn 9ea1eb6e28 Update build scripts
* Use `snapcraft.yaml` as the source-of-truth for APT dependencies to reduce burden of maintianing multiple lists

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-02 18:35:32 +00:00
Daniel Llewellyn f14e574e59 Initial Snap Package
* Add `snap/` directory containing
  - `snapcraft.yaml` the build script
  - `local/usr/lib/python3.6/sitecustomize.py` a snap-specific override
    file to get python to recognise the snap's python paths
* Add `*.snap` to gitignore so built snap packages aren't accidentally
  committed to the repository.
2020-10-27 23:07:15 +00:00