Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ports/pcl/Workaround-ICE-in-release.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
index 49e52b4..a9578bd 100644
--- a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
+++ b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
@@ -666,6 +666,7 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const
return m_active_id_count;
}

+#pragma optimize("", off)
struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
{
struct SN_ELEMENT* e=0;
@@ -717,6 +718,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
}
return e;
}
+#pragma optimize("", on)

struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::LastElement() const
{
1 change: 1 addition & 0 deletions ports/pcl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ vcpkg_from_github(
fix-find-libusb.patch
install-examples.patch
no-absolute.patch
Workaround-ICE-in-release.patch
)

file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake"
Expand Down
2 changes: 1 addition & 1 deletion ports/pcl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pcl",
"version": "1.12.0",
"port-version": 5,
"port-version": 6,
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
"homepage": "https://github.com/PointCloudLibrary/pcl",
"license": "BSD-3-Clause",
Expand Down
20 changes: 20 additions & 0 deletions ports/soil2/Workaround-ICE-in-release.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/src/SOIL2/SOIL2.c b/src/SOIL2/SOIL2.c
index 3a10885..01bbb23 100644
--- a/src/SOIL2/SOIL2.c
+++ b/src/SOIL2/SOIL2.c
@@ -2027,6 +2027,7 @@ const char*
return result_string_pointer;
}

+#pragma optimize("", off)
unsigned int SOIL_direct_load_DDS_from_memory(
const unsigned char *const buffer,
int buffer_length,
@@ -2409,6 +2410,7 @@ unsigned int SOIL_direct_load_DDS_from_memory(
quick_exit:
return tex_ID;
}
+#pragma optimize("", on)

unsigned int SOIL_direct_load_DDS(
const char *filename,
18 changes: 9 additions & 9 deletions ports/soil2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ vcpkg_from_github(
REF 51023d551d895fb4beb576d726d798ccfe358d34
SHA512 5ce8b3f04eea674cdef7ee58778e81bcefa5df7afb1013ad28dcd2d502e26915529da8bf06b751b8c350165172866e4f99d4b1081bb6c7ba04ac83a78faba83c
HEAD_REF master
PATCHES Workaround-ICE-in-release.patch
)

file(
COPY
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/LICENSE
${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in
DESTINATION ${SOURCE_PATH}
"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
"${CMAKE_CURRENT_LIST_DIR}/LICENSE"
"${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in"
DESTINATION "${SOURCE_PATH}"
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
)

vcpkg_install_cmake()
vcpkg_cmake_install()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
10 changes: 9 additions & 1 deletion ports/soil2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"name": "soil2",
"version-date": "2021-05-01",
"port-version": 1,
"description": "Simple OpenGL Image Library 2",
"homepage": "https://github.com/SpartanJ/SOIL2"
"homepage": "https://github.com/SpartanJ/SOIL2",
"license": "MIT-0",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5254,7 +5254,7 @@
},
"pcl": {
"baseline": "1.12.0",
"port-version": 5
"port-version": 6
},
"pcre": {
"baseline": "8.45",
Expand Down Expand Up @@ -6506,7 +6506,7 @@
},
"soil2": {
"baseline": "2021-05-01",
"port-version": 0
"port-version": 1
},
"sokol": {
"baseline": "2019-09-09",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pcl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "af82798f0369372866e38d58f1e38a1165801c1d",
"version": "1.12.0",
"port-version": 6
},
{
"git-tree": "5e5ebb57bf0a08e7eab28fe3571ebaa55c3d4ba8",
"version": "1.12.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/soil2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287",
"version-date": "2021-05-01",
"port-version": 1
},
{
"git-tree": "e72741e77acc80b5d72a64ce396f6a713548e3a1",
"version-date": "2021-05-01",
Expand Down