[vxl] Fix conflict with Intel libvpl (#51516)

Co-authored-by: Copilot <copilot@github.com>

ports/vxl/devendor-and-conflicts.diff

@@ -1,8 +1,8 @@
 diff --git a/config/cmake/Modules/FindGEOTIFF.cmake b/config/cmake/Modules/FindGEOTIFF.cmake
-index bcc8fc5..ed9420e 100644
+index 2f5d9d0..33c6f7b 100644
 --- a/config/cmake/Modules/FindGEOTIFF.cmake
 +++ b/config/cmake/Modules/FindGEOTIFF.cmake
-@@ -18,7 +18,7 @@ if (${VXL_USE_GEOTIFF})
+@@ -18,7 +18,7 @@ if ( VXL_USE_GEOTIFF )
  
      # If this FORCE variable is unset or is FALSE, try to find a native library.
      if( NOT VXL_FORCE_V3P_GEOTIFF )
@@ -11,6 +11,19 @@ index bcc8fc5..ed9420e 100644
        if( GEOTIFF_FOUND )
          set(VXL_USING_NATIVE_GEOTIFF "YES")
        endif()
+diff --git a/config/cmake/Modules/FindOpenJPEG2.cmake b/config/cmake/Modules/FindOpenJPEG2.cmake
+index c76bc44..41dc198 100644
+--- a/config/cmake/Modules/FindOpenJPEG2.cmake
++++ b/config/cmake/Modules/FindOpenJPEG2.cmake
+@@ -62,6 +62,8 @@ set(OPENJPEG2_DEFINITIONS "")
+ 
+ if(OPENJPEG2_FOUND)
+   set(VXL_USING_NATIVE_OPENJPEG2 "YES")
++elseif(NOT ENABLE_OPENJPEG)
++  set(VXL_USING_NATIVE_OPENJPEG2 "YES")  # to disable internal lib, too
+ else()
+   if( EXISTS ${VXL_ROOT_SOURCE_DIR}/v3p/openjpeg2/openjpeg.h)
+     set(OPENJPEG2_FOUND TRUE)
 diff --git a/config/cmake/Modules/VXLConfig_export.cmake.in b/config/cmake/Modules/VXLConfig_export.cmake.in
 index 86bb564..c69b7d8 100644
 --- a/config/cmake/Modules/VXLConfig_export.cmake.in
@@ -39,8 +52,20 @@ index 9ff64f8..10c986a 100644
  
  namespace {
    //: Creates a Clipper polygon from a vgl_polygon.
+diff --git a/core/vpl/CMakeLists.txt b/core/vpl/CMakeLists.txt
+index f69d3e7..5f84776 100644
+--- a/core/vpl/CMakeLists.txt
++++ b/core/vpl/CMakeLists.txt
+@@ -26,6 +26,7 @@ set_vxl_library_properties(
+      USE_HIDDEN_VISIBILITY
+ )
+ 
++set_target_properties(${VXL_LIB_PREFIX}vpl PROPERTIES OUTPUT_NAME vxl_vpl) # avoid conflict with Intel libvpl
+ target_link_libraries( ${VXL_LIB_PREFIX}vpl ${VXL_LIB_PREFIX}vcl )
+ if(NOT UNIX)
+   target_link_libraries( ${VXL_LIB_PREFIX}vpl ws2_32 ${VXL_LIB_PREFIX}vcl )
 diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index 251ef9a..78a84fc 100644
+index 251ef9a..266cc5b 100644
 --- a/v3p/CMakeLists.txt
 +++ b/v3p/CMakeLists.txt
 @@ -48,6 +48,9 @@ CMAKE_DEPENDENT_OPTION( VXL_FORCE_V3P_RPLY "Use V3P instead of any native RPLY l
@@ -53,3 +78,15 @@ index 251ef9a..78a84fc 100644
    include(${VXL_CMAKE_DIR}/FindZLIB.cmake)
    if (VXL_FORCE_V3P_ZLIB OR ( NOT VXL_USING_NATIVE_ZLIB ) AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib)
      add_subdirectory(zlib)
+diff --git a/v3p/openjpeg2/CMakeLists.txt b/v3p/openjpeg2/CMakeLists.txt
+index e65a03b..910c56d 100644
+--- a/v3p/openjpeg2/CMakeLists.txt
++++ b/v3p/openjpeg2/CMakeLists.txt
+@@ -53,6 +53,7 @@ if(VXL_MATH_LIBRARY_FOUND)
+ endif()
+ mark_as_advanced(VXL_MATH_LIBRARY_FOUND)
+ set_target_properties(openjpeg2 PROPERTIES
++  OUTPUT_NAME   vxl_openjpeg
+   VERSION       2.0.0
+   DEFINE_SYMBOL OPJ_EXPORTS)
+ endif()

ports/vxl/openjpeg.diff

@@ -1,25 +0,0 @@
-diff --git a/config/cmake/Modules/FindOpenJPEG2.cmake b/config/cmake/Modules/FindOpenJPEG2.cmake
-index c76bc44..41dc198 100644
---- a/config/cmake/Modules/FindOpenJPEG2.cmake
-+++ b/config/cmake/Modules/FindOpenJPEG2.cmake
-@@ -62,6 +62,8 @@ set(OPENJPEG2_DEFINITIONS "")
- 
- if(OPENJPEG2_FOUND)
-   set(VXL_USING_NATIVE_OPENJPEG2 "YES")
-+elseif(NOT ENABLE_OPENJPEG)
-+  set(VXL_USING_NATIVE_OPENJPEG2 "YES")  # to disable internal lib, too
- else()
-   if( EXISTS ${VXL_ROOT_SOURCE_DIR}/v3p/openjpeg2/openjpeg.h)
-     set(OPENJPEG2_FOUND TRUE)
-diff --git a/v3p/openjpeg2/CMakeLists.txt b/v3p/openjpeg2/CMakeLists.txt
-index 67b184e..354180b 100644
---- a/v3p/openjpeg2/CMakeLists.txt
-+++ b/v3p/openjpeg2/CMakeLists.txt
-@@ -49,6 +49,7 @@ if(VXL_MATH_LIBRARY_FOUND)
- endif()
- mark_as_advanced(VXL_MATH_LIBRARY_FOUND)
- set_target_properties(openjpeg2 PROPERTIES
-+  OUTPUT_NAME   vxl_openjpeg
-   VERSION       2.0.0
-   DEFINE_SYMBOL OPJ_EXPORTS)
- endif()

ports/vxl/portfile.cmake

@@ -11,13 +11,13 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         cmake-package.diff
-        devendor.diff
+        devendor-and-conflicts.diff
         disable-tests.diff
-        file_formats.diff
+        file-formats.diff
         limits.diff
         mingw.diff
-        openjpeg.diff
 )
+
 file(GLOB_RECURSE vendored_sources "${SOURCE_PATH}/v3p/*.c" "${SOURCE_PATH}/v3p/*.cpp" "${SOURCE_PATH}/v3p/*.cxx")
 list(FILTER vendored_sources EXCLUDE REGEX "/(netlib|openjpeg2)/")
 file(REMOVE_RECURSE ${vendored_sources})

ports/vxl/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "vxl",
   "version": "3.5.0",
+  "port-version": 1,
   "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.",
   "homepage": "https://vxl.github.io/",
   "license": null,

versions/baseline.json

@@ -10702,7 +10702,7 @@
     },
     "vxl": {
       "baseline": "3.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "wabt": {
       "baseline": "1.0.40",

versions/v-/vxl.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5b43dcf6b229397702b1f790b3018085dc0268d4",
+      "version": "3.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "5678400bc3c92ba662f6678f51dc6ee1e1d6ece0",
       "version": "3.5.0",