Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Omri/rendering model generalization #38

Merged
merged 9 commits into from
Sep 19, 2023

Conversation

omri-polycam
Copy link

No description provided.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff
diff --git a/ports/filament/vcpkg.json b/ports/filament/vcpkg.json
index b130f99d..7e690aad 100644
--- a/ports/filament/vcpkg.json
+++ b/ports/filament/vcpkg.json
@@ -5,11 +5,14 @@
   "homepage": "https://github.com/Polycam/filament",
   "license": "Apache-2.0",
   "dependencies": [
-    "zlib",
-    "libpng",
+    "assimp",
     "draco",
+    {
+      "name": "filament",
+      "host": true
+    },
+    "libpng",
     "stb",
-    "assimp",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -18,9 +21,6 @@
       "name": "vcpkg-cmake-config",
       "host": true
     },
-    {
-      "name": "filament",
-      "host": true
-    }
+    "zlib"
   ]
 }
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
deleted file mode 100644
index ce04fe43..00000000
--- a/ports/fmt/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: fmt
-Version: 6.2.1
-Homepage: https://github.com/fmtlib/fmt
-Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
diff --git a/ports/open3d/vcpkg.json b/ports/open3d/vcpkg.json
index 37e54263..2c863748 100644
--- a/ports/open3d/vcpkg.json
+++ b/ports/open3d/vcpkg.json
@@ -4,15 +4,15 @@
   "description": "Open3D: A Modern Library for 3D Data Processing",
   "homepage": "https://github.com/polycam/open3d",
   "dependencies": [
-    "libpng",
-    "tinygltf",
     "eigen3",
     "fmt",
     "jsoncpp",
+    "libpng",
+    "lz4",
     "qhull",
     "rply",
+    "tinygltf",
     "tinyobjloader",
-    "lz4",
     {
       "name": "vcpkg-cmake",
       "host": true
PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for tinygltf have changed but the version was not updated
version: 2.5.0
old SHA: 68e4d0aabd2073861e4add08af282c0eff858a1e
new SHA: e5056626f128ef6521fbd5e59e41fb27638cc33f
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for assimp have changed but the version was not updated
version: 5.2.5
old SHA: bdd963b2ef327bf5e8533689aff4707226e22851
new SHA: e999e960280ebd4a6322ef6abd4b273db2f0570a
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for tinyobjloader have changed but the version was not updated
version: 2.0.0-rc9
old SHA: c1e6a1c3ddc75a72ea801b5d0980a73e14358e5e
new SHA: b62d28cf3e06621d95316616562615e30d05c5a7
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for brotli have changed but the version was not updated
version: 1.0.9#3
old SHA: 7b182b3e0615d6f3538b5eeac680f7eb8af5abd0
new SHA: 16117880939f5e3fc09eba0f8d8702b6b8b1e3ce
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for lunasvg have changed but the version was not updated
version: 2.3.1
old SHA: bf20380ca537151f7d1e02a6ca5b19c302db18c7
new SHA: 4b372a79465322856a24c31e4d1e75de8bc6a991
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for stb have changed but the version was not updated
version: 2021-09-10#1
old SHA: 9ebadca0be90431f35a8d20b44f40b07285eb33d
new SHA: 24affdde8258cef209f123be993b9de6aa2f91db
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for openexr have changed but the version was not updated
version: 2.5.8#1
old SHA: 447c9eae823d9570dfc549995efba4f623ddaae2
new SHA: e8e07882aaff017bed473719e543bf125959da79
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
warning: there are uncommitted changes for fmt
error: checked-in files for fmt have changed but the version was not updated
version: 6.2.1
old SHA: dc405c40eb48c9be904aa93bdab522d135a9fc2b
new SHA: 4a24ade01976e70f560e9e17d2e35d548baa7b5c
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 4039e5ef23af11fda4ab02f637a3fa4735b0aa0e -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 22bc60e5..6471ed1a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2001,7 +2001,7 @@
       "port-version": 0
     },
     "draco": {
-      "baseline": "1.5.2",
+      "baseline": "1.5.3",
       "port-version": 0
     },
     "drlibs": {
@@ -2296,6 +2296,10 @@
       "baseline": "2019-12-19",
       "port-version": 2
     },
+    "filament": {
+      "baseline": "1.29.0",
+      "port-version": 0
+    },
     "fixed-string": {
       "baseline": "0.1.1",
       "port-version": 0
@@ -2361,7 +2365,7 @@
       "port-version": 4
     },
     "fmt": {
-      "baseline": "9.0.0",
+      "baseline": "6.2.1",
       "port-version": 0
     },
     "folly": {
@@ -5276,6 +5280,10 @@
       "baseline": "2021-11-23",
       "port-version": 0
     },
+    "open3d": {
+      "baseline": "0.16",
+      "port-version": 0
+    },
     "open62541": {
       "baseline": "1.2.3",
       "port-version": 1
@@ -5902,7 +5910,7 @@
     },
     "qhull": {
       "baseline": "8.0.2",
-      "port-version": 3
+      "port-version": 4
     },
     "qnnpack": {
       "baseline": "2021-02-26",
@@ -7525,8 +7533,8 @@
       "port-version": 1
     },
     "usd": {
-      "baseline": "20.08",
-      "port-version": 2
+      "baseline": "23.5",
+      "port-version": 3
     },
     "usockets": {
       "baseline": "0.8.1",
diff --git a/versions/d-/draco.json b/versions/d-/draco.json
index 3c06f246..2fd7b9fd 100644
--- a/versions/d-/draco.json
+++ b/versions/d-/draco.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4007906657d8c05ef8b9bb3f30f2e0218a802d80",
+      "version": "1.5.3",
+      "port-version": 0
+    },
     {
       "git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1",
       "version": "1.5.2",
diff --git a/versions/q-/qhull.json b/versions/q-/qhull.json
index 69b98685..cb450e79 100644
--- a/versions/q-/qhull.json
+++ b/versions/q-/qhull.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1cfdbe28c32936c2ac6c9fb8d269f81c2a96415f",
+      "version": "8.0.2",
+      "port-version": 4
+    },
     {
       "git-tree": "afe7d7f235d72db1da52a99ebe085cafd21577b3",
       "version": "8.0.2",
diff --git a/versions/u-/usd.json b/versions/u-/usd.json
index f32c455a..5ada95bc 100644
--- a/versions/u-/usd.json
+++ b/versions/u-/usd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5bc137eb0716468fe0289c98f63ee31a64dd1789",
+      "version": "23.5",
+      "port-version": 3
+    },
     {
       "git-tree": "177f2af7397316cc1fa92a72ea8992f6acca8dfb",
       "version-string": "20.08",

@omri-polycam omri-polycam merged commit e2f79de into master Sep 19, 2023
1 check passed
@bjovanovic84 bjovanovic84 deleted the omri/rendering-model-generalization branch September 10, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant