aboutsummaryrefslogtreecommitdiff
path: root/ports/nvtt
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-10-24 22:36:53 -0700
committerGitHub <noreply@github.com>2020-10-24 22:36:53 -0700
commitb97849d25804ca06125f6d311c7139df1339b84c (patch)
tree11c0fca83f90f035d2a348ef3ca04857712f1fa0 /ports/nvtt
parent2f731d650f4b5810fede35adda304807daa034df (diff)
downloadvcpkg-b97849d25804ca06125f6d311c7139df1339b84c.tar.gz
vcpkg-b97849d25804ca06125f6d311c7139df1339b84c.zip
[Many Ports] Baseline Fixes for 2020-10-24 CI Build (#14208)
* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6. In a recent CI build, we started getting output like: Installing package libp7-baical[core]:x86-windows... The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows Installed by libp7client:x86-windows bin/P7x32.dll bin/P7x32.pdb debug/bin/P7x32d.dll debug/bin/P7x32d.pdb include/P7/GTypes.h include/P7/P7_Client.h include/P7/P7_Cproxy.h include/P7/P7_Extensions.h include/P7/P7_Telemetry.h include/P7/P7_Trace.h It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version. * [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure. * Fix several "passing: remove from fail list." * [akali] Disable parallel configure. REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt. Attempts to fix: CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp CMake Error: : System Error: Permission denied CMake Error at CMakeLists.txt:20 (configure_file): configure_file Problem configuring file * [nvtt] Devendor libsquish This was regressed by https://github.com/microsoft/vcpkg/pull/13674 REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt. Installing package nvtt[core]:x64-linux... The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux Installed by libsquish:x64-linux debug/lib/libsquishd.a include/squish.h lib/libsquish.a * [knet] Disable parallel configure. REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at src/CMakeLists.txt:1 (configure_file): configure_file Problem configuring file * [libnice] Diable parallel configure. REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at CMakeLists.txt:13 (configure_file): configure_file Problem configuring file
Diffstat (limited to 'ports/nvtt')
-rw-r--r--ports/nvtt/CONTROL2
-rw-r--r--ports/nvtt/portfile.cmake3
-rw-r--r--ports/nvtt/skip-building-libsquish.patch13
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/nvtt/CONTROL b/ports/nvtt/CONTROL
index aaa388269..4e2332dad 100644
--- a/ports/nvtt/CONTROL
+++ b/ports/nvtt/CONTROL
@@ -1,5 +1,7 @@
Source: nvtt
Version: 2.1.2
+Port-Version: 1
Homepage: https://github.com/castano/nvidia-texture-tools
Description: Texture processing tools with support for Direct3D 10 and 11 formats.
Supports: !x86
+Build-Depends: libsquish
diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake
index 46ea7f9b8..f235be2d0 100644
--- a/ports/nvtt/portfile.cmake
+++ b/ports/nvtt/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
squish.patch
fix-build-error.patch
add-compile-options-for-osx.patch
+ skip-building-libsquish.patch
)
vcpkg_configure_cmake(
@@ -38,4 +39,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(REMOVE ${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/nvtt/skip-building-libsquish.patch b/ports/nvtt/skip-building-libsquish.patch
new file mode 100644
index 000000000..dba065d1f
--- /dev/null
+++ b/ports/nvtt/skip-building-libsquish.patch
@@ -0,0 +1,13 @@
+diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
+index 911c19e..6f13de4 100644
+--- a/extern/CMakeLists.txt
++++ b/extern/CMakeLists.txt
+@@ -5,7 +5,6 @@ ADD_SUBDIRECTORY(EtcLib)
+ ADD_SUBDIRECTORY(rg_etc1_v104)
+ #ADD_SUBDIRECTORY(etcpack)
+
+-ADD_SUBDIRECTORY(libsquish-1.15)
++#ADD_SUBDIRECTORY(libsquish-1.15)
+
+ ADD_SUBDIRECTORY(CMP_Core)
+-