Skip to content

[vxl] Update to 3.5.0 #41518

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.

Sign up for GitHub

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

Merged
data-queue merged 2 commits into from
Oct 15, 2024
Merged

[vxl] Update to 3.5.0 #41518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84671ce
[vxl] Update to 3.5.0
dg0yt Oct 12, 2024
9a38acd
[vcpkg-ci-vxl] Fixup
dg0yt Oct 13, 2024
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
19 changes: 16 additions & 3 deletions ports/vxl/file_formats.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 3483f9c..5040676 100644
index 88daf27..a47c183 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -60,6 +60,10 @@ if(VXL_BUILD_CORE_IMAGING)
Expand All @@ -13,11 +13,24 @@ index 3483f9c..5040676 100644
endif()


diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
index 9ec767a..fda53dc 100644
--- a/core/vpgl/algo/CMakeLists.txt
+++ b/core/vpgl/algo/CMakeLists.txt
@@ -32,7 +32,7 @@ set( vpgl_algo_sources
vpgl_equi_rectification.h vpgl_equi_rectification.cxx
)
include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
-if(TIFF_FOUND)
+if(VXL_BUILD_CORE_IMAGING)
include_directories(${TIFF_INCLUDE_DIR})
include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
if(GEOTIFF_FOUND)
diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
index cd33c8e..e2501d3 100644
index d23a2f2..6c933f0 100644
--- a/core/vpgl/file_formats/CMakeLists.txt
+++ b/core/vpgl/file_formats/CMakeLists.txt
@@ -8,7 +8,7 @@ set( vpgl_file_formats_sources
@@ -9,7 +9,7 @@ set( vpgl_file_formats_sources
)

include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
Expand Down
60 changes: 0 additions & 60 deletions ports/vxl/int_64.diff
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions ports/vxl/mingw.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/core/vul/vul_temp_filename.cxx b/core/vul/vul_temp_filename.cxx
index 87649e8..1fb263a 100644
index 4921a04..731fee0 100644
--- a/core/vul/vul_temp_filename.cxx
+++ b/core/vul/vul_temp_filename.cxx
@@ -11,7 +11,7 @@

#if defined (_MSC_VER) || defined(__MINGW32__)
#if defined(_MSC_VER) || defined(__MINGW32__)

-# include <Windows.h>
+# include <windows.h>
-# include <Windows.h>
+# include <windows.h>
#else
#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
// Helper functions for Unix
# if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
// Helper functions for Unix
13 changes: 0 additions & 13 deletions ports/vxl/omit-broken-install.diff
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions ports/vxl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vxl/vxl
REF dac1c7ed8e183e9c6de8b928c8b0294a7bd1d8ee # v2.0.2
SHA512 4c6f6dcd793a50cbbc9c7f61c561ed4a747ded67e3dceb09792998c0f0d4294445a441fed668d59297560f196274b1c25593ce67b0aa7597cbb773328e8612c0
REF v${VERSION}
SHA512 0b33e12557315058e7786c2049af3b01f1208e50660ccbc45f4d9a4dba4eeadfa5e3125380d8781eed2a9abf1d153ffb71c416ed2d196ab4194f5b3722fe6f2b
HEAD_REF master
PATCHES
cmake-package.diff
devendor.diff
disable-tests.diff
file_formats.diff
int_64.diff
limits.diff
mingw.diff
omit-broken-install.diff
openjpeg.diff
)
file(GLOB_RECURSE vendored_sources "${SOURCE_PATH}/v3p/*.c" "${SOURCE_PATH}/v3p/*.cpp" "${SOURCE_PATH}/v3p/*.cxx")
Expand Down
3 changes: 1 addition & 2 deletions ports/vxl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "vxl",
"version": "2.0.2",
"port-version": 7,
"version": "3.5.0",
"description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.",
"homepage": "https://vxl.github.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ vcpkg-ci-sqlpp11:x86-windows=pass
vcpkg-ci-vxl:arm-neon-android=pass
vcpkg-ci-vxl:arm64-android=pass
vcpkg-ci-vxl:arm64-windows=pass
vcpkg-ci-vxl:x64-android=fail
vcpkg-ci-vxl:x64-android=pass
Copy link
Contributor Author

@dg0yt dg0yt Oct 13, 2024

Choose a reason for hiding this comment

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

Fixes current vcpkg.ci regression (unexpected pass).

vcpkg-ci-vxl:x64-linux=pass
vcpkg-ci-vxl:x64-osx=pass
vcpkg-ci-vxl:x64-windows=pass
Expand Down
4 changes: 4 additions & 0 deletions scripts/test_ports/vcpkg-ci-vxl/project/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 3.7)
project(vnl-test CXX)

if(APPLE)
set(CMAKE_CXX_STANDARD "11")
endif()

find_package(VXL CONFIG REQUIRED)

# The use file doesn't only set variables,
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9485,8 +9485,8 @@
"port-version": 0
},
"vxl": {
"baseline": "2.0.2",
"port-version": 7
"baseline": "3.5.0",
"port-version": 0
},
"wabt": {
"baseline": "1.0.36",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vxl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5678400bc3c92ba662f6678f51dc6ee1e1d6ece0",
"version": "3.5.0",
"port-version": 0
},
{
"git-tree": "53a9a629f70fb7bb7e488b889b1608eac9d3411e",
"version": "2.0.2",
Expand Down