[PR PATCH] New package: colmap-3.8

[PR PATCH] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

There is a new pull request by agausmann against master on the void-packages repository

https://github.com/agausmann/void-packages colmap-3.8
https://github.com/void-linux/void-packages/pull/42457

New package: colmap-3.8
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42457.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-colmap-3.8-42457.patch --]
[-- Type: text/x-diff, Size: 3677 bytes --]

From 023c261902b18bb24472a54f3f0c6a514eacbde3 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Sat, 25 Feb 2023 20:31:53 -0600
Subject: [PATCH 1/2] New package: metis-5.1.0

---
 common/shlibs          |  1 +
 srcpkgs/metis-devel    |  1 +
 srcpkgs/metis/template | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/metis-devel
 create mode 100644 srcpkgs/metis/template

diff --git a/common/shlibs b/common/shlibs
index 538ff08ce5ff..d09bd41b1486 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -45,6 +45,7 @@ libBrokenLocale.so.1 glibc-2.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
 libmemusage.so glibc-2.36_1
+libmetis.so metis-5.1.0_1
 libSegFault.so glibc-2.36_1
 libpcprofile.so glibc-2.36_1
 libcidn.so.1 glibc-2.36_1
diff --git a/srcpkgs/metis-devel b/srcpkgs/metis-devel
new file mode 120000
index 000000000000..701b536397ed
--- /dev/null
+++ b/srcpkgs/metis-devel
@@ -0,0 +1 @@
+metis
\ No newline at end of file
diff --git a/srcpkgs/metis/template b/srcpkgs/metis/template
new file mode 100644
index 000000000000..67befc58ad45
--- /dev/null
+++ b/srcpkgs/metis/template
@@ -0,0 +1,24 @@
+# Template file for 'metis'
+pkgname=metis
+version=5.1.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="cmake"
+short_desc="Serial Graph Partitioning and Fill-reducing Matrix Ordering"
+maintainer="Adam Gausmann <adam@gaussian.dev>"
+license="Apache-2.0"
+homepage="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
+distfiles="http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz"
+checksum=76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2
+
+do_configure() {
+	make config shared=1 prefix="/usr"
+}
+
+metis-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From f3567bb75c38f371c7f1198acabc43a2853f2603 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Sat, 25 Feb 2023 20:32:08 -0600
Subject: [PATCH 2/2] New package: colmap-3.8

---
 srcpkgs/colmap-devel    |  1 +
 srcpkgs/colmap/template | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/colmap-devel
 create mode 100644 srcpkgs/colmap/template

