Skip to content

[KTX] Fixing port to properly patch zstd for platforms other than windows #24869

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
dan-shaw merged 10 commits into from
Jun 20, 2022
Merged

[KTX] Fixing port to properly patch zstd for platforms other than windows #24869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d1a15bb
Updating ktx zstd patch to work for non-windows platforms
Honeybunch May 22, 2022
6532c1b
Formatting
Honeybunch May 22, 2022
375d2f1
Updating version
Honeybunch May 23, 2022
fa475d1
Extra version nonsense
Honeybunch May 23, 2022
6093706
Private zstd
Honeybunch May 24, 2022
0f66fe9
Versioning
Honeybunch May 24, 2022
1b81537
Merge branch 'master' of https://github.com/microsoft/vcpkg into ktx-…
Honeybunch Jun 16, 2022
6a82bc2
Updating hash of ktx revision and tweaking mingw toolchain to find gc…
Honeybunch Jun 16, 2022
1708ecb
Updating version
Honeybunch Jun 16, 2022
06cb720
Removing change to mingw
Honeybunch Jun 16, 2022
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
15 changes: 7 additions & 8 deletions ports/ktx/0001-Use-vcpkg-zstd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ca40f8..84fcb18 100644
index f1d37cf7..9cf43c75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,7 +174,6 @@ set(KTX_MAIN_SRC
Expand All @@ -18,18 +18,17 @@ index 8ca40f8..84fcb18 100644

$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
$<INSTALL_INTERFACE:other_include>
@@ -361,6 +359,11 @@ macro(commom_lib_settings lib write)
@@ -370,6 +368,10 @@ macro(commom_lib_settings lib write)
target_compile_definitions(${lib} PUBLIC KTX_FEATURE_KTX2)
endif()

+ # Use vcpkg zstd
+ find_package(zstd CONFIG REQUIRED)
+ target_link_libraries(${lib} PRIVATE $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+
if(WIN32)
+ find_package(zstd CONFIG REQUIRED)
+ target_link_libraries(
+ ${lib} PRIVATE
+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
+ )
# By wrapping in generator expression we force multi configuration
# generators (like Visual Studio) to take the exact path and not
# change it.
diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt
index 492233a..8786d16 100644
--- a/lib/basisu/CMakeLists.txt
Expand Down
6 changes: 3 additions & 3 deletions ports/ktx/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
set(PORT_VERSION 4.1.0-rc1)
set(PORT_VERSION 4.1.0-rc2)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/KTX-Software
REF af6df0267b07bf5d4278837e5350f97bcbdcc870 #v${PORT_VERSION}
SHA512 00e5c37ec1922bae7903e3b51ac61e44d815bd606e12104c87b3c8d89e04b5d81f8d502712d8d6c9420aa21289c93c6ef01d0a4091062d03aae07b7fbfce5f74
REF b995ac337276648afc3a5beaa6206995d2399bce #v${PORT_VERSION}
SHA512 522272226b56dce496c739f2657992e4b3e972a16f04168becf574ae6d6b15c3dec428854a5b7fee2e8167ce110cc258744778abe4b8fb20eab69c742c78b13e
HEAD_REF master
FILE_DISAMBIGUATOR 1
PATCHES
Expand Down
4 changes: 2 additions & 2 deletions ports/ktx/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "ktx",
"version-semver": "4.1.0-rc1",
"version-semver": "4.1.0-rc2",
"description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them",
"homepage": "https://github.com/KhronosGroup/KTX-Software",
"license": "Apache-2.0",
"supports": "!(uwp | x86 | arm64)",
"supports": "!(uwp | x86 | (arm & !arm64))",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3329,7 +3329,7 @@
"port-version": 1
},
"ktx": {
"baseline": "4.1.0-rc1",
"baseline": "4.1.0-rc2",
"port-version": 0
},
"kubazip": {
Expand Down
5 changes: 5 additions & 0 deletions versions/k-/ktx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e8a49dcd008235323faeb7a266a0b04a8487a11c",
"version-semver": "4.1.0-rc2",
"port-version": 0
},
{
"git-tree": "70ff7e521be27f851d96a9d69016fe3c58abe74d",
"version-semver": "4.1.0-rc1",
Expand Down