From 721dbcc4b9792893199c13dc5bda78ec4d8a3203 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:06:25 +0800 Subject: [PATCH 01/10] Generate Imath.pc --- ports/imath/portfile.cmake | 1 + ports/imath/vcpkg.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake index 0c60c9daa5f874..3f4f34ad58c7c6 100644 --- a/ports/imath/portfile.cmake +++ b/ports/imath/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_cmake_configure( OPTIONS -DIMATH_INSTALL_SYM_LINK=OFF -DBUILD_TESTING=OFF + -DIMATH_INSTALL_PKG_CONFIG=ON ) vcpkg_cmake_install() diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json index 0973f840591bd2..85b1cb6915f3e7 100644 --- a/ports/imath/vcpkg.json +++ b/ports/imath/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imath", "version": "3.1.9", + "port-version": 1, "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", "license": "BSD-3-Clause", From 56fabcaa0ef8b54747f89598be3ebbd30fd3708b Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:07:06 +0800 Subject: [PATCH 02/10] update version --- versions/baseline.json | 2 +- versions/i-/imath.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a79b946fca4f2a..69222c91b2789a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3374,7 +3374,7 @@ }, "imath": { "baseline": "3.1.9", - "port-version": 0 + "port-version": 1 }, "imgui": { "baseline": "1.89.7", diff --git a/versions/i-/imath.json b/versions/i-/imath.json index ff451ccffac500..a04da5782798d0 100644 --- a/versions/i-/imath.json +++ b/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c02f0c550c3639178d554a27475f376c2fdcbc", + "version": "3.1.9", + "port-version": 1 + }, { "git-tree": "1853273c56448fff5ec5e2c9133895922df682bd", "version": "3.1.9", From 2ddb224ad13d26b14fa523998a13b9b1e994bf9c Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:08:39 +0800 Subject: [PATCH 03/10] add dependency imath minizip-ng --- ports/opencolorio/fix-pkgconfig.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencolorio/fix-pkgconfig.patch b/ports/opencolorio/fix-pkgconfig.patch index 7337952c8c12a2..976afe122c52e3 100644 --- a/ports/opencolorio/fix-pkgconfig.patch +++ b/ports/opencolorio/fix-pkgconfig.patch @@ -7,4 +7,4 @@ index f25c280..d9a450b 100644 Libs: -L${libdir} -l@PROJECT_NAME@ Cflags: -I${includedir} +Libs.private: -lpystring -+Requires.private: expat Imath yaml-cpp ++Requires.private: expat Imath yaml-cpp minizip-ng From c4906863801b82b424b0499437d522780c72de30 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:09:18 +0800 Subject: [PATCH 04/10] updata version --- versions/o-/opencolorio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 4d749dfe24d568..2a4dee6e4f43eb 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d728bb2681e89ffbe9c6e1ec2811d5d194d9fd09", + "git-tree": "9569944b76966b78bec5ef83672899acd7e4febe", "version-semver": "2.1.2", "port-version": 0 }, From 3a7032272a79c5350a0cb57012aa3a4b98ef1fac Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Tue, 22 Aug 2023 16:45:40 +0800 Subject: [PATCH 05/10] update version --- versions/o-/opencolorio.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 2a4dee6e4f43eb..d33683a26eae63 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5c69dc2c181e658e67ba57e3836a548c469477a", + "version-semver": "2.2.1", + "port-version": 0 + }, { "git-tree": "9569944b76966b78bec5ef83672899acd7e4febe", "version-semver": "2.1.2", From 1e5a0418ad094f25641d6324347bd0562c99d966 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Mon, 28 Aug 2023 15:52:20 +0800 Subject: [PATCH 06/10] add static suffix --- ports/libjxl/fix_static_suffix.patch | 66 ++++++++++++++++++++++++++++ ports/libjxl/portfile.cmake | 1 + ports/libjxl/vcpkg.json | 1 + 3 files changed, 68 insertions(+) create mode 100644 ports/libjxl/fix_static_suffix.patch diff --git a/ports/libjxl/fix_static_suffix.patch b/ports/libjxl/fix_static_suffix.patch new file mode 100644 index 00000000000000..ed441e611763af --- /dev/null +++ b/ports/libjxl/fix_static_suffix.patch @@ -0,0 +1,66 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +index a42b6f0..77e850b 100644 +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -627,6 +627,7 @@ foreach(target IN ITEMS jxl jxl_dec) + endif() + endforeach() + ++set(JXL_STATIC_SUFFIX "") + # Only install libjxl shared library. The libjxl_dec is not installed since it + # contains symbols also in libjxl which would conflict if programs try to use + # both. +@@ -637,6 +638,7 @@ install(TARGETS jxl + else() + add_library(jxl ALIAS jxl-static) + add_library(jxl_dec ALIAS jxl_dec-static) ++set(JXL_STATIC_SUFFIX "-static") + endif() # BUILD_SHARED_LIBS + + # Add a pkg-config file for libjxl. +diff --git a/lib/jxl/libjxl.pc.in b/lib/jxl/libjxl.pc.in +index 4a7af65..2d8d433 100644 +--- a/lib/jxl/libjxl.pc.in ++++ b/lib/jxl/libjxl.pc.in +@@ -7,7 +7,7 @@ Name: libjxl + Description: Loads and saves JPEG XL files + Version: @JPEGXL_LIBRARY_VERSION@ + Requires.private: @JPEGXL_LIBRARY_REQUIRES@ +-Libs: -L${libdir} -ljxl ++Libs: -L${libdir} -ljxl@JXL_STATIC_SUFFIX@ + Libs.private: -lm + Cflags: -I${includedir} + Cflags.private: -DJXL_STATIC_DEFINE +diff --git a/lib/jxl_threads.cmake b/lib/jxl_threads.cmake +index b8ce66b..1634280 100644 +--- a/lib/jxl_threads.cmake ++++ b/lib/jxl_threads.cmake +@@ -100,6 +100,7 @@ target_compile_definitions(jxl_threads + generate_export_header(jxl_threads + BASE_NAME JXL_THREADS + EXPORT_FILE_NAME include/jxl/jxl_threads_export.h) ++set(THREAD_STATIC_SUFFIX "") + else() + add_library(jxl_threads ALIAS jxl_threads-static) + # When not building the shared library generate the jxl_threads_export.h header +@@ -107,6 +108,7 @@ add_library(jxl_threads ALIAS jxl_threads-static) + generate_export_header(jxl_threads-static + BASE_NAME JXL_THREADS + EXPORT_FILE_NAME include/jxl/jxl_threads_export.h) ++set(THREAD_STATIC_SUFFIX "-static") + endif() # BUILD_SHARED_LIBS + + +diff --git a/lib/threads/libjxl_threads.pc.in b/lib/threads/libjxl_threads.pc.in +index 50b937a..26cebbc 100644 +--- a/lib/threads/libjxl_threads.pc.in ++++ b/lib/threads/libjxl_threads.pc.in +@@ -7,7 +7,7 @@ Name: libjxl_threads + Description: JPEG XL multi-thread runner using std::threads. + Version: @JPEGXL_LIBRARY_VERSION@ + Requires.private: @JPEGXL_THREADS_LIBRARY_REQUIRES@ +-Libs: -L${libdir} -ljxl_threads ++Libs: -L${libdir} -ljxl_threads@THREAD_STATIC_SUFFIX@ + Libs.private: -lm + Cflags: -I${includedir} + Cflags.private: -DJXL_THREADS_STATIC_DEFINE diff --git a/ports/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake index e5219990a2eb96..6508ef7222a30d 100644 --- a/ports/libjxl/portfile.cmake +++ b/ports/libjxl/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependencies.patch trim-shared-build.patch + fix_static_suffix.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json index 55b1ade18bb7d1..e4b499f15b9bbd 100644 --- a/ports/libjxl/vcpkg.json +++ b/ports/libjxl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjxl", "version-semver": "0.8.2", + "port-version" : 1, "description": "JPEG XL image format reference implementation", "homepage": "https://github.com/libjxl/libjxl", "license": "BSD-3-Clause", From 45cc9bd8023414e312f439b141e541f7f68d66a1 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Mon, 28 Aug 2023 15:54:07 +0800 Subject: [PATCH 07/10] update version --- ports/libjxl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjxl.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json index e4b499f15b9bbd..4ce6ff6d42b453 100644 --- a/ports/libjxl/vcpkg.json +++ b/ports/libjxl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjxl", "version-semver": "0.8.2", - "port-version" : 1, + "port-version": 1, "description": "JPEG XL image format reference implementation", "homepage": "https://github.com/libjxl/libjxl", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 80eef7ea975adb..60d619222b9f65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4258,7 +4258,7 @@ }, "libjxl": { "baseline": "0.8.2", - "port-version": 0 + "port-version": 1 }, "libkeyfinder": { "baseline": "2.2.6", diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index cec4a8082c1ba0..ebdd2178b60872 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef1fff2a654e48aab95a026f98a44f897ed1a675", + "version-semver": "0.8.2", + "port-version": 1 + }, { "git-tree": "f97d35060ccfc751fc3729988cef203437c5a0dc", "version-semver": "0.8.2", From cdd0e5dc5b01e8cc1fc73903f53659f3a89bb032 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Mon, 28 Aug 2023 16:04:31 +0800 Subject: [PATCH 08/10] update version --- versions/l-/libjxl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index ebdd2178b60872..613bbefea832d7 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ef1fff2a654e48aab95a026f98a44f897ed1a675", + "git-tree": "49bf5a6f51c7daa25e9627c9c96b773be1902b02", "version-semver": "0.8.2", "port-version": 1 }, From 71c2847fc6423b964508fe6bdf7d1307dbbcf1c5 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 6 Sep 2023 16:36:08 +0800 Subject: [PATCH 09/10] add link to upstream PR --- ports/libjxl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake index 6508ef7222a30d..96a841b7daa1b9 100644 --- a/ports/libjxl/portfile.cmake +++ b/ports/libjxl/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( PATCHES fix-dependencies.patch trim-shared-build.patch - fix_static_suffix.patch + fix_static_suffix.patch #https://github.com/libjxl/libjxl/pull/2754 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From 3082542916a37a8292bad54e377be2c314d0e7e8 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 6 Sep 2023 16:36:47 +0800 Subject: [PATCH 10/10] update version --- versions/l-/libjxl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index 613bbefea832d7..4c763aa359c1ca 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "49bf5a6f51c7daa25e9627c9c96b773be1902b02", + "git-tree": "e99c7d6510e1417508c01729a93f001a87dce06e", "version-semver": "0.8.2", "port-version": 1 },