mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[ptex] update to 2.5.0 (#48792)
This commit is contained in:
13
ports/ptex/fix-android.patch
Normal file
13
ports/ptex/fix-android.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/ptex/PtexWriter.cpp b/src/ptex/PtexWriter.cpp
|
||||
index 99df951..0032275 100644
|
||||
--- a/src/ptex/PtexWriter.cpp
|
||||
+++ b/src/ptex/PtexWriter.cpp
|
||||
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__ANDROID__)
|
||||
#include <unistd.h>
|
||||
#include <stddef.h>
|
||||
#endif
|
||||
@@ -1,18 +1,17 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 78f6531..b7ea30b 100644
|
||||
index 86c937a..99d2aa3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,7 +28,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
@@ -28,7 +28,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
include(GNUInstallDirs)
|
||||
|
||||
include(CTest)
|
||||
+if(0)
|
||||
enable_testing()
|
||||
+endif()
|
||||
-enable_testing()
|
||||
+# enable_testing()
|
||||
|
||||
# Setup platform-specific threading flags.
|
||||
find_package(Threads REQUIRED)
|
||||
@@ -113,9 +115,11 @@ endif ()
|
||||
@@ -113,9 +113,11 @@ endif ()
|
||||
include_directories(src/ptex)
|
||||
|
||||
add_subdirectory(src/ptex)
|
||||
@@ -22,16 +21,16 @@ index 78f6531..b7ea30b 100644
|
||||
if (PTEX_BUILD_DOCS)
|
||||
add_subdirectory(src/doc)
|
||||
endif ()
|
||||
+endif ()
|
||||
+endif()
|
||||
add_subdirectory(src/build)
|
||||
diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt
|
||||
index 4dfe372..4572dd5 100644
|
||||
index 3f238e0..7d6fccb 100644
|
||||
--- a/src/ptex/CMakeLists.txt
|
||||
+++ b/src/ptex/CMakeLists.txt
|
||||
@@ -40,7 +40,10 @@ if(PTEX_BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(Ptex_dynamic PRIVATE PTEX_EXPORTS)
|
||||
target_link_libraries(Ptex_dynamic
|
||||
PUBLIC Threads::Threads ZLIB::ZLIB)
|
||||
@@ -44,7 +44,10 @@ if(PTEX_BUILD_SHARED_LIBS)
|
||||
PUBLIC Threads::Threads
|
||||
PRIVATE libdeflate::libdeflate_shared
|
||||
)
|
||||
- install(TARGETS Ptex_dynamic EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+ install(TARGETS Ptex_dynamic EXPORT Ptex
|
||||
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
|
||||
|
||||
@@ -2,10 +2,11 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO wdas/ptex
|
||||
REF "v${VERSION}"
|
||||
SHA512 34fcaf1c4fe27cb4e66d66bb729137ef17ffeea2bc2d849f2f5f543b19acc250f425633142320ce797c2a086e04bc3e0870c94928ad45d94e34faee71af36890
|
||||
SHA512 8c9d1e2b26f74ea988f4df6f4a6b342a152a8068ff7f85eacdfbab9f516d2ab15282f16326e9527d0f842f4eb8e16858eb57c19b8bbee153f1ab074175571025
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-build.patch
|
||||
fix-android.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIB)
|
||||
@@ -15,6 +16,7 @@ vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DCMAKE_CXX_STANDARD=17
|
||||
"-DPTEX_VER=v${VERSION}"
|
||||
-DPTEX_BUILD_SHARED_LIBS=${BUILD_SHARED_LIB}
|
||||
-DPTEX_BUILD_STATIC_LIBS=${BUILD_STATIC_LIB}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "ptex",
|
||||
"version": "2.4.3",
|
||||
"port-version": 1,
|
||||
"version": "2.5.0",
|
||||
"description": "Per-Face Texture Mapping for Production Rendering.",
|
||||
"homepage": "https://github.com/wdas/ptex",
|
||||
"license": "BSD-3-Clause",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"libdeflate",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
@@ -14,7 +14,6 @@
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -7837,8 +7837,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"ptex": {
|
||||
"baseline": "2.4.3",
|
||||
"port-version": 1
|
||||
"baseline": "2.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"pthread": {
|
||||
"baseline": "3.0.0",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e6bc414dff812506314e6ae493a3a8043b6f8504",
|
||||
"version": "2.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "1e63d512185d2991ba49e4a3eb7c1472b8fbf02e",
|
||||
"version": "2.4.3",
|
||||
|
||||
Reference in New Issue
Block a user