diff --git a/srcpkgs/colmap-devel b/srcpkgs/colmap-devel
new file mode 120000
index 000000000000..3cbc82bbee21
--- /dev/null
+++ b/srcpkgs/colmap-devel
@@ -0,0 +1 @@
+colmap
\ No newline at end of file
diff --git a/srcpkgs/colmap/template b/srcpkgs/colmap/template
new file mode 100644
index 000000000000..81b24895279f
--- /dev/null
+++ b/srcpkgs/colmap/template
@@ -0,0 +1,26 @@
+# Template file for 'colmap'
+pkgname=colmap
+version=3.8
+revision=1
+build_style=cmake
+makedepends="boost-devel eigen flann-devel freeimage-devel metis-devel \
+	glog-devel gflags-devel sqlite-devel glew-devel qt5-devel cgal-devel \
+	ceres-solver-devel liblz4-devel"
+short_desc="Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline"
+maintainer="Adam Gausmann <adam@gaussian.dev>"
+license="GPL-3.0-or-later"
+homepage="https://demuc.de/colmap/"
+changelog="https://github.com/colmap/colmap/raw/master/CHANGELOG.txt"
+distfiles="https://github.com/colmap/colmap/archive/refs/tags/${version}.tar.gz"
+checksum=02288f8f61692fe38049d65608ed832b31246e7792692376afb712fa4cef8775
+
+colmap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/colmap/*.a"
+		vmove "usr/share/colmap/*.cmake"
+		vmove "usr/share/colmap/cmake"
+	}
+}

Re: [PR REVIEW] New package: colmap-3.8

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013235

Comment:
why not just use the cmake build style?

Re: [PR REVIEW] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New review comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013292

Comment:
While still overriding `do_configure()`? If that's okay, then sure.

Re: [PR REVIEW] New package: colmap-3.8

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 349 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013298

Comment:
```suggestion
makedepends="boost-devel eigen flann-devel freeimage-devel metis-devel
 glog-devel gflags-devel sqlite-devel glew-devel qt5-devel cgal-devel
 ceres-solver-devel liblz4-devel"
```

Re: [PR REVIEW] New package: colmap-3.8

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013309

Comment:
```suggestion
homepage="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
changelog="http://glaros.dtc.umn.edu/gkhome/metis/metis/changes"
```

Re: [PR REVIEW] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New review comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013292

Comment:
Even though this has a custom `do_configure()`? If that's okay, then sure.

Re: [PR REVIEW] New package: colmap-3.8

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013467

Comment:
you shouldn't need to touch their weird makefile -- it runs cmake internally

Re: [PR REVIEW] New package: colmap-3.8

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013522

Comment:
not correct: https://github.com/colmap/colmap/blob/dev/COPYING.txt

Re: [PR REVIEW] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New review comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118013663

Comment:
Oops, missed that field

Re: [PR PATCH] [Updated] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]

There is an updated pull request by agausmann against master on the void-packages repository

https://github.com/agausmann/void-packages colmap-3.8
https://github.com/void-linux/void-packages/pull/42457

New package: colmap-3.8
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42457.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-colmap-3.8-42457.patch --]
[-- Type: text/x-diff, Size: 3639 bytes --]

From 518a4a04b63ca17636ab2176aa1740109abd2dc1 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Sat, 25 Feb 2023 20:31:53 -0600
Subject: [PATCH 1/2] New package: metis-5.1.0

---
 common/shlibs          |  1 +
 srcpkgs/metis-devel    |  1 +
 srcpkgs/metis/template | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 120000 srcpkgs/metis-devel
 create mode 100644 srcpkgs/metis/template

diff --git a/common/shlibs b/common/shlibs
index 538ff08ce5ff..d09bd41b1486 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -45,6 +45,7 @@ libBrokenLocale.so.1 glibc-2.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
 libmemusage.so glibc-2.36_1
+libmetis.so metis-5.1.0_1
 libSegFault.so glibc-2.36_1
 libpcprofile.so glibc-2.36_1
 libcidn.so.1 glibc-2.36_1
diff --git a/srcpkgs/metis-devel b/srcpkgs/metis-devel
new file mode 120000
index 000000000000..701b536397ed
--- /dev/null
+++ b/srcpkgs/metis-devel
@@ -0,0 +1 @@
+metis
\ No newline at end of file
diff --git a/srcpkgs/metis/template b/srcpkgs/metis/template
new file mode 100644
index 000000000000..364cf93a56bc
--- /dev/null
+++ b/srcpkgs/metis/template
@@ -0,0 +1,20 @@
+# Template file for 'metis'
+pkgname=metis
+version=5.1.0
+revision=1
+build_style=cmake
+short_desc="Serial Graph Partitioning and Fill-reducing Matrix Ordering"
+maintainer="Adam Gausmann <adam@gaussian.dev>"
+license="Apache-2.0"
+homepage="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
+changelog="http://glaros.dtc.umn.edu/gkhome/metis/metis/changes"
+distfiles="http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz"
+checksum=76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2
+
+metis-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From 17d43b54cb0d7128eab0885050bb7f68b4a3d05a Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Sat, 25 Feb 2023 20:32:08 -0600
Subject: [PATCH 2/2] New package: colmap-3.8

---
 srcpkgs/colmap-devel    |  1 +
 srcpkgs/colmap/template | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/colmap-devel
 create mode 100644 srcpkgs/colmap/template

diff --git a/srcpkgs/colmap-devel b/srcpkgs/colmap-devel
new file mode 120000
index 000000000000..3cbc82bbee21
--- /dev/null
+++ b/srcpkgs/colmap-devel
@@ -0,0 +1 @@
+colmap
\ No newline at end of file
diff --git a/srcpkgs/colmap/template b/srcpkgs/colmap/template
new file mode 100644
index 000000000000..2233b273de75
--- /dev/null
+++ b/srcpkgs/colmap/template
@@ -0,0 +1,26 @@
+# Template file for 'colmap'
+pkgname=colmap
+version=3.8
+revision=1
+build_style=cmake
+makedepends="boost-devel eigen flann-devel freeimage-devel metis-devel
+ glog-devel gflags-devel sqlite-devel glew-devel qt5-devel cgal-devel
+ ceres-solver-devel liblz4-devel"
+short_desc="Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline"
+maintainer="Adam Gausmann <adam@gaussian.dev>"
+license="BSD-3-Clause"
+homepage="https://demuc.de/colmap/"
+changelog="https://github.com/colmap/colmap/raw/master/CHANGELOG.txt"
+distfiles="https://github.com/colmap/colmap/archive/refs/tags/${version}.tar.gz"
+checksum=02288f8f61692fe38049d65608ed832b31246e7792692376afb712fa4cef8775
+
+colmap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/colmap/*.a"
+		vmove "usr/share/colmap/*.cmake"
+		vmove "usr/share/colmap/cmake"
+	}
+}

Re: [PR PATCH] [Updated] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]

There is an updated pull request by agausmann against master on the void-packages repository

https://github.com/agausmann/void-packages colmap-3.8
https://github.com/void-linux/void-packages/pull/42457

New package: colmap-3.8
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42457.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-colmap-3.8-42457.patch --]
[-- Type: text/x-diff, Size: 3772 bytes --]

From 44f308a9e2b0873c1eb281f3371ee2ce50f5dd7e Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Sat, 25 Feb 2023 20:31:53 -0600
Subject: [PATCH 1/2] New package: metis-5.1.0

---
 common/shlibs          |  1 +
 srcpkgs/metis-devel    |  1 +
 srcpkgs/metis/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/metis-devel
 create mode 100644 srcpkgs/metis/template

diff --git a/common/shlibs b/common/shlibs
index 538ff08ce5ff..d09bd41b1486 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -45,6 +45,7 @@ libBrokenLocale.so.1 glibc-2.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
 libmemusage.so glibc-2.36_1
+libmetis.so metis-5.1.0_1
 libSegFault.so glibc-2.36_1
 libpcprofile.so glibc-2.36_1
 libcidn.so.1 glibc-2.36_1
diff --git a/srcpkgs/metis-devel b/srcpkgs/metis-devel
new file mode 120000
index 000000000000..701b536397ed
--- /dev/null
+++ b/srcpkgs/metis-devel
@@ -0,0 +1 @@
+metis
\ No newline at end of file
diff --git a/srcpkgs/metis/template b/srcpkgs/metis/template
new file mode 100644
index 000000000000..61655b490258
--- /dev/null
+++ b/srcpkgs/metis/template
@@ -0,0 +1,21 @@
+# Template file for 'metis'
+pkgname=metis
+version=5.1.0
+revision=1
+build_style=cmake
+configure_args="-DSHARED=1 -DGKLIB_PATH=${XBPS_BUILDDIR}/metis-${version}/GKlib"
+short_desc="Serial Graph Partitioning and Fill-reducing Matrix Ordering"
+maintainer="Adam Gausmann <adam@gaussian.dev>"
+license="Apache-2.0"
+homepage="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
+changelog="http://glaros.dtc.umn.edu/gkhome/metis/metis/changes"
+distfiles="http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz"
+checksum=76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2
+
+metis-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From 17ff19446a965e33ec719075f3a7a0f995047588 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Sat, 25 Feb 2023 20:32:08 -0600
Subject: [PATCH 2/2] New package: colmap-3.8

---
 srcpkgs/colmap-devel    |  1 +
 srcpkgs/colmap/template | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/colmap-devel
 create mode 100644 srcpkgs/colmap/template

diff --git a/srcpkgs/colmap-devel b/srcpkgs/colmap-devel
new file mode 120000
index 000000000000..3cbc82bbee21
--- /dev/null
+++ b/srcpkgs/colmap-devel
@@ -0,0 +1 @@
+colmap
\ No newline at end of file
diff --git a/srcpkgs/colmap/template b/srcpkgs/colmap/template
new file mode 100644
index 000000000000..d9e14369955f
--- /dev/null
+++ b/srcpkgs/colmap/template
@@ -0,0 +1,30 @@
+# Template file for 'colmap'
+pkgname=colmap
+version=3.8
+revision=1
+build_style=cmake
+makedepends="boost-devel eigen flann-devel freeimage-devel metis-devel
+ glog-devel gflags-devel sqlite-devel glew-devel qt5-devel cgal-devel
+ ceres-solver-devel liblz4-devel"
+short_desc="Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline"
+maintainer="Adam Gausmann <adam@gaussian.dev>"
+license="BSD-3-Clause"
+homepage="https://demuc.de/colmap/"
+changelog="https://github.com/colmap/colmap/raw/master/CHANGELOG.txt"
+distfiles="https://github.com/colmap/colmap/archive/refs/tags/${version}.tar.gz"
+checksum=02288f8f61692fe38049d65608ed832b31246e7792692376afb712fa4cef8775
+
+post_install() {
+	vlicense COPYING.txt
+}
+
+colmap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/colmap/*.a"
+		vmove "usr/share/colmap/*.cmake"
+		vmove "usr/share/colmap/cmake"
+	}
+}

Re: [PR REVIEW] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

New review comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118022766

Comment:
The makefile does do one thing - resolve the absolute path the the `GKlib` folder.
Could have been done within CMake, but doing it ourselves isn't too bad.

Re: [PR REVIEW] New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

New review comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#discussion_r1118022766

Comment:
The makefile does do one important thing - resolve the absolute path the the `GKlib` folder. If that isn't passed to CMake, then I get configure errors.
Could have been done within CMake, but doing it ourselves isn't too bad.

Re: New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/42457#issuecomment-1493177519

Comment:
Closing since I am no longer using it and don't want to maintain it. If somebody else wants to pick this up, feel free.

Re: [PR PATCH] [Closed]: New package: colmap-3.8

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

There's a closed pull request on the void-packages repository

New package: colmap-3.8
https://github.com/void-linux/void-packages/pull/42457

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->