From df9da40d0e11ad96140ee89fc1d7d7e29823e10a Mon Sep 17 00:00:00 2001 From: ParvusLacertus Date: Thu, 2 Jan 2025 19:49:12 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 4b6c50d962cc20aaa3ef457f8ba683b586263cfb Author: Kai Pastor Date: Tue Dec 31 20:16:19 2024 +0100 [msquic] Allow windows build without openssl (#43031) commit 597956c88f9bdbea24fb1b9e1e0a89f900569050 Author: Kai Pastor Date: Tue Dec 31 17:38:27 2024 +0100 [gstreamer] Modify dependencies (#42972) commit 8917d3209ee9db2cc85feba7dbf5ffb18a780d74 Author: Kai Pastor Date: Tue Dec 31 17:37:35 2024 +0100 [kealib] Update to 1.6.1 (#43025) commit d367c84b5410c4f46c71b2d11e5aeed81732b34a Author: Kai Pastor Date: Tue Dec 31 17:36:15 2024 +0100 [libcap] Update to 2.73 (#42958) commit 01c94166780f3f4c5b6c69493c7b75b4d8b14dce Author: Weihang Ding <798047000@qq.com> Date: Wed Jan 1 00:33:30 2025 +0800 [aws-sdk-cpp] Bump to 1.11.474 (#42963) commit 6e50d48dc84ce276ff21585c8e044ec13ab59d3d Author: Boris Petkov Date: Tue Dec 31 17:33:12 2024 +0100 Update Nuget to Version 6.11.1 (#43012) commit fc75cfe2f86dcdd159ede8552ad0d78c2d60ae08 Author: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Tue Dec 31 16:32:56 2024 +0000 [angle] Add export unofficial targets include (#43023) commit 8d238ae26c4e4fd8ad6f14fccb5c897091b7daa6 Author: Kai Pastor Date: Tue Dec 31 17:32:18 2024 +0100 [libgpod] Delist libgpod (#42960) Co-authored-by: Javier Matos commit 8f2ab06e577a286fac49566b3068a6e935758219 Author: Kai Pastor Date: Tue Dec 31 17:31:01 2024 +0100 [vcpkg-make] Misc fixes (#42954) Co-authored-by: Javier Matos commit 4b3b6201414638abfcd8ef4629dfbd958985667e Author: Kai Pastor Date: Tue Dec 31 04:32:07 2024 +0100 [gmime] Fix crypto, remove stray patch (#43014) commit 1c896ecce3aaad6c34af83c018b86fb988b5f8cc Author: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Tue Dec 31 03:15:39 2024 +0000 [g2o] Add feature spdlog (#42912) commit 3f3e77df3b541d677b81b2f421b17880a4723dde Author: Sean Farrell Date: Tue Dec 31 04:15:09 2024 +0100 [openexr] Update to 3.3.2 (#43015) commit b32534780c038b51ac81956f11dde85b5451ea86 Author: Saikari Date: Tue Dec 31 06:14:50 2024 +0300 [LIEF] update to 0.16.1 (#43019) commit dc162683a25430d1610e4846d668f22caecc6e81 Author: Mengna-Li <543250287@qq.com> Date: Tue Dec 31 03:13:14 2024 +0000 [vcpkg baseline][kubazip] Remove kubazip:arm-neon-android from fail list (#42916) Co-authored-by: Mengna-Li commit 7bac26279fc130cfe0935bd9629352ebb972abe2 Author: Saikari Date: Mon Dec 30 22:29:08 2024 +0300 [lief] add new port LIEF-0.16.0 (#42374) Co-authored-by: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> commit 78030b65d91f5f27ede49967e8516d0eb2949b8d Author: Kai Pastor Date: Mon Dec 30 20:21:27 2024 +0100 [msh3,msquic,vcpkg-ci-msh3] Update, add test port (#42788) commit 48afdad969ae7d4322df9eacf5c4c115fd59fbb0 Author: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Tue Dec 31 02:28:54 2024 +0800 [ucoro] add new port (#42969) commit 3fb435727d78e00c5cb8a09cfd4abb53ecb9afe0 Author: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Date: Tue Dec 31 02:14:39 2024 +0800 [boost-cobalt] Throw error in the configure step when the compiler is not supported (#42738) Co-authored-by: jyu49 commit c2a3eb2d6a8e00233354c340e985ff85b1a9a5db Author: myd7349 Date: Tue Dec 31 02:11:54 2024 +0800 [ruapu] Add new port (#42915) commit 8906f1899446b437b02b3bbb3ae1605e6eb4fb98 Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Mon Dec 30 18:10:22 2024 +0000 [libheif] Fix compilation errors using gcc8 (#42869) commit 89b92ea059fac7b5a5b41f9470afda70705bdf0e Author: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue Dec 31 02:09:24 2024 +0800 [ismrmrd] Fix nodiscard warning in meta.cpp (#42924) commit dbef60a908c854993dac67cb2e9f6ada286de2ed Author: Billy O'Neal Date: Mon Dec 30 12:08:14 2024 -0600 Promote arm64-windows-static-md and x64-windows-static-md (#42896) commit 521abc5c2f438e5980b41cf17e7bdf5c3307a9ac Author: l.feng <43399351+msclock@users.noreply.github.com> Date: Mon Dec 30 23:34:52 2024 +0800 [bit7z] compile option without warnings as errors (#43005) Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> commit 0660e5edf21a748caad809948545bcad9f95b359 Author: gfeyer Date: Mon Dec 30 10:34:15 2024 -0500 [behaviortree-cpp] Update behaviortree.cpp port from 4.3.7 to 4.6.2 (#42991) commit 51380fe77515452fafa0463d24d621ddcb68e1ee Author: Kai Pastor Date: Mon Dec 30 16:33:59 2024 +0100 [libgpg-error] Update to 1.51, [libsecret] Fix platforms (#42984) commit 2be9c632a8c34702f6555d79cc79c3bc6d8b2101 Author: c8ef Date: Mon Dec 30 23:33:24 2024 +0800 [folly related] update to 12.23 (#42914) commit efa63210b49469bbed18cac7b31eb252adb6d8bd Author: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon Dec 30 15:33:02 2024 +0000 [v-hacd] Update version to v4.1.0 (#42908) commit 6cb30d5d4d046dafaf0e00d4a4c1ae6bcaf53147 Author: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon Dec 30 07:32:11 2024 -0800 [libical] Update to 3.0.19 (#42906) commit bb4cfe509de0ce1211b34a53072434da4a86d6ed Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 30 23:31:56 2024 +0800 [level-zero] Bump to 1.19.2 (#42904) commit 3d607b2fd04997d3217ec3ba7995b4c8359880ce Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 30 23:31:40 2024 +0800 [utfcpp] Bump to 4.0.6 (#42873) commit eac02d61d1806a13a84a390ce172baee1fcdf96b Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 30 16:30:53 2024 +0100 [date] Update to official release version 3.0.3. (#42864) commit b6b5322b16d1cbfd2b09635b6d8b1005a0a2fe64 Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 30 23:30:08 2024 +0800 [audiofile] Bump to 1.1.2 (#42809) commit 4413468742eadbbbf8f1aff2e8b8595d1dc6225a Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 30 16:29:40 2024 +0100 [sleef] Update to version 3.7 (#42706) commit 23ef699bbd8bbd528e553263c601943fb24ad647 Author: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon Dec 30 23:27:37 2024 +0800 [geogram] update to 1.9.2 (#42920) commit 352cf2faf211a8dec3b822cb49280c3f4d7f8cdd Author: Chip Hogg Date: Mon Dec 30 10:27:17 2024 -0500 [aurora-au] Update to version 0.4.1 (#42930) commit ddcee8f0b8e10f5f5edfec54236eebece5448286 Author: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon Dec 30 15:26:59 2024 +0000 [libmagic] Update version to 5.46 (#42939) commit 19f945ab2c1e816de6bbb812fc1514e3dc52c287 Author: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon Dec 30 07:26:41 2024 -0800 [log4cxx] update to 1.3.1 (#42943) Co-authored-by: Monica commit caaabe3dd427f78276d434626509b8567007db8e Author: Alexis La Goutte Date: Mon Dec 30 16:26:20 2024 +0100 [ngtcp2] update to 1.10.0 (#42944) commit 3d8789d70a9e2186c7b8ac324f36cef558b6a89b Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 30 16:26:02 2024 +0100 [benchmark] Update google benchmark to 1.9.1 (#42945) commit f0a40541578de0d7d16dc5b6520abbeae00e26d5 Author: Alexis La Goutte Date: Mon Dec 30 16:25:49 2024 +0100 [nghttp3] update to 1.7.0 (#42947) commit 18b1aed507ff913eaeccc2733afdc822a115ac90 Author: Dennis Date: Mon Dec 30 16:25:36 2024 +0100 [asio-grpc] update to 3.4.1 (#42949) commit 2fc86f714a003d76ece2c8e769c53d805e13c2fa Author: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon Dec 30 07:25:24 2024 -0800 [zfp] Update to 1.0.1 (#42956) Co-authored-by: Monica commit 8a3beb39132845749dbd7f22948fa91d96e0ba40 Author: Kai Pastor Date: Mon Dec 30 16:25:08 2024 +0100 [gmime] Update to 3.2.15, use official build system (#42959) commit a54ecb2ce91c125c8a8a39c2ae811cc18663668b Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 30 23:24:06 2024 +0800 [sse2neon] Bump to 1.8.0 (#42961) commit 3a68d1b70f26775a45fbb0d276d6c1ed4790357f Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 30 23:23:50 2024 +0800 [stringzilla] Bump to 3.11.3 (#42962) commit 27048529da21846ce5208a31919ef25dd50d3a10 Author: Rusty Conover Date: Mon Dec 30 10:23:08 2024 -0500 [apache-datasketches] Upgrade to 5.1.0 (#42976) commit 462c5f06581e579549fd2d46ac377867139ee1e7 Author: Kai Pastor Date: Mon Dec 30 16:22:46 2024 +0100 [pdal] Update to 2.8.3 (#42981) commit 9bdf3848f3dc67429947252fe940f1d78423492b Author: Charles Karney Date: Mon Dec 30 10:22:03 2024 -0500 [geographiclib] Update to version 2.5 (#42992) commit 32d2684b947482b7037ba080eeb538fd4f40c59a Author: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon Dec 30 15:21:47 2024 +0000 [tgui] Update version to 1.7.0 (#43011) commit 80d54ff62d528339c626a6fbc3489a7f25956ade Author: Javier Matos Denizac Date: Mon Dec 23 14:58:54 2024 -0500 [vcpkg-make] Add new port (#39050) Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Alexander Neumann Co-authored-by: Kai Pastor Co-authored-by: Billy O'Neal Co-authored-by: Javier Matos commit 1bf27ad221da9acea6bd5788026df9e9b81631d9 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:45:15 2024 +0800 [alembic] Bump to 1.8.8 (#42808) commit 8d3b7a872f0a8aff44501b34f1654c3151a13106 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:43:40 2024 +0800 [aws-sdk-cpp] Bump to 1.11.471 (#42810) commit e6a096ffc8f8ff732b2eeb3c27d26d48e20ffd19 Author: Buck Yeh Date: Tue Dec 24 01:43:19 2024 +0800 [buck-yeh-bux-sqlite] Update to 1.0.5 (#42824) commit 66ceb03a7e1c445a07b46f1c67cde842c13074dc Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 23 18:42:06 2024 +0100 [dlpack]Update dlpack tor v1.0 (#42861) commit 6dd6281298cc8a81f9304fbb48d85bd8e22f97bf Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:41:49 2024 +0800 [stringzilla] Bump to 3.11.2 (#42877) commit f7c018d67fe57b6e1eb8a286a8a9b9866f571837 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:40:59 2024 +0800 [imgui] Bump to 1.91.6 (#42880) commit b556a153896240607f7cd7dc801ab2a3ca048e97 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:40:11 2024 +0800 [bit7z] Bump to 4.0.9 (#42882) commit 8496f6ad8274b985e1a7ea395b16a01fd9e6fbfe Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:39:55 2024 +0800 [nanoprintf] Bump to 0.5.3 (#42883) commit 84630f057cbe9bcfc593c0308e9e0b1689f03f02 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:39:29 2024 +0800 [cpp-timsort] Bump to 3.0.1 (#42885) commit 6f15319425e0b22512dd30f76adac9ab8cf4d22d Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:39:01 2024 +0800 [cpp-peglib] Bump to 1.9.1 (#42886) commit d75af6919cc11b29a0be01e344cf0b48999d0292 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:38:41 2024 +0800 [capnproto] Bump to 1.1.0 (#42888) commit aa1dd09928425e4f56b6698ec33d936b948a15d7 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:38:11 2024 +0800 [glaze] Bump to 4.2.2 (#42889) commit 096a5b15d5f9452ef2b1037631054f59704f61cc Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:37:50 2024 +0800 [bddisasm] Bump to 2.2.0 (#42890) commit 558bc16e48aa9abc8c0f9bcceca36ef8d6b98cfb Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 01:37:34 2024 +0800 [libxdf] Bump to 0.99.9 (#42891) commit fea9f015660105f3014d0d3d99a9d5444c8b23bf Author: Ryan Zoeller Date: Mon Dec 23 11:37:07 2024 -0600 [cpptrace] update 0.7.4 (#42897) commit 386ee8bae87d1cbfe8ea14b17f436c9b98547b01 Author: Matthias Kuhn Date: Mon Dec 23 17:19:40 2024 +0100 [qtbase] fix macdeployqt for symlinks (#42430) commit a08d0b196fdac369716b908ccef452f18221d024 Author: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue Dec 24 00:17:35 2024 +0800 [aurora-au] Update to version 0.4.0 and add test port (#42679) Co-authored-by: Jon commit 119d4fffcbcac1a99e118cb819e40eda098c7901 Author: Kai Pastor Date: Mon Dec 23 17:12:53 2024 +0100 [vcpkg-tool-meson] Update to 1.6.1 (#42750) commit 20c95969d8bc7b4d44d5fbe18e2359cd1fa9894e Author: Kai Pastor Date: Mon Dec 23 17:12:22 2024 +0100 [ls-qpack] Update, revise (#42767) commit 16a03c88aa7672d67b7b7d85aff31e8166b4b561 Author: Salman Javed <89359699+salman-javed-nz@users.noreply.github.com> Date: Tue Dec 24 05:09:17 2024 +1300 [meekrosoft-fff] Add new port (#42778) Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> commit 37e135d7989672c550a4bd6de4d72c994a4291d2 Author: مهدي شينون (Mehdi Chinoune) <79349457+MehdiChinoune@users.noreply.github.com> Date: Mon Dec 23 17:07:17 2024 +0100 [muparser] update to 2.3.5 (#42789) commit 63f7beabacf072f0fb31f80a30707ac12794c0ce Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 00:04:01 2024 +0800 [mlpack] Bump to 4.5.1 (#42813) commit 36f7c8a895999f5585357c37af7d7b97c91a2e13 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 00:03:46 2024 +0800 [nanojsonc] Bump to 1.1.0 (#42816) commit 74ecd117026fb6924fcd8fab6c5138d6899ab47a Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 00:03:30 2024 +0800 [recycle] Bump to 7.0.0 (#42817) commit daf75de7f2a5c3ea97941f9d0c34f3306fbe3910 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 00:02:55 2024 +0800 [leptonica] Bump to 1.85.0 (#42818) commit 2b85cc22afcfc1f2f7330ca13c9e83a6d36f8294 Author: Weihang Ding <798047000@qq.com> Date: Tue Dec 24 00:01:55 2024 +0800 [imageinfo] Bump to 2024-12-02 (#42819) commit 43bb33c13b919aa95a7601476cd5f6e008058ace Author: c8ef Date: Tue Dec 24 00:01:36 2024 +0800 [folly related] update to 12.16 (#42823) commit 385d36862d023f780740cb4ea3be3e824fa03351 Author: Nick D'Ademo Date: Tue Dec 24 03:00:37 2024 +1100 [kubazip] update to 0.3.3 (#42831) commit 47c6ca890bbf5daeedbed350b4b373fb4366cf59 Author: Nick D'Ademo Date: Tue Dec 24 02:59:54 2024 +1100 [mimicpp] update to v5 (#42832) commit 248d650320284d02e9174c4302fa6ac913ee9dbb Author: Eyal Rozenberg Date: Mon Dec 23 17:59:18 2024 +0200 [cuda-api-wrappers] Updated version from 0.7.1 to 0.8.0 (#42837) commit b760423c4f20d628fa1c53e82548c9b798a091e1 Author: Denis Kovalchuk Date: Mon Dec 23 18:57:26 2024 +0300 [deniskovalchuk-libftp] Update to 1.4.1 (#42852) commit da015cae99c19c8a3dacf4d870da43c833e15685 Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 23 16:57:07 2024 +0100 [gumbo] Update to version 0.12.3 (#42860) commit 33fe5762b2fe9d90e3a5c19266f4f1c0a03b57c2 Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Mon Dec 23 15:56:39 2024 +0000 [vcpkg baseline][unicorn] Remove from fail list (#42867) commit 0715d0d22ac9d7fc3909ed26be4987b639da8402 Author: Mengna-Li <543250287@qq.com> Date: Mon Dec 23 15:56:13 2024 +0000 [fastio] update to 2024-12-05 (#42871) Co-authored-by: Mengna-Li commit 989b8d34f947bb92636a500c72aaff1736820a29 Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Mon Dec 23 15:55:45 2024 +0000 [itpp] Fix runtime errors (#42881) commit 1e73628cc5f31512664a45899d47317e224cac10 Author: Mengna-Li <543250287@qq.com> Date: Mon Dec 23 15:43:54 2024 +0000 [yoga] update to 3.2.1 (#42872) Co-authored-by: Mengna-Li commit f4a382c0ff78f6af54fc84430720d662a282c237 Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 23 23:43:18 2024 +0800 [tinyexr] Bump to 1.0.9 (#42874) commit 0ab0ae30bf21ab470cb2c6bdd3f7d8ec352f74f6 Author: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon Dec 23 15:42:10 2024 +0000 [allegro5] Update to 5.2.10.0 (#42878) Co-authored-by: Monica commit 67310523bb13e7dd9375d8eb94eb5fa56fa6a18a Author: Weihang Ding <798047000@qq.com> Date: Mon Dec 23 23:41:33 2024 +0800 [nyan-lang] Bump to 0.3.1 (#42879) commit f06267da58f3c06b3a1aff9cbf5c2906e595ebc9 Author: Billy O'Neal Date: Sat Dec 21 03:48:36 2024 -0800 Patch Tuesday for December 2024 (#42749) commit 4fcf123fe53c63db265b5841a5aeff06cec375a1 Author: Kai Pastor Date: Fri Dec 20 21:45:28 2024 +0100 [juce] Fix cross builds, cleanup (#42615) commit 8476a6d43a012200ed7f49e10e03cd1d7dcf94f4 Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri Dec 20 20:35:11 2024 +0000 [aom] Update to 3.11.0 (#41125) commit d940c1b196765dbc0a262fd757e492c84fa524b2 Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri Dec 20 20:33:39 2024 +0000 [vcpkg baseline][g2o] Update to 2024-12-14 (#42753) commit 5c425b4df679a2abbefd86ea032bcc13b3030cd1 Author: Barak Shoshany Date: Fri Dec 20 15:32:18 2024 -0500 [bshoshany-thread-pool] Updated to v5.0.0 (#42803) commit 6eab0a7b21ccd0edb1efddf3ef6ffdb4e0dae915 Author: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat Dec 21 04:31:35 2024 +0800 [mongo-cxx-driver] update to 4.0.0 (#42805) commit faa3c0a4052e0e42431d5d1602ce542075adc45e Author: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri Dec 20 20:30:40 2024 +0000 [gazebo] Fix dependencies and update (#42807) Co-authored-by: Monica commit 11627a2ca769817941224b69051dd81332221b57 Author: Weihang Ding <798047000@qq.com> Date: Sat Dec 21 04:25:37 2024 +0800 [xsimd] Bump to 13.1.0 (#42811) commit 14dad0d42c25adf51b95ce561be5d77399455430 Author: Weihang Ding <798047000@qq.com> Date: Sat Dec 21 04:23:36 2024 +0800 [glslang] Bump to 15.1.0 (#42812) commit 7ba6833e293ffa4c551d03bf388ac36564803260 Author: Weihang Ding <798047000@qq.com> Date: Sat Dec 21 04:22:31 2024 +0800 [vincentlaucsb-csv-parser] Bump to 2.3.0 (#42814) commit 4c71f15288e524faab32fa8c1b927be8d89f23c4 Author: Saikari Date: Fri Dec 20 23:21:05 2024 +0300 [orange-math] new port (#42756) Co-authored-by: Mengna-Li <543250287@qq.com> commit 9790589e0f7929f4ae94e4869cdd1890bac6f45b Author: Weihang Ding <798047000@qq.com> Date: Sat Dec 21 04:19:42 2024 +0800 [yalantinglibs] Bump to 0.3.11 (#42815) commit 1f65d84539cba5a0b7581299dcaee92eee5d2b71 Author: Billy O'Neal Date: Thu Dec 19 20:01:53 2024 -0800 [casadi] Deindex. (#42773) commit 6de717b75b8326f6d004984f14ae5bbbd86c928d Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu Dec 19 21:22:45 2024 +0000 [usd] update to 24.11 (#41864) commit 8e78590ad7a3c7318c2d1013f77892c59babf1e2 Author: Eviral Date: Thu Dec 19 22:14:06 2024 +0100 [openfbx] Miniz dep was removed in latest version and replaced by libdeflate (#42694) Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> commit 5a1b13ca83f32c01d40a779747b5cb59d359ac2f Author: Wiki Wang Date: Fri Dec 20 04:52:58 2024 +0800 [ffmpeg] add implicit link libs (#42676) (#42677) commit d18ed2bf5c899e3d007dd0b9bf198f45eb1f7546 Author: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Thu Dec 19 20:50:47 2024 +0000 [gz-common5] Add include for system_clock (#42635) commit 3f92cf1a34194436d9acea8dcd21428a2b29f7e2 Author: Chuck Walbourn Date: Thu Dec 19 12:03:10 2024 -0800 [directx12-agility] add message for compliance (#42797) commit cf454fe933beba64baaa0648579af1e32985a9c1 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu Dec 19 20:07:58 2024 +0100 [cppmicroservices] update and devendor stuff (#42720) commit 1bf29ad4944d74acfb475ced53705b0a5efdf604 Author: Kai Pastor Date: Thu Dec 19 19:28:21 2024 +0100 [zix] Sanitize (#42772) commit 38bf1efc4e794dd574d2528b138ffff3c73e7662 Author: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu Dec 19 18:14:19 2024 +0000 [poco] Update version to 1.14.0 (#42751) commit 14ff626bc4fe56e6f687f4930d291d7b7ab4a4df Author: Alesiani Marco Date: Thu Dec 19 19:12:57 2024 +0100 [physx] Update to version 5.5.0 (#42764) commit 99070cfc9941d9259f750eb9a5dc66ee8f6c14fa Author: Kai Pastor Date: Thu Dec 19 19:11:37 2024 +0100 [lilv] Fix dependencies, tools (#42770) commit 54f4adb7f1da7ddeb4f5718b865a708989356c8a Author: Kai Pastor Date: Thu Dec 19 19:04:49 2024 +0100 [shiva] Delist (#42711) commit a3ff43d793af28eaca4505fe6da908a65b359948 Author: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri Dec 20 02:04:29 2024 +0800 [utf8-range] update to 5.29.1 (#42752) Co-authored-by: Jon commit 13409aa76a24fc28239473fc508cb4cffead536a Author: c8ef Date: Fri Dec 20 02:04:14 2024 +0800 [glaze] update to 4.2.0 (#42763) commit b6ed02f7f1e58864682975168bfabd99f1aefb3d Author: Nick Logozzo Date: Thu Dec 19 10:03:45 2024 -0800 [libnick] Update to 2024.12.0 (#42766) commit 8c9c81c6dd92da1c955895aebd5fbd40bcffaf35 Author: Vitalii Koshura Date: Thu Dec 19 19:03:14 2024 +0100 [sentry-native] update to 0.7.17 (#42776) Signed-off-by: Vitalii Koshura commit 111995150f2ac31808297e7f4520a0ddf06d1c7e Author: Scott Hart Date: Thu Dec 19 13:02:41 2024 -0500 [google-cloud-cpp] update to the latest release (v2.33.0) (#42780) commit 526b56d8b0701b67344ea1bf846bcf17fc4eb1ac Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu Dec 19 18:02:16 2024 +0000 [prometheus-cpp] Update to 1.3.0 (#42786) commit 2dc91c6439568f694052c3fa25859dc78d9ff8e4 Author: Mengna-Li <543250287@qq.com> Date: Tue Dec 17 20:11:08 2024 +0000 [gumbo] update to 0.12.2 and switch homepage (#42737) Co-authored-by: Mengna-Li commit c368dabefa2f9ab6ce2002f7164832e783a9bd19 Author: Saikari Date: Tue Dec 17 23:10:21 2024 +0300 [unicorn] update version 2.1.1 (#42578) commit be216000c56c8af529b1cc3db78f7b257992ca74 Author: Daniele E. Domenichelli Date: Tue Dec 17 21:09:28 2024 +0100 [kdreports] new port (#42625) commit ef6588394c4baf0630861bf316da5a896356abf3 Author: Daniele E. Domenichelli Date: Tue Dec 17 21:08:00 2024 +0100 [kdstatemachineeditor] new port (#42664) commit 76527256e82e158dc690fe2dfa2057be677680cf Author: Nick D'Ademo Date: Wed Dec 18 07:00:39 2024 +1100 [winsparkle] update to 0.8.3 (#42712) Co-authored-by: Nick D'Ademo Co-authored-by: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> commit 2434e488f0fa434cadd734eaae881ae729a038d2 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue Dec 17 21:00:20 2024 +0100 [curlpp] fix abs path (#42722) commit 8cbc1d7ab8fad003ca237c06c849596d30d7ee12 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue Dec 17 20:59:52 2024 +0100 [Libtorch] remove abs compiler path (#42729) commit ab4e7d5518544cb19286796ef55f378e15b01a27 Author: Paul Xu <40262910+xb284524239@users.noreply.github.com> Date: Wed Dec 18 03:53:45 2024 +0800 [dcmtk] remove ICU (#42742) commit 13737397f799dcc39459baeb03b427f1a09c6655 Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue Dec 17 19:53:10 2024 +0000 [vcpkg baseline][openfbx] Remove from fail list (#42743) commit 0350335ccb922c2478e8dccd5d772ebfb0d5eec7 Author: SunBlack Date: Tue Dec 17 20:52:50 2024 +0100 [libdeflate] Update to v1.23 (#42744) commit c67dcfff6201dda783b8a6d96571c34f556c4a43 Author: Davide Pianca Date: Tue Dec 17 20:52:26 2024 +0100 [opencv4] Add carotene feature flag (#42745) commit db3a4f0e6c150383c65e7f0a6ae94d1c4c0f1b84 Author: Daniele E. Domenichelli Date: Tue Dec 17 20:51:53 2024 +0100 [kdsingleapplication] Fix copyright file (#42746) commit a258b5e32d07e64460aff3e9662e41c707dc8b6c Author: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue Dec 17 19:51:32 2024 +0000 [gstreamer] Fix multiple definition of functions (#42638) commit b322364f06308bdd24823f9d8f03fe0cc86fd46f Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:52:52 2024 +0100 [g2o] fix abs compiler path in binary (#42724) commit 4474162f65c59117075aa843b00170df51f68e51 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:52:32 2024 +0100 [ffnvcodec] fix single config builds (#42442) commit e303a7292ba6b05d43b67afdcbb8a2158ae162b2 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:10:33 2024 +0100 [usd] fix single config builds (#42446) commit e534a9d589ff25fecd29c3430dfcf0a42fdc4cb6 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:10:14 2024 +0100 [realsense2] fix single config builds (#42449) commit 3c24aa351645c267bf3afef1e3a96125380a2f6c Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:09:56 2024 +0100 [azure-kinect-sensor-sdk] fix single config builds (#42719) commit 78df9686ab6036ce159aaff0c1e5a2c2727206fa Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:09:01 2024 +0100 [crashpad] fix single config builds (#42721) commit 9cfeb3b011995dedc8b8f0b3be6209d12759edb1 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:08:38 2024 +0100 [kf5plotting] fix single config builds (#42725) commit 948820b46ed406dea12a72760b4ab152e0859e32 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:08:24 2024 +0100 [Kf5testeditor] fix single config (#42726) commit e1f8cf71b2444e76c9faa41b10a3c86d9b8fcef2 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:08:03 2024 +0100 [krb5] fix single config builds (#42727) commit 21938223614eec1fdba0031bf4d8023d90d4e6ce Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:07:40 2024 +0100 [Libdshowcapture] fix single config builds (#42728) commit 2892ef50b723246e5c5b1f19f79dc4cec8d7394b Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 19:07:18 2024 +0100 [libxfont] fix single config builds (#42730) commit a09e4e86d8590867b56f157627219d4ed52a34eb Author: Theodore Tsirpanis Date: Mon Dec 16 20:06:41 2024 +0200 [capnproto] Support Windows on ARM64. (#42697) commit d00bfc5a86fdc03109433fb7e3d88b198281a284 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 18:05:45 2024 +0100 [Mongo-c-driver] remove compiler abs path (#42731) commit 83ee120b22571f01ac1e7ea55d4d65f00bbb09e4 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 17:33:04 2024 +0100 [fltk] Fix abs path (#42723) commit 39cd4f4da75a6b894225628baf45712632f60946 Author: Nick D'Ademo Date: Tue Dec 17 03:27:38 2024 +1100 [sqlcipher] fix windows build (#42675) Co-authored-by: Nick D'Ademo Co-authored-by: Kai Pastor commit 58b4954290c311692295f793a9089235296edbb3 Author: Daniele E. Domenichelli Date: Mon Dec 16 17:24:24 2024 +0100 [kdsoap] Fix license, usage and dependencies (#42671) commit e4644bd15436d406bba71928d086c809e5c9ca45 Author: Mathieu Pellerin Date: Mon Dec 16 23:19:34 2024 +0700 [libxml2] Fix compilation on iOS (#42695) commit bda3f4603b0675cce9baac8268582c7995f45653 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 17:09:35 2024 +0100 [arpack-ng] Export Fortran symbols (#42718) commit 6936437e11b0268c6ebf7383c16e7781d787f1e1 Author: Kai Pastor Date: Mon Dec 16 17:08:55 2024 +0100 [stxxl] Cleanup, enable dynamic linkage on !windows (#42700) commit 00bd5c4aa5ab20dfeb466eeb4e246728de3040b2 Author: Kai Pastor Date: Mon Dec 16 17:08:15 2024 +0100 [fontconfig] Add features, fix emscripten (#42699) commit c26eabb23948d3bf18bc08a6f12e0a7956be9f27 Author: rinechran Date: Tue Dec 17 00:34:28 2024 +0900 [Thorvg] update v0.15.6 (#42672) commit aa59239965a2f819a2b3c08721b64fa80e64eeba Author: Johannes Schönberger Date: Mon Dec 16 16:34:00 2024 +0100 [colmap] Update to port version 3.11.1 (#42477) commit fa4640854ba5be074e5f4fae04ad3eaf26c5db7e Author: Kai Pastor Date: Mon Dec 16 16:28:49 2024 +0100 [mchehab-zbar] Update to 0.23.93 (#42739) commit e2fa7daf5f912891235ac08712e5232d54296588 Author: Tom Willow Date: Mon Dec 16 23:27:37 2024 +0800 [tomsolver] Update to 1.0.1 (#42710) commit 463b45aa753217d975394129989f40c7082fd95b Author: Maxime Gervais Date: Mon Dec 16 16:27:10 2024 +0100 [libmediainfo] update to 24.12 (#42703) commit eb4c5067c5d098620ab2bf22787f653f1822c20b Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 16 16:26:49 2024 +0100 [libjpeg-turbo] Update to version 3.1.0 (#42702) commit 09be456e7eddf109cd82ceb6c7573489e3037ae7 Author: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon Dec 16 16:24:59 2024 +0100 [taglib ] Update to version 2.0.2 (#42701) commit 6a1fccc46125a294397b8e7d7e22f5cc29f4aa86 Author: Theodore Tsirpanis Date: Mon Dec 16 17:24:21 2024 +0200 [aws-*,s2n] Update ports to their latest versions and support Windows on ARM64. (#42698) commit e7a608f33098fee33b02868c0b31719596cde977 Author: Buck Yeh Date: Mon Dec 16 23:20:55 2024 +0800 [buck-yeh-bux] Update to 1.10.2 (#42688) commit 3fd12ea2232ab3b31fa02a73e02f2429a13cf089 Author: Dennis Date: Mon Dec 16 16:17:35 2024 +0100 [asio-grpc] Update to 3.4.0 (#42714) commit fbbe5f6005e7eaabbf54108a86a24291839ffb04 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 16:15:41 2024 +0100 [Openmvg] single config build fixes (#42732) commit c6ae21229c3ba1dfafba87e55aaad552feb0c30b Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 16:15:21 2024 +0100 [pdcurses] Fix missing platform (#42733) commit 10474e022cd21d863857d74e25d65b86d283b7be Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 16:14:53 2024 +0100 [Physx] fix single config builds (#42734) commit 1c753cf99b57580e1688c2af63a18387cafd1ee8 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 16:13:08 2024 +0100 [ptex] fix single config build (#42735) commit d18f1baaa9d58fd36e9c83d36861e75d034507b8 Author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon Dec 16 16:12:32 2024 +0100 [sese] single config fixes (#42736) --- ports/alembic/portfile.cmake | 2 +- ports/alembic/vcpkg.json | 2 +- ports/allegro5/portfile.cmake | 4 +- ports/allegro5/vcpkg.json | 3 +- ports/angle/cmake-buildsystem/CMakeLists.txt | 1 + ports/angle/vcpkg.json | 2 +- ports/aom/portfile.cmake | 11 +- ports/aom/vcpkg.json | 3 +- ports/apache-datasketches/portfile.cmake | 2 +- ports/apache-datasketches/vcpkg.json | 2 +- ports/arpack-ng/portfile.cmake | 1 + ports/arpack-ng/vcpkg.json | 1 + ports/asio-grpc/portfile.cmake | 2 +- ports/asio-grpc/vcpkg.json | 2 +- ports/audiofile/fix-cmakeLists.patch | 13 - ports/audiofile/portfile.cmake | 9 +- ports/audiofile/vcpkg.json | 2 +- ports/aurora-au/disable-googletest.patch | 41 -- ports/aurora-au/portfile.cmake | 11 +- ports/aurora-au/vcpkg.json | 3 +- ports/aws-c-auth/portfile.cmake | 2 +- ports/aws-c-auth/vcpkg.json | 3 +- ports/aws-c-cal/portfile.cmake | 2 +- ports/aws-c-cal/vcpkg.json | 3 +- ports/aws-c-common/portfile.cmake | 2 +- ports/aws-c-common/vcpkg.json | 4 +- ports/aws-c-compression/portfile.cmake | 2 +- ports/aws-c-compression/vcpkg.json | 3 +- ports/aws-c-event-stream/portfile.cmake | 2 +- ports/aws-c-event-stream/vcpkg.json | 3 +- ports/aws-c-http/portfile.cmake | 2 +- ports/aws-c-http/vcpkg.json | 3 +- ports/aws-c-io/portfile.cmake | 2 +- ports/aws-c-io/vcpkg.json | 3 +- ports/aws-c-mqtt/portfile.cmake | 2 +- ports/aws-c-mqtt/vcpkg.json | 3 +- ports/aws-c-s3/portfile.cmake | 2 +- ports/aws-c-s3/vcpkg.json | 3 +- ports/aws-c-sdkutils/portfile.cmake | 2 +- ports/aws-c-sdkutils/vcpkg.json | 3 +- ports/aws-checksums/portfile.cmake | 2 +- ports/aws-checksums/vcpkg.json | 3 +- ports/aws-crt-cpp/portfile.cmake | 2 +- ports/aws-crt-cpp/vcpkg.json | 3 +- ports/aws-sdk-cpp/generateFeatures.ps1 | 14 +- ports/aws-sdk-cpp/portfile.cmake | 2 +- ports/aws-sdk-cpp/vcpkg.in.json | 3 +- ports/aws-sdk-cpp/vcpkg.json | 84 ++- .../azure-kinect-sensor-sdk/fix-builds.patch | 4 +- ports/azure-kinect-sensor-sdk/portfile.cmake | 14 +- ports/azure-kinect-sensor-sdk/vcpkg.json | 2 +- ports/bddisasm/portfile.cmake | 2 +- ports/bddisasm/vcpkg.json | 2 +- ports/behaviortree-cpp/portfile.cmake | 2 +- ports/behaviortree-cpp/vcpkg.json | 2 +- ports/benchmark/portfile.cmake | 2 +- ports/benchmark/vcpkg.json | 2 +- ports/bit7z/fix_compile_options.patch | 13 + ports/bit7z/portfile.cmake | 3 +- ports/bit7z/vcpkg.json | 3 +- .../fail-on-compiler-not-supported.patch | 13 + ports/boost-cobalt/portfile.cmake | 5 +- ports/boost-cobalt/vcpkg.json | 1 + ports/boost/vcpkg.json | 16 +- ports/bshoshany-thread-pool/portfile.cmake | 6 +- ports/bshoshany-thread-pool/vcpkg.json | 4 +- ports/buck-yeh-bux-sqlite/portfile.cmake | 4 +- ports/buck-yeh-bux-sqlite/vcpkg.json | 10 +- ports/buck-yeh-bux/portfile.cmake | 2 +- ports/buck-yeh-bux/vcpkg.json | 2 +- ports/capnproto/portfile.cmake | 8 +- ports/capnproto/vcpkg.json | 5 +- ports/casadi/portfile.cmake | 41 -- ports/casadi/usage | 5 - ports/casadi/vcpkg.json | 17 - ports/coin-or-cbc/portfile.cmake | 6 +- ports/coin-or-cbc/vcpkg.json | 7 +- ports/colmap/portfile.cmake | 25 +- ports/colmap/vcpkg.json | 41 +- ports/cpp-peglib/portfile.cmake | 2 +- ports/cpp-peglib/vcpkg.json | 2 +- ports/cpp-timsort/portfile.cmake | 2 +- ports/cpp-timsort/vcpkg.json | 2 +- .../devendor_boost_absl.patch | 175 +++++ ports/cppmicroservices/portfile.cmake | 22 +- ports/cppmicroservices/remove-wx.patch | 13 - ports/cppmicroservices/vcpkg.json | 6 +- ports/cpptrace/portfile.cmake | 2 +- ports/cpptrace/vcpkg.json | 2 +- ports/crashpad/portfile.cmake | 12 +- ports/crashpad/vcpkg.json | 2 +- ports/cuda-api-wrappers/portfile.cmake | 2 +- ports/cuda-api-wrappers/usage | 2 +- ports/cuda-api-wrappers/vcpkg.json | 2 +- ports/curlpp/portfile.cmake | 2 + ports/curlpp/vcpkg.json | 2 +- ports/date/0001-fix-uwp.patch | 90 --- ports/date/0002-fix-cmake-install.patch | 63 -- ports/date/portfile.cmake | 14 +- ports/date/vcpkg.json | 2 +- ports/dcmtk/dependencies.diff | 13 +- ports/dcmtk/portfile.cmake | 1 - ports/dcmtk/vcpkg.json | 1 + ports/deniskovalchuk-libftp/portfile.cmake | 2 +- ports/deniskovalchuk-libftp/vcpkg.json | 3 +- ports/directx12-agility/portfile.cmake | 2 + ports/directx12-agility/vcpkg.json | 1 + ports/dlpack/portfile.cmake | 2 +- ports/dlpack/vcpkg.json | 2 +- ports/fastio/portfile.cmake | 4 +- ports/fastio/vcpkg.json | 2 +- ports/fbthrift/portfile.cmake | 3 +- ports/fbthrift/vcpkg.json | 2 +- ports/ffmpeg/FindFFMPEG.cmake.in | 6 +- ports/ffmpeg/vcpkg.json | 2 +- ports/ffnvcodec/portfile.cmake | 12 +- ports/ffnvcodec/vcpkg.json | 1 + ports/fizz/portfile.cmake | 2 +- ports/fizz/vcpkg.json | 2 +- ports/fltk/portfile.cmake | 2 + ports/fltk/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 2 +- ports/fontconfig/emscripten.diff | 13 + ports/fontconfig/portfile.cmake | 30 +- ports/fontconfig/usage | 9 +- ports/fontconfig/vcpkg.json | 42 +- ports/g2o/0003-dependency-spdlog.diff | 14 + ports/g2o/fix-absolute.patch | 18 +- ports/g2o/portfile.cmake | 11 +- ports/g2o/vcpkg.json | 13 +- ports/gazebo/0001-Fix-deps.patch | 178 ++++- ports/gazebo/fix-tbb.patch | 443 ------------ ports/gazebo/portfile.cmake | 14 +- ports/gazebo/vcpkg.json | 4 +- ports/geogram/fix-vcpkg-install.patch | 57 +- ports/geogram/portfile.cmake | 17 +- ports/geogram/vcpkg.json | 3 +- ports/geographiclib/portfile.cmake | 2 +- ports/geographiclib/vcpkg.json | 2 +- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- ports/glslang/portfile.cmake | 2 +- ports/glslang/vcpkg.json | 2 +- ports/gmime/CMakeLists.txt | 58 -- ports/gmime/msvc-ssize_t.diff | 33 + ports/gmime/portfile.cmake | 76 +- ports/gmime/subdirs.diff | 16 + ports/gmime/vcpkg.json | 27 +- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 5 +- ports/gstreamer/fix-multiple-def.patch | 35 + ports/gstreamer/portfile.cmake | 2 + ports/gstreamer/vcpkg.json | 4 +- ports/gumbo/portfile.cmake | 18 +- ports/gumbo/vcpkg.json | 5 +- ports/gz-common5/003-include-chrono.patch | 12 + ports/gz-common5/portfile.cmake | 1 + ports/gz-common5/vcpkg.json | 2 +- ports/imageinfo/portfile.cmake | 4 +- ports/imageinfo/vcpkg.json | 2 +- ports/imgui/portfile.cmake | 4 +- ports/imgui/vcpkg.json | 2 +- ports/ismrmrd/fix-nodiscard-warning.patch | 13 + ports/ismrmrd/portfile.cmake | 3 +- ports/ismrmrd/vcpkg.json | 1 + ports/itpp/fix-build.patch | 14 + ports/itpp/portfile.cmake | 3 +- ports/itpp/vcpkg.json | 2 +- ports/jemalloc/portfile.cmake | 9 +- ports/jemalloc/vcpkg.json | 10 +- .../juce/0002-build-linux-find_packages.patch | 37 - .../0003-build-forward-vcpkg-toolchain.patch | 32 - ports/juce/0004-install-paths.patch | 26 - ports/juce/devendor-oboe.diff | 17 + ports/juce/gcc-has-builtin.diff | 12 + ports/juce/install-extras.diff | 19 + ports/juce/juceaide.diff | 83 +++ ports/juce/missing-modules.diff | 20 + ports/juce/portfile.cmake | 137 ++-- ports/juce/prefer-cmake.diff | 45 ++ ports/juce/vcpkg-compile-definitions.diff | 27 + ports/juce/vcpkg.json | 151 ++-- ports/kdreports/fix-cmake-config.patch | 19 + ports/kdreports/fix-license-text.patch | 10 + ports/kdreports/portfile.cmake | 39 ++ ports/kdreports/usage | 4 + ports/kdreports/vcpkg.json | 24 + .../fix-license-text.patch | 12 + ports/kdsingleapplication/portfile.cmake | 9 +- ports/kdsingleapplication/vcpkg.json | 1 + ports/kdsoap/fix-license-text.patch | 10 + ports/kdsoap/portfile.cmake | 16 +- ports/kdsoap/usage | 7 + ports/kdsoap/vcpkg.json | 6 +- ports/kdstatemachineeditor/portfile.cmake | 43 ++ ports/kdstatemachineeditor/usage | 11 + ports/kdstatemachineeditor/vcpkg.json | 30 + ports/kealib/portfile.cmake | 2 +- ports/kealib/vcpkg.json | 2 +- ports/kf5plotting/portfile.cmake | 4 +- ports/kf5plotting/vcpkg.json | 1 + ports/kf5texteditor/portfile.cmake | 12 +- ports/kf5texteditor/vcpkg.json | 2 +- ports/krb5/portfile.cmake | 6 +- ports/krb5/vcpkg.json | 10 +- ports/kubazip/fix_targets.patch | 12 +- ports/kubazip/portfile.cmake | 4 +- ports/kubazip/vcpkg.json | 4 +- ports/leptonica/portfile.cmake | 9 +- ports/leptonica/vcpkg.json | 3 +- ports/level-zero/portfile.cmake | 2 +- ports/level-zero/vcpkg.json | 2 +- ports/libcap/portfile.cmake | 2 +- ports/libcap/vcpkg.json | 2 +- ports/libdeflate/portfile.cmake | 2 +- ports/libdeflate/vcpkg.json | 2 +- ports/libdshowcapture/portfile.cmake | 10 +- ports/libdshowcapture/vcpkg.json | 2 +- ports/libgpg-error/android.diff | 12 + ports/libgpg-error/mingw.diff | 15 + ports/libgpg-error/portfile.cmake | 11 +- ports/libgpg-error/vcpkg.json | 6 +- ports/libgpg-error/win32-nls.diff | 25 + ports/libgpod/configure.ac.patch | 13 - ports/libgpod/portfile.cmake | 38 - ports/libgpod/vcpkg.json | 13 - ports/libheif/fix-gcc8.patch | 33 + ports/libheif/portfile.cmake | 1 + ports/libheif/vcpkg.json | 2 +- ports/libical/portfile.cmake | 4 +- ports/libical/vcpkg.json | 2 +- ports/libidn2/portfile.cmake | 7 +- ports/libidn2/vcpkg.json | 8 +- .../add-options-for-exes-docs-headers.patch | 122 ++-- ports/libjpeg-turbo/portfile.cmake | 2 +- ports/libjpeg-turbo/vcpkg.json | 2 +- .../0003-Fix-WIN32-macro-checks.patch | 30 +- ports/libmagic/portfile.cmake | 4 +- ports/libmagic/vcpkg.json | 3 +- ports/libmediainfo/msvc-arm.diff | 25 - ports/libmediainfo/no-windows-namespace.diff | 56 -- ports/libmediainfo/portfile.cmake | 4 +- ports/libmediainfo/vcpkg.json | 2 +- ports/libnick/portfile.cmake | 2 +- ports/libnick/vcpkg.json | 2 +- ports/libsecret/portfile.cmake | 5 +- ports/libsecret/vcpkg.json | 3 +- ports/libtorch/fix-sleef.patch | 62 ++ ports/libtorch/no-abs-path.patch | 25 + ports/libtorch/portfile.cmake | 1 + ports/libtorch/vcpkg.json | 2 +- ports/libxdf/fix-pugixml-dependency.patch | 65 -- ports/libxdf/portfile.cmake | 4 +- ports/libxdf/vcpkg.json | 2 +- ports/libxfont/portfile.cmake | 10 +- ports/libxfont/vcpkg.json | 1 + ports/libxml2/fix_ios_compilation.patch | 87 +++ ports/libxml2/portfile.cmake | 1 + ports/libxml2/vcpkg.json | 1 + ports/lief/fix-cmakelists.patch | 49 ++ ports/lief/fix-liefconfig-cmake-in.patch | 24 + ports/lief/fix-vcpkg-includes.patch | 52 ++ ports/lief/portfile.cmake | 71 ++ ports/lief/vcpkg.json | 79 +++ ports/lilv/portfile.cmake | 23 +- ports/lilv/vcpkg.json | 13 +- ports/log4cxx/fix-find-package.patch | 6 +- ports/log4cxx/portfile.cmake | 12 +- ports/log4cxx/vcpkg.json | 2 +- ports/ls-qpack/cmake-config.diff | 44 ++ ports/ls-qpack/emscripten.diff | 21 + ports/ls-qpack/mingw.diff | 13 + ports/ls-qpack/pkgconfig.diff | 34 + ports/ls-qpack/portfile.cmake | 19 +- ports/ls-qpack/vcpkg.json | 3 +- ports/mchehab-zbar/c99.patch | 89 --- ports/mchehab-zbar/issue219.patch | 13 - ports/mchehab-zbar/portfile.cmake | 7 +- ports/mchehab-zbar/vcpkg.json | 3 +- ports/mchehab-zbar/windows.patch | 44 +- ports/mchehab-zbar/x64.patch | 14 +- ports/meekrosoft-fff/portfile.cmake | 12 + ports/meekrosoft-fff/vcpkg.json | 7 + ports/mimicpp/portfile.cmake | 2 +- ports/mimicpp/vcpkg.json | 2 +- ports/mlpack/portfile.cmake | 2 +- ports/mlpack/vcpkg.json | 2 +- ports/mongo-c-driver/portfile.cmake | 1 + ports/mongo-c-driver/remove_abs_patch.cmake | 13 + ports/mongo-c-driver/vcpkg.json | 1 + ports/mongo-cxx-driver/portfile.cmake | 14 +- ports/mongo-cxx-driver/vcpkg.json | 17 +- ports/msh3/dependencies_fix.patch | 76 +- ports/msh3/portfile.cmake | 10 +- ports/msh3/vcpkg.json | 5 +- ports/msh3/width-exceeds-type.diff | 32 + ports/msquic/all_headers.patch | 13 - ports/msquic/exports-for-msh3.diff | 56 ++ ports/msquic/fix-install.patch | 44 +- ports/msquic/portfile.cmake | 97 ++- ports/msquic/uwp-link-libs.diff | 47 ++ ports/msquic/vcpkg.json | 22 +- ports/muparser/portfile.cmake | 15 +- ports/muparser/vcpkg.json | 9 +- ports/mvfst/portfile.cmake | 2 +- ports/mvfst/vcpkg.json | 2 +- ports/nanojsonc/portfile.cmake | 2 +- ports/nanojsonc/vcpkg.json | 2 +- ports/nanoprintf/portfile.cmake | 2 +- ports/nanoprintf/vcpkg.json | 2 +- ports/nghttp3/portfile.cmake | 6 +- ports/nghttp3/vcpkg.json | 2 +- ports/ngtcp2/portfile.cmake | 2 +- ports/ngtcp2/vcpkg.json | 2 +- ports/nyan-lang/portfile.cmake | 3 +- ports/nyan-lang/vcpkg.json | 2 +- ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 5 +- ports/openexr/portfile.cmake | 2 +- ports/openexr/vcpkg.json | 2 +- ports/openfbx/CMakeLists.txt | 5 +- .../openfbx/unofficial-openfbxConfig.cmake.in | 4 +- ports/openfbx/vcpkg.json | 3 +- ports/openmvg/portfile.cmake | 6 +- ports/openmvg/vcpkg.json | 1 + ports/orange-math/portfile.cmake | 34 + ports/orange-math/vcpkg.json | 18 + ports/pdal-dimbuilder/portfile.cmake | 2 +- ports/pdal-dimbuilder/vcpkg.json | 2 +- ports/pdal/portfile.cmake | 2 +- ports/pdal/vcpkg.json | 2 +- ports/pdcurses/portfile.cmake | 1 + ports/pdcurses/vcpkg.json | 2 +- ports/physx/portfile.cmake | 106 ++- ports/physx/vcpkg.json | 2 +- ports/poco/0001-static-pcre.patch | 10 +- ports/poco/0003-fix-dependency.patch | 38 +- ports/poco/0005-fix-error-c3861.patch | 10 +- ports/poco/0007-find-pcre2.patch | 28 +- ports/poco/portfile.cmake | 3 +- ports/poco/vcpkg.json | 11 +- ports/prometheus-cpp/portfile.cmake | 2 +- ports/prometheus-cpp/vcpkg.json | 2 +- ports/proxygen/portfile.cmake | 2 +- ports/proxygen/vcpkg.json | 2 +- ports/ptex/portfile.cmake | 5 +- ports/ptex/vcpkg.json | 1 + ports/qtbase/macdeployqt-symlinks.patch | 33 + ports/qtbase/portfile.cmake | 1 + ports/qtbase/vcpkg.json | 1 + ports/realsense2/portfile.cmake | 9 +- ports/realsense2/vcpkg.json | 2 +- ports/recycle/portfile.cmake | 4 +- ports/recycle/vcpkg.json | 2 +- ports/ruapu/portfile.cmake | 14 + ports/ruapu/vcpkg.json | 7 + ports/ryu/CMakeLists.txt | 53 ++ ports/ryu/portfile.cmake | 115 +-- ports/ryu/ryuConfig.cmake | 26 - ports/ryu/usage | 2 +- ports/ryu/vcpkg.json | 7 +- ports/s2n/portfile.cmake | 2 +- ports/s2n/vcpkg.json | 2 +- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- ports/sese/portfile.cmake | 3 + ports/sese/vcpkg.json | 2 +- ports/shiva/find_python_and_no_copy_dll.patch | 25 - ports/shiva/portfile.cmake | 22 - ports/shiva/vcpkg.json | 33 - ports/sleef/portfile.cmake | 18 +- ports/sleef/vcpkg.json | 7 +- ports/sqlcipher/portfile.cmake | 4 +- ports/sqlcipher/vcpkg.json | 1 + ports/sse2neon/portfile.cmake | 2 +- ports/sse2neon/vcpkg.json | 2 +- ports/stringzilla/portfile.cmake | 2 +- ports/stringzilla/vcpkg.json | 5 +- ports/stxxl/portfile.cmake | 45 +- ports/stxxl/vcpkg.json | 2 +- .../disable-wchar-t-check-emscripten.patch | 30 - ports/taglib/portfile.cmake | 4 +- ports/taglib/vcpkg.json | 3 +- ports/tgui/portfile.cmake | 2 +- ports/tgui/vcpkg.json | 2 +- ports/thorvg/portfile.cmake | 2 +- ports/thorvg/vcpkg.json | 2 +- ports/tinyexr/fixtargets.patch | 16 +- ports/tinyexr/portfile.cmake | 2 +- ports/tinyexr/vcpkg.json | 2 +- ports/tomsolver/portfile.cmake | 2 +- ports/tomsolver/vcpkg.json | 2 +- ports/ucoro/cmake-install.patch | 39 ++ ports/ucoro/portfile.cmake | 23 + ports/ucoro/vcpkg.json | 17 + ports/unicorn/fix-build.patch | 20 +- ports/unicorn/fix-msvc-shared.patch | 26 + ports/unicorn/portfile.cmake | 31 +- ports/unicorn/vcpkg.json | 4 +- ports/usd/003-fix-dep.patch | 139 ++++ ports/usd/003-vcpkg_find_opensubdiv.patch | 34 - ...kage.patch => 004-fix_cmake_package.patch} | 25 +- ports/usd/004-vcpkg_find_openimageio.patch | 57 -- ...-39.patch => 005-MaterialX_v1.38-39.patch} | 64 +- ports/usd/005-vcpkg_find_shaderc.patch | 43 -- ports/usd/006-vcpkg_find_spirv-reflect.patch | 40 -- ....patch => 007-fix_cmake_hgi_interop.patch} | 0 ports/usd/007-vcpkg_find_vma.patch | 27 - ...ch => 008-fix_clang8_compiler_error.patch} | 0 ...09-vcpkg_install_folder_conventions.patch} | 0 ... 010-cmake_export_plugin_as_modules.patch} | 0 ...0-fix_missing_find_dependency_vulkan.patch | 17 - ...{016-TBB-2022.patch => 011-TBB-2022.patch} | 0 ports/usd/012-fix-find-vulkan.patch | 28 + ...5-fix_missing_find_dependency_opengl.patch | 14 - ports/usd/portfile.cmake | 41 +- ports/usd/vcpkg.json | 2 +- ports/utf8-range/portfile.cmake | 2 +- ports/utf8-range/vcpkg.json | 2 +- ports/utfcpp/portfile.cmake | 2 +- ports/utfcpp/vcpkg.json | 2 +- ports/v-hacd/CMakeLists.txt | 19 - ports/v-hacd/fix-cmake.patch | 140 ---- ports/v-hacd/portfile.cmake | 42 +- ports/v-hacd/vcpkg.json | 26 +- ports/vcpkg-make/portfile.cmake | 43 ++ ports/vcpkg-make/vcpkg-port-config.cmake | 6 + ports/vcpkg-make/vcpkg.json | 13 + ports/vcpkg-make/vcpkg_make.cmake | 277 ++++++++ ports/vcpkg-make/vcpkg_make_common.cmake | 660 ++++++++++++++++++ ports/vcpkg-make/vcpkg_make_configure.cmake | 135 ++++ ports/vcpkg-make/vcpkg_make_install.cmake | 134 ++++ ports/vcpkg-make/vcpkg_scripts.cmake | 203 ++++++ ports/vcpkg-make/wrappers/cl_cpp_wrapper | 95 +++ ports/vcpkg-make/wrappers/windres-rc | 122 ++++ .../vcpkg-tool-meson/vcpkg-port-config.cmake | 2 +- ports/vcpkg-tool-meson/vcpkg.json | 2 +- ports/vincentlaucsb-csv-parser/portfile.cmake | 2 +- ports/vincentlaucsb-csv-parser/vcpkg.json | 3 +- ports/wangle/portfile.cmake | 2 +- ports/wangle/vcpkg.json | 2 +- ports/winsparkle/portfile.cmake | 6 +- ports/winsparkle/vcpkg.json | 2 +- ports/x264/allow-clang-cl.patch | 3 +- ports/x264/portfile.cmake | 54 +- ports/x264/vcpkg.json | 3 +- ports/xsimd/portfile.cmake | 11 +- ports/xsimd/vcpkg.json | 3 +- ports/yalantinglibs/portfile.cmake | 2 +- ports/yalantinglibs/vcpkg.json | 2 +- ports/yoga/portfile.cmake | 2 +- ports/yoga/vcpkg.json | 2 +- ports/zfp/portfile.cmake | 6 +- ports/zfp/vcpkg.json | 3 +- ports/zix/fix-win32.patch | 33 - ports/zix/portfile.cmake | 13 +- ports/zix/vcpkg.json | 1 + scripts/azure-pipelines/android/Dockerfile | 6 +- .../android/create-docker-image.ps1 | 10 +- scripts/azure-pipelines/azure-pipelines.yml | 2 +- .../windows/azure-pipelines.yml | 2 +- .../windows/deploy-azure-cli.ps1 | 4 +- .../windows/deploy-visual-studio.ps1 | 6 +- scripts/boost/generate-ports.ps1 | 8 +- scripts/ci.baseline.txt | 43 +- .../vcpkg_find_acquire_program(NUGET).cmake | 8 +- .../vcpkg-ci-aurora-au/portfile.cmake | 7 + .../vcpkg-ci-aurora-au/project/CMakeLists.txt | 9 + .../project/test_au_client.cc | 18 + .../test_ports/vcpkg-ci-aurora-au/vcpkg.json | 13 + scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 2 +- .../test_ports/vcpkg-ci-gmime/portfile.cmake | 11 + .../vcpkg-ci-gmime/project/CMakeLists.txt | 15 + .../test_ports/vcpkg-ci-gmime/project/main.c | 26 + scripts/test_ports/vcpkg-ci-gmime/vcpkg.json | 31 + .../test_ports/vcpkg-ci-juce/portfile.cmake | 8 + .../vcpkg-ci-juce/project/CMakeLists.txt | 25 + .../test_ports/vcpkg-ci-juce/project/main.cpp | 7 + scripts/test_ports/vcpkg-ci-juce/vcpkg.json | 28 + .../test_ports/vcpkg-ci-lief/portfile.cmake | 7 + .../vcpkg-ci-lief/project/CMakeLists.txt | 9 + .../test_ports/vcpkg-ci-lief/project/main.cpp | 10 + scripts/test_ports/vcpkg-ci-lief/vcpkg.json | 30 + .../vcpkg-ci-mongo-cxx-driver/portfile.cmake | 1 - .../vcpkg-ci-mongo-cxx-driver/vcpkg.json | 14 - .../test_ports/vcpkg-ci-msh3/portfile.cmake | 10 + .../vcpkg-ci-msh3/project/CMakeLists.txt | 22 + .../test_ports/vcpkg-ci-msh3/project/main.c | 8 + scripts/test_ports/vcpkg-ci-msh3/vcpkg.json | 19 + .../vcpkg-ci-orange-math/portfile.cmake | 7 + .../project/CMakeLists.txt | 10 + .../vcpkg-ci-orange-math/project/main.cpp | 18 + .../vcpkg-ci-orange-math/vcpkg.json | 13 + .../test_ports/vcpkg-ci-ryu/CMakeLists.txt | 6 + .../test_ports/vcpkg-ci-ryu/portfile.cmake | 9 + scripts/test_ports/vcpkg-ci-ryu/test.c | 21 + scripts/test_ports/vcpkg-ci-ryu/vcpkg.json | 11 + .../vcpkg-ci-unicorn/portfile.cmake | 10 + .../vcpkg-ci-unicorn/project/CMakeLists.txt | 12 + .../vcpkg-ci-unicorn/project/main.c | 8 + .../test_ports/vcpkg-ci-unicorn/vcpkg.json | 13 + .../vcpkg-make-tests/portfile.cmake | 22 + .../test-z_adapt_lib_link_names.cmake | 51 ++ .../test-z_vcpkg_make_determine_arch.cmake | 28 + ...est-z_vcpkg_make_determine_host_arch.cmake | 14 + ...t-z_vcpkg_make_determine_target_arch.cmake | 15 + ...t-z_vcpkg_make_prepare_compile_flags.cmake | 99 +++ .../test_ports/vcpkg-make-tests/vcpkg.json | 37 + .../arm64-windows-static-md.cmake | 0 .../x64-windows-static-md.cmake | 0 versions/a-/alembic.json | 5 + versions/a-/allegro5.json | 5 + versions/a-/angle.json | 5 + versions/a-/aom.json | 5 + versions/a-/apache-datasketches.json | 5 + versions/a-/arpack-ng.json | 5 + versions/a-/asio-grpc.json | 10 + versions/a-/audiofile.json | 5 + versions/a-/aurora-au.json | 10 + versions/a-/aws-c-auth.json | 5 + versions/a-/aws-c-cal.json | 5 + versions/a-/aws-c-common.json | 5 + versions/a-/aws-c-compression.json | 5 + versions/a-/aws-c-event-stream.json | 5 + versions/a-/aws-c-http.json | 5 + versions/a-/aws-c-io.json | 5 + versions/a-/aws-c-mqtt.json | 5 + versions/a-/aws-c-s3.json | 5 + versions/a-/aws-c-sdkutils.json | 5 + versions/a-/aws-checksums.json | 5 + versions/a-/aws-crt-cpp.json | 5 + versions/a-/aws-sdk-cpp.json | 15 + versions/a-/azure-kinect-sensor-sdk.json | 5 + versions/b-/bddisasm.json | 5 + versions/b-/behaviortree-cpp.json | 5 + versions/b-/benchmark.json | 5 + versions/b-/bit7z.json | 10 + versions/b-/boost-cobalt.json | 5 + versions/b-/boost.json | 5 + versions/b-/bshoshany-thread-pool.json | 5 + versions/b-/buck-yeh-bux-sqlite.json | 5 + versions/b-/buck-yeh-bux.json | 5 + versions/baseline.json | 402 ++++++----- versions/c-/capnproto.json | 10 + versions/c-/coin-or-cbc.json | 5 + versions/c-/colmap.json | 5 + versions/c-/cpp-peglib.json | 5 + versions/c-/cpp-timsort.json | 5 + versions/c-/cppmicroservices.json | 5 + versions/c-/cpptrace.json | 5 + versions/c-/crashpad.json | 5 + versions/c-/cuda-api-wrappers.json | 5 + versions/c-/curlpp.json | 5 + versions/d-/date.json | 5 + versions/d-/dcmtk.json | 5 + versions/d-/deniskovalchuk-libftp.json | 5 + versions/d-/directx12-agility.json | 5 + versions/d-/dlpack.json | 5 + versions/f-/fastio.json | 5 + versions/f-/fbthrift.json | 10 + versions/f-/ffmpeg.json | 5 + versions/f-/ffnvcodec.json | 5 + versions/f-/fizz.json | 10 + versions/f-/fltk.json | 5 + versions/f-/folly.json | 10 + versions/f-/fontconfig.json | 5 + versions/g-/g2o.json | 20 + versions/g-/gazebo.json | 5 + versions/g-/geogram.json | 5 + versions/g-/geographiclib.json | 5 + versions/g-/glaze.json | 10 + versions/g-/glslang.json | 5 + versions/g-/gmime.json | 10 + versions/g-/google-cloud-cpp.json | 5 + versions/g-/gstreamer.json | 10 + versions/g-/gumbo.json | 10 + versions/g-/gz-common5.json | 5 + versions/i-/imageinfo.json | 5 + versions/i-/imgui.json | 5 + versions/i-/ismrmrd.json | 5 + versions/i-/itpp.json | 5 + versions/j-/jemalloc.json | 5 + versions/j-/juce.json | 5 + versions/k-/kdreports.json | 9 + versions/k-/kdsingleapplication.json | 5 + versions/k-/kdsoap.json | 5 + versions/k-/kdstatemachineeditor.json | 9 + versions/k-/kealib.json | 5 + versions/k-/kf5plotting.json | 5 + versions/k-/kf5texteditor.json | 5 + versions/k-/krb5.json | 5 + versions/k-/kubazip.json | 5 + versions/l-/leptonica.json | 5 + versions/l-/level-zero.json | 5 + versions/l-/libcap.json | 5 + versions/l-/libdeflate.json | 5 + versions/l-/libdshowcapture.json | 5 + versions/l-/libgpg-error.json | 5 + versions/l-/libheif.json | 5 + versions/l-/libical.json | 5 + versions/l-/libidn2.json | 5 + versions/l-/libjpeg-turbo.json | 5 + versions/l-/libmagic.json | 5 + versions/l-/libmediainfo.json | 5 + versions/l-/libnick.json | 5 + versions/l-/libsecret.json | 5 + versions/l-/libtorch.json | 10 + versions/l-/libxdf.json | 5 + versions/l-/libxfont.json | 5 + versions/l-/libxml2.json | 5 + versions/l-/lief.json | 14 + versions/l-/lilv.json | 5 + versions/l-/log4cxx.json | 5 + versions/l-/ls-qpack.json | 5 + versions/m-/mchehab-zbar.json | 5 + versions/m-/meekrosoft-fff.json | 9 + versions/m-/mimicpp.json | 5 + versions/m-/mlpack.json | 5 + versions/m-/mongo-c-driver.json | 5 + versions/m-/mongo-cxx-driver.json | 5 + versions/m-/msh3.json | 5 + versions/m-/msquic.json | 10 + versions/m-/muparser.json | 5 + versions/m-/mvfst.json | 10 + versions/n-/nanojsonc.json | 5 + versions/n-/nanoprintf.json | 5 + versions/n-/nghttp3.json | 5 + versions/n-/ngtcp2.json | 5 + versions/n-/nyan-lang.json | 5 + versions/o-/opencv4.json | 5 + versions/o-/openexr.json | 5 + versions/o-/openfbx.json | 5 + versions/o-/openmvg.json | 5 + versions/o-/orange-math.json | 9 + versions/p-/pdal-dimbuilder.json | 5 + versions/p-/pdal.json | 5 + versions/p-/pdcurses.json | 5 + versions/p-/physx.json | 12 +- versions/p-/poco.json | 5 + versions/p-/prometheus-cpp.json | 5 + versions/p-/proxygen.json | 10 + versions/p-/ptex.json | 5 + versions/q-/qtbase.json | 5 + versions/r-/realsense2.json | 5 + versions/r-/recycle.json | 5 + versions/r-/ruapu.json | 9 + versions/r-/ryu.json | 5 + versions/s-/s2n.json | 5 + versions/s-/sentry-native.json | 5 + versions/s-/sese.json | 5 + versions/s-/sleef.json | 5 + versions/s-/sqlcipher.json | 5 + versions/s-/sse2neon.json | 5 + versions/s-/stringzilla.json | 10 + versions/s-/stxxl.json | 5 + versions/t-/taglib.json | 5 + versions/t-/tgui.json | 5 + versions/t-/thorvg.json | 5 + versions/t-/tinyexr.json | 5 + versions/t-/tomsolver.json | 5 + versions/u-/ucoro.json | 9 + versions/u-/unicorn.json | 5 + versions/u-/usd.json | 10 + versions/u-/utf8-range.json | 5 + versions/u-/utfcpp.json | 5 + versions/v-/v-hacd.json | 5 + versions/v-/vcpkg-make.json | 14 + versions/v-/vcpkg-tool-meson.json | 5 + versions/v-/vincentlaucsb-csv-parser.json | 5 + versions/w-/wangle.json | 10 + versions/w-/winsparkle.json | 5 + versions/x-/x264.json | 5 + versions/x-/xsimd.json | 5 + versions/y-/yalantinglibs.json | 5 + versions/y-/yoga.json | 5 + versions/z-/zfp.json | 5 + versions/z-/zix.json | 5 + 678 files changed, 7467 insertions(+), 3466 deletions(-) delete mode 100644 ports/audiofile/fix-cmakeLists.patch delete mode 100644 ports/aurora-au/disable-googletest.patch create mode 100644 ports/bit7z/fix_compile_options.patch create mode 100644 ports/boost-cobalt/fail-on-compiler-not-supported.patch delete mode 100644 ports/casadi/portfile.cmake delete mode 100644 ports/casadi/usage delete mode 100644 ports/casadi/vcpkg.json create mode 100644 ports/cppmicroservices/devendor_boost_absl.patch delete mode 100644 ports/cppmicroservices/remove-wx.patch delete mode 100644 ports/date/0001-fix-uwp.patch delete mode 100644 ports/date/0002-fix-cmake-install.patch create mode 100644 ports/fontconfig/emscripten.diff create mode 100644 ports/g2o/0003-dependency-spdlog.diff delete mode 100644 ports/gazebo/fix-tbb.patch delete mode 100644 ports/gmime/CMakeLists.txt create mode 100644 ports/gmime/msvc-ssize_t.diff create mode 100644 ports/gmime/subdirs.diff create mode 100644 ports/gstreamer/fix-multiple-def.patch create mode 100644 ports/gz-common5/003-include-chrono.patch create mode 100644 ports/ismrmrd/fix-nodiscard-warning.patch create mode 100644 ports/itpp/fix-build.patch delete mode 100644 ports/juce/0002-build-linux-find_packages.patch delete mode 100644 ports/juce/0003-build-forward-vcpkg-toolchain.patch create mode 100644 ports/juce/devendor-oboe.diff create mode 100644 ports/juce/gcc-has-builtin.diff create mode 100644 ports/juce/install-extras.diff create mode 100644 ports/juce/juceaide.diff create mode 100644 ports/juce/missing-modules.diff create mode 100644 ports/juce/prefer-cmake.diff create mode 100644 ports/juce/vcpkg-compile-definitions.diff create mode 100644 ports/kdreports/fix-cmake-config.patch create mode 100644 ports/kdreports/fix-license-text.patch create mode 100644 ports/kdreports/portfile.cmake create mode 100644 ports/kdreports/usage create mode 100644 ports/kdreports/vcpkg.json create mode 100644 ports/kdsingleapplication/fix-license-text.patch create mode 100644 ports/kdsoap/fix-license-text.patch create mode 100644 ports/kdsoap/usage create mode 100644 ports/kdstatemachineeditor/portfile.cmake create mode 100644 ports/kdstatemachineeditor/usage create mode 100644 ports/kdstatemachineeditor/vcpkg.json create mode 100644 ports/libgpg-error/android.diff create mode 100644 ports/libgpg-error/mingw.diff create mode 100644 ports/libgpg-error/win32-nls.diff delete mode 100644 ports/libgpod/configure.ac.patch delete mode 100644 ports/libgpod/portfile.cmake delete mode 100644 ports/libgpod/vcpkg.json create mode 100644 ports/libheif/fix-gcc8.patch delete mode 100644 ports/libmediainfo/msvc-arm.diff delete mode 100644 ports/libmediainfo/no-windows-namespace.diff create mode 100644 ports/libtorch/no-abs-path.patch delete mode 100644 ports/libxdf/fix-pugixml-dependency.patch create mode 100644 ports/libxml2/fix_ios_compilation.patch create mode 100644 ports/lief/fix-cmakelists.patch create mode 100644 ports/lief/fix-liefconfig-cmake-in.patch create mode 100644 ports/lief/fix-vcpkg-includes.patch create mode 100644 ports/lief/portfile.cmake create mode 100644 ports/lief/vcpkg.json create mode 100644 ports/ls-qpack/cmake-config.diff create mode 100644 ports/ls-qpack/emscripten.diff create mode 100644 ports/ls-qpack/mingw.diff create mode 100644 ports/ls-qpack/pkgconfig.diff delete mode 100644 ports/mchehab-zbar/c99.patch delete mode 100644 ports/mchehab-zbar/issue219.patch create mode 100644 ports/meekrosoft-fff/portfile.cmake create mode 100644 ports/meekrosoft-fff/vcpkg.json create mode 100644 ports/mongo-c-driver/remove_abs_patch.cmake create mode 100644 ports/msh3/width-exceeds-type.diff delete mode 100644 ports/msquic/all_headers.patch create mode 100644 ports/msquic/exports-for-msh3.diff create mode 100644 ports/msquic/uwp-link-libs.diff create mode 100644 ports/orange-math/portfile.cmake create mode 100644 ports/orange-math/vcpkg.json create mode 100644 ports/qtbase/macdeployqt-symlinks.patch create mode 100644 ports/ruapu/portfile.cmake create mode 100644 ports/ruapu/vcpkg.json create mode 100644 ports/ryu/CMakeLists.txt delete mode 100644 ports/ryu/ryuConfig.cmake delete mode 100644 ports/shiva/find_python_and_no_copy_dll.patch delete mode 100644 ports/shiva/portfile.cmake delete mode 100644 ports/shiva/vcpkg.json delete mode 100644 ports/taglib/disable-wchar-t-check-emscripten.patch create mode 100644 ports/ucoro/cmake-install.patch create mode 100644 ports/ucoro/portfile.cmake create mode 100644 ports/ucoro/vcpkg.json create mode 100644 ports/unicorn/fix-msvc-shared.patch create mode 100644 ports/usd/003-fix-dep.patch delete mode 100644 ports/usd/003-vcpkg_find_opensubdiv.patch rename ports/usd/{008-fix_cmake_package.patch => 004-fix_cmake_package.patch} (57%) delete mode 100644 ports/usd/004-vcpkg_find_openimageio.patch rename ports/usd/{014-MaterialX_v1.38-39.patch => 005-MaterialX_v1.38-39.patch} (91%) delete mode 100644 ports/usd/005-vcpkg_find_shaderc.patch delete mode 100644 ports/usd/006-vcpkg_find_spirv-reflect.patch rename ports/usd/{009-fix_cmake_hgi_interop.patch => 007-fix_cmake_hgi_interop.patch} (100%) delete mode 100644 ports/usd/007-vcpkg_find_vma.patch rename ports/usd/{011-fix_clang8_compiler_error.patch => 008-fix_clang8_compiler_error.patch} (100%) rename ports/usd/{012-vcpkg_install_folder_conventions.patch => 009-vcpkg_install_folder_conventions.patch} (100%) rename ports/usd/{013-cmake_export_plugin_as_modules.patch => 010-cmake_export_plugin_as_modules.patch} (100%) delete mode 100644 ports/usd/010-fix_missing_find_dependency_vulkan.patch rename ports/usd/{016-TBB-2022.patch => 011-TBB-2022.patch} (100%) create mode 100644 ports/usd/012-fix-find-vulkan.patch delete mode 100644 ports/usd/015-fix_missing_find_dependency_opengl.patch delete mode 100644 ports/v-hacd/CMakeLists.txt delete mode 100644 ports/v-hacd/fix-cmake.patch create mode 100644 ports/vcpkg-make/portfile.cmake create mode 100644 ports/vcpkg-make/vcpkg-port-config.cmake create mode 100644 ports/vcpkg-make/vcpkg.json create mode 100644 ports/vcpkg-make/vcpkg_make.cmake create mode 100644 ports/vcpkg-make/vcpkg_make_common.cmake create mode 100644 ports/vcpkg-make/vcpkg_make_configure.cmake create mode 100644 ports/vcpkg-make/vcpkg_make_install.cmake create mode 100644 ports/vcpkg-make/vcpkg_scripts.cmake create mode 100644 ports/vcpkg-make/wrappers/cl_cpp_wrapper create mode 100644 ports/vcpkg-make/wrappers/windres-rc delete mode 100644 ports/zix/fix-win32.patch create mode 100644 scripts/test_ports/vcpkg-ci-aurora-au/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-aurora-au/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-aurora-au/project/test_au_client.cc create mode 100644 scripts/test_ports/vcpkg-ci-aurora-au/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-gmime/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-gmime/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-gmime/project/main.c create mode 100644 scripts/test_ports/vcpkg-ci-gmime/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-juce/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-juce/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-juce/project/main.cpp create mode 100644 scripts/test_ports/vcpkg-ci-juce/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-lief/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-lief/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-lief/project/main.cpp create mode 100644 scripts/test_ports/vcpkg-ci-lief/vcpkg.json delete mode 100644 scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake delete mode 100644 scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-msh3/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-msh3/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-msh3/project/main.c create mode 100644 scripts/test_ports/vcpkg-ci-msh3/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-orange-math/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-orange-math/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-orange-math/project/main.cpp create mode 100644 scripts/test_ports/vcpkg-ci-orange-math/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-ryu/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-ryu/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-ryu/test.c create mode 100644 scripts/test_ports/vcpkg-ci-ryu/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-unicorn/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-unicorn/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-unicorn/project/main.c create mode 100644 scripts/test_ports/vcpkg-ci-unicorn/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-make-tests/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-make-tests/test-z_adapt_lib_link_names.cmake create mode 100644 scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_arch.cmake create mode 100644 scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_host_arch.cmake create mode 100644 scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_target_arch.cmake create mode 100644 scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_prepare_compile_flags.cmake create mode 100644 scripts/test_ports/vcpkg-make-tests/vcpkg.json rename triplets/{community => }/arm64-windows-static-md.cmake (100%) rename triplets/{community => }/x64-windows-static-md.cmake (100%) create mode 100644 versions/k-/kdreports.json create mode 100644 versions/k-/kdstatemachineeditor.json create mode 100644 versions/l-/lief.json create mode 100644 versions/m-/meekrosoft-fff.json create mode 100644 versions/o-/orange-math.json create mode 100644 versions/r-/ruapu.json create mode 100644 versions/u-/ucoro.json create mode 100644 versions/v-/vcpkg-make.json diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 2aff154b28b4af..f01c40be3b45e9 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic REF "${VERSION}" - SHA512 510cc85346b685833091cd616ad6d8a3ba602e716747ab8dea6573abbaa1a2d49eed80b2d566b68293df78f3f3b9cf412ff4e3515f0d37951d63b9634b207a08 + SHA512 02b7bf5782e83efb08a8653f130b02565fa997e857dbd8d0523e1b218ff58d929fbf9690db0980e8101a31f01a67341b6000af8794538890ef7d759fe0289e2f HEAD_REF master ) diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index bb6bc853a2eae1..e44c38863165bb 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "alembic", - "version": "1.8.7", + "version": "1.8.8", "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", "supports": "!(windows & x86) & !uwp", diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index f91e20f1559c2a..d124032a86c7bb 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO liballeg/allegro5 - REF ${VERSION} - SHA512 5466e547a20bf22d606a385eeb9facc57b43c7f64689c724f82a572d4730dc62b2860829435b739a716ebca85fdc01c071f3e630048cdfd4799157e61fe815e9 + REF "${VERSION}" + SHA512 fe9a1c28824b88d34045cf3a296a5671f5b6992f881678bbeb5290ec220138ab9bd3608fa241539d39a2c6eec32ef267d31f2694a4c5b06d13164eead6a13a5b HEAD_REF master PATCHES do-not-copy-pdbs-to-lib.patch diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json index 8e5ba134cf6c84..45ad66860fc420 100644 --- a/ports/allegro5/vcpkg.json +++ b/ports/allegro5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "allegro5", - "version": "5.2.9.1", - "port-version": 1, + "version": "5.2.10.0", "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.", "homepage": "https://liballeg.org/", "license": "BSD-3-Clause AND Zlib", diff --git a/ports/angle/cmake-buildsystem/CMakeLists.txt b/ports/angle/cmake-buildsystem/CMakeLists.txt index 110c5a09755d67..758f12504a45ef 100644 --- a/ports/angle/cmake-buildsystem/CMakeLists.txt +++ b/ports/angle/cmake-buildsystem/CMakeLists.txt @@ -414,6 +414,7 @@ set(_possibleTargets EGL GLESv2 ANGLE) foreach(_target IN LISTS _possibleTargets) if(TARGET ${_target}) list(APPEND _installableTargets "${_target}") + target_include_directories(${_target} INTERFACE $) endif() endforeach() diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index a42d9356b2f0f1..de293cd1af5442 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 9, + "port-version": 10, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index b70e2ac9869a78..4da2a35cedc06b 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" - REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # v3.9.1 + REF d6f30ae474dd6c358f26de0a0fc26a0d7340a84c HEAD_REF main PATCHES aom-rename-static.diff @@ -32,7 +32,7 @@ vcpkg_cmake_configure( -DENABLE_TESTDATA=OFF -DENABLE_TESTS=OFF -DENABLE_TOOLS=OFF - -DTHREADS_PREFER_PTHREAD_FLAGS=ON + -DTHREADS_PREFER_PTHREAD_FLAG=ON "-DCMAKE_ASM_NASM_COMPILER=${NASM}" "-DPERL_EXECUTABLE=${PERL}" ) @@ -42,13 +42,6 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VPCKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "") - endif() -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 4d29e3feef91e3..7f94a120e2aa31 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,9 +1,10 @@ { "name": "aom", - "version-semver": "3.9.1", + "version-semver": "3.11.0", "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "license": "BSD-2-Clause", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/apache-datasketches/portfile.cmake b/ports/apache-datasketches/portfile.cmake index 955fdfd80d2be9..09a77a53db2b54 100644 --- a/ports/apache-datasketches/portfile.cmake +++ b/ports/apache-datasketches/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/datasketches-cpp REF "${VERSION}" - SHA512 eb307d0e6468fc4784fb4ba2a49b894c59c2669386c5983afd671695dadd4e50711de6a50a2824d14af7c474fdbb0c6bbe2f3352d2481fb74fd16654674cbbfc + SHA512 3be2480390bff9ec62d92885174dc5cb7e86c9e5f8215ee57e77626151002d614d41254d532e53c7e1d509b420ee0024edfcea6043caa1b9863d100f492096cd HEAD_REF master ) diff --git a/ports/apache-datasketches/vcpkg.json b/ports/apache-datasketches/vcpkg.json index b5323424029e84..ba5fd8cf2b4bb2 100644 --- a/ports/apache-datasketches/vcpkg.json +++ b/ports/apache-datasketches/vcpkg.json @@ -1,6 +1,6 @@ { "name": "apache-datasketches", - "version": "5.0.2", + "version": "5.1.0", "description": "Apache DataSketches Core C++ Library Component.", "homepage": "https://datasketches.apache.org/", "license": "Apache-2.0", diff --git a/ports/arpack-ng/portfile.cmake b/ports/arpack-ng/portfile.cmake index 51c9378f7d266b..9fdd5d17ad9162 100644 --- a/ports/arpack-ng/portfile.cmake +++ b/ports/arpack-ng/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_cmake_configure( -DICBEXMM=OFF -DEXAMPLES=OFF -DTESTS=OFF + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ) vcpkg_cmake_install() diff --git a/ports/arpack-ng/vcpkg.json b/ports/arpack-ng/vcpkg.json index 11df367d28afff..2a284616a6a14e 100644 --- a/ports/arpack-ng/vcpkg.json +++ b/ports/arpack-ng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arpack-ng", "version": "3.9.1", + "port-version": 1, "description": "ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.", "homepage": "https://github.com/opencollab/arpack-ng", "license": "BSD-3-Clause", diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index c275ed14637db0..f70bae373afdc7 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc REF "v${VERSION}" - SHA512 477ce61e4f1f6baed2f95d49f8d67572f1c88fb98e76006ac82ef02c633d8121d01b835b5da1cbac183e3154b3dcd9a3f9307601a108a5e8b7b902dab4a65a10 + SHA512 d502152a1adc2f7cbd521b0226fbe7ffc15327091efd8f94ab445155bbcf46c1d5773760e106c602deb5d857f9c8fc8784ac50ead564d6e7f27b270137c4c4f1 HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index b46ddea8721577..76eaccb33ed840 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "3.3.0", + "version": "3.4.1", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/ports/audiofile/fix-cmakeLists.patch b/ports/audiofile/fix-cmakeLists.patch deleted file mode 100644 index a281171a59e5c0..00000000000000 --- a/ports/audiofile/fix-cmakeLists.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,3 +42,10 @@ endif () - - #=============================================================================== - set (CMAKE_SUPPRESS_REGENERATION true) -+ -+#install and export targets -+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config) -+export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_NAME}Config.cmake) -+install(EXPORT ${PROJECT_NAME}Config DESTINATION share/AudioFile FILE ${PROJECT_NAME}Config.cmake) -+#install headers -+install(FILES AudioFile.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/ports/audiofile/portfile.cmake b/ports/audiofile/portfile.cmake index 33c371f39c04c3..54fae7ff46275a 100644 --- a/ports/audiofile/portfile.cmake +++ b/ports/audiofile/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adamstark/AudioFile REF "${VERSION}" - SHA512 b0612e6d6c440e52a168f27410d6ac14f7fcef2ba183e8a80e03f924e6fc778c01e4f46b40cab10dd73c48f8f10dc4112c58f602728fdeec0bc3e143852fc95e + SHA512 ee8af7687fe420634ea8dacef7ecc0c4d3dd1de13c6131202710b3055fdc5ffb27ac1e8ff034690a3ce5d512b6182a788adfa5852a29ac532a08322b14083e8a HEAD_REF master - PATCHES - fix-cmakeLists.patch ) vcpkg_cmake_configure( @@ -19,8 +17,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile) +vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile CONFIG_PATH lib/cmake/AudioFile) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -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/audiofile/vcpkg.json b/ports/audiofile/vcpkg.json index 6b96e03181fd3b..74013771d9d4b1 100644 --- a/ports/audiofile/vcpkg.json +++ b/ports/audiofile/vcpkg.json @@ -1,6 +1,6 @@ { "name": "audiofile", - "version": "1.1.1", + "version": "1.1.2", "description": "A simple header-only C++ library for reading and writing audio files.", "homepage": "https://github.com/adamstark/AudioFile", "license": "MIT", diff --git a/ports/aurora-au/disable-googletest.patch b/ports/aurora-au/disable-googletest.patch deleted file mode 100644 index ff6f750dafa038..00000000000000 --- a/ports/aurora-au/disable-googletest.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b18407f..f1be4c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,9 +52,6 @@ FetchContent_Declare( - # For Windows: Prevent overriding the parent project's compiler/linker settings - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - --FetchContent_MakeAvailable(googletest) --include(GoogleTest) -- - add_subdirectory(au) - - # Configure how Au will be installed. -diff --git a/cmake/AuConfig.cmake.in b/cmake/AuConfig.cmake.in -index b121f76..65da38a 100644 ---- a/cmake/AuConfig.cmake.in -+++ b/cmake/AuConfig.cmake.in -@@ -14,9 +14,6 @@ - - @PACKAGE_INIT@ - --include(CMakeFindDependencyMacro) --find_dependency(googletest 1.12.1) -- - include(${CMAKE_CURRENT_LIST_DIR}/AuHeaders.cmake) - - check_required_components(Au) -diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake -index 28daf00..f2bf389 100644 ---- a/cmake/HeaderOnlyLibrary.cmake -+++ b/cmake/HeaderOnlyLibrary.cmake -@@ -75,7 +75,7 @@ function(header_only_library) - ) - - # Add the test, if requested. -- if (DEFINED ARG_GTEST_SRCS) -+ if (0) - add_executable("${ARG_NAME}_test") - target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS}) - target_link_libraries( diff --git a/ports/aurora-au/portfile.cmake b/ports/aurora-au/portfile.cmake index afd21242bcc8d4..07d9283a366787 100644 --- a/ports/aurora-au/portfile.cmake +++ b/ports/aurora-au/portfile.cmake @@ -4,13 +4,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aurora-opensource/au REF "${VERSION}" - SHA512 4aa3282f6b76fbadd04ca572734f72c86b1b0b4e85fc21a03d1ab00b83d3aea319ab2dac3934361b5f6fa7c4a0dccece94fe0a57f3d73d208315b51b1950e374 + SHA512 85b90924f82a123000ecc3c9a1f44f31d6f1a7f3664968abc27f4fbdc6712b7bc9a8a30428b9422529fed7fe269a13c57e0dad8483658530dcbfa0c6b15daa6c HEAD_REF main - PATCHES - disable-googletest.patch ) -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DAU_EXCLUDE_GTEST_DEPENDENCY=1 + ) + vcpkg_cmake_install() vcpkg_cmake_config_fixup( diff --git a/ports/aurora-au/vcpkg.json b/ports/aurora-au/vcpkg.json index 25454f090e6872..3d36c4d6118931 100644 --- a/ports/aurora-au/vcpkg.json +++ b/ports/aurora-au/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "aurora-au", - "version-semver": "0.3.5", - "port-version": 1, + "version-semver": "0.4.1", "description": "A C++14-compatible physical units library with no dependencies and a single-file delivery option. Emphasis on safety, accessibility, performance, and developer experience.", "homepage": "https://github.com/aurora-opensource/au", "documentation": "https://aurora-opensource.github.io/au/main/", diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake index f0fb31b0a08f1d..22e95aa588a96a 100644 --- a/ports/aws-c-auth/portfile.cmake +++ b/ports/aws-c-auth/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-auth REF "v${VERSION}" - SHA512 1847b7790590cf079785c4fb98fbcde9988cbc68254d18904a8676802bf96168e7038799642d4b67b834c6c772b7a35c6e7f7d35b93438cb9c0ceac9130e31ad + SHA512 8c2b2230d694005d6e8e0245b3bf1c3a623f2bea6f2b854e6cabebf00652af120bf05961b2c18625226d2ede2e07485c5e0a35f8c929cc142af440579d84cc60 HEAD_REF master ) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index ee3f819350a25a..95e8388b3e457d 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-auth", - "version": "0.7.31", + "version": "0.8.0", "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-http", diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake index dc1b4e44dbb4b7..55078dd9dae924 100644 --- a/ports/aws-c-cal/portfile.cmake +++ b/ports/aws-c-cal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-cal REF "v${VERSION}" - SHA512 7c0fa1fe976e7b432b5126792bd1fad94cf5bacffb4e9a5e374e173f617722431bea880b6026c2c664372399635cbf9f129b6ad48c9aca7c087fb6f94fb81837 + SHA512 c601a00f5e21bf42bd8e44787182be3805b90ab9c8a23025bed5acac602718548e6236106891b336c4ea81f68a26c3f0a5d33e090246b670efe53229df1fca90 HEAD_REF master PATCHES remove-libcrypto-messages.patch ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index 6baf2e77c75713..3f91db18304086 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-cal", - "version": "0.7.4", + "version": "0.8.1", "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 79b57f894a86fc..d223202ccee15c 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common REF "v${VERSION}" - SHA512 482bfeb5c7dac16486236417af0f5c0a20bc36c271aaf32088d188186861d61bf0b96c5da13a1c88853fdc6a1fb8b8db254a547c3648a659ec6e91177978dc9b + SHA512 5ec579dca53a0b5dc8ceac4ef65d1ee5dd76e585f10b7bab14e5c668c001516d48fb0669e2d909d665af665ba1429e5a87e15d7dc784fd3796455531af7b3762 HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index 20469aaef6e2e0..dc8d62d7b9c6a6 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-common", - "version": "0.9.30", + "version": "0.10.6", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", + "supports": "!(windows & arm32) & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake index 1840cd27d85d5c..fd66396ea6d910 100644 --- a/ports/aws-c-compression/portfile.cmake +++ b/ports/aws-c-compression/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-compression REF "v${VERSION}" - SHA512 8af6b6ff78fbcb37bf858d0b56cb371974742aa769f08581d0efb6262b93f5c01203b6fcce7f3e9d78c915379d2c75e0c677a374793d8cdd1302961c7299553d + SHA512 aae2031c22a5d716eb5be274eba7c49a4f4fb322b42d3709a7bf5cd64188b26a0938ef9b0b8e21f4e0cb8d236b4903605a78ddb76221a255d46ac57c5164402c HEAD_REF master ) diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json index 521cb41d8f563f..175eb14f7547a8 100644 --- a/ports/aws-c-compression/vcpkg.json +++ b/ports/aws-c-compression/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-compression", - "version": "0.2.19", + "version": "0.3.0", "description": "C99 implementation of huffman encoding/decoding", "homepage": "https://github.com/awslabs/aws-c-compression", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake index 8e7b289451788e..230c519df34516 100644 --- a/ports/aws-c-event-stream/portfile.cmake +++ b/ports/aws-c-event-stream/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-event-stream REF "v${VERSION}" - SHA512 522ddc326dfc1865664727a48bcef041ecd3aa40a1fe8e680055059796a31d606a126ed73d8953b77935306ac26e162cc901b813b1ae3ba816a33122f2abc6ce + SHA512 0ef4b45e84eb014a392ca5eb4e701999cc294a36d3330036be587ec34d41efc30413f3e6fa829bd9da4ca595db64b4bf9c3df53efd47a14ebf70ed00b3a6dbc0 HEAD_REF master ) diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json index f6d67804cc3e75..5886f1afe27f85 100644 --- a/ports/aws-c-event-stream/vcpkg.json +++ b/ports/aws-c-event-stream/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-event-stream", - "version": "0.4.3", + "version": "0.5.0", "description": "C99 implementation of the vnd.amazon.event-stream content-type.", "homepage": "https://github.com/awslabs/aws-c-event-stream", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", "aws-c-io", diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake index ccac21019dcb92..38fe64860a04db 100644 --- a/ports/aws-c-http/portfile.cmake +++ b/ports/aws-c-http/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-http REF "v${VERSION}" - SHA512 32b7e83ddae5997771136a5c7a6a7890b8cfa7f8808961e108e1519a9b85a39cccc4f0435526cebd3950607d530b6eb1645692dad4677b5f81f73dcc23ce5be0 + SHA512 9989b8a0cd10e4f96aa4a3c5e6072aa61d2d4851f1caffb86ff0754f89ad11b2aee3d522fe844ab43120a8006d6aa5ee2f7b74bfc3dd9e46160dabd67daf91e5 HEAD_REF master ) diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json index 975292e57cccad..9d95aa213e90f2 100644 --- a/ports/aws-c-http/vcpkg.json +++ b/ports/aws-c-http/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-http", - "version": "0.8.10", + "version": "0.9.2", "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", "homepage": "https://github.com/awslabs/aws-c-http", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index c3b3e19121da9f..c47d441b397d0a 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io REF "v${VERSION}" - SHA512 3e690edc5a13bd603fd28917d60e3f96f1796bfc8194c1f9632447a94e02dc0be8297e3b96752cffb70a21d75fc57825acd64a99680189f9a3216e9ec6c3fa9f + SHA512 3ed00ef885c4424651222acecb1a8c090b6db36e0e001937734d26a326ddf363078628a03a6e33952dca52d22cb16b9ed8d422cf036d71ea153856e9a1f11659 HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index f514cc0b704541..1492bebc09962b 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-io", - "version": "0.14.18", + "version": "0.15.3", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake index cb8fa4ad5cbd7f..7e561af2b6c2a9 100644 --- a/ports/aws-c-mqtt/portfile.cmake +++ b/ports/aws-c-mqtt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-mqtt REF "v${VERSION}" - SHA512 4384d20020ee9dbb84db9db7c4feb32477f42990bf4c1412e48184675f10d9056b4433d825056ed8302654788dd1131c3150e99cb173c92520695f8d09311fe3 + SHA512 62fc05f6153953e42178dc2861a5ce6644ce01e5ba05db3b63899af63bc2d15bb3f45272e6812a21a8ef91b7cf65e91818f7ff8611a3fc45a9b66db33f874204 HEAD_REF master ) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index 5186e33c1e919e..67663342c1cc6e 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-mqtt", - "version": "0.10.7", + "version": "0.11.0", "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-http", "aws-c-io", diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake index 947c5807e4a001..5c9e7a01cd5b7e 100644 --- a/ports/aws-c-s3/portfile.cmake +++ b/ports/aws-c-s3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-s3 REF "v${VERSION}" - SHA512 20e364b50fdbf9cc0c9c515ccf15410c5771c545d585274db97e77f0459b05b3d7af82863a926d373d93590276020778345744db7e7ca575e686cd9bc627f8e2 + SHA512 887081a014dc49596191a97f9999a5221e3e6341ca192103325dbdabfbeefa143da94d6026682b4f867c336f70ee238e56572960011f788f0be7caf6b1047c06 HEAD_REF master ) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 832c6a20e99d95..f50b68d8523d21 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-s3", - "version": "0.6.6", + "version": "0.7.7", "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", "homepage": "https://github.com/awslabs/aws-c-s3", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", "aws-c-http", diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake index bc990b20f9f9be..d9cd9dbcbff9a8 100644 --- a/ports/aws-c-sdkutils/portfile.cmake +++ b/ports/aws-c-sdkutils/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-sdkutils REF "v${VERSION}" - SHA512 a92576c7a4188a2cfa0cacac06ca363bc34dd86c8e8eed20d61aeeee08ed700f4c90d2cbc49a50214bb95fdc1de2fc4c344bcfb12aaeaa12bfe855fe3c585999 + SHA512 b3e0917d01c0f66adb1b789324d7d2b4d45c5efe22d769a19895f8c9c8473f21fcb7b01f4621e7e46826b14688cf894d18ffc9d0451ab57c0319b666cc28cd20 HEAD_REF master ) diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json index ff87434be6161b..585a370c40e5cc 100644 --- a/ports/aws-c-sdkutils/vcpkg.json +++ b/ports/aws-c-sdkutils/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-c-sdkutils", - "version": "0.1.19", + "version": "0.2.1", "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...", "homepage": "https://github.com/awslabs/aws-c-sdkutils", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake index 9892b11ee3cce6..92638058c023fa 100644 --- a/ports/aws-checksums/portfile.cmake +++ b/ports/aws-checksums/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-checksums REF "v${VERSION}" - SHA512 9a352ef1a26032260874d0d78511c308ac49e074b27c1819fb9ae1ccc92decffb1c1a737aa4a18873e210e9df264a35cec4e7f4c4b406af0ff35ecd9f42b58d0 + SHA512 56ea4946a40816e11ae8819d7d383f8c871c1b9ad5bdf410f61169e62263daf08a5eea4e81eb0f9bd8de2e3ff5479b1a61e6441f7281bda70029ae35abd4ae59 HEAD_REF master ) diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index 23f4022f1e3a91..0e52e79396961a 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-checksums", - "version": "0.1.20", + "version": "0.2.2", "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", "license": "Apache-2.0", - "supports": "!(windows & arm)", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index d674c19ce160d6..1b19edc3667267 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-crt-cpp REF "v${VERSION}" - SHA512 acea11d88b4826b31a7072ec7ccae0d8bf2ab7c41fb692af716fe37e3c93fc1cb410f6307907f3cacbc3521bde141c557e61683056ebb6ed5712098bee3db733 + SHA512 d89038277b030ee7611447daf08521f9c08bf39143861518f7343d3c2397ddb46358a2911713b92d780c8bd49e50c5c06a8b8f93bd3f2cba1a1fdf27144bb0a8 PATCHES no-werror.patch ) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index f3b1a4553e92da..8b7d295553558a 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,10 +1,9 @@ { "name": "aws-crt-cpp", - "version": "0.29.6", + "version": "0.29.7", "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", "homepage": "https://github.com/awslabs/aws-crt-cpp", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", "aws-c-cal", diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 index 299ef13583d670..be3f504c26481f 100644 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ b/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -1,6 +1,5 @@ [CmdletBinding()] param( - [Parameter(Mandatory=$true)][string]$SourcesRef, [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" ) @@ -10,24 +9,27 @@ $ErrorActionPreference = "Stop" $ManifestIn = "$PortDirectory/vcpkg.in.json" $ManifestOut = "$PortDirectory/vcpkg.json" -$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" +$manifest = Get-Content $ManifestIn | ConvertFrom-Json +$version = $manifest.version + +Write-Host "Using version from vcpkg.in.json: $version" + +$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$version" if (-not (Test-Path $ExtractedSources)) { if (Test-Path "$ExtractedSources.tmp") { Remove-Item -Force "$ExtractedSources.tmp" } git clone --depth=1 "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host - git -c "$ExtractedSources.tmp" checkout $SourcesRef + git -c "$ExtractedSources.tmp" checkout $version Move-Item "$ExtractedSources.tmp" "$ExtractedSources" } Write-Host "Using sources directory: $ExtractedSources" - $subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name -$manifest = Get-Content $ManifestIn | ConvertFrom-Json $manifest | Add-Member ` -NotePropertyName '$note' ` - -NotePropertyValue 'Automatically generated by generateFeatures.ps1' + -NotePropertyValue 'Automatically generated by generateFeatures.ps1 from vcpkg.in.json, do not edit manually' $manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} function GetDescription($dir, $modulename) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index f08b978f2d133e..1d8a8da4ac2d6a 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 7f4aea0810df1bfc907f65454b83e7c345c61198de350e974118695ed4d7ff0a9e42c8f1009b34e9b05b247079d778d4b4bbf681c5e149857c78ed10088a0127 + SHA512 f81b0afd9c3bb6e8181c6edc04de9b83af8a17e5bdf993e68fc00abc07980fadbe9e6b98635632cb96ed62c9b2753771f9cf6d91088d6ab42f409eec5d136faa PATCHES fix-aws-root.patch lock-curl-http-and-tls-settings.patch diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index e71d1612b2cad6..1e25eb70592358 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,10 +1,9 @@ { "name": "aws-sdk-cpp", - "version": "1.11.352", + "version": "1.11.474", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-crt-cpp", { diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 00e50fab33392d..2ca1eff1d6ef89 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,11 +1,10 @@ { - "$note": "Automatically generated by generateFeatures.ps1", + "$note": "Automatically generated by generateFeatures.ps1 from vcpkg.in.json, do not edit manually", "name": "aws-sdk-cpp", - "version": "1.11.460", + "version": "1.11.474", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-crt-cpp", { @@ -157,12 +156,18 @@ "backup-gateway": { "description": "C++ SDK for the AWS backup-gateway service" }, + "backupsearch": { + "description": "C++ SDK for the AWS backupsearch service" + }, "batch": { "description": "C++ SDK for the AWS batch service" }, "bcm-data-exports": { "description": "C++ SDK for the AWS bcm-data-exports service" }, + "bcm-pricing-calculator": { + "description": "C++ SDK for the AWS bcm-pricing-calculator service" + }, "bedrock": { "description": "C++ SDK for the AWS bedrock service" }, @@ -172,9 +177,18 @@ "bedrock-agent-runtime": { "description": "C++ SDK for the AWS bedrock-agent-runtime service" }, + "bedrock-data-automation": { + "description": "C++ SDK for the AWS bedrock-data-automation service" + }, + "bedrock-data-automation-runtime": { + "description": "C++ SDK for the AWS bedrock-data-automation-runtime service" + }, "bedrock-runtime": { "description": "C++ SDK for the AWS bedrock-runtime service" }, + "billing": { + "description": "C++ SDK for the AWS billing service" + }, "billingconductor": { "description": "C++ SDK for the AWS billingconductor service" }, @@ -280,9 +294,6 @@ "codepipeline": { "description": "C++ SDK for the AWS codepipeline service" }, - "codestar": { - "description": "C++ SDK for the AWS codestar service" - }, "codestar-connections": { "description": "C++ SDK for the AWS codestar-connections service" }, @@ -319,6 +330,9 @@ "connectcampaigns": { "description": "C++ SDK for the AWS connectcampaigns service" }, + "connectcampaignsv2": { + "description": "C++ SDK for the AWS connectcampaignsv2 service" + }, "connectcases": { "description": "C++ SDK for the AWS connectcases service" }, @@ -373,6 +387,9 @@ "directconnect": { "description": "C++ SDK for the AWS directconnect service" }, + "directory-service-data": { + "description": "C++ SDK for the AWS directory-service-data service" + }, "discovery": { "description": "C++ SDK for the AWS discovery service" }, @@ -394,6 +411,9 @@ "ds": { "description": "C++ SDK for the AWS ds service" }, + "dsql": { + "description": "C++ SDK for the AWS dsql service" + }, "dynamodb": { "description": "C++ SDK for the AWS dynamodb service" }, @@ -505,6 +525,15 @@ "gamelift": { "description": "C++ SDK for the AWS gamelift service" }, + "geo-maps": { + "description": "C++ SDK for the AWS geo-maps service" + }, + "geo-places": { + "description": "C++ SDK for the AWS geo-places service" + }, + "geo-routes": { + "description": "C++ SDK for the AWS geo-routes service" + }, "glacier": { "description": "C++ SDK for the AWS glacier service" }, @@ -572,6 +601,9 @@ "internetmonitor": { "description": "C++ SDK for the AWS internetmonitor service" }, + "invoicing": { + "description": "C++ SDK for the AWS invoicing service" + }, "iot": { "description": "C++ SDK for the AWS iot service" }, @@ -749,6 +781,9 @@ "marketplace-entitlement": { "description": "C++ SDK for the AWS marketplace-entitlement service" }, + "marketplace-reporting": { + "description": "C++ SDK for the AWS marketplace-reporting service" + }, "marketplacecommerceanalytics": { "description": "C++ SDK for the AWS marketplacecommerceanalytics service" }, @@ -803,9 +838,6 @@ "migrationhubstrategy": { "description": "C++ SDK for the AWS migrationhubstrategy service" }, - "mobile": { - "description": "C++ SDK for the AWS mobile service" - }, "monitoring": { "description": "C++ SDK for the AWS monitoring service" }, @@ -830,18 +862,27 @@ "network-firewall": { "description": "C++ SDK for the AWS network-firewall service" }, + "networkflowmonitor": { + "description": "C++ SDK for the AWS networkflowmonitor service" + }, "networkmanager": { "description": "C++ SDK for the AWS networkmanager service" }, "networkmonitor": { "description": "C++ SDK for the AWS networkmonitor service" }, - "nimble": { - "description": "C++ SDK for the AWS nimble service" + "notifications": { + "description": "C++ SDK for the AWS notifications service" + }, + "notificationscontacts": { + "description": "C++ SDK for the AWS notificationscontacts service" }, "oam": { "description": "C++ SDK for the AWS oam service" }, + "observabilityadmin": { + "description": "C++ SDK for the AWS observabilityadmin service" + }, "omics": { "description": "C++ SDK for the AWS omics service" }, @@ -869,6 +910,9 @@ "panorama": { "description": "C++ SDK for the AWS panorama service" }, + "partnercentral-selling": { + "description": "C++ SDK for the AWS partnercentral-selling service" + }, "payment-cryptography": { "description": "C++ SDK for the AWS payment-cryptography service" }, @@ -881,6 +925,9 @@ "pca-connector-scep": { "description": "C++ SDK for the AWS pca-connector-scep service" }, + "pcs": { + "description": "C++ SDK for the AWS pcs service" + }, "personalize": { "description": "C++ SDK for the AWS personalize service" }, @@ -917,6 +964,9 @@ "proton": { "description": "C++ SDK for the AWS proton service" }, + "qapps": { + "description": "C++ SDK for the AWS qapps service" + }, "qbusiness": { "description": "C++ SDK for the AWS qbusiness service" }, @@ -1038,6 +1088,9 @@ "s3outposts": { "description": "C++ SDK for the AWS s3outposts service" }, + "s3tables": { + "description": "C++ SDK for the AWS s3tables service" + }, "sagemaker": { "description": "C++ SDK for the AWS sagemaker service" }, @@ -1074,6 +1127,9 @@ "secretsmanager": { "description": "C++ SDK for the AWS secretsmanager service" }, + "security-ir": { + "description": "C++ SDK for the AWS security-ir service" + }, "securityhub": { "description": "C++ SDK for the AWS securityhub service" }, @@ -1122,6 +1178,9 @@ "sns": { "description": "C++ SDK for the AWS sns service" }, + "socialmessaging": { + "description": "C++ SDK for the AWS socialmessaging service" + }, "sqs": { "description": "C++ SDK for the AWS sqs service" }, @@ -1134,6 +1193,9 @@ "ssm-incidents": { "description": "C++ SDK for the AWS ssm-incidents service" }, + "ssm-quicksetup": { + "description": "C++ SDK for the AWS ssm-quicksetup service" + }, "ssm-sap": { "description": "C++ SDK for the AWS ssm-sap service" }, diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index 881d5abe2e8d6e..aa839ca225403c 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -26,8 +26,8 @@ index 4f002b5..dd9b1df 100644 +add_library(libjpeg-turbo::libjpeg-turbo UNKNOWN IMPORTED) +set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TURBOJPEG_INCLUDE_DIR}) +set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_RELEASE ${TURBOJPEG_LIBRARY_RELEASE}) -+if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") -+ find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH REQUIRED) ++find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) ++if(TURBOJPEG_LIBRARY_DEBUG) + set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_DEBUG ${TURBOJPEG_LIBRARY_DEBUG}) +endif() +find_package(Matroska CONFIG REQUIRED) diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index cedac7bdfed363..f20fe2a747551e 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -42,7 +42,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Avoid deleting debug/lib/cmake when fixing the first cmake -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/share") vcpkg_cmake_config_fixup(PACKAGE_NAME k4a CONFIG_PATH share/k4a) @@ -83,12 +85,16 @@ endif () if (VCPKG_TARGET_IS_LINUX) file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() else() file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") - file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + endif() endif() # Handle copyright diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index ced72efcfb5d17..63c4ff4a8d8cfb 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 7, + "port-version": 8, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", "supports": "linux | windows", diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 45072a402595d6..f0c0adc79e8af1 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bitdefender/bddisasm REF "v${VERSION}" - SHA512 254aa303f5957327de85715cc05c8bcf33f27bd18ad90959a74b2d817ee393d672878d66c83de63c9ec1e6d65df7ae2657e3a585ead24dbc093a035a7daeea4a + SHA512 5c1b8b8b9a29db76ce6197674e662fdc526e89372a84f7fac8e74cf4cc53bfab8d55c096cdb3f344fcfaa6a4d54a5bef79e8f1cf9131e497636072523b2cf3ec HEAD_REF master ) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index 99c3a5ab6bc566..964e8c9fd38c7a 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bddisasm", - "version": "2.1.5", + "version": "2.2.0", "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 521e9b089471f8..c71ffeb0976949 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BehaviorTree/BehaviorTree.CPP REF ${VERSION} - SHA512 f2ee647c734e39e50f92405c5dc9fd2876602ff074a86416959fbf6548e37130d35f312cafb084ca4a40da7ee81386502a75ad839ce99a2859c30ff187820fdf + SHA512 f3ebbf21a93839b66b3b9d5091906b62c7a7f121f2c296cfdd7be4563924e695ea7464b8ab947ee95039242b3ea0cfe1572a2fd0ae826ab2bbeebd820631f716 HEAD_REF master PATCHES fix-x86_build.patch diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 32f343b67070bd..4d47dae4c2289a 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "behaviortree-cpp", - "version": "4.3.7", + "version": "4.6.2", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp", diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 9a898f90e64906..141ac37e07fa52 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark REF "v${VERSION}" - SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25 + SHA512 fc787d3d60a55abb3edaa575bf947c72e1ad1404a35bfddf585299411bcd04d32503bba563f9a36dccf128fce6261b97d460d6c293ed2c2d0807cf0154c86aa7 HEAD_REF main ) diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 65e1347970c67b..826b3ce72bfa0f 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.9.0", + "version-semver": "1.9.1", "description": "A library to benchmark code snippets, similar to unit tests.", "homepage": "https://github.com/google/benchmark", "license": "Apache-2.0", diff --git a/ports/bit7z/fix_compile_options.patch b/ports/bit7z/fix_compile_options.patch new file mode 100644 index 00000000000000..19f611a5bd9d53 --- /dev/null +++ b/ports/bit7z/fix_compile_options.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/CompilerOptions.cmake b/cmake/CompilerOptions.cmake +index 1cdb84f..fd9346f 100644 +--- a/cmake/CompilerOptions.cmake ++++ b/cmake/CompilerOptions.cmake +@@ -70,7 +70,7 @@ if( MSVC ) + endforeach() + endif() + else() +- target_compile_options( ${LIB_TARGET} PRIVATE -Wall -Wextra -Werror -Wconversion -Wsign-conversion ) ++ target_compile_options( ${LIB_TARGET} PRIVATE -Wall -Wextra -Wconversion -Wsign-conversion ) + endif() + + # Extra warning flags for Clang diff --git a/ports/bit7z/portfile.cmake b/ports/bit7z/portfile.cmake index ffbd2ab241b3f9..3f08cdc4907ed7 100644 --- a/ports/bit7z/portfile.cmake +++ b/ports/bit7z/portfile.cmake @@ -4,11 +4,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rikyoz/bit7z REF "v${VERSION}" - SHA512 02ee10a66598e9a2f5b47f35392dc8f3de11e01dac9d657e1321d1de97baf9832b1f1559054160d122dddd0427f54076820d7252185912c38b2f277d9c5fa1c0 + SHA512 c0577b07301b09726fb46164483dc277d681a74a80a90a1aa4881d949be28e6ec26678a0cfbf83e38b4915c8a724078e0771fecefba8c6dfbf9029f8db6063fa HEAD_REF master PATCHES fix_install.patch fix_dependency.patch + fix_compile_options.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-bit7z-config.cmake.in" DESTINATION "${SOURCE_PATH}") diff --git a/ports/bit7z/vcpkg.json b/ports/bit7z/vcpkg.json index bc1cc29b904732..d7e4438f18f0a4 100644 --- a/ports/bit7z/vcpkg.json +++ b/ports/bit7z/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bit7z", - "version": "4.0.8", + "version": "4.0.9", + "port-version": 1, "description": "A C++ static library offering a clean and simple interface to the 7-zip shared libraries.", "homepage": "https://github.com/rikyoz/bit7z", "license": "MPL-2.0", diff --git a/ports/boost-cobalt/fail-on-compiler-not-supported.patch b/ports/boost-cobalt/fail-on-compiler-not-supported.patch new file mode 100644 index 00000000000000..db564c659ee3dd --- /dev/null +++ b/ports/boost-cobalt/fail-on-compiler-not-supported.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5a51d5285c..8374f911a6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ project(boost_cobalt VERSION "${BOOST_COBALT_VERSION}" LANGUAGES CXX) + + include(cmake/CheckRequirements.cmake) + if (NOT BOOST_COBALT_REQUIREMENTS_MATCHED) +- return() ++ message(FATAL_ERROR "The current compiler is not supported.") + endif() + + set(BOOST_COBALT_IS_ROOT OFF) diff --git a/ports/boost-cobalt/portfile.cmake b/ports/boost-cobalt/portfile.cmake index 5bfee935b30570..9938c6bbbfd18c 100644 --- a/ports/boost-cobalt/portfile.cmake +++ b/ports/boost-cobalt/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by scripts/boost/generate-ports.ps1 +# Automatically generated by scripts/boost/generate-ports.ps1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,6 +6,9 @@ vcpkg_from_github( REF boost-${VERSION} SHA512 a92ff4050772b61035121f944d81d4a9d6d2da858dedc0956ad850132657c80c660a8839a99597443751744577dd5b0958239e99d948d3036c85b8361151aa27 HEAD_REF master + PATCHES + fail-on-compiler-not-supported.patch + ) set(FEATURE_OPTIONS "") diff --git a/ports/boost-cobalt/vcpkg.json b/ports/boost-cobalt/vcpkg.json index 9fa189bb86256b..b0472210327885 100644 --- a/ports/boost-cobalt/vcpkg.json +++ b/ports/boost-cobalt/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-cobalt", "version": "1.86.0", + "port-version": 1, "description": "Boost cobalt module", "homepage": "https://www.boost.org/libs/cobalt", "license": "BSL-1.0", diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index d831b83de13465..d0727aa58e6888 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost", "version": "1.86.0", + "port-version": 1, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", @@ -71,11 +72,6 @@ "name": "boost-circular-buffer", "version>=": "1.86.0" }, - { - "name": "boost-cobalt", - "platform": "!osx & !ios & !android & !uwp", - "version>=": "1.86.0" - }, { "name": "boost-compat", "version>=": "1.86.0" @@ -627,6 +623,16 @@ } ], "features": { + "cobalt": { + "description": "Build boost-cobalt", + "dependencies": [ + { + "name": "boost-cobalt", + "platform": "!osx & !ios & !android & !uwp", + "version>=": "1.86.0" + } + ] + }, "mpi": { "description": "Build with MPI support", "dependencies": [ diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index e9b47b2114baac..919943455a857a 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -2,12 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool REF "v${VERSION}" - SHA512 4908f00def23082e7ddc0b24a710e53b3fde51b02188e79cfcd9dabb22627ebd1b6e5b3c4bf1b366eae79660c26878cc034c171747c3d0b7ef8a98c85a77033b + SHA512 ba118decce074a3bbd004dcd3d2ee233b629c6f7b452e6e81700107f22c1b426931121b03e6497c1e3035dfdc6631080ebb539201fcbe1c3a8e919210d3ebf91 HEAD_REF master ) -file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp") +file(INSTALL "${SOURCE_PATH}/include/BS_thread_pool.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/modules/BS.thread_pool.cppm" DESTINATION "${CURRENT_PACKAGES_DIR}/modules") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 9390a97180c19e..e921ccf1e83773 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,8 +1,8 @@ { "name": "bshoshany-thread-pool", - "version": "4.1.0", + "version": "5.0.0", "maintainers": "Barak Shoshany ", - "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", + "description": "BS::thread_pool: a fast, lightweight, modern, and easy-to-use C++17 / C++20 / C++23 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", "documentation": "https://github.com/bshoshany/thread-pool/blob/master/README.md", "license": "MIT" diff --git a/ports/buck-yeh-bux-sqlite/portfile.cmake b/ports/buck-yeh-bux-sqlite/portfile.cmake index 6846f46018f31f..b2706e20c05a9b 100644 --- a/ports/buck-yeh-bux-sqlite/portfile.cmake +++ b/ports/buck-yeh-bux-sqlite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux-sqlite - REF e8ab90da9586f61024b59aa1a4900efb94f1d3f4 # v1.0.1 - SHA512 27acefdb32dd00dbbef91479b5e682cf6a9281e13a596128d5050fe44ed4b8669d5e7279b4db30efbd4d016d268c6f2ce893f91bbdddff17f2a227ba3a292d01 + REF "${VERSION}" + SHA512 ccfeb141530efcf8233bd3579ba6eb17e7decc1d4fa92706f0810824303078e7f379a9c81a777189860e53c866b9c338b51b2f5884958782d02f7d79d7fb575c HEAD_REF main ) diff --git a/ports/buck-yeh-bux-sqlite/vcpkg.json b/ports/buck-yeh-bux-sqlite/vcpkg.json index 17dae253fda5e6..5320d65312a12d 100644 --- a/ports/buck-yeh-bux-sqlite/vcpkg.json +++ b/ports/buck-yeh-bux-sqlite/vcpkg.json @@ -1,14 +1,16 @@ { "name": "buck-yeh-bux-sqlite", - "version": "1.0.1", + "version": "1.0.5", "description": "Modern C++ wrapper classes and utilities of the original sqlite3 API", "homepage": "https://github.com/buck-yeh/bux-sqlite", "license": "MIT", - "supports": "!(arm | uwp | osx | linux)", + "supports": "!(android | linux | osx | uwp)", "dependencies": [ "buck-yeh-bux", - "fmt", - "sqlite3", + { + "name": "sqlite3", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index 49bd996477a731..3bb3a957e6afff 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux REF "${VERSION}" - SHA512 236145828dae5b0c69077ec4c5b40259b5e4b3d095e4ad138973ebf81f62a25a3ea72dcade5549c8608457e2868209f0ca7b292fa4f839399b9bbfee8c22aeff + SHA512 90ce7cd956f758fb0f17398ce9f63651965ec5288256d318e267c619aff59f49e05412a52d0032df5896173fc5b32bc7c42ac1422485ef9e261af278f38ccf4b HEAD_REF main ) diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 5dae099da164c3..fd95a409987139 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,6 @@ { "name": "buck-yeh-bux", - "version": "1.9.0", + "version": "1.10.2", "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "license": "MIT", diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index 7df078985b9545..305b07b814e4c7 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -4,12 +4,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO capnproto/capnproto REF "v${VERSION}" - SHA512 56551ecad52cf06e5dd52401e6d848eae41126c6ba2bb31a9ec1c82e1b47e0e6171d69db923c118c614aec0d396ddf35724081cccef3a605c39d0b5379a2c03e + SHA512 6992efffbfb375e2ce141e5e99bcab4c2ff2e1a71817d70dc71966633c18c7136e25220bf54da66928346d43697dbdf504e04a9d24cb00313a75b8d990cf53dd HEAD_REF master PATCHES undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch ) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + # In ARM64 it fails without /bigobj + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /bigobj") + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /bigobj") +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "openssl" OPENSSL_FEATURE diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 7d671e4a99e11a..3d3fde366dc861 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,11 +1,10 @@ { "name": "capnproto", - "version": "1.0.2", - "port-version": 1, + "version": "1.1.0", "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", "license": "MIT", - "supports": "!windows | (!uwp & !arm)", + "supports": "!windows | (!uwp & !arm32)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/casadi/portfile.cmake b/ports/casadi/portfile.cmake deleted file mode 100644 index 70a497e318ae9c..00000000000000 --- a/ports/casadi/portfile.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Currently no upstream support for static libraries -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO casadi/casadi - REF "${VERSION}" - SHA512 2c95368281f0bda385c6c451e361c168589f13aa66af6bc6fadf01f899bcd6c785ea7da3dee0fb5835559e58982e499182a4d244af3ea208ac05f672ea99cfd1 - HEAD_REF main -) - -# Pending upstream fix https://github.com/casadi/casadi/issues/3896 -set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DWITH_SELFCONTAINED=OFF - -DWITH_TINYXML=OFF - -DWITH_BUILD_TINYXML=OFF - -DWITH_QPOASES=OFF - -DWITH_SUNDIALS=OFF - -DWITH_CSPARSE=OFF - -DLIB_PREFIX:PATH=lib - -DBIN_PREFIX:PATH=bin - -DINCLUDE_PREFIX:PATH=include - -DCMAKE_PREFIX:PATH=share/${PORT} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") - -vcpkg_fixup_pkgconfig() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_tools(TOOL_NAMES casadi-cli AUTO_CLEAN) diff --git a/ports/casadi/usage b/ports/casadi/usage deleted file mode 100644 index cbec5b01f539ea..00000000000000 --- a/ports/casadi/usage +++ /dev/null @@ -1,5 +0,0 @@ -casadi provides CMake targets: - - find_package(casadi CONFIG REQUIRED) - target_link_libraries(main PRIVATE $) - \ No newline at end of file diff --git a/ports/casadi/vcpkg.json b/ports/casadi/vcpkg.json deleted file mode 100644 index 683ce0fe949683..00000000000000 --- a/ports/casadi/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "casadi", - "version": "3.6.7", - "description": "CasADi is a symbolic framework for numeric optimization implementing automatic differentiation in forward and reverse modes on sparse matrix-valued computational graphs. It supports self-contained C-code generation and interfaces state-of-the-art codes such as SUNDIALS, IPOPT etc. It can be used from C++, Python or Matlab/Octave.", - "homepage": "http://casadi.org", - "license": "LGPL-3.0-only", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/coin-or-cbc/portfile.cmake b/ports/coin-or-cbc/portfile.cmake index 08b30b289e455f..4cf58e13121431 100644 --- a/ports/coin-or-cbc/portfile.cmake +++ b/ports/coin-or-cbc/portfile.cmake @@ -12,10 +12,8 @@ file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SO set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"") -vcpkg_configure_make( +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS OPTIONS --with-coinutils --with-clp @@ -29,7 +27,7 @@ vcpkg_configure_make( --disable-readline ) -vcpkg_install_make() +vcpkg_make_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/coin-or-cbc/vcpkg.json b/ports/coin-or-cbc/vcpkg.json index 886dbaf00e213e..650306140c67a5 100644 --- a/ports/coin-or-cbc/vcpkg.json +++ b/ports/coin-or-cbc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "coin-or-cbc", "version-date": "2024-06-04", + "port-version": 1, "description": "Cbc (Coin-or branch and cut) is an open-source mixed integer linear programming solver written in C++.", "homepage": "https://github.com/coin-or/Cbc", "license": "EPL-2.0", @@ -8,6 +9,10 @@ "coin-or-cgl", "coin-or-clp", "coin-or-osi", - "coinutils" + "coinutils", + { + "name": "vcpkg-make", + "host": true + } ] } diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 7cd675cb854194..97acb883f901ba 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,10 +1,10 @@ -set(COLMAP_REF "0bd66d901c7549051e21e8f648777f802eb20a73") # v3.10 +set(COLMAP_REF "aa087848a8bd09cebf3e3cc8a5732552f30c51ad") # v3.11.1 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF "${VERSION}" - SHA512 1bcb6b1a740d07666e9f1dcc813bd4464113d0054238c0f86a0ed94099918947d1a58d83661f8ff3fc699727627436b2b555c5d51d37c8ebad7f590155dcb43d + SHA512 1260db4346cc33c6c35efdee0157450fccef67dbc9de876fdc997c7cb90daec716e5ccec97df0a77e3e8686f43ec79f2c0a1523ea12eca2ee158347cb52dea48 HEAD_REF main ) @@ -21,8 +21,15 @@ endif() string(TIMESTAMP COLMAP_GIT_COMMIT_DATE "%Y-%m-%d") +foreach(FEATURE ${FEATURE_OPTIONS}) + message(STATUS "${FEATURE}") +endforeach() + set(CUDA_ENABLED OFF) +set(GUI_ENABLED OFF) set(TESTS_ENABLED OFF) +set(CGAL_ENABLED OFF) +set(OPENMP_ENABLED ON) if("cuda" IN_LIST FEATURES) set(CUDA_ENABLED ON) @@ -34,13 +41,20 @@ if("cuda-redist" IN_LIST FEATURES) set(CUDA_ARCHITECTURES "all-major") endif() +if("gui" IN_LIST FEATURES) + set(GUI_ENABLED ON) +endif() + if("tests" IN_LIST FEATURES) set(TESTS_ENABLED ON) endif() -set(OPENMP_ENABLED ON) +if("cgal" IN_LIST FEATURES) + set(CGAL_ENABLED ON) +endif() + if (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") - set(OPENMP_ENABLED Off) + set(OPENMP_ENABLED OFF) endif() vcpkg_cmake_configure( @@ -49,10 +63,13 @@ vcpkg_cmake_configure( OPTIONS -DCUDA_ENABLED=${CUDA_ENABLED} -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES} + -DGUI_ENABLED=${GUI_ENABLED} -DTESTS_ENABLED=${TESTS_ENABLED} -DGIT_COMMIT_ID=${GIT_COMMIT_ID} -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE} -DOPENMP_ENABLED=${OPENMP_ENABLED} + -DCGAL_ENABLED=${CGAL_ENABLED} + -DFETCH_POSELIB=OFF ) vcpkg_cmake_install() diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 56da41beab5ced..68593c5c181fa9 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,16 +1,17 @@ { "name": "colmap", - "version": "3.10", + "version": "3.11.1", "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", - "supports": "(linux | (windows & !static) | osx) & (x86 | x64)", + "supports": "(linux | (windows & !static) | osx) & (x86 | x64 | arm64)", "dependencies": [ - "boost-filesystem", + "boost-algorithm", "boost-graph", + "boost-heap", "boost-program-options", - "boost-system", - "boost-test", + "boost-property-map", + "boost-property-tree", { "name": "ceres", "features": [ @@ -18,14 +19,17 @@ "suitesparse" ] }, - "cgal", "eigen3", "flann", "freeimage", "gflags", - "glew", "glog", - "qt5-base", + { + "name": "jasper", + "default-features": false + }, + "metis", + "poselib", "sqlite3", { "name": "vcpkg-cmake", @@ -36,11 +40,21 @@ "host": true } ], + "default-features": [ + "gui" + ], "features": { + "cgal": { + "description": "Build with CGAL.", + "dependencies": [ + "cgal" + ] + }, "cuda": { - "description": "CUDA support for current compute architecture of this machine.", + "description": "Build with CUDA.", "dependencies": [ - "cuda" + "cuda", + "glew" ] }, "cuda-redist": { @@ -49,6 +63,13 @@ "cuda" ] }, + "gui": { + "description": "Build the GUI.", + "dependencies": [ + "glew", + "qt5-base" + ] + }, "tests": { "description": "Build all tests.", "dependencies": [ diff --git a/ports/cpp-peglib/portfile.cmake b/ports/cpp-peglib/portfile.cmake index 7a060bb5ca4265..8034231aab3d5d 100644 --- a/ports/cpp-peglib/portfile.cmake +++ b/ports/cpp-peglib/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-peglib REF "v${VERSION}" - SHA512 084e2770a6f73a66a90b43bae0f2c372c1767ca975e2ca2581f38b1828c3587bcfe400868cb5710b7546b499e516040fe33145a2c4098c15de11d384f6377bf4 + SHA512 09bd45132933b39c7b9c6026ca7149b79c6833b86037c18b2d101842cf48fe839188e215f6c4eba286f17a831887b9b34e59f43b9148729f5f8e7c56e0c829ba HEAD_REF master ) diff --git a/ports/cpp-peglib/vcpkg.json b/ports/cpp-peglib/vcpkg.json index 1fbc0a504736c8..eecdf9df4d5a13 100644 --- a/ports/cpp-peglib/vcpkg.json +++ b/ports/cpp-peglib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-peglib", - "version": "1.9.0", + "version": "1.9.1", "description": "C++11 header-only PEG (Parsing Expression Grammars) library.", "license": "MIT" } diff --git a/ports/cpp-timsort/portfile.cmake b/ports/cpp-timsort/portfile.cmake index 2d50533f32a3f5..1ff340e0831fea 100644 --- a/ports/cpp-timsort/portfile.cmake +++ b/ports/cpp-timsort/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO timsort/cpp-TimSort REF "v${VERSION}" - SHA512 4110017fa25055724a896367f572f1119f0635c7be787f600d68714e4438dd73d0d023f3d021c3c15a3b09a47b13c43a927a2674e5ca601ef5a202b9bc56b849 + SHA512 79a7640d9aef8c5347d4916efaf9dd70ceb4b72417b29a313a567a8d86786886dc44c79eff8f47092cd7c782c54ea82d2d33237360e3049aa2d4781441c31dbe HEAD_REF master ) diff --git a/ports/cpp-timsort/vcpkg.json b/ports/cpp-timsort/vcpkg.json index 9f8a27141f15cb..26eec5ff1a1677 100644 --- a/ports/cpp-timsort/vcpkg.json +++ b/ports/cpp-timsort/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-timsort", - "version": "3.0.0", + "version": "3.0.1", "description": "A C++ implementation of timsort", "homepage": "https://github.com/timsort/cpp-TimSort", "license": "MIT", diff --git a/ports/cppmicroservices/devendor_boost_absl.patch b/ports/cppmicroservices/devendor_boost_absl.patch new file mode 100644 index 00000000000000..359a75005c3d7f --- /dev/null +++ b/ports/cppmicroservices/devendor_boost_absl.patch @@ -0,0 +1,175 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55b99bb765..85b4484990 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -692,9 +692,9 @@ endif() + #----------------------------------------------------------------------------- + # Compile libraries here if you do not want -Werror or /WX on + #----------------------------------------------------------------------------- +-add_subdirectory(third_party/absl) ++find_package(absl CONFIG REQUIRED) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries" FORCE) +-add_subdirectory(third_party/boost/nowide) ++find_package(Boost COMPONENTS nowide CONFIG REQUIRED) + set(BUILD_SHARED_LIBS ${_us_build_shared} CACHE BOOL "Build shared libraries" FORCE) + #----------------------------------------------------------------------------- + +diff --git a/cmake/usBundleConfig.cmake.in b/cmake/usBundleConfig.cmake.in +index c9cf743790..078c5b3fad 100644 +--- a/cmake/usBundleConfig.cmake.in ++++ b/cmake/usBundleConfig.cmake.in +@@ -3,6 +3,10 @@ + set(US_@PROJECT_NAME@_LIBRARIES @PROJECT_TARGET@) + set(US_@PROJECT_NAME@_RUNTIME_LIBRARY_DIRS "@PACKAGE_CONFIG_RUNTIME_LIBRARY_DIR@") + ++include(CMakeFindDependencyMacro) ++find_dependency(Boost COMPONENTS asio nowide CONFIG) ++find_dependency(absl CONFIG) ++ + if(NOT TARGET @PROJECT_TARGET@) + include("${CMAKE_CURRENT_LIST_DIR}/us@PROJECT_NAME@Targets.cmake") + endif() +diff --git a/compendium/CMakeLists.txt b/compendium/CMakeLists.txt +index a5713313ec..d26ac7e4fe 100644 +--- a/compendium/CMakeLists.txt ++++ b/compendium/CMakeLists.txt +@@ -1,3 +1,4 @@ ++find_package(Boost COMPONENTS asio CONFIG REQUIRED) + if(US_BUILD_TESTING) + add_subdirectory(test_bundles) + endif() +diff --git a/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp b/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp +index 50f02e6e1f..fdfa45d991 100644 +--- a/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp ++++ b/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp +@@ -22,10 +22,10 @@ + + #include "CMAsyncWorkService.hpp" + +-#include "boost/asio/async_result.hpp" +-#include "boost/asio/packaged_task.hpp" +-#include "boost/asio/post.hpp" +-#include "boost/asio/thread_pool.hpp" ++#include ++#include ++#include ++#include + + namespace cppmicroservices + { +diff --git a/compendium/ConfigurationAdmin/src/CMakeLists.txt b/compendium/ConfigurationAdmin/src/CMakeLists.txt +index f2eca66ce7..8d7c8bd671 100644 +--- a/compendium/ConfigurationAdmin/src/CMakeLists.txt ++++ b/compendium/ConfigurationAdmin/src/CMakeLists.txt +@@ -25,7 +25,7 @@ set(_private_headers + ) + + add_library(ConfigurationAdminObjs OBJECT ${_srcs} ${_private_headers}) +- ++target_link_libraries(ConfigurationAdminObjs PULBIC Boost::asio) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + get_property(_compile_flags TARGET ConfigurationAdminObjs PROPERTY COMPILE_FLAGS) + set_property(TARGET ConfigurationAdminObjs PROPERTY COMPILE_FLAGS "${_compile_flags} -fPIC") +diff --git a/compendium/DeclarativeServices/CMakeLists.txt b/compendium/DeclarativeServices/CMakeLists.txt +index 24f2820fa5..cb518781b4 100644 +--- a/compendium/DeclarativeServices/CMakeLists.txt ++++ b/compendium/DeclarativeServices/CMakeLists.txt +@@ -37,14 +37,14 @@ endif() + add_compile_definitions(BOOST_DATE_TIME_NO_LIB) + add_compile_definitions(BOOST_REGEX_NO_LIB) + +- ++find_package(Boost COMPONENTS asio CONFIG REQUIRED) + usMacroCreateBundle(DeclarativeServices + VERSION "1.5.10" + DEPENDS Framework + TARGET DeclarativeServices + SYMBOLIC_NAME declarative_services + EMBED_RESOURCE_METHOD LINK +- LINK_LIBRARIES ${_link_libraries} usServiceComponent usAsyncWorkService ++ LINK_LIBRARIES ${_link_libraries} usServiceComponent usAsyncWorkService Boost::asio + PRIVATE_HEADERS ${_ds_private_headers} + SOURCES $ src/SCRActivator.cpp + BINARY_RESOURCES manifest.json +diff --git a/compendium/DeclarativeServices/src/CMakeLists.txt b/compendium/DeclarativeServices/src/CMakeLists.txt +index d25961b6d7..9283babe46 100644 +--- a/compendium/DeclarativeServices/src/CMakeLists.txt ++++ b/compendium/DeclarativeServices/src/CMakeLists.txt +@@ -79,8 +79,9 @@ set(_private_headers + metadata/ServiceMetadata.hpp + metadata/Util.hpp + ) +- ++find_package(Boost COMPONENTS asio CONFIG REQUIRED) + add_library(DeclarativeServicesObjs OBJECT ${_srcs} ${_private_headers}) ++target_link_libraries(DeclarativeServicesObjs PUBLIC Boost::asio) + + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + get_property(_compile_flags TARGET DeclarativeServicesObjs PROPERTY COMPILE_FLAGS) +diff --git a/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp b/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp +index ffc93e9e86..1b9af7bd6c 100644 +--- a/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp ++++ b/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp +@@ -22,10 +22,10 @@ + + #include "SCRAsyncWorkService.hpp" + +-#include "boost/asio/async_result.hpp" +-#include "boost/asio/packaged_task.hpp" +-#include "boost/asio/post.hpp" +-#include "boost/asio/thread_pool.hpp" ++#include ++#include ++#include ++#include + + namespace cppmicroservices + { +diff --git a/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp b/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp +index c4483a98c1..84d4217e7a 100644 +--- a/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp ++++ b/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp +@@ -30,7 +30,7 @@ + #include "ReferenceManager.hpp" + #include "ReferenceManagerImpl.hpp" + #include "RegistrationManager.hpp" +-#include "boost/asio/post.hpp" ++#include + #include "cppmicroservices/servicecomponent/ComponentConstants.hpp" + #include "states/CCUnsatisfiedReferenceState.hpp" + #include "states/ComponentConfigurationState.hpp" +diff --git a/tools/rc/CMakeLists.txt b/tools/rc/CMakeLists.txt +index c4a36f8dd1..ffcf13e44a 100644 +--- a/tools/rc/CMakeLists.txt ++++ b/tools/rc/CMakeLists.txt +@@ -19,9 +19,8 @@ set_property(TARGET ${US_RCC_EXECUTABLE_TARGET} PROPERTY OUTPUT_NAME ${US_RCC_EX + if(WIN32) + target_link_libraries(${US_RCC_EXECUTABLE_TARGET} Shlwapi) + endif() +- +-target_link_libraries(${US_RCC_EXECUTABLE_TARGET} nowide::nowide) +-target_include_directories(${US_RCC_EXECUTABLE_TARGET} PRIVATE ${CppMicroServices_SOURCE_DIR}/third_party/boost/nowide/include) ++find_package(Boost COMPONENTS nowide CONFIG REQUIRED) ++target_link_libraries(${US_RCC_EXECUTABLE_TARGET} Boost::nowide) + + set_property(TARGET ${US_RCC_EXECUTABLE_TARGET} APPEND PROPERTY + COMPILE_DEFINITIONS "MINIZ_NO_ARCHIVE_READING_API;MINIZ_NO_ZLIB_COMPATIBLE_NAMES") +diff --git a/tools/rc/ResourceCompiler.cpp b/tools/rc/ResourceCompiler.cpp +index a5b81d3522..4e92db4e3a 100644 +--- a/tools/rc/ResourceCompiler.cpp ++++ b/tools/rc/ResourceCompiler.cpp +@@ -37,9 +37,12 @@ + #include + #include + +-#include +-#include ++#include ++#include + ++namespace nowide { ++ using namespace boost::nowide; ++} + #include "optionparser.h" + #include "json/json.h" + diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index ad7b3cc77aad5c..989894c8ff13b8 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -2,35 +2,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CppMicroServices/CppMicroservices REF "v${VERSION}" - SHA512 4743846a8ba45e6bd320c93bb3bd443b5dac16ea0bbf55bda6212e9200a40ee29031fd74c6141de4c6b5ef9ad3e70789d13fda25b40638547782d386a12dd7e2 + SHA512 26b76b124fba50a079b002867f5d349b4719833358f09712a73bc3f4370362bc27b01eb7ba31e3a0d01f101f70e5be45d5d99fe9f25216eadacc02127459d91b HEAD_REF development PATCHES werror.patch fix_strnicmp.patch - remove-wx.patch + devendor_boost_absl.patch ) -#nowide download -vcpkg_from_github( - OUT_SOURCE_PATH NOWIDE_SOURCE_PATH - REPO boostorg/nowide - REF 02f40f0b5f5686627fcddae93ff88ca399db4766 - SHA512 e68e0704896726c7a94b8ace0e03c5206b4c7acd23a6b05f6fb2660abe30611ac6913cf5fab7b57eaff1990a7c28aeee8c9f526b60f7094c0c201f90b715d6c6 - HEAD_REF develop +# TODO: De-vendor everything +file(REMOVE_RECURSE + "${SOURCE_PATH}/third_party/absl" + "${SOURCE_PATH}/third_party/boost" ) -file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/boost/nowide") -file(RENAME "${NOWIDE_SOURCE_PATH}" "${SOURCE_PATH}/third_party/boost/nowide") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices -DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices -DUS_USE_SYSTEM_GTEST=TRUE + -DUS_BUILD_TESTING=FALSE + -DUS_USE_SYSTEM_BOOST=TRUE ) -vcpkg_cmake_install() +vcpkg_cmake_install(ADD_BIN_TO_PATH) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cppmicroservices/remove-wx.patch b/ports/cppmicroservices/remove-wx.patch deleted file mode 100644 index dadae53f59804a..00000000000000 --- a/ports/cppmicroservices/remove-wx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2bec34f..801d049 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -511,7 +511,7 @@ if(MSVC) - set(US_ENABLE_ASAN OFF) - endif() - -- set(US_CXX_FLAGS "/MP /WX /D${msvc_version_define} ${US_CXX_FLAGS}") -+ set(US_CXX_FLAGS "/MP /D${msvc_version_define} ${US_CXX_FLAGS}") - else() - - # If not cross-compiling, turn on Stack Smashing Protection. diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 4a7a4be789cdcb..315e4893717a34 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,11 +1,13 @@ { "name": "cppmicroservices", - "version": "3.7.6", - "port-version": 1, + "version": "3.8.4", "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", "license": "Apache-2.0", "dependencies": [ + "abseil", + "boost-asio", + "boost-nowide", "gtest", { "name": "vcpkg-cmake", diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake index 67cdf34b5eab3d..fd1ca255c894bd 100644 --- a/ports/cpptrace/portfile.cmake +++ b/ports/cpptrace/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/cpptrace REF "v${VERSION}" - SHA512 8e1c4ec3f7bbc717a677f00ee8c56bb082732d779b2682e9cc629ba96e68def786c12e815f10606067e361f0c1d46f9833e454c786aa26688ef1a940a5e6d98b + SHA512 86784217cfca1d55f326d713aba547d1c858c97a8ab5f9c0c79a8a7e395a7ac6adc2fa9efd97f202c1bab817c1ab0472352c2322cd1712b772e8ea2160cf0cca HEAD_REF main ) diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json index a8c948c6b5a5ca..6bc297f345bbce 100644 --- a/ports/cpptrace/vcpkg.json +++ b/ports/cpptrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpptrace", - "version": "0.7.3", + "version": "0.7.4", "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer", "homepage": "https://github.com/jeremy-rifkin/cpptrace", "license": "MIT", diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index e868e9b1294834..57ad2305cdc145 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -41,7 +41,7 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES) PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) - if(_LIBRARY_DEB MATCHES "-NOTFOUND") + if(_LIBRARY_DEB MATCHES "-NOTFOUND" AND NOT VCPKG_BUILD_TYPE) message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}") endif() @@ -131,10 +131,14 @@ install_headers("${SOURCE_PATH}/util") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") -file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") -file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +endif() if(VCPKG_TARGET_IS_OSX) - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") endif() diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 5c4aaa4633bde9..008749cd6c8ce4 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", "version-date": "2024-04-11", - "port-version": 4, + "port-version": 5, "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/ports/cuda-api-wrappers/portfile.cmake b/ports/cuda-api-wrappers/portfile.cmake index aa143e63788598..26a8caac964a66 100644 --- a/ports/cuda-api-wrappers/portfile.cmake +++ b/ports/cuda-api-wrappers/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eyalroz/cuda-api-wrappers REF "v${VERSION}" - SHA512 5281557d05faa95f25a509a03d331ecf60b881cfbe0d80f560a9a1be1957d5b3b7a9afa99e1ffb35175f30b357fea3103058665f56bcecea55df9efa23179619 + SHA512 14df77c3d613500e57f223fb692b04ea89c6b6b4ba9ecc1b58059e1b2970acaa8986cb55f3f090d305a3fe6136a83d2a8cf0bb88e02be691456fcef1b1867ef9 HEAD_REF master ) diff --git a/ports/cuda-api-wrappers/usage b/ports/cuda-api-wrappers/usage index aeb5856dfa794f..fb7ec925f18a4a 100644 --- a/ports/cuda-api-wrappers/usage +++ b/ports/cuda-api-wrappers/usage @@ -1,4 +1,4 @@ cuda-api-wrappers provides CMake targets: find_package(cuda-api-wrappers CONFIG REQUIRED) - target_link_libraries(main PRIVATE cuda-api-wrappers::rtc cuda-api-wrappers::nvtx cuda-api-wrappers::runtime-and-driver) + target_link_libraries(main PRIVATE cuda-api-wrappers::rtc cuda-api-wrappers::nvtx cuda-api-wrappers::runtime-and-driver cuda-api-wrappers::fatbin) diff --git a/ports/cuda-api-wrappers/vcpkg.json b/ports/cuda-api-wrappers/vcpkg.json index 07dba7e88311e1..6ef88438c586bf 100644 --- a/ports/cuda-api-wrappers/vcpkg.json +++ b/ports/cuda-api-wrappers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cuda-api-wrappers", - "version": "0.7.1", + "version": "0.8.0", "description": "Header-only library of integrated wrappers around the core parts of NVIDIA's CUDA execution ecosystem", "homepage": "https://github.com/eyalroz/cuda-api-wrappers", "license": "BSD-3-Clause", diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index 49a15b208a4cff..b7008111c21e4d 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -29,8 +29,10 @@ endif() if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static)) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_INSTALLED_DIR}" "$(prefix)" IGNORE_UNCHANGED) if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_INSTALLED_DIR}" "$(prefix)" IGNORE_UNCHANGED) endif() endif() diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json index 95ae9444a7fd81..40e0eebba351bc 100644 --- a/ports/curlpp/vcpkg.json +++ b/ports/curlpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curlpp", "version-date": "2018-06-15", - "port-version": 10, + "port-version": 11, "description": "C++ wrapper around libcURL", "homepage": "https://github.com/jpbarrette/curlpp", "license": "MIT", diff --git a/ports/date/0001-fix-uwp.patch b/ports/date/0001-fix-uwp.patch deleted file mode 100644 index 534f432f46c1bf..00000000000000 --- a/ports/date/0001-fix-uwp.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/include/date/date.h b/include/date/date.h -index beb627e..ba48515 100644 ---- a/include/date/date.h -+++ b/include/date/date.h -@@ -81,7 +81,7 @@ - #ifdef _MSC_VER - # pragma warning(push) - // warning C4127: conditional expression is constant --# pragma warning(disable : 4127) -+# pragma warning(disable : 4127 4996) - #endif - - namespace date -diff --git a/src/tz.cpp b/src/tz.cpp -index 82e4312..9481afa 100644 ---- a/src/tz.cpp -+++ b/src/tz.cpp -@@ -202,35 +202,6 @@ namespace - using co_task_mem_ptr = std::unique_ptr; - } - --static --std::wstring --convert_utf8_to_utf16(const std::string& s) --{ -- std::wstring out; -- const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0); -- -- if (size == 0) -- { -- std::string msg = "Failed to determine required size when converting \""; -- msg += s; -- msg += "\" to UTF-16."; -- throw std::runtime_error(msg); -- } -- -- out.resize(size); -- const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size); -- -- if (size != check) -- { -- std::string msg = "Failed to convert \""; -- msg += s; -- msg += "\" to UTF-16."; -- throw std::runtime_error(msg); -- } -- -- return out; --} -- - // We might need to know certain locations even if not using the remote API, - // so keep these routines out of that block for now. - static -@@ -268,6 +239,36 @@ get_download_folder() - # endif // !INSTALL - - # endif // WINRT -+ -+static -+std::wstring -+convert_utf8_to_utf16(const std::string& s) -+{ -+ std::wstring out; -+ const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0); -+ -+ if (size == 0) -+ { -+ std::string msg = "Failed to determine required size when converting \""; -+ msg += s; -+ msg += "\" to UTF-16."; -+ throw std::runtime_error(msg); -+ } -+ -+ out.resize(size); -+ const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size); -+ -+ if (size != check) -+ { -+ std::string msg = "Failed to convert \""; -+ msg += s; -+ msg += "\" to UTF-16."; -+ throw std::runtime_error(msg); -+ } -+ -+ return out; -+} -+ - # else // !_WIN32 - - # if !defined(INSTALL) diff --git a/ports/date/0002-fix-cmake-install.patch b/ports/date/0002-fix-cmake-install.patch deleted file mode 100644 index aa404f1ce95c75..00000000000000 --- a/ports/date/0002-fix-cmake-install.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 012512a..2cbcc21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,10 +73,6 @@ target_sources( date INTERFACE - $ - $ - ) --if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) -- # public headers will get installed: -- set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) --endif () - - # These used to be set with generator expressions, - # -@@ -144,7 +140,6 @@ if( BUILD_TZ_LIB ) - endif( ) - set_target_properties( date-tz PROPERTIES - POSITION_INDEPENDENT_CODE ON -- PUBLIC_HEADER "${TZ_HEADERS}" - VERSION "${PROJECT_VERSION}" - SOVERSION "${ABI_VERSION}" ) - if( NOT MSVC ) -@@ -169,30 +164,26 @@ write_basic_package_version_file( "${version_config}" - COMPATIBILITY SameMajorVersion ) - - install( TARGETS date -- EXPORT dateConfig -- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) -+ EXPORT dateConfig ) - export( TARGETS date NAMESPACE date:: FILE dateTargets.cmake ) --if (CMAKE_VERSION VERSION_LESS 3.15) -- install( -- FILES include/date/date.h -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) --endif () -+install( -+ DIRECTORY "${CMAKE_SOURCE_DIR}/include/date" -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -+ PATTERN "chrono_io.h" EXCLUDE -+) - - if( BUILD_TZ_LIB ) - install( TARGETS date-tz - EXPORT dateConfig -- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) # This is for Windows - export( TARGETS date-tz NAMESPACE date:: APPEND FILE dateTargets.cmake ) - endif( ) - --if( WIN32 AND NOT CYGWIN) -- set( CONFIG_LOC CMake ) --else( ) -- set( CONFIG_LOC "${CMAKE_INSTALL_LIBDIR}/cmake/date" ) --endif( ) -+ -+set( CONFIG_LOC "${CMAKE_INSTALL_LIBDIR}/cmake/date" ) -+ - install( EXPORT dateConfig - FILE dateTargets.cmake - NAMESPACE date:: diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index d442f34f696304..91857548f060ee 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -8,12 +8,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date - REF 1ead6715dec030d340a316c927c877a3c4e5a00c - SHA512 a0b5dd2d94788929a2ba98bd629d64d188ff0ae40affd9338d3d7a94c848ae4d6addc72613964e7fad7f62e4ee20b7170b2133cb39d4e018c604ba35c68d1cff + REF "v${VERSION}" + SHA512 e11d7f230ecc431d94c4b58fe7394dd57a9ec0baa9de52496578479b51bbf885566d6666882916d84d388060fa36065b3fa8dd3a8bc14f720b38d1c943f06700 HEAD_REF master - PATCHES - 0001-fix-uwp.patch - 0002-fix-cmake-install.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -29,7 +26,12 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/date) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/date") +endif() vcpkg_copy_pdbs() diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json index 8c1ac3e2d0bb07..7c5cab7f6836c8 100644 --- a/ports/date/vcpkg.json +++ b/ports/date/vcpkg.json @@ -1,6 +1,6 @@ { "name": "date", - "version-date": "2024-05-14", + "version": "3.0.3", "description": "A date and time library based on the C++17 header", "homepage": "https://github.com/HowardHinnant/date", "license": "MIT", diff --git a/ports/dcmtk/dependencies.diff b/ports/dcmtk/dependencies.diff index 2d573999e441ef..91b1a112bb8cd6 100644 --- a/ports/dcmtk/dependencies.diff +++ b/ports/dcmtk/dependencies.diff @@ -1,10 +1,9 @@ diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake -index 510027c..9f3a5da 100644 +index 510027c..eb8fe90 100644 --- a/CMake/3rdparty.cmake +++ b/CMake/3rdparty.cmake -@@ -1,3 +1,11 @@ +@@ -1,3 +1,10 @@ +set(CMAKE_REQUIRE_FIND_PACKAGE_Iconv "${DCMTK_WITH_ICONV}") -+set(CMAKE_REQUIRE_FIND_PACKAGE_ICU "${DCMTK_WITH_ICU}") +set(CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 "${DCMTK_WITH_XML}") +set(CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL "${DCMTK_WITH_OPENSSL}") +set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}") @@ -14,7 +13,7 @@ index 510027c..9f3a5da 100644 set(USE_FIND_PACKAGE_DOCS "Control whether libraries are searched via CMake's find_package() mechanism or a Windows specific fallback") # Advanced user (eg. vcpkg) may want to override this: if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT) -@@ -42,7 +50,7 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -42,7 +49,7 @@ if(DCMTK_USE_FIND_PACKAGE) else() message(STATUS "Info: DCMTK TIFF support will be enabled") include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) @@ -23,7 +22,7 @@ index 510027c..9f3a5da 100644 endif() endif() endif() -@@ -58,7 +66,7 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -58,7 +65,7 @@ if(DCMTK_USE_FIND_PACKAGE) message(STATUS "Info: DCMTK PNG support will be enabled") set(WITH_LIBPNG 1) include_directories(${PNG_INCLUDE_DIR}) @@ -32,7 +31,7 @@ index 510027c..9f3a5da 100644 endif() endif() -@@ -103,7 +111,7 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -103,7 +110,7 @@ if(DCMTK_USE_FIND_PACKAGE) else() message(STATUS "Info: DCMTK XML support will be enabled") set(WITH_LIBXML 1) @@ -41,7 +40,7 @@ index 510027c..9f3a5da 100644 set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) endif() endif() -@@ -141,7 +149,10 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -141,7 +148,10 @@ if(DCMTK_USE_FIND_PACKAGE) # Find libiconv if(DCMTK_WITH_ICONV) find_package(Iconv QUIET) diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 6d678327f9c245..531e9ea4ae094d 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -14,7 +14,6 @@ vcpkg_from_github( ) file(REMOVE "${SOURCE_PATH}/CMake/FindICONV.cmake" - "${SOURCE_PATH}/CMake/FindICU.cmake" "${SOURCE_PATH}/CMake/FindJPEG.cmake" ) diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index baebdca62f98d6..9d8c24d5755105 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dcmtk", "version": "3.6.9", + "port-version": 1, "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", "homepage": "https://github.com/DCMTK/dcmtk", "license": null, diff --git a/ports/deniskovalchuk-libftp/portfile.cmake b/ports/deniskovalchuk-libftp/portfile.cmake index 7e75c08623dcb8..369713da5907a9 100644 --- a/ports/deniskovalchuk-libftp/portfile.cmake +++ b/ports/deniskovalchuk-libftp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO deniskovalchuk/libftp REF "v${VERSION}" - SHA512 017c809c19e32b0ddb3b4d7f5cc4cb5cc0f27a4c2be0640ddf115d869f9dbfa4b7cc77845193fed9058885bb38d33f0cff436c18c35e9611ca4f299afefe3b9d + SHA512 c0fe6f174d0bcb200f7b3a933671f5b6ab63599ba9c7a4cadd2219866d246c0ab11bb9c9bfdfe6bf9adfebb9132c2378c7912cb7cb80489e29c05c9710e839c3 HEAD_REF master ) diff --git a/ports/deniskovalchuk-libftp/vcpkg.json b/ports/deniskovalchuk-libftp/vcpkg.json index 7da6a7814e3d24..75312aa6d1e92d 100644 --- a/ports/deniskovalchuk-libftp/vcpkg.json +++ b/ports/deniskovalchuk-libftp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "deniskovalchuk-libftp", - "version": "1.4.0", - "port-version": 1, + "version": "1.4.1", "maintainers": "Denis Kovalchuk ", "description": "A cross-platform FTP/FTPS client library based on Boost.Asio.", "homepage": "https://github.com/deniskovalchuk/libftp", diff --git a/ports/directx12-agility/portfile.cmake b/ports/directx12-agility/portfile.cmake index 275391ae5b61c7..9a38b1da120ce9 100644 --- a/ports/directx12-agility/portfile.cmake +++ b/ports/directx12-agility/portfile.cmake @@ -42,4 +42,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") +message(STATUS "BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS: https://www.nuget.org/packages/Microsoft.Direct3D.D3D12/${VERSION}/License") + configure_file("${CMAKE_CURRENT_LIST_DIR}/directx12-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) diff --git a/ports/directx12-agility/vcpkg.json b/ports/directx12-agility/vcpkg.json index de29548a6aee42..3911861af5689f 100644 --- a/ports/directx12-agility/vcpkg.json +++ b/ports/directx12-agility/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directx12-agility", "version": "1.614.1", + "port-version": 1, "description": "DirectX 12 Agility SDK", "homepage": "https://aka.ms/directx12agility", "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", diff --git a/ports/dlpack/portfile.cmake b/ports/dlpack/portfile.cmake index bac36394544d6b..54e2461b080adc 100644 --- a/ports/dlpack/portfile.cmake +++ b/ports/dlpack/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dmlc/dlpack REF "v${VERSION}" - SHA512 1669d5145904918499682ed80db7a444d012708c7b8c1d03410ef8fa8bcacd95e56450e95a842b0b4d900f973d04e24bd86e33f54b8afe80dd5dbbb02d04fc13 + SHA512 bdf27bdb6d24db2da9155b9c78e62faf043e0aa4d54dba4cadac312c2b87533ae1b44ecebd462a764141297baa35884c1379902d655bab8a71fe65838c7b1e9b HEAD_REF main ) diff --git a/ports/dlpack/vcpkg.json b/ports/dlpack/vcpkg.json index 80b64d26aeb9d9..75df75fd1b3bcc 100644 --- a/ports/dlpack/vcpkg.json +++ b/ports/dlpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dlpack", - "version": "0.8", + "version": "1.0", "description": "DLPack is an open in-memory tensor structure for sharing tensors among frameworks", "homepage": "https://github.com/dmlc/dlpack", "license": "Apache-2.0", diff --git a/ports/fastio/portfile.cmake b/ports/fastio/portfile.cmake index d711474ffbb397..996f53cd3bb98f 100644 --- a/ports/fastio/portfile.cmake +++ b/ports/fastio/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cppfastio/fast_io - REF 621b461a12af1d4c52d867127753b2bc0b60f946 - SHA512 bdc651a06071d5e9b043d0295396351ef05552e98f80161f6026b0ba32ff6f65397cd95daa1da47e4811b2eb94c12a7d0dd47219385b7278e668bb117128f774 + REF dd78867b7ae27da71c2e6d5d4f543066c301c047 + SHA512 7376b4f2420c6b21d1b81f693a067c43ca16ad3110a53893687e1715acfdfa4d41604fb1d13c1537809a9f14321cfae6829f56a10bdceba72926feb45ec9d0a3 HEAD_REF master ) diff --git a/ports/fastio/vcpkg.json b/ports/fastio/vcpkg.json index 13e39fac2945b7..5af20b1b38c1eb 100644 --- a/ports/fastio/vcpkg.json +++ b/ports/fastio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastio", - "version-date": "2024-07-05", + "version-date": "2024-12-05", "description": "fast_io is an extremely fast C++20 input/output library aiming to replace and . It supports networking, NT apis, pipe, filesystem, winrt hstring, Qt, OpenSSL, cryptography. It is freestanding and it works on any platform, including dos, win95, wasm, linux kernel, windows kernel or your own operating system kernel. It has no dependencies.", "homepage": "https://github.com/cppfastio/fast_io", "license": "MIT", diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index c7e052f7f749ee..a182910807183f 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 5948672fad493ef5d469d824cdd216932dc6043789939aa687613d94f2b56a83cff2b71aa28679d7640043f04aef888fb2915eefb147017e0b91b15ebae1791f + SHA512 1eeb3d370b91cdcffca48b7bf47aaccf883f48f57db2067f6912c33faaf5c05373eb0e2e9d91ababe7b0494a928400540b3abc22c63345c0d90863a46c67cc61 HEAD_REF main PATCHES fix-deps.patch @@ -46,6 +46,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/demo" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/schema/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 9bfd87ecd54980..d8cdcc297e6998 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.12.09.00", + "version-string": "2024.12.23.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 1b36f1779101b3..1b67dab02ab863 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -45,17 +45,17 @@ function(append_dependencies out) cmake_parse_arguments(PARSE_ARGV 1 "arg" "DEBUG" "NAMES" "") if(${arg_DEBUG}) set(config DEBUG) - set(path "${CURRENT_INSTALLED_DIR}/debug/lib/") + set(path "${SEARCH_PATH}/debug/lib/") else() set(config RELEASE) - set(path "${CURRENT_INSTALLED_DIR}/lib/") + set(path "${SEARCH_PATH}/lib/") endif() if("${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}" STREQUAL "") enable_language(CXX) endif() set(pass_through ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} - bcrypt gdi32 mfuuid ole32 oleaut32 psapi secur32 shlwapi strmiids user32 uuid vfw32 ws2_32 + advapi32 bcrypt crypt32 gdi32 mfuuid ole32 oleaut32 psapi secur32 shlwapi strmiids user32 uuid vfw32 ws2_32 -pthread -pthreads pthread atomic m ) cmake_policy(SET CMP0057 NEW) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index de90c54006e760..6d9e7638fc419f 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "7.1", - "port-version": 1, + "port-version": 2, "description": [ "A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index 5092e09bdf9a18..1d100396507998 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -28,8 +28,10 @@ if(VCPKG_TARGET_IS_WINDOWS) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET} LOGNAME build-${TARGET_TRIPLET} ) - - file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + + if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + endif() # Linux, etc. else() @@ -47,11 +49,13 @@ else() # FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where # FFMpeg's call to pkgconfig expects to find it. file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") - file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + endif() endif() vcpkg_fixup_pkgconfig() # Install the files to their default vcpkg locations file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") -file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index b02718f8f3bad5..1536c28efbea79 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffnvcodec", "version": "12.2.72.0", + "port-version": 1, "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index ace75eddfb27ef..2366151c9eb5b0 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 a93a95b2ff8e775b51899de552a794d43cc9293b40bafec2d5420a73954f1efa192980732a0c3e85634bf38e7b3780c53ef392200578135a40e11a80592ce097 + SHA512 a10abb3f26f3f213e59a8c6fcda63ad41177914969ae7c10e62aee385ac191eb04c37f49acac710e7ea46c364e15a0ed7bb452bf8a790e2216c058d1527fec34 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 1538d459516a5e..45b2175a460cd0 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.12.09.00", + "version-string": "2024.12.23.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index 415c4815804437..e6180cc66e07b8 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -65,10 +65,12 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/fltk-config") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../.." IGNORE_UNCHANGED) if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../.." IGNORE_UNCHANGED) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "{prefix}/include" "{prefix}/../include") endif() endif() diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index b1b9b58b390f2f..ad1ac7ef0e0e05 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fltk", "version": "1.3.9", - "port-version": 1, + "port-version": 2, "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "license": null, diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 4aef288deab744..67776f9f2c0127 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 c3bfbf6a1691d6a8a4a5d224b58d9ca70b8a2c274c69bc0c0700025f512ce26ede31cd2ab8fc290c6697b49e1cb3dcfaf9a4fda1e1427d102c32f29632b445fd + SHA512 476248496118ed0a27776055096a8667ca5114ca8bb4bcb7562c690ece7d3ed5c9f02cf4d5363cbfed0dab9782d8e66269afa72cc29b13df0a5fc84f3da611a4 HEAD_REF main PATCHES fix-windows-minmax.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 897a6136e17204..9fdb528d639dd0 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.12.09.00", + "version-string": "2024.12.23.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/fontconfig/emscripten.diff b/ports/fontconfig/emscripten.diff new file mode 100644 index 00000000000000..da8ef2923d8bf9 --- /dev/null +++ b/ports/fontconfig/emscripten.diff @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 08d9532..37cc195 100644 +--- a/meson.build ++++ b/meson.build +@@ -289,7 +289,7 @@ if fc_cachedir in ['yes', 'no', 'default'] + endif + endif + +-if host_machine.system() != 'windows' ++if host_machine.system() != 'windows' and host_machine.system() != 'emscripten' + thread_dep = dependency('threads') + conf.set('HAVE_PTHREAD', 1) + deps += [thread_dep] diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 9cf2635b8f9d0e..382a57a61fcc3a 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -6,20 +6,34 @@ vcpkg_from_gitlab( SHA512 daa6d1e6058e12c694d9e1512e09be957ff7f3fa375246b9d13eb0a8cf2f21e1512a5cabe93f270e96790e2c20420bf7422d213e43ab9749da3255286ea65a7c HEAD_REF master PATCHES + emscripten.diff no-etc-symlinks.patch libgetopt.patch fix-wasm-shared-memory-atomics.patch ) -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") +set(options "") +if("nls" IN_LIST FEATURES) + list(APPEND options "-Dnls=enabled") +else() + list(APPEND options "-Dnls=disabled") +endif() +if("tools" IN_LIST FEATURES) + list(APPEND options "-Dtools=enabled") +else() + list(APPEND options "-Dtools=disabled") +endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${options} -Ddoc=disabled -Dcache-build=disabled -Diconv=enabled -Dtests=disabled + ADDITIONAL_BINARIES + "gperf = ['${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}']" ) # https://www.freedesktop.org/software/fontconfig/fontconfig-user.html @@ -42,7 +56,7 @@ vcpkg_install_meson(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() #Fix missing libintl static dependency -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) +if("nls" IN_LIST FEATURES AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc" "-liconv" "-liconv -lintl" IGNORE_UNCHANGED) endif() @@ -83,11 +97,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endforeach() endif() -vcpkg_copy_tools( - TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist - AUTO_CLEAN -) +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist + AUTO_CLEAN + ) +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/fontconfig/usage b/ports/fontconfig/usage index 9d14caf70de12d..b59bc482f7a387 100644 --- a/ports/fontconfig/usage +++ b/ports/fontconfig/usage @@ -1,4 +1,9 @@ fontconfig is compatible with built-in CMake targets: - find_package(Fontconfig REQUIRED) # since CMake 3.14 - target_link_libraries(main PRIVATE Fontconfig::Fontconfig) + find_package(Fontconfig REQUIRED) # since CMake 3.14 + target_link_libraries(main PRIVATE Fontconfig::Fontconfig) + +fontconfig provides pkg-config modules: + + # Font configuration and customization library + fontconfig diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 81d0ad316c6bf8..18fe0b72b80e90 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,16 +1,18 @@ { "name": "fontconfig", "version": "2.15.0", - "port-version": 1, + "port-version": 2, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", + "supports": "!uwp", "dependencies": [ "dirent", "expat", - "freetype", - "getopt", - "gettext", + { + "name": "freetype", + "default-features": false + }, { "name": "gperf", "host": true @@ -21,12 +23,38 @@ }, { "name": "libuuid", - "platform": "!windows & !osx & !mingw" + "platform": "!osx & !windows" + }, + { + "name": "pthread", + "platform": "!emscripten & !windows" }, - "pthread", { "name": "vcpkg-tool-meson", "host": true } - ] + ], + "features": { + "nls": { + "description": "Native languages support", + "dependencies": [ + { + "name": "gettext", + "host": true, + "default-features": false, + "features": [ + "tools" + ] + }, + "gettext-libintl" + ] + }, + "tools": { + "description": "Build tools", + "supports": "!emscripten", + "dependencies": [ + "getopt" + ] + } + } } diff --git a/ports/g2o/0003-dependency-spdlog.diff b/ports/g2o/0003-dependency-spdlog.diff new file mode 100644 index 00000000000000..b98e071bf9836a --- /dev/null +++ b/ports/g2o/0003-dependency-spdlog.diff @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2b0a09b..2645ff66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -177,7 +177,8 @@ find_package(QGLViewer) + option(G2O_USE_LOGGING "Try to use spdlog for logging" ON) + set(G2O_HAVE_LOGGING 0) + if (G2O_USE_LOGGING) +- find_package(spdlog 1.6 QUIET) ++ find_package(spdlog 1.6 REQUIRED CONFIG) ++ set(G2O_HAVE_LOGGING 1) + if (TARGET spdlog::spdlog OR TARGET spdlog::spdlog_header_only) + set(G2O_HAVE_LOGGING 1) + message(STATUS "Compiling with logging support") diff --git a/ports/g2o/fix-absolute.patch b/ports/g2o/fix-absolute.patch index 8b2ee5246faa39..3faabf8bce8a58 100644 --- a/ports/g2o/fix-absolute.patch +++ b/ports/g2o/fix-absolute.patch @@ -1,12 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c3b6ab5..f050970 100644 +index c2b0a09..8c62d5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -496,7 +496,6 @@ set(G2O_PROJECT_CONFIG "${G2O_GENERATED_DIR}/${PROJECT_NAME}Config.cmake") +@@ -492,7 +492,8 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND}) + set(G2O_HAVE_CSPARSE ${G2O_USE_CSPARSE}) + set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS}) +-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}") ++cmake_path(GET CMAKE_CXX_COMPILER FILENAME cxx_compiler) ++set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${cxx_compiler}") + + # Generate cmake configuration scripts + set(G2O_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") +@@ -501,7 +502,6 @@ set(G2O_PROJECT_CONFIG "${G2O_GENERATED_DIR}/${PROJECT_NAME}Config.cmake") set(G2O_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") set(G2O_CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") set(G2O_NAMESPACE "${PROJECT_NAME}::") -set(G2O_SRC_DIR "${PROJECT_SOURCE_DIR}") - set(G2O_VERSION 1.0.0) - + include(CMakePackageConfigHelpers) + WRITE_BASIC_PACKAGE_VERSION_FILE( diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 5e5a8d1fa7a01b..c6ef1910448ce5 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -2,19 +2,26 @@ string(REPLACE "-" "" GIT_TAG "${VERSION}_git") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RainerKuemmerle/g2o - REF "${GIT_TAG}" - SHA512 626b4d286b564ca6714957d0caf41cf5387ecbc7100299c1a1134fa4a11a340f6e6e0796fa5ff16229032a1e1e384bc03e7d2c118be39d6d51a20d9f2774a98d + REF eec325a1da1273e87bc97887d49e70570f28570c + SHA512 22d3d546fbc92bff4767b66dcc9a001b5ed0cac0787874dda8712140aa03004b0312f702ea7d61c5fdcfa0bb00654c873f8b99899cd9e2b89667d8d99667d5cd HEAD_REF master PATCHES fix-absolute.patch + 0003-dependency-spdlog.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindBLAS.cmake") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + spdlog G2O_USE_LOGGING +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS} -DG2O_BUILD_EXAMPLES=OFF -DG2O_BUILD_APPS=OFF diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index 67905648b0354d..c54ff90755dd66 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,6 +1,7 @@ { "name": "g2o", - "version-date": "2023-08-06", + "version-date": "2024-12-14", + "port-version": 2, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "dependencies": [ @@ -16,5 +17,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "spdlog": { + "description": "Use spdlog for logging", + "dependencies": [ + "spdlog" + ] + } + } } diff --git a/ports/gazebo/0001-Fix-deps.patch b/ports/gazebo/0001-Fix-deps.patch index a933d6884f9b04..d06cf32d5a6da4 100644 --- a/ports/gazebo/0001-Fix-deps.patch +++ b/ports/gazebo/0001-Fix-deps.patch @@ -1,26 +1,145 @@ diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 4085b5aaeb..f89ac88333 100644 +index 732cbb4..d9d4c0c 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake -@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND) +@@ -3,11 +3,9 @@ include (CheckCXXSourceCompiles) + + include (${gazebo_cmake_dir}/FindOS.cmake) + find_package(PkgConfig) +-include (${gazebo_cmake_dir}/FindFreeimage.cmake) +- +-execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --modversion protobuf +- OUTPUT_VARIABLE PROTOBUF_VERSION +- RESULT_VARIABLE protobuf_modversion_failed) ++find_package(freeimage CONFIG REQUIRED) ++set(freeimage_LIBRARIES freeimage::FreeImage) ++get_target_property(freeimage_INCLUDE_DIRS freeimage::FreeImage INTERFACE_INCLUDE_DIRECTORIES) + + ######################################## + # 1. can not use GAZEBO_BUILD_TYPE_PROFILE is defined after include this module +@@ -25,6 +23,8 @@ if (CMAKE_BUILD_TYPE) + endif() + + ######################################## ++find_package(Protobuf CONFIG REQUIRED) ++ + if (PROTOBUF_VERSION LESS 2.3.0) + BUILD_ERROR("Incorrect version: Gazebo requires protobuf version 2.3.0 or greater") + endif() +@@ -35,6 +35,7 @@ endif() + # Protobuf >= 22 requires to link abseil, so we are constrained to use + # find_package(Protobuf) and link to protobuf::libprotobuf, + # see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075#issuecomment-1569242816 ++ + if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0) + set(GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT ON) + else() +@@ -62,7 +63,6 @@ if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG) + set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY}) + endif() + else() +- find_package(Protobuf CONFIG REQUIRED) + set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf) + set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) + if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE) +@@ -203,7 +203,7 @@ if (PKG_CONFIG_FOUND) # (needed, at least, for MacOS) # Use system installation on UNIX and Apple, and internal copy on Windows - if (UNIX OR APPLE) + if (true) - message (STATUS "Using system tinyxml.") - set (USE_EXTERNAL_TINYXML True) + set (USE_EXTERNAL_TINYXML_DEFAULT_VALUE ON) elseif(WIN32) -@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND) + set (USE_EXTERNAL_TINYXML_DEFAULT_VALUE OFF) +@@ -252,7 +252,7 @@ if (PKG_CONFIG_FOUND) # (needed, at least, for MacOS) # Use system installation on UNIX and Apple, and internal copy on Windows - if (UNIX OR APPLE) + if (true) - message (STATUS "Using system tinyxml2.") - set (USE_EXTERNAL_TINYXML2 True) + set (USE_EXTERNAL_TINYXML2_DEFAULT_VALUE ON) elseif(WIN32) -@@ -513,7 +513,7 @@ if (PKG_CONFIG_FOUND) + set (USE_EXTERNAL_TINYXML2_DEFAULT_VALUE OFF) +@@ -331,8 +331,7 @@ if (PKG_CONFIG_FOUND) + + ################################################# + # Find TBB +- pkg_check_modules(TBB tbb) +- set (TBB_PKG_CONFIG "tbb") ++ find_package(TBB CONFIG REQUIRED) + if (NOT TBB_FOUND) + message(STATUS "TBB not found, attempting to detect manually") + set (TBB_PKG_CONFIG "") +@@ -365,23 +364,20 @@ if (PKG_CONFIG_FOUND) + ################################################# + # Find OGRE + +- pkg_check_modules(OGRE-RTShaderSystem +- OGRE-RTShaderSystem>=${MIN_OGRE_VERSION}) ++ find_package(OGRE CONFIG REQUIRED) + +- if (OGRE-RTShaderSystem_FOUND) +- set(ogre_ldflags ${OGRE-RTShaderSystem_LDFLAGS}) +- set(ogre_include_dirs ${OGRE-RTShaderSystem_INCLUDE_DIRS}) +- set(ogre_libraries ${OGRE-RTShaderSystem_LIBRARIES}) +- set(ogre_library_dirs ${OGRE-RTShaderSystem_LIBRARY_DIRS}) +- set(ogre_cflags ${OGRE-RTShaderSystem_CFLAGS}) ++ if (OGRE_RTShaderSystem_FOUND) ++ set(ogre_ldflags ${OGRE_RTShaderSystem_LDFLAGS}) ++ set(ogre_include_dirs ${OGRE_RTShaderSystem_INCLUDE_DIRS}) ++ set(ogre_libraries ${OGRE_RTShaderSystem_LIBRARIES}) ++ set(ogre_library_dirs ${OGRE_RTShaderSystem_LIBRARY_DIRS}) ++ set(ogre_cflags ${OGRE_RTShaderSystem_CFLAGS}) + + set (INCLUDE_RTSHADER ON CACHE BOOL "Enable GPU shaders") + else () + set (INCLUDE_RTSHADER OFF CACHE BOOL "Enable GPU shaders") + endif () + +- pkg_check_modules(OGRE OGRE>=${MIN_OGRE_VERSION}) +- + if (PKG_CONFIG_EXECUTABLE AND OGRE_FOUND AND NOT DEFINED OGRE_VERSION) + execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --modversion OGRE + OUTPUT_VARIABLE OGRE_VERSION) +@@ -451,25 +447,22 @@ if (PKG_CONFIG_FOUND) + set(ogre_cflags ${ogre_cflags} ${OGRE_CFLAGS}) + endif () + +- pkg_check_modules(OGRE-Terrain OGRE-Terrain) +- if (OGRE-Terrain_FOUND) +- set(ogre_ldflags ${ogre_ldflags} ${OGRE-Terrain_LDFLAGS}) +- set(ogre_include_dirs ${ogre_include_dirs} ${OGRE-Terrain_INCLUDE_DIRS}) +- set(ogre_libraries ${ogre_libraries};${OGRE-Terrain_LIBRARIES}) +- set(ogre_library_dirs ${ogre_library_dirs} ${OGRE-Terrain_LIBRARY_DIRS}) +- set(ogre_cflags ${ogre_cflags} ${OGRE-Terrain_CFLAGS}) ++ if (OGRE_Terrain_FOUND) ++ set(ogre_ldflags ${ogre_ldflags} ${OGRE_Terrain_LDFLAGS}) ++ set(ogre_include_dirs ${ogre_include_dirs} ${OGRE_Terrain_INCLUDE_DIRS}) ++ set(ogre_libraries ${ogre_libraries};${OGRE_Terrain_LIBRARIES}) ++ set(ogre_library_dirs ${ogre_library_dirs} ${OGRE_Terrain_LIBRARY_DIRS}) ++ set(ogre_cflags ${ogre_cflags} ${OGRE_Terrain_CFLAGS}) + endif() + +- pkg_check_modules(OGRE-Overlay OGRE-Overlay) +- if (OGRE-Overlay_FOUND) +- set(ogre_ldflags ${ogre_ldflags} ${OGRE-Overlay_LDFLAGS}) +- set(ogre_include_dirs ${ogre_include_dirs} ${OGRE-Overlay_INCLUDE_DIRS}) +- set(ogre_libraries ${ogre_libraries};${OGRE-Overlay_LIBRARIES}) +- set(ogre_library_dirs ${ogre_library_dirs} ${OGRE-Overlay_LIBRARY_DIRS}) +- set(ogre_cflags ${ogre_cflags} ${OGRE-Overlay_CFLAGS}) ++ if (OGRE_Overlay_FOUND) ++ set(ogre_ldflags ${ogre_ldflags} ${OGRE_Overlay_LDFLAGS}) ++ set(ogre_include_dirs ${ogre_include_dirs} ${OGRE_Overlay_INCLUDE_DIRS}) ++ set(ogre_libraries ${ogre_libraries};${OGRE_Overlay_LIBRARIES}) ++ set(ogre_library_dirs ${ogre_library_dirs} ${OGRE_Overlay_LIBRARY_DIRS}) ++ set(ogre_cflags ${ogre_cflags} ${OGRE_Overlay_CFLAGS}) + endif() + +- + set (OGRE_INCLUDE_DIRS ${ogre_include_dirs} + CACHE INTERNAL "Ogre include path") + +@@ -549,7 +542,7 @@ if (PKG_CONFIG_FOUND) endif () if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND @@ -29,7 +148,7 @@ index 4085b5aaeb..f89ac88333 100644 set (HAVE_FFMPEG TRUE) else () set (HAVE_FFMPEG FALSE) -@@ -538,7 +538,7 @@ if (PKG_CONFIG_FOUND) +@@ -574,7 +567,7 @@ if (PKG_CONFIG_FOUND) ######################################## # Find GNU Triangulation Surface Library pkg_check_modules(gts gts) @@ -38,7 +157,7 @@ index 4085b5aaeb..f89ac88333 100644 message (STATUS "Looking for GTS - found") set (HAVE_GTS TRUE) else () -@@ -551,13 +551,14 @@ if (PKG_CONFIG_FOUND) +@@ -587,7 +580,7 @@ if (PKG_CONFIG_FOUND) # First and preferred option is to look for bullet standard pkgconfig, # so check it first. if it is not present, check for the OSRF # custom bullet2.82.pc file @@ -47,14 +166,15 @@ index 4085b5aaeb..f89ac88333 100644 if (NOT BULLET_FOUND) pkg_check_modules(BULLET bullet2.82>=2.82) endif() - +@@ -596,6 +589,7 @@ if (PKG_CONFIG_FOUND) + endif() if (BULLET_FOUND) set (HAVE_BULLET TRUE) + set(BULLET_VERSION ${BULLET_VERSION_STRING}) - add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} ) - else() - set (HAVE_BULLET FALSE) -@@ -572,7 +573,7 @@ if (PKG_CONFIG_FOUND) + if (${BULLET_VERSION} STREQUAL "") + set (BULLET_VERSION ${BULLET_VERSION_STRING}) + endif() +@@ -614,7 +608,7 @@ if (PKG_CONFIG_FOUND) ######################################## # Find libusb pkg_check_modules(libusb-1.0 libusb-1.0) @@ -63,7 +183,7 @@ index 4085b5aaeb..f89ac88333 100644 BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.") set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE) else() -@@ -648,7 +649,7 @@ endif () +@@ -690,7 +684,7 @@ endif () ######################################## # Find gdal include (FindGDAL) @@ -72,7 +192,7 @@ index 4085b5aaeb..f89ac88333 100644 message (STATUS "Looking for libgdal - not found") BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.") set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE) -@@ -718,7 +719,7 @@ endif() +@@ -774,7 +768,7 @@ endif() ######################################## # Find graphviz include (${gazebo_cmake_dir}/FindGraphviz.cmake) @@ -82,10 +202,17 @@ index 4085b5aaeb..f89ac88333 100644 BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.") set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE) diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in -index b57a90dd76..63ce97095e 100644 +index ac1de2c..05cdc02 100644 --- a/cmake/gazebo-config.cmake.in +++ b/cmake/gazebo-config.cmake.in -@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ +@@ -1,3 +1,6 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(freeimage CONFIG) ++ + if (@PKG_NAME@_CONFIG_INCLUDED) + return() + endif() +@@ -99,12 +102,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ if (GAZEBO_HAS_BULLET) if (PKG_CONFIG_FOUND) @@ -100,3 +227,16 @@ index b57a90dd76..63ce97095e 100644 add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION}) else() message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.") +diff --git a/gazebo/rendering/ogre_gazebo.h b/gazebo/rendering/ogre_gazebo.h +index a171782..c390d14 100644 +--- a/gazebo/rendering/ogre_gazebo.h ++++ b/gazebo/rendering/ogre_gazebo.h +@@ -66,7 +66,7 @@ + #if OGRE_VERSION_MAJOR > 1 || OGRE_VERSION_MINOR >= 7 + #include + #include +-#include ++#include + #include + #include + #include diff --git a/ports/gazebo/fix-tbb.patch b/ports/gazebo/fix-tbb.patch deleted file mode 100644 index b494c93bc7615a..00000000000000 --- a/ports/gazebo/fix-tbb.patch +++ /dev/null @@ -1,443 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index af56ee4..8583740 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -301,7 +301,7 @@ if (PKG_CONFIG_FOUND) - - ################################################# - # Find TBB -- pkg_check_modules(TBB tbb<2021) -+ pkg_check_modules(TBB tbb) - set (TBB_PKG_CONFIG "tbb") - if (NOT TBB_FOUND) - message(STATUS "TBB not found, attempting to detect manually") -@@ -325,6 +325,12 @@ if (PKG_CONFIG_FOUND) - endif(tbb_library) - endif (NOT TBB_FOUND) - endif (NOT TBB_FOUND) -+ set(HAVE_TBB_GREATER_OR_EQUAL_2021 OFF) -+ if (DEFINED TBB_VERSION AND NOT ${TBB_VERSION} STREQUAL "") -+ if (${TBB_VERSION} VERSION_GREATER_EQUAL "2021.0") -+ set(HAVE_TBB_GREATER_OR_EQUAL_2021 ON) -+ endif() -+ endif() - - ################################################# - # Find OGRE -diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in -index 36bb341..6bb8e51 100644 ---- a/cmake/gazebo-config.cmake.in -+++ b/cmake/gazebo-config.cmake.in -@@ -223,3 +223,11 @@ list(APPEND @PKG_NAME@_LIBRARIES ${IGNITION-FUEL_TOOLS_LIBRARIES}) - list(APPEND @PKG_NAME@_LDFLAGS -Wl,-rpath,${GAZEBO_INSTALL_LIB_DIR}/gazebo-@GAZEBO_MAJOR_VERSION@/plugins) - list(APPEND @PKG_NAME@_LDFLAGS -L${GAZEBO_INSTALL_LIB_DIR}) - list(APPEND @PKG_NAME@_LDFLAGS -L${GAZEBO_INSTALL_LIB_DIR}/gazebo-@GAZEBO_MAJOR_VERSION@/plugins) -+ -+set (GAZEBO_HAS_TBB_GREATER_OR_EQUAL_2021 @HAVE_TBB_GREATER_OR_EQUAL_2021@) -+if (GAZEBO_HAS_TBB_GREATER_OR_EQUAL_2021) -+ find_package(TBB CONFIG) -+ if (TARGET tbb::tbb) -+ list(APPEND @PKG_NAME@_LIBRARIES TBB::tbb) -+ endif () -+endif () -diff --git a/gazebo/transport/CMakeLists.txt b/gazebo/transport/CMakeLists.txt -index 8e59020..a72d49b 100644 ---- a/gazebo/transport/CMakeLists.txt -+++ b/gazebo/transport/CMakeLists.txt -@@ -29,6 +29,7 @@ set (headers - SubscribeOptions.hh - Subscriber.hh - SubscriptionTransport.hh -+ TaskGroup.hh - TopicManager.hh - TransportIface.hh - TransportTypes.hh -@@ -70,6 +71,12 @@ if (WIN32) - target_link_libraries(gazebo_transport ws2_32 Iphlpapi) - endif() - -+if(${CMAKE_VERSION} VERSION_LESS "3.13.0") -+ link_directories(${TBB_LIBRARY_DIRS}) -+else() -+ target_link_directories(gazebo_transport PUBLIC ${TBB_LIBRARY_DIRS}) -+endif() -+ - if (USE_PCH) - add_pch(gazebo_transport transport_pch.hh ${Boost_PKGCONFIG_CFLAGS} "-I${PROTOBUF_INCLUDE_DIR}" "-I${TBB_INCLUDEDIR}") - endif() -diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh -index 0e7d88a..cbcd7af 100644 ---- a/gazebo/transport/Connection.hh -+++ b/gazebo/transport/Connection.hh -@@ -17,7 +17,16 @@ - #ifndef _CONNECTION_HH_ - #define _CONNECTION_HH_ - -+#undef emit - #include -+#define emit -+ -+// If TBB_VERSION_MAJOR is not defined, this means that -+// tbb >= 2021 and we can include the tbb/version.h header -+#ifndef TBB_VERSION_MAJOR -+#include -+#endif -+ - #include - - #include -@@ -37,6 +46,9 @@ - #include "gazebo/common/Console.hh" - #include "gazebo/common/Exception.hh" - #include "gazebo/common/WeakBind.hh" -+#if TBB_VERSION_MAJOR >= 2021 -+#include "gazebo/transport/TaskGroup.hh" -+#endif - #include "gazebo/util/system.hh" - - #define HEADER_LENGTH 8 -@@ -54,7 +66,11 @@ namespace gazebo - /// \cond - /// \brief A task instance that is created when data is read from - /// a socket and used by TBB -+#if TBB_VERSION_MAJOR < 2021 - class GZ_TRANSPORT_VISIBLE ConnectionReadTask : public tbb::task -+#else -+ class GZ_TRANSPORT_VISIBLE ConnectionReadTask -+#endif - { - /// \brief Constructor - /// \param[_in] _func Boost function pointer, which is the function -@@ -68,6 +84,7 @@ namespace gazebo - { - } - -+#if TBB_VERSION_MAJOR < 2021 - /// \bried Overridden function from tbb::task that exectues the data - /// callback. - public: tbb::task *execute() -@@ -75,6 +92,11 @@ namespace gazebo - this->func(this->data); - return NULL; - } -+#else -+ /// \brief Execute the data callback -+ public: void operator()() const -+ { this->func(this->data); } -+#endif - - /// \brief The boost function pointer - private: boost::function func; -@@ -310,12 +332,16 @@ namespace gazebo - - if (!_e && !transport::is_stopped()) - { -+#if TBB_VERSION_MAJOR < 2021 - ConnectionReadTask *task = new(tbb::task::allocate_root()) - ConnectionReadTask(boost::get<0>(_handler), data); - tbb::task::enqueue(*task); - - // Non-tbb version: - // boost::get<0>(_handler)(data); -+#else -+ this->taskGroup.run(boost::get<0>(_handler), data); -+#endif - } - } - -@@ -465,6 +491,11 @@ namespace gazebo - - /// \brief True if the connection is open. - private: bool isOpen; -+ -+#if TBB_VERSION_MAJOR >= 2021 -+ /// \brief For managing asynchronous tasks with tbb -+ private: TaskGroup taskGroup; -+#endif - }; - /// \} - } -diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc -index b0546e5..17016a4 100644 ---- a/gazebo/transport/ConnectionManager.cc -+++ b/gazebo/transport/ConnectionManager.cc -@@ -27,6 +27,7 @@ - using namespace gazebo; - using namespace transport; - -+#if TBB_VERSION_MAJOR < 2021 - /// TBB task to process nodes. - class TopicManagerProcessTask : public tbb::task - { -@@ -37,20 +38,30 @@ class TopicManagerProcessTask : public tbb::task - return NULL; - } - }; -+#endif - - /// TBB task to establish subscriber to publisher connection. -+#if TBB_VERSION_MAJOR < 2021 - class TopicManagerConnectionTask : public tbb::task -+#else -+class TopicManagerConnectionTask -+#endif - { - /// \brief Constructor. - /// \param[in] _pub Publish message - public: explicit TopicManagerConnectionTask(msgs::Publish _pub) : pub(_pub) {} - - /// Implements the necessary execute function -+#if TBB_VERSION_MAJOR < 2021 - public: tbb::task *execute() - { - TopicManager::Instance()->ConnectSubToPub(pub); - return NULL; - } -+#else -+ public: void operator()() const -+ { TopicManager::Instance()->ConnectSubToPub(pub); } -+#endif - - /// \brief Publish message - private: msgs::Publish pub; -@@ -273,11 +284,6 @@ void ConnectionManager::RunUpdate() - if (this->masterConn) - this->masterConn->ProcessWriteQueue(); - -- // Use TBB to process nodes. Need more testing to see if this makes -- // a difference. -- // TopicManagerProcessTask *task = new(tbb::task::allocate_root()) -- // TopicManagerProcessTask(); -- // tbb::task::enqueue(*task); - boost::recursive_mutex::scoped_lock lock(this->connectionMutex); - - TopicManager::Instance()->ProcessNodes(); -@@ -403,9 +409,13 @@ void ConnectionManager::ProcessMessage(const std::string &_data) - if (pub.host() != this->serverConn->GetLocalAddress() || - pub.port() != this->serverConn->GetLocalPort()) - { -+#if TBB_VERSION_MAJOR < 2021 - TopicManagerConnectionTask *task = new(tbb::task::allocate_root()) - TopicManagerConnectionTask(pub); - tbb::task::enqueue(*task); -+#else -+ this->taskGroup.run(pub); -+#endif - } - } - // publisher_subscribe. This occurs when we try to subscribe to a topic, and -diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh -index ef80eaf..6dc212b 100644 ---- a/gazebo/transport/ConnectionManager.hh -+++ b/gazebo/transport/ConnectionManager.hh -@@ -27,8 +27,11 @@ - #include "gazebo/msgs/msgs.hh" - #include "gazebo/common/SingletonT.hh" - --#include "gazebo/transport/Publisher.hh" - #include "gazebo/transport/Connection.hh" -+#include "gazebo/transport/Publisher.hh" -+#if TBB_VERSION_MAJOR >= 2021 -+#include "gazebo/transport/TaskGroup.hh" -+#endif - #include "gazebo/util/system.hh" - - /// \brief Explicit instantiation for typed SingletonT. -@@ -194,6 +197,11 @@ namespace gazebo - /// \brief Condition used for synchronization - private: boost::condition_variable namespaceCondition; - -+#if TBB_VERSION_MAJOR >= 2021 -+ /// \brief For managing asynchronous tasks with tbb -+ private: TaskGroup taskGroup; -+#endif -+ - // Singleton implementation - private: friend class SingletonT; - }; -diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh -index b7d37f7..7248b72 100644 ---- a/gazebo/transport/Node.hh -+++ b/gazebo/transport/Node.hh -@@ -18,7 +18,12 @@ - #ifndef GAZEBO_TRANSPORT_NODE_HH_ - #define GAZEBO_TRANSPORT_NODE_HH_ - -+#undef emit - #include -+#define emit -+#ifndef TBB_VERSION_MAJOR -+#include -+#endif - #include - #include - #include -@@ -26,6 +31,9 @@ - #include - #include - -+#if TBB_VERSION_MAJOR >= 2021 -+#include "gazebo/transport/TaskGroup.hh" -+#endif - #include "gazebo/transport/TransportTypes.hh" - #include "gazebo/transport/TopicManager.hh" - #include "gazebo/util/system.hh" -@@ -36,7 +44,11 @@ namespace gazebo - { - /// \cond - /// \brief Task used by Node::Publish to publish on a one-time publisher -+#if TBB_VERSION_MAJOR < 2021 - class GZ_TRANSPORT_VISIBLE PublishTask : public tbb::task -+#else -+ class GZ_TRANSPORT_VISIBLE PublishTask -+#endif - { - /// \brief Constructor - /// \param[in] _pub Publisher to publish the message on. -@@ -49,16 +61,23 @@ namespace gazebo - this->msg->CopyFrom(_message); - } - -+#if TBB_VERSION_MAJOR < 2021 - /// \brief Overridden function from tbb::task that exectues the - /// publish task. - public: tbb::task *execute() -+#else -+ /// \brief Executes the publish task. -+ public: void operator()() const -+#endif - { - this->pub->WaitForConnection(); - this->pub->Publish(*this->msg, true); - this->pub->SendMessage(); - delete this->msg; -+#if TBB_VERSION_MAJOR < 2021 - this->pub.reset(); - return NULL; -+#endif - } - - /// \brief Pointer to the publisher. -@@ -159,11 +178,15 @@ namespace gazebo - const google::protobuf::Message &_message) - { - transport::PublisherPtr pub = this->Advertise(_topic); -+#if TBB_VERSION_MAJOR < 2021 - PublishTask *task = new(tbb::task::allocate_root()) - PublishTask(pub, _message); - - tbb::task::enqueue(*task); - return; -+#else -+ this->taskGroup.run(pub, _message); -+#endif - } - - /// \brief Advertise a topic -@@ -420,6 +443,10 @@ namespace gazebo - - /// \brief List of newly arrive messages - private: std::map > incomingMsgsLocal; -+#if TBB_VERSION_MAJOR >= 2021 -+ /// \brief For managing asynchronous tasks with tbb -+ private: TaskGroup taskGroup; -+#endif - - private: boost::mutex publisherMutex; - private: boost::mutex publisherDeleteMutex; -diff --git a/gazebo/transport/TaskGroup.hh b/gazebo/transport/TaskGroup.hh -new file mode 100644 -index 0000000..b95b5d8 ---- /dev/null -+++ b/gazebo/transport/TaskGroup.hh -@@ -0,0 +1,47 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+*/ -+#ifndef GAZEBO_TRANSPORT_TASKGROUP_HH_ -+#define GAZEBO_TRANSPORT_TASKGROUP_HH_ -+ -+#include -+ -+// Emit is both a macro in Qt and a function defined by tbb -+#undef emit -+#include -+#define emit -+ -+namespace gazebo { -+ namespace transport { -+ class TaskGroup -+ { -+ public: ~TaskGroup() noexcept -+ { -+ // Wait for running tasks to finish -+ this->taskGroup.wait(); -+ } -+ -+ public: template void run(Args&&... args) -+ { -+ this->taskGroup.run(Functor(std::forward(args)...)); -+ } -+ -+ private: tbb::task_group taskGroup; -+ }; -+ } -+} -+ -+#endif -diff --git a/gazebo/transport/transport_pch.hh b/gazebo/transport/transport_pch.hh -index 0119d40..f288de2 100644 ---- a/gazebo/transport/transport_pch.hh -+++ b/gazebo/transport/transport_pch.hh -@@ -21,6 +21,7 @@ - * To get a starting list for this file, I use the command: - * grep --include="*.hh" --include="*.cc" --no-filename -r "#include <" | sort -u - */ -+ - #include - #include - #include -@@ -44,8 +45,18 @@ - #include - #include - #include -+#include -+#ifndef TBB_VERSION_MAJOR -+#include -+#endif -+#if TBB_VERSION_MAJOR < 2021 - #include - #include - #include -+#else -+#undef emit -+#include -+#define emit -+#endif - #include - #include -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 5f2c112..6d09a11 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -49,6 +49,7 @@ target_link_libraries(gz - gazebo_gui - gazebo_physics - gazebo_sensors -+ gazebo_transport - ${Qt5Core_LIBRARIES} - ${Qt5Widgets_LIBRARIES} - ${Boost_LIBRARIES} diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake index c6322c64b9e295..a2199e36213108 100644 --- a/ports/gazebo/portfile.cmake +++ b/ports/gazebo/portfile.cmake @@ -1,19 +1,11 @@ -vcpkg_download_distfile(gazebo3211 - URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff?full_index=1" - FILENAME "gazebo3211.diff" - SHA512 761e254866d4705acc0b81479285f979c436b3b611739a207a575031d8a8daba48de4fc0c8de5edb9a9f89725586c5caeef9e6e1e3d63a2d961ca09df974f7de -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO osrf/gazebo - REF 382dcc3f36095a8d79b5bc9c8b8ad346e867c51d - SHA512 57638cd0b23b5f2bfd32fdc159d6cd77ca34e3bd695c225591979aef4b7271eac93d3706fa1ffa2340f90013267a4171bebe1e4c142f19ad2bf67963dfed627e + REPO gazebosim/gazebo-classic + REF "gazebo11_${VERSION}" + SHA512 0dede29618fc9d9a91d208a75b8ca1d3e6d3e8f4f60a80047b2d5806991f00f0bec46f6e2daca5931aed9c243f1e1d334e7a3eae9165b453cdedfb5b73b71186 HEAD_REF gazebo11 PATCHES 0001-Fix-deps.patch - "${gazebo3211}" - fix-tbb.patch # Effectively https://github.com/osrf/gazebo/pull/3174 with merge conflict resolutions ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json index 44cb543488966e..bcb67be3148718 100644 --- a/ports/gazebo/vcpkg.json +++ b/ports/gazebo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gazebo", - "version-date": "2022-01-20", - "port-version": 5, + "version": "11.15.1", "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", @@ -36,6 +35,7 @@ "host": true }, "protobuf", + "qt5", "qwt", "sdformat9", "tbb", diff --git a/ports/geogram/fix-vcpkg-install.patch b/ports/geogram/fix-vcpkg-install.patch index b05a53f62d9238..09cb877e2c886c 100644 --- a/ports/geogram/fix-vcpkg-install.patch +++ b/ports/geogram/fix-vcpkg-install.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fd796c..05bd735 100644 +index 6934fca..c2f855d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,7 +53,7 @@ endif() - include(cmake/geogram.cmake) +@@ -68,7 +68,7 @@ set(GEOGRAM_INSTALL_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH " + set(GEOGRAM_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/modules CACHE PATH "CMake file install destination") -set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR}) @@ -11,19 +11,19 @@ index 1fd796c..05bd735 100644 # Determine the current Build-OS (Build-platform without the compiler info) string(REGEX REPLACE "-[^-]+$" "" VORPALINE_OS ${VORPALINE_PLATFORM}) -@@ -115,6 +115,7 @@ endif() +@@ -130,6 +130,7 @@ endif() add_subdirectory(src/lib/third_party) if(GEOGRAM_WITH_GRAPHICS) -+ find_package(GLFW3 REQUIRED) - add_subdirectory(src/lib/geogram_gfx) ++find_package(GLFW3 REQUIRED) + add_subdirectory(src/lib/geogram_gfx) endif() -@@ -145,7 +146,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt) +@@ -160,7 +161,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt) # FindGeogram.cmake --install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) +-install(FILES cmake/FindGeogram.cmake DESTINATION ${GEOGRAM_INSTALL_CMAKE_DIR} COMPONENT devkit) +# This installation is not suitable for vcpkg +# install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) + @@ -66,10 +66,10 @@ index 1fd796c..05bd735 100644 # Configure CPack diff --git a/src/lib/geogram/CMakeLists.txt b/src/lib/geogram/CMakeLists.txt -index ed2dca0..30f87b7 100644 +index d50b3d2..41ec3e4 100644 --- a/src/lib/geogram/CMakeLists.txt +++ b/src/lib/geogram/CMakeLists.txt -@@ -45,7 +45,7 @@ target_include_directories(geogram PRIVATE +@@ -69,7 +69,7 @@ endif() # path for targets that depend on geogram. # See: https://cmake.org/cmake/help/v3.3/command/target_include_directories.html # https://stackoverflow.com/questions/26243169/cmake-target-include-directories-meaning-of-scope @@ -77,15 +77,20 @@ index ed2dca0..30f87b7 100644 +target_include_directories(geogram PUBLIC $) if(ANDROID) - target_include_directories(geogram PRIVATE -@@ -72,8 +72,19 @@ if(WIN32) - target_link_libraries(geogram psapi) + target_include_directories(geogram PRIVATE +@@ -78,6 +78,9 @@ ${ANDROID_NDK}/sources/android/native_app_glue + message(STATUS "building for Android") endif() +if(WIN32 AND VORPALINE_BUILD_DYNAMIC) + target_compile_definitions(geogram PUBLIC GEO_DYNAMIC_LIBS) +endif() -+ + + set_target_properties(geogram PROPERTIES + VERSION ${VORPALINE_VERSION} +@@ -101,7 +104,14 @@ target_link_libraries(geogram ${GEOGRAMPLUS_LIBS}) + endif() + # Install the library -install_devkit_targets(geogram) +install( @@ -100,10 +105,10 @@ index ed2dca0..30f87b7 100644 # Install include files for the standard devkit install( diff --git a/src/lib/geogram_gfx/CMakeLists.txt b/src/lib/geogram_gfx/CMakeLists.txt -index a6f8372..195b1e2 100644 +index 391e607..13b6bcb 100644 --- a/src/lib/geogram_gfx/CMakeLists.txt +++ b/src/lib/geogram_gfx/CMakeLists.txt -@@ -52,14 +52,21 @@ if(VORPALINE_BUILD_DYNAMIC) +@@ -52,14 +52,21 @@ target_link_libraries(geogram_gfx ${OPENGL_LIBRARIES}) endif() # Install the library @@ -119,20 +124,20 @@ index a6f8372..195b1e2 100644 # Install include files for the standard devkit install( - DIRECTORY . - DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx - COMPONENT devkit -- FILES_MATCHING PATTERN *.h -+ FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file + DIRECTORY . + DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx + COMPONENT devkit +-FILES_MATCHING PATTERN *.h ++FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file ) # Install include files for the full devkit @@ -67,7 +74,7 @@ install( - DIRECTORY . - DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx - COMPONENT devkit-full -- FILES_MATCHING PATTERN *.h -+ FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file + DIRECTORY . + DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx + COMPONENT devkit-full +-FILES_MATCHING PATTERN *.h ++FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file ) install( diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index a55fff64dc183a..9a227879193c28 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -1,33 +1,26 @@ -vcpkg_download_distfile(FIX_IMPLICIT_INT_PATCH - URLS https://github.com/BrunoLevy/geogram/commit/382da2d2f0d39bf8df2f65051c338e7e827e31db.patch?full_index=1 - FILENAME geogram-implicit-ini-382da2d2f0d39bf8df2f65051c338e7e827e31db.patch - SHA512 1a85195b76cd7140fe890893bf1f57a1f9c30dbc2865bab28b7eda9d97b9bab5be7cbc638b24d8da489aee1e25e0e7289655ade13893bdc225d1b332f1d845a0 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BrunoLevy/geogram REF "v${VERSION}" - SHA512 ae3d95be1c5061ace92921b3fcfb0027d23c595b131b0d31f1788adbe0d8f92367bef71736d6c936504bd37eba5fcdae658369f03734e233bf3eab14bca6f9e5 + SHA512 ed60352bfc3bc65dfbeac7c34b5ecf59e12cd61678e961f7d3ca445315bc13d377df93982f070be69815824ea1d6490a683e108b0456a4ebf4019e9d9e206599 PATCHES fix-vcpkg-install.patch - "${FIX_IMPLICIT_INT_PATCH}" ) #third_party: amgcl vcpkg_from_github( OUT_SOURCE_PATH AMGCL_SOURCE_PATH REPO ddemidov/amgcl - REF 8083b23fbe69c43cee0d4bc17e4334572e292c93 - SHA512 1b29871ace68c53b46711012921261929f8bd612f93b47d2c59523cd3d68366956fe1c9ec81a94b3aaab63357001799c9e34af79376b940fa6b7a53cdf136897 + REF a705f0822a332e215c41bccbeb6a7d92e90c49f2 + SHA512 09dda0eb318ee4cd74af9ea67d9fcdce8a4399ab08b08cd72e2c7de953ad584204402b932c2a3222b7c74b25934267230bbc333a377e25f87ad045087ace2000 ) #third_party: libMeshb vcpkg_from_github( OUT_SOURCE_PATH LIBMESHB_SOURCE_PATH REPO LoicMarechal/libMeshb - REF b4a91513317119ff71a1186906a052da0e535913 - SHA512 bff30a233c2746a454d552be66f5654bf4af995d6f1eb00a4d21ed10c86234a5be4d6f31282645858e0a829b10fd98cad7188c69be65cdabbd18478fc26bad1f + REF e3678731ef14497c720ee7017a14450eba2602d2 + SHA512 5c8f25805ce02cb48600914893f24ecd2dcbb8226692d47089605ff99db8785781407ec9152e29b0c3bc44d16f6d893cd171e5337c3cb1861468da05471872b6 ) #third_party: rply diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index 25c67bc1e4393f..bf3c8414febeef 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,7 +1,6 @@ { "name": "geogram", - "version": "1.8.3", - "port-version": 3, + "version": "1.9.2", "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://github.com/BrunoLevy/geogram", "license": "BSD-3-Clause", diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 3c51758a2fe6a2..8e9f66ae4acee4 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_sourceforge( REPO geographiclib REF distrib-C++ FILENAME "GeographicLib-${VERSION}.tar.gz" - SHA512 31b6019784d3379572f973e6bd99957cd977baeaec55a7702340e50285321158646b3a87ea96111b3f14ee08ea50bc3a1b2eb2c51641995e8f289518cc23f618 + SHA512 c165115228b775a4a95b318c1bac1d2871e45ea21f20043c9c9f1c165efb6848c027b883f7b19dcce8c86e71ded56eb5fdcde39f1ff94d61fdc98c9206abd1ae ) vcpkg_check_features( diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index 9d392644e45410..e60306b3c09b4c 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geographiclib", - "version": "2.4", + "version": "2.5", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "license": "MIT", diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 44274c6dfac740..50e6085b82c572 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 31e736069a877908f86aec1c5d9263475dd2d8efd2af8d5cb71ec6531a15a96ccae6de0799830ba577546bcbaee3d59672002ba61e6bc6d8e2ca723dd596083e + SHA512 e1e1f0aff6b352ba22a8cd6a5871f8f0b5269930cd7cad77f4df199bb3e7e27600125512b804bd5d1c15d4f36852e59fa2a02845f7eb2bd976360d3383e9309f HEAD_REF main ) diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 7c68539e429065..33943a9d9e8c2d 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "4.0.3", + "version": "4.2.2", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index ac3eb8e47d1c8f..9f1727ba7c885c 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang REF "${VERSION}" - SHA512 b246c6f280891b7c9b6cd0b5e85e03ccf1fe173cdfc40e566339a5698176cbcfe23eb7aeaba277f071222d76b9f2a00376d790d4d604aedad82e6196fab7fc70 + SHA512 8ba7e5f73746b221ff39387282e2d929d1142c60d1c79019f4c21c84b105fb59253e88f2f649a25e9bb7ab01094e455f002c7412aeea882548fac4a426eee809 HEAD_REF master ) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index d171ebaff83ee7..25e3580b949189 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "15.0.0", + "version": "15.1.0", "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt deleted file mode 100644 index ce185ec39c8fd4..00000000000000 --- a/ports/gmime/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -cmake_minimum_required(VERSION 3.8) - -project(gmime C) - -set(GMIME_DLL_SUFFIX 3) -set(GMIME_LIB_SUFFIX 3.0) - -find_package(ZLIB REQUIRED) -find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) -find_package(Iconv REQUIRED) - -pkg_check_modules(IDN2 libidn2 IMPORTED_TARGET) - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -endif() - -add_definitions(-DHAVE_CONFIG_H) -add_definitions(-DG_DISABLE_DEPRECATED) -add_definitions(-DG_LOG_DOMAIN="GMime") - -# Source files -file(GLOB LIB_SRC gmime/gmime-*.c) -list(APPEND LIB_SRC gmime/gmime.c - gmime/internet-address.c - util/packed.c - util/url-scanner.c - util/gtrie.c) - -# Headers -file(GLOB LIB_HEADERS gmime/gmime-*.h) -list(APPEND LIB_HEADERS gmime/gmime.h) -list(APPEND LIB_HEADERS gmime/internet-address.h) - -if(MSVC AND BUILD_SHARED_LIBS) - set(MSVC_SRC gmime.def) -endif() - -add_library(${PROJECT_NAME} ${LIB_SRC} ${MSVC_SRC}) - -set_target_properties(${PROJECT_NAME} PROPERTIES - OUTPUT_NAME ${PROJECT_NAME}-${GMIME_DLL_SUFFIX} - ARCHIVE_OUTPUT_NAME ${PROJECT_NAME}-${GMIME_LIB_SUFFIX} -) - -target_include_directories(${PROJECT_NAME} PRIVATE . ./util) -target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv ZLIB::ZLIB PkgConfig::IDN2) -target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::GLIB2) -target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib) - -install(TARGETS ${PROJECT_NAME} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - -install(FILES ${LIB_HEADERS} DESTINATION include/gmime) diff --git a/ports/gmime/msvc-ssize_t.diff b/ports/gmime/msvc-ssize_t.diff new file mode 100644 index 00000000000000..677187d6cee4a7 --- /dev/null +++ b/ports/gmime/msvc-ssize_t.diff @@ -0,0 +1,33 @@ +diff --git a/configure.ac b/configure.ac +index 9d368e0..c534a09 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,6 +168,13 @@ AC_TYPE_MODE_T + AC_TYPE_OFF_T + AC_TYPE_SIZE_T + AC_TYPE_SSIZE_T ++AH_BOTTOM([ ++#ifdef _MSC_VER ++#undef ssize_t; ++#include ++typedef SSIZE_T ssize_t; ++#endif ++]) + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + AC_TYPE_UINT8_T +diff --git a/gmime/gmime.h b/gmime/gmime.h +index ef6b93e..d3696ac 100644 +--- a/gmime/gmime.h ++++ b/gmime/gmime.h +@@ -22,6 +22,10 @@ + #ifndef __GMIME_H__ + #define __GMIME_H__ + ++#ifdef _MSC_VER ++#include ++typedef SSIZE_T ssize_t; ++#endif + #include + #include + #include diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index dbdc226e4e342b..beab3f4ccf0a47 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -1,38 +1,70 @@ -set(LIB_NAME gmime) -set(LIB_VERSION 3.2.6) - -set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz) - vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/gmime/3.2/${LIB_FILENAME}" - FILENAME "${LIB_FILENAME}" - SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d + URLS https://github.com/jstedfast/gmime/releases/download/${VERSION}/gmime-${VERSION}.tar.xz + FILENAME "gmime-${VERSION}.tar.xz" + SHA512 cafb89854b2441508bf940fd6f991739d30fb137b8928ad33e8e4d2a0293a6460e4d1318e73c3ee9e5a964b692f36e7a4eb5f2930c6998698bd9edf866629655 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - SOURCE_BASE "${LIB_VERSION}" + PATCHES + subdirs.diff + msvc-ssize_t.diff ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/aclocal/\"") # for glib +set(ENV{GTKDOCIZE} true) + +vcpkg_list(SET options) +set(iconv_detect_h "${CURRENT_HOST_INSTALLED_DIR}/share/${PORT}/iconv-detect-${VCPKG_CMAKE_SYSTEM_NAME}.h") +if(EXISTS "${iconv_detect_h}") + vcpkg_list(APPEND options "ac_cv_have_iconv_detect_h=yes") +elseif(VCPKG_CROSSCOMPILING) + vcpkg_list(APPEND options "ac_cv_have_iconv_detect_h=no") +endif() -# We can use file supplied with original sources -configure_file("${SOURCE_PATH}/build/vs2017/unistd.h" "${SOURCE_PATH}" COPYONLY) -configure_file("${SOURCE_PATH}/build/vs2017/config.h" "${SOURCE_PATH}" COPYONLY) -configure_file("${SOURCE_PATH}/build/vs2017/gmime.def" "${SOURCE_PATH}" COPYONLY) -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_cmake_configure( +if("crypto" IN_LIST FEATURES) + vcpkg_list(APPEND options "--enable-crypto") +else() + vcpkg_list(APPEND options "--disable-crypto") +endif() + +vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + ADD_BIN_TO_PATH # for iconv-detect OPTIONS - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + ${options} + --disable-glibtest + --disable-introspection + --disable-vala ) -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(EXISTS "${iconv_detect_h}") + file(COPY_FILE "${iconv_detect_h}" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/iconv-detect.h") + if(NOT VCPKG_BUILD_TYPE) + file(COPY_FILE "${iconv_detect_h}" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/iconv-detect.h") + endif() +endif() -# License and man -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${LIB_NAME}" RENAME copyright) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(COPY "${SOURCE_PATH}/build/vs2017/unistd.h" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${SOURCE_PATH}/build/vs2017/unistd.h" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + endif() +endif() +vcpkg_install_make() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(NOT VCPKG_CROSSCOMPILING) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/iconv-detect.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME "iconv-detect-${VCPKG_CMAKE_SYSTEM_NAME}.h" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/gmime/subdirs.diff b/ports/gmime/subdirs.diff new file mode 100644 index 00000000000000..24ef5082148a82 --- /dev/null +++ b/ports/gmime/subdirs.diff @@ -0,0 +1,16 @@ +diff --git a/Makefile.am b/Makefile.am +index c004167..0fafe72 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,10 +2,9 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = m4 build util gmime tests docs ++SUBDIRS = m4 build util gmime + + if !PLATFORM_WIN32 +-SUBDIRS += examples + endif + + SUBDIRS += tools . diff --git a/ports/gmime/vcpkg.json b/ports/gmime/vcpkg.json index 349a31b7051f2a..c4833964fc3980 100644 --- a/ports/gmime/vcpkg.json +++ b/ports/gmime/vcpkg.json @@ -1,19 +1,30 @@ { "name": "gmime", - "version": "3.2.6", - "port-version": 6, + "version": "3.2.15", + "port-version": 1, "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", - "homepage": "https://developer.gnome.org/gmime/", + "homepage": "https://github.com/jstedfast/gmime", "license": "LGPL-2.1-or-later", - "supports": "windows & !xbox", + "supports": "!xbox", "dependencies": [ "glib", - "libiconv", - "libidn2", { - "name": "vcpkg-cmake", + "name": "gmime", "host": true }, + "libiconv", + "libidn2", "zlib" - ] + ], + "features": { + "crypto": { + "description": "PGP and S/MIME support", + "dependencies": [ + { + "name": "gpgme", + "default-features": false + } + ] + } + } } diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index ff2a7fa96a6797..60bc95f90116dc 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 849c9cd1929e78d232b1b669676df46c7b597ed132f503880b65d9a7d495a573e58de7b95cea9df0d861e7046620397ef804d72d57c770243cea7fc1afcf9762 + SHA512 f57857a0853fa0980bb2c07d25d22240ce27a005a41cc99bf25ca0148fe7c9d5717eeb393519a37f05b40d4c114dde30e959e994700aece1ca2c45e68cd9bf77 HEAD_REF main ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 2a66011c3005b3..ae166a2171f407 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.32.0", + "version": "2.33.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -765,7 +765,8 @@ "name": "google-cloud-cpp", "default-features": false, "features": [ - "grpc-common" + "grpc-common", + "rest-common" ] } ] diff --git a/ports/gstreamer/fix-multiple-def.patch b/ports/gstreamer/fix-multiple-def.patch new file mode 100644 index 00000000000000..b8f8f2e408784f --- /dev/null +++ b/ports/gstreamer/fix-multiple-def.patch @@ -0,0 +1,35 @@ +diff --git a/subprojects/gst-plugins-bad/gst/siren/common.c b/subprojects/gst-plugins-bad/gst/siren/common.c +index 2e07748..70f58f6 100644 +--- a/subprojects/gst-plugins-bad/gst/siren/common.c ++++ b/subprojects/gst-plugins-bad/gst/siren/common.c +@@ -44,7 +44,7 @@ int max_bin[8] = { + 1 + }; + +-float step_size[8] = { ++float stp_size[8] = { + 0.3536f, + 0.5f, + 0.70709997f, +@@ -87,7 +87,7 @@ siren_init (void) + (float) pow (10, (i - 24 + 0.5) * STEPSIZE); + + for (i = 0; i < 8; i++) +- step_size_inverse[i] = (float) 1.0 / step_size[i]; ++ step_size_inverse[i] = (float) 1.0 / stp_size[i]; + + siren_dct4_init (); + siren_rmlt_init (); +diff --git a/subprojects/gst-plugins-bad/gst/siren/common.h b/subprojects/gst-plugins-bad/gst/siren/common.h +index e09e533..123b888 100644 +--- a/subprojects/gst-plugins-bad/gst/siren/common.h ++++ b/subprojects/gst-plugins-bad/gst/siren/common.h +@@ -95,7 +95,7 @@ extern int vector_dimension[8]; + extern int number_of_vectors[8]; + extern float dead_zone[8]; + extern int max_bin[8]; +-extern float step_size[8]; ++extern float stp_size[8]; + extern float step_size_inverse[8]; + + diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 5a6ba5e431824e..1f4a3b5ac5d7d9 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_from_gitlab( fix-bz2-windows-debug-dependency.patch no-downloads.patch ${PATCHES} + fix-multiple-def.patch ) vcpkg_find_acquire_program(FLEX) @@ -177,6 +178,7 @@ vcpkg_configure_meson( -Dgstreamer:coretracers=disabled -Dgstreamer:benchmarks=disabled -Dgstreamer:gst_debug=true + -Dgstreamer:ptp-helper=disabled # needs rustc toolchain setup # gst-plugins-base -Dgst-plugins-base:gl_winsys=${PLUGIN_BASE_WINDOW_SYSTEM} -Dgst-plugins-base:gl_platform=${PLUGIN_BASE_GL_PLATFORM} diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 3bd1e432bfd76d..ae9bee7f2ff765 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.24.7", - "port-version": 1, + "port-version": 3, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -418,7 +418,6 @@ "nls": { "description": "National language support", "dependencies": [ - "gettext", { "name": "gettext", "host": true, @@ -427,6 +426,7 @@ "tools" ] }, + "gettext-libintl", { "name": "gstreamer", "default-features": false, diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake index 20df402f03f21a..89ca188c9e8896 100644 --- a/ports/gumbo/portfile.cmake +++ b/ports/gumbo/portfile.cmake @@ -1,11 +1,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/gumbo-parser - REF v0.10.1 - SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1 - HEAD_REF master +vcpkg_download_distfile(ARCHIVE + URLS "https://codeberg.org/gumbo-parser/gumbo-parser/archive/${VERSION}.tar.gz" + FILENAME "gumbo-${VERSION}.tar.gz" + SHA512 15da29bc1b7d70a827870562462ca90fd57469d72d7a4804c59da96c5c46b3a0c50e99a08a80d6e08d2be87f55388c8848918bfbab58ac0c22df85fdc2bd35e7 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -25,4 +29,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gumbo" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/COPYING") diff --git a/ports/gumbo/vcpkg.json b/ports/gumbo/vcpkg.json index 39ad5a14416586..d384b3a5e536ec 100644 --- a/ports/gumbo/vcpkg.json +++ b/ports/gumbo/vcpkg.json @@ -1,9 +1,8 @@ { "name": "gumbo", - "version": "0.10.1", - "port-version": 6, + "version": "0.12.3", "description": "An HTML5 parsing library in pure C99", - "homepage": "https://github.com/google/gumbo-parser", + "homepage": "https://codeberg.org/gumbo-parser/gumbo-parser", "license": "Apache-2.0", "dependencies": [ { diff --git a/ports/gz-common5/003-include-chrono.patch b/ports/gz-common5/003-include-chrono.patch new file mode 100644 index 00000000000000..bf89471ae97e23 --- /dev/null +++ b/ports/gz-common5/003-include-chrono.patch @@ -0,0 +1,12 @@ +diff --git a/events/include/gz/common/Event.hh b/events/include/gz/common/Event.hh +index a86c3ac07..936417d74 100644 +--- a/events/include/gz/common/Event.hh ++++ b/events/include/gz/common/Event.hh +@@ -18,6 +18,7 @@ + #define GZ_COMMON_EVENT_HH_ + + #include ++#include + #include + #include + #include diff --git a/ports/gz-common5/portfile.cmake b/ports/gz-common5/portfile.cmake index a8b2e1132f0d51..07b413c5d1fdcf 100644 --- a/ports/gz-common5/portfile.cmake +++ b/ports/gz-common5/portfile.cmake @@ -11,6 +11,7 @@ ignition_modular_library( "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATCHES gz_remotery_vis.patch + 003-include-chrono.patch ) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gz-common5-graphics/gz-common5-graphics-config.cmake" "find_package(GTS " diff --git a/ports/gz-common5/vcpkg.json b/ports/gz-common5/vcpkg.json index d2c94556ae489d..4e0ef293e91227 100644 --- a/ports/gz-common5/vcpkg.json +++ b/ports/gz-common5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gz-common5", "version": "5.4.1", - "port-version": 2, + "port-version": 3, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": "Apache-2.0", diff --git a/ports/imageinfo/portfile.cmake b/ports/imageinfo/portfile.cmake index b09f0fc904035b..0479faebde6964 100644 --- a/ports/imageinfo/portfile.cmake +++ b/ports/imageinfo/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaozhuai/imageinfo - REF d010e59f25867a0ee159143f8bf116f071d993b1 # committed on 2024-08-05 - SHA512 a30c241608d44aa296f75debc988f7a8875eafe45ea925ca9d276975512cd1de9413b95c6421d1e37a71cb3e1c65f2bed101ffdf0e83ef3a883c8443a8bffb8d + REF 4e772f7d7d4453028c71f90e1783c390f5d78adf # committed on 2024-12-02 + SHA512 6ef9041a450c516ba84c5ccb4d96a2f5e27c0b45164e1db38b8df6adfeaec1725b76677955e8b2bf4d73842162cecf734ee25163af21eeeb045af48af92ba821 HEAD_REF master ) diff --git a/ports/imageinfo/vcpkg.json b/ports/imageinfo/vcpkg.json index dc2bc9b51f5d64..93dff9183d30ef 100644 --- a/ports/imageinfo/vcpkg.json +++ b/ports/imageinfo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imageinfo", - "version-date": "2024-08-05", + "version-date": "2024-12-02", "description": "Cross platform super fast single header c++ library to get image size and format without loading/decoding. Support avif, bmp, cur, dds, gif, hdr (pic), heic (heif), icns, ico, jp2, jpeg (jpg), jpx, ktx, png, psd, qoi, tga, tiff (tif), webp ...", "homepage": "https://github.com/xiaozhuai/imageinfo", "license": "MIT", diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index b2e202665e2792..a7e1be23bfc033 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -5,7 +5,7 @@ if ("docking-experimental" IN_LIST FEATURES) OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF "v${VERSION}-docking" - SHA512 2864672d3b08caf3396f69affe1b83d7977d2300f571864378ebe5b4a1a1b5634e6e171c8870444b7f8947fdc681aeaf07f59b25a290c94059d36226fc7e1aad + SHA512 5d1849867475c24dea51254bde945e919938b4fa2aac218e35a9371d3f48d8fc486ac4e459e9a0c3d36526f18972ac3ac292581aa831ca54efb3d640c6e156b1 HEAD_REF docking ) else() @@ -13,7 +13,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF "v${VERSION}" - SHA512 85ced14d0c4c3506caf0cff5897dc2c49521fe6de5bcadbc1107e2b63d6bd9a19f967960ba31206187fc2c830246f635e8f2b29b0b1ff522be209dd2a5349529 + SHA512 eef35ba9f7e39ddeff3e2df0eef77d3cd8602115cb42a6fad274aecf4d5e6922c43ea4fab37908729df00a3d3e69c5000b21b46b23ed18891fb899e6b9807feb HEAD_REF master ) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index b619dc44c48af8..c78fb6532a108f 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.91.5", + "version": "1.91.6", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/ports/ismrmrd/fix-nodiscard-warning.patch b/ports/ismrmrd/fix-nodiscard-warning.patch new file mode 100644 index 00000000000000..a5b8f54196638f --- /dev/null +++ b/ports/ismrmrd/fix-nodiscard-warning.patch @@ -0,0 +1,13 @@ +diff --git a/libsrc/meta.cpp b/libsrc/meta.cpp +index 9cc8cc9..69fce79 100644 +--- a/libsrc/meta.cpp ++++ b/libsrc/meta.cpp +@@ -23,7 +23,7 @@ namespace ISMRMRD { + pugi::xml_node value = meta.child("value"); + + if (!name || !value) { +- std::runtime_error("Malformed metadata value"); ++ throw std::runtime_error("Malformed metadata value"); + } + + while (value) { diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake index b231ec3c87178d..155f72a1204a56 100644 --- a/ports/ismrmrd/portfile.cmake +++ b/ports/ismrmrd/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES ${WIN32_INCLUDE_STDDEF_PATCH} fix-depends-hdf5.patch + fix-nodiscard-warning.patch ) vcpkg_cmake_configure( @@ -47,4 +48,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ismrmrd/vcpkg.json b/ports/ismrmrd/vcpkg.json index 6d44ee6957d71c..f9214cbb0442bc 100644 --- a/ports/ismrmrd/vcpkg.json +++ b/ports/ismrmrd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ismrmrd", "version": "1.14.1", + "port-version": 1, "description": "ISMRM Raw Data Format", "homepage": "https://github.com/ismrmrd/ismrmrd", "license": "BSD-3-Clause", diff --git a/ports/itpp/fix-build.patch b/ports/itpp/fix-build.patch new file mode 100644 index 00000000000000..282504d4189ad0 --- /dev/null +++ b/ports/itpp/fix-build.patch @@ -0,0 +1,14 @@ +diff --git a/itpp/base/mat.cpp b/itpp/base/mat.cpp +index 9f2a20e..11b0a58 100644 +--- a/itpp/base/mat.cpp ++++ b/itpp/base/mat.cpp +@@ -173,8 +173,7 @@ cmat operator*(const cmat &m1, const cmat &m2) + template<> + mat operator*(const mat &m1, const mat &m2) + { +- it_assert_debug(m1.rows() == m2.cols(), +- "Mat<>::operator*(): Wrong sizes"); ++ it_assert_debug(m1.cols() == m2.rows(), "cmat::operator*(): Wrong sizes"); + mat r(m1.rows(), m2.cols()); + double *tr = r._data(); + const double *t1; diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index 598dc8a7090c56..ddb762856b0440 100644 --- a/ports/itpp/portfile.cmake +++ b/ports/itpp/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_sourceforge( fix-uwp.patch fix-linux.patch rename-version.patch + fix-build.patch ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") @@ -33,6 +34,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_fixup_pkgconfig() diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json index adafea28712cb9..72fb888f7ab635 100644 --- a/ports/itpp/vcpkg.json +++ b/ports/itpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itpp", "version-semver": "4.3.1", - "port-version": 11, + "port-version": 12, "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", "homepage": "http://itpp.sourceforge.net", "dependencies": [ diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake index 36f0834e1dc3aa..4db87d2ee0be13 100644 --- a/ports/jemalloc/portfile.cmake +++ b/ports/jemalloc/portfile.cmake @@ -12,14 +12,15 @@ if(VCPKG_TARGET_IS_WINDOWS) set(opts "ac_cv_search_log=none required" "--without-private-namespace") endif() -vcpkg_configure_make( +vcpkg_make_configure( + AUTORECONF SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - NO_WRAPPERS + DISABLE_MSVC_WRAPPERS + DISABLE_MSVC_TRANSFORMATIONS OPTIONS ${opts} ) -vcpkg_install_make() +vcpkg_make_install() if(VCPKG_TARGET_IS_WINDOWS) file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat") diff --git a/ports/jemalloc/vcpkg.json b/ports/jemalloc/vcpkg.json index 007e05b931c989..59c1cfe0d0b3f7 100644 --- a/ports/jemalloc/vcpkg.json +++ b/ports/jemalloc/vcpkg.json @@ -1,8 +1,14 @@ { "name": "jemalloc", "version": "5.3.0", - "port-version": 1, + "port-version": 2, "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support", "homepage": "https://jemalloc.net/", - "license": "BSD-2-Clause" + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-make", + "host": true + } + ] } diff --git a/ports/juce/0002-build-linux-find_packages.patch b/ports/juce/0002-build-linux-find_packages.patch deleted file mode 100644 index 5f168e54060104..00000000000000 --- a/ports/juce/0002-build-linux-find_packages.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake -index e18dd5e08..45cc9245f 100644 ---- a/extras/Build/CMake/JUCEModuleSupport.cmake -+++ b/extras/Build/CMake/JUCEModuleSupport.cmake -@@ -389,6 +389,30 @@ - if(TARGET juce::pkgconfig_${name}) - return() - endif() -+ -+ # The package that can be found via find_package instead of pkg-config -+ if("${name}" STREQUAL "freetype2") -+ find_package(Freetype REQUIRED) -+ add_library(juce::pkgconfig_${name} INTERFACE) -+ target_link_libraries(juce::pkgconfig_${name} INTERFACE Freetype::Freetype) -+ return() -+ elseif("${name}" STREQUAL "libcurl") -+ find_package(CURL REQUIRED) -+ add_library(juce::pkgconfig_${name} INTERFACE) -+ target_link_libraries(juce::pkgconfig_${name} INTERFACE CURL::libcurl) -+ return() -+ elseif("${name}" STREQUAL "alsa") -+ find_package(ALSA REQUIRED) -+ add_library(juce::pkgconfig_${name} INTERFACE) -+ target_link_libraries(juce::pkgconfig_${name} INTERFACE ALSA::ALSA) -+ return() -+ elseif("${name}" STREQUAL "gl") -+ find_package(OpenGL REQUIRED) -+ add_library(juce::pkgconfig_${name} INTERFACE) -+ target_link_libraries(juce::pkgconfig_${name} INTERFACE OpenGL::GL) -+ return() -+ endif() -+ - - find_package(PkgConfig REQUIRED) - pkg_check_modules(${name} ${JUCE_ARG_UNPARSED_ARGUMENTS}) --- -2.34.1 diff --git a/ports/juce/0003-build-forward-vcpkg-toolchain.patch b/ports/juce/0003-build-forward-vcpkg-toolchain.patch deleted file mode 100644 index 095a919340a1dc..00000000000000 --- a/ports/juce/0003-build-forward-vcpkg-toolchain.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt -index 163f203cc..f4cdba7f7 100644 ---- a/extras/Build/juceaide/CMakeLists.txt -+++ b/extras/Build/juceaide/CMakeLists.txt -@@ -120,6 +120,25 @@ - "-DCMAKE_BUILD_TYPE=Debug" - "-DJUCE_BUILD_HELPER_TOOLS=ON" - "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" -+ # forward vcpkg flags -+ "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" -+ "-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}" -+ "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION}" -+ "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}" -+ "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}" -+ "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY}" -+ "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}" -+ "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}" -+ "-DVCPKG_APPLOCAL_DEPS=${VCPKG_APPLOCAL_DEPS}" -+ "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" -+ "-DVCPKG_MANIFEST_INSTALL=${VCPKG_MANIFEST_INSTALL}" -+ "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" -+ "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" -+ "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}" -+ "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" -+ "-D_VCPKG_ROOT_DIR=${_VCPKG_ROOT_DIR}" - WORKING_DIRECTORY "${JUCE_SOURCE_DIR}" - OUTPUT_VARIABLE command_output - ERROR_VARIABLE command_output --- -2.34.1 diff --git a/ports/juce/0004-install-paths.patch b/ports/juce/0004-install-paths.patch index d9d2d8b293d55e..c66511853a3033 100644 --- a/ports/juce/0004-install-paths.patch +++ b/ports/juce/0004-install-paths.patch @@ -19,31 +19,5 @@ index 4262a9852..a46b51f1a 100644 install(EXPORT VST3_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}") endif() endif() -diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt -index f4cdba7f7..fab57fdb4 100644 ---- a/extras/Build/juceaide/CMakeLists.txt -+++ b/extras/Build/juceaide/CMakeLists.txt -@@ -164,7 +164,7 @@ else() - - add_executable(juce::juceaide ALIAS juceaide) - -- set(JUCE_TOOL_INSTALL_DIR "bin/JUCE-${JUCE_VERSION}" CACHE STRING -+ set(JUCE_TOOL_INSTALL_DIR "tools/juce" CACHE STRING - "The location, relative to the install prefix, where juceaide will be installed") - - install(PROGRAMS "${imported_location}" DESTINATION "${JUCE_TOOL_INSTALL_DIR}") -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a46b51f1a..38f863a3e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -137,7 +137,7 @@ - VERSION ${JUCE_VERSION} - COMPATIBILITY ExactVersion) - --set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING -+set(JUCE_INSTALL_DESTINATION "share/juce" CACHE STRING - "The location, relative to the install prefix, where the JUCE config file will be installed") - - set(JUCE_MODULE_PATH "include/JUCE-${JUCE_VERSION}/modules") -- 2.34.1 diff --git a/ports/juce/devendor-oboe.diff b/ports/juce/devendor-oboe.diff new file mode 100644 index 00000000000000..c45949a28fba61 --- /dev/null +++ b/ports/juce/devendor-oboe.diff @@ -0,0 +1,17 @@ +diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake +index afefe2d..2dd2ecf 100644 +--- a/extras/Build/CMake/JUCEModuleSupport.cmake ++++ b/extras/Build/CMake/JUCEModuleSupport.cmake +@@ -603,8 +603,10 @@ function(juce_add_module module_path) + endif() + + if((${module_name} STREQUAL "juce_audio_devices") AND (CMAKE_SYSTEM_NAME STREQUAL "Android")) +- add_subdirectory("${module_path}/native/oboe") +- target_link_libraries(${module_name} INTERFACE oboe) ++ find_path(JUCE_OBOE_INCLUDE_DIR NAMES oboe/Oboe.h REQUIRED) ++ target_include_directories(${module_name} INTERFACE "${JUCE_OBOE_INCLUDE_DIR}") ++ find_library(JUCE_OBOE_LIBRARY NAMES oboe REQUIRED) ++ target_link_libraries(${module_name} INTERFACE "${JUCE_OBOE_LIBRARY}" log OpenSLES) + endif() + + if((${module_name} STREQUAL "juce_opengl") AND (CMAKE_SYSTEM_NAME STREQUAL "Android")) diff --git a/ports/juce/gcc-has-builtin.diff b/ports/juce/gcc-has-builtin.diff new file mode 100644 index 00000000000000..b403964cd9b017 --- /dev/null +++ b/ports/juce/gcc-has-builtin.diff @@ -0,0 +1,12 @@ +diff --git a/modules/juce_graphics/juce_graphics_Harfbuzz.cpp b/modules/juce_graphics/juce_graphics_Harfbuzz.cpp +index a491af9..44e934a 100644 +--- a/modules/juce_graphics/juce_graphics_Harfbuzz.cpp ++++ b/modules/juce_graphics/juce_graphics_Harfbuzz.cpp +@@ -84,7 +84,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations", + // -Wexpansion-to-defined on gcc 7. There's no way to turn that warning off + // locally, so we sidestep it. + #if ! defined(__has_builtin) && defined(__GNUC__) && __GNUC__ >= 5 +- #define __has_builtin(x) 1 + #endif + + #include diff --git a/ports/juce/install-extras.diff b/ports/juce/install-extras.diff new file mode 100644 index 00000000000000..ae80aef526e2fe --- /dev/null +++ b/ports/juce/install-extras.diff @@ -0,0 +1,19 @@ +diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt +index 7f5555e..539f1cb 100644 +--- a/extras/CMakeLists.txt ++++ b/extras/CMakeLists.txt +@@ -35,5 +35,14 @@ add_subdirectory(AudioPerformanceTest) + add_subdirectory(AudioPluginHost) + add_subdirectory(BinaryBuilder) + add_subdirectory(NetworkGraphicsDemo) ++if(NOT ANDROID AND NOT IOS) + add_subdirectory(Projucer) ++endif() + add_subdirectory(UnitTestRunner) ++ ++file(GLOB tools RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*") ++foreach(tool IN LISTS tools) ++ if(TARGET "${tool}") ++ install(TARGETS "${tool}" DESTINATION "${JUCE_TOOL_INSTALL_DIR}") ++ endif() ++endforeach() diff --git a/ports/juce/juceaide.diff b/ports/juce/juceaide.diff new file mode 100644 index 00000000000000..de39cd4d09d5fe --- /dev/null +++ b/ports/juce/juceaide.diff @@ -0,0 +1,83 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49d85c6..76209f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,5 @@ ++# Save cmake input for nested juceaide build ++get_cmake_property(vcpkg_input_vars CACHE_VARIABLES) + # ============================================================================== + # + # This file is part of the JUCE framework. +@@ -142,7 +144,10 @@ set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING + + set(JUCE_MODULE_PATH "include/JUCE-${JUCE_VERSION}/modules") + set(UTILS_INSTALL_DIR "${JUCE_INSTALL_DESTINATION}") +-set(JUCEAIDE_PATH "${JUCE_TOOL_INSTALL_DIR}/${JUCE_JUCEAIDE_NAME}") ++set(JUCEAIDE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/juce/${JUCE_JUCEAIDE_NAME}") ++if(WITH_JUCEAIDE) ++ set(JUCEAIDE_PATH "${WITH_JUCEAIDE}") ++endif() + configure_package_config_file("${JUCE_CMAKE_UTILS_DIR}/JUCEConfig.cmake.in" + "${JUCE_BINARY_DIR}/JUCEConfig.cmake" + PATH_VARS UTILS_INSTALL_DIR JUCEAIDE_PATH JUCE_MODULE_PATH +diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt +index 651aa53..9ff0fba 100644 +--- a/extras/Build/juceaide/CMakeLists.txt ++++ b/extras/Build/juceaide/CMakeLists.txt +@@ -55,12 +55,16 @@ if(JUCE_BUILD_HELPER_TOOLS) + juce::juce_recommended_lto_flags + juce::juce_recommended_warning_flags) + +- set_target_properties(juceaide PROPERTIES +- MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + + export(TARGETS juceaide + NAMESPACE juce_tools:: + FILE "${JUCE_BINARY_DIR}/JUCEToolsExport.cmake") ++ ++elseif(WITH_JUCEAIDE) ++ add_executable(juceaide IMPORTED GLOBAL) ++ set_target_properties(juceaide PROPERTIES IMPORTED_LOCATION "${WITH_JUCEAIDE}") ++ add_executable(juce::juceaide ALIAS juceaide) ++ + else() + message(STATUS "Configuring juceaide") + +@@ -111,13 +115,18 @@ else() + set(ENV{CMAKE_GENERATOR_PLATFORM} "${CMAKE_HOST_SYSTEM_PROCESSOR}") + endif() + ++ set(options "") ++ list(REMOVE_ITEM vcpkg_input_vars "JUCE_BUILD_EXTRAS") ++ foreach(var IN LISTS vcpkg_input_vars) ++ list(APPEND options "-D${var}=$CACHE{${var}}") ++ endforeach() + # Looks like we're bootstrapping, reinvoke CMake + execute_process(COMMAND "${CMAKE_COMMAND}" + "." + "-B${JUCE_BINARY_DIR}/tools" + "-G${CMAKE_GENERATOR}" + "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" +- "-DCMAKE_BUILD_TYPE=Debug" ++ ${options} + "-DJUCE_BUILD_HELPER_TOOLS=ON" + "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + WORKING_DIRECTORY "${JUCE_SOURCE_DIR}" +@@ -133,7 +142,7 @@ else() + + execute_process(COMMAND "${CMAKE_COMMAND}" + --build "${JUCE_BINARY_DIR}/tools" +- --config Debug ++ --target juceaide + OUTPUT_VARIABLE command_output + ERROR_VARIABLE command_output + RESULT_VARIABLE result_variable) +@@ -148,7 +157,7 @@ else() + include("${JUCE_BINARY_DIR}/tools/JUCEToolsExport.cmake") + + add_executable(juceaide IMPORTED GLOBAL) +- get_target_property(imported_location juce_tools::juceaide IMPORTED_LOCATION_DEBUG) ++ get_target_property(imported_location juce_tools::juceaide IMPORTED_LOCATION_RELEASE) + set_target_properties(juceaide PROPERTIES IMPORTED_LOCATION "${imported_location}") + + add_executable(juce::juceaide ALIAS juceaide) diff --git a/ports/juce/missing-modules.diff b/ports/juce/missing-modules.diff new file mode 100644 index 00000000000000..8e2ea05fdf59c8 --- /dev/null +++ b/ports/juce/missing-modules.diff @@ -0,0 +1,20 @@ +diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in +index c0c1eef..03a09ef 100644 +--- a/extras/Build/CMake/JUCEConfig.cmake.in ++++ b/extras/Build/CMake/JUCEConfig.cmake.in +@@ -39,6 +39,7 @@ include("@PACKAGE_UTILS_INSTALL_DIR@/JUCEUtils.cmake") + + set(_juce_modules + juce_analytics ++ juce_animation + juce_audio_basics + juce_audio_devices + juce_audio_formats +@@ -55,6 +56,7 @@ set(_juce_modules + juce_gui_basics + juce_gui_extra + juce_javascript ++ juce_midi_ci + juce_opengl + juce_osc + juce_product_unlocking diff --git a/ports/juce/portfile.cmake b/ports/juce/portfile.cmake index 77544ad6cfd58f..dd7f250f5b6276 100644 --- a/ports/juce/portfile.cmake +++ b/ports/juce/portfile.cmake @@ -1,3 +1,5 @@ +set(VCPKG_BUILD_TYPE release) # no libraries + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO juce-framework/JUCE @@ -5,28 +7,54 @@ vcpkg_from_github( SHA512 c1cb2f315c2b3b9c534d21b16d31e641661fbb9ad55b29a0949c038cb69cce65d35c8c669a400e33fdcedd7fc5ef578a1eba787826d525402330551c4d240fe6 HEAD_REF master PATCHES - "0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch" - "0002-build-linux-find_packages.patch" - "0003-build-forward-vcpkg-toolchain.patch" - "0004-install-paths.patch" + 0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch + 0004-install-paths.patch + gcc-has-builtin.diff + devendor-oboe.diff + install-extras.diff + juceaide.diff + missing-modules.diff + prefer-cmake.diff + vcpkg-compile-definitions.diff +) +file(REMOVE_RECURSE "${SOURCE_PATH}/modules/juce_audio_devices/native/oboe") + +set(feature_compile_definitions + "curl" JUCE_USE_CURL + "fontconfig" JUCE_USE_FONTCONFIG + "freetype" JUCE_USE_FREETYPE + "jack" JUCE_JACK + "ladspa" JUCE_PLUGINHOST_LADSPA + "web-browser" JUCE_WEB_BROWSER + "xcursor" JUCE_USE_XCURSOR + "xinerama" JUCE_USE_XINERAMA + "xrandr" JUCE_USE_XRANDR + "xrender" JUCE_USE_XRENDER ) +set(enforced_definitions "") +while(feature_compile_definitions) + list(POP_FRONT feature_compile_definitions feature compile_definition) + if(NOT feature IN_LIST FEATURES) + # Enforce controlled absence of dependency + list(APPEND enforced_definitions "${compile_definition}=0") + endif() +endwhile() +list(JOIN enforced_definitions "\n " enforced_definitions) +file(WRITE "${SOURCE_PATH}/extras/Build/CMake/vcpkg-compile-definitions.cmake" " +function(vcpkg_juce_add_compile_definitions target) + target_compile_definitions(\${target} INTERFACE + ${enforced_definitions} + ) +endfunction() +") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "extras" JUCE_BUILD_EXTRAS "ladspa" JUCE_PLUGINHOST_LADSPA - "jack" JUCE_JACK - "curl" JUCE_USE_CURL - "freetype" JUCE_USE_FREETYPE - "xcursor" JUCE_USE_XCURSOR - "xinerama" JUCE_USE_XINERAMA - "xrandr" JUCE_USE_XRANDR - "xrender" JUCE_USE_XRENDER - "web-browser" JUCE_WEB_BROWSER - "opengl" JUCE_OPENGL ) # Based on https://github.com/juce-framework/JUCE/blob/master/docs/Linux%20Dependencies.md -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") +if(VCPKG_TARGET_IS_LINUX) message("juce currently requires the following programs from the system package manager: libx11-dev libxcomposite-dev libxext-dev On Ubuntu derivatives: @@ -89,22 +117,21 @@ On Ubuntu derivatives: endif() endif() +if(VCPKG_CROSSCOMPILING) + # Constructed with CURRENT_INSTALLED_DIR, for vcpkg_cmake_config_fixup. + list(APPEND FEATURE_OPTIONS "-DWITH_JUCEAIDE=${CURRENT_INSTALLED_DIR}/../${HOST_TRIPLET}/tools/${PORT}/juceaide${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DJUCE_ENABLE_MODULE_SOURCE_GROUPS=ON - ${FEATURE_OPTIONS} + -DJUCE_ENABLE_MODULE_SOURCE_GROUPS=ON + -DJUCE_INSTALL_DESTINATION=share/juce + -DJUCE_TOOL_INSTALL_DIR=bin + ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES + JUCE_TOOL_INSTALL_DIR JUCE_PLUGINHOST_LADSPA - JUCE_JACK - JUCE_OPENGL - JUCE_USE_CURL - JUCE_USE_FREETYPE - JUCE_USE_XCURSOR - JUCE_USE_XINERAMA - JUCE_USE_XRANDR - JUCE_USE_XRENDER - JUCE_WEB_BROWSER ) vcpkg_cmake_install() @@ -112,44 +139,36 @@ vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Copy tools -file(GLOB JUCE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/JUCE-${VERSION}/*") -foreach(JUCE_TOOL_PATH IN LISTS JUCE_TOOLS) - get_filename_component(JUCE_TOOL "${JUCE_TOOL_PATH}" NAME_WLE) - get_filename_component(JUCE_TOOL_DIR "${JUCE_TOOL_PATH}" DIRECTORY) - vcpkg_copy_tools(TOOL_NAMES ${JUCE_TOOL} SEARCH_DIR "${JUCE_TOOL_DIR}") -endforeach() - -# Copy extras tools -if(JUCE_BUILD_EXTRAS) - file(GLOB JUCE_EXTRA_TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/extras/*/*_artefacts/Release/*") - foreach(JUCE_EXTRA_TOOL_PATH IN LISTS JUCE_EXTRA_TOOLS) - get_filename_component(JUCE_EXTRA_TOOL "${JUCE_EXTRA_TOOL_PATH}" NAME_WLE) - get_filename_component(JUCE_EXTRA_TOOL_DIR "${JUCE_EXTRA_TOOL_PATH}" DIRECTORY) - vcpkg_copy_tools(TOOL_NAMES ${JUCE_EXTRA_TOOL} SEARCH_DIR "${JUCE_EXTRA_TOOL_DIR}") - endforeach() +file(GLOB icons "${CURRENT_PACKAGES_DIR}/bin/*.ico") +if(icons) + file(REMOVE_RECURSE ${icons}) endif() -# Copy JUCE modules including the cpp/cmake files -file(GLOB JUCE_MODULES_FOLDERS "${CURRENT_PACKAGES_DIR}/include/JUCE-${VERSION}/modules/*") -foreach(JUCE_MODULE_FOLDER IN LISTS JUCE_MODULES_FOLDERS) - file(COPY "${JUCE_MODULE_FOLDER}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +set(tool_names "") +file(GLOB tools "${CURRENT_PACKAGES_DIR}/bin/*") +set(name_component NAME_WE) +if(VCPKG_TARGET_EXECUTABLE_SUFFIX STREQUAL "") + set(name_component NAME) +endif() +foreach(tool IN LISTS tools) + get_filename_component(name "${tool}" ${name_component}) + list(APPEND tool_names "${name}") endforeach() +if(tool_names) + vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN) +endif() -# Remove duplicate tools directories -file(REMOVE_RECURSE -"${CURRENT_PACKAGES_DIR}/bin" -"${CURRENT_PACKAGES_DIR}/debug/bin" -) +# Files not generated for Android or iOS +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/juce/LV2_HELPER.cmake") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/juce/VST3_HELPER.cmake") -# Remove duplicate debug files -file(REMOVE_RECURSE -"${CURRENT_PACKAGES_DIR}/debug/" -) +# Catch libs which must be de-vendored, e.g. oboe. +# This is to avoid ownership conflicts. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/include/oboe") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib") + message(${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL} "juce must not install files to ${CURRENT_PACKAGES_DIR}/lib.") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +endif() -# Copy license +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") - -# Copy usage examples -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/juce/prefer-cmake.diff b/ports/juce/prefer-cmake.diff new file mode 100644 index 00000000000000..4395748427e032 --- /dev/null +++ b/ports/juce/prefer-cmake.diff @@ -0,0 +1,45 @@ +diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake +index e89cc5d..afefe2d 100644 +--- a/extras/Build/CMake/JUCEModuleSupport.cmake ++++ b/extras/Build/CMake/JUCEModuleSupport.cmake +@@ -390,10 +390,40 @@ function(_juce_create_pkgconfig_target name) + return() + endif() + ++ # Prefer CMake over pkg-config ++ set(link_libs "") ++ if("alsa" IN_LIST JUCE_ARG_UNPARSED_ARGUMENTS) ++ list(REMOVE_ITEM JUCE_ARG_UNPARSED_ARGUMENTS "alsa") ++ find_package(ALSA REQUIRED) ++ list(APPEND link_libs ALSA::ALSA) ++ endif() ++ if("fontconfig" IN_LIST JUCE_ARG_UNPARSED_ARGUMENTS) ++ list(REMOVE_ITEM JUCE_ARG_UNPARSED_ARGUMENTS "fontconfig") ++ find_package(Fontconfig REQUIRED) ++ list(APPEND link_libs Fontconfig::Fontconfig) ++ endif() ++ if("freetype2" IN_LIST JUCE_ARG_UNPARSED_ARGUMENTS) ++ list(REMOVE_ITEM JUCE_ARG_UNPARSED_ARGUMENTS "freetype2") ++ find_package(Freetype REQUIRED) ++ list(APPEND link_libs Freetype::Freetype) ++ endif() ++ if("gl" IN_LIST JUCE_ARG_UNPARSED_ARGUMENTS) ++ list(REMOVE_ITEM JUCE_ARG_UNPARSED_ARGUMENTS "gl") ++ find_package(OpenGL REQUIRED) ++ list(APPEND link_libs OpenGL::GL) ++ endif() ++ if("libcurl" IN_LIST JUCE_ARG_UNPARSED_ARGUMENTS) ++ list(REMOVE_ITEM JUCE_ARG_UNPARSED_ARGUMENTS "libcurl") ++ find_package(CURL REQUIRED) ++ list(APPEND link_libs CURL::libcurl) ++ endif() ++ if(JUCE_ARG_UNPARSED_ARGUMENTS) + find_package(PkgConfig REQUIRED) + pkg_check_modules(${name} ${JUCE_ARG_UNPARSED_ARGUMENTS}) ++ endif() + + add_library(pkgconfig_${name} INTERFACE) ++ set_target_properties(pkgconfig_${name} PROPERTIES INTERFACE_LINK_LIBRARIES "${link_libs}") + add_library(juce::pkgconfig_${name} ALIAS pkgconfig_${name}) + install(TARGETS pkgconfig_${name} EXPORT JUCE) + diff --git a/ports/juce/vcpkg-compile-definitions.diff b/ports/juce/vcpkg-compile-definitions.diff new file mode 100644 index 00000000000000..6ba027856870bc --- /dev/null +++ b/ports/juce/vcpkg-compile-definitions.diff @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76209f5..69dc639 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,6 +167,7 @@ install(FILES "${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake" + "${JUCE_CMAKE_UTILS_DIR}/JUCECheckAtomic.cmake" + "${JUCE_CMAKE_UTILS_DIR}/JUCEHelperTargets.cmake" + "${JUCE_CMAKE_UTILS_DIR}/JUCEModuleSupport.cmake" ++ "${JUCE_CMAKE_UTILS_DIR}/vcpkg-compile-definitions.cmake" + "${JUCE_CMAKE_UTILS_DIR}/JUCEUtils.cmake" + "${JUCE_CMAKE_UTILS_DIR}/JuceLV2Defines.h.in" + "${JUCE_CMAKE_UTILS_DIR}/LaunchScreen.storyboard" +diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake +index 2dd2ecf..635c50e 100644 +--- a/extras/Build/CMake/JUCEModuleSupport.cmake ++++ b/extras/Build/CMake/JUCEModuleSupport.cmake +@@ -96,8 +96,10 @@ endif() + + # ================================================================================================== + ++include("${CMAKE_CURRENT_LIST_DIR}/vcpkg-compile-definitions.cmake") + function(_juce_add_interface_library target) + add_library(${target} INTERFACE) ++ vcpkg_juce_add_compile_definitions(${target}) + target_sources(${target} INTERFACE ${ARGN}) + endfunction() + diff --git a/ports/juce/vcpkg.json b/ports/juce/vcpkg.json index 075715da89a9a0..14beb51c949949 100644 --- a/ports/juce/vcpkg.json +++ b/ports/juce/vcpkg.json @@ -2,19 +2,25 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "juce", "version": "8.0.4", + "port-version": 1, "description": "Open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, AAX and LV2 audio plug-ins and plug-in hosts", "homepage": "https://juce.com", "license": null, - "supports": "!android & !uwp & !(windows & arm)", + "supports": "!uwp", "dependencies": [ { - "name": "alsa", - "platform": "linux" + "name": "juce", + "host": true, + "default-features": false, + "features": [ + "juceaide" + ] }, { - "name": "juce", - "host": true + "name": "oboe", + "platform": "android" }, + "opengl", { "name": "vcpkg-cmake", "host": true @@ -25,84 +31,149 @@ } ], "default-features": [ - "curl", - "freetype", - "jack", - "opengl", - "xcursor", - "xinerama", - "xrandr", - "xrender" + { + "name": "alsa", + "platform": "linux" + }, + { + "name": "curl", + "platform": "freebsd | linux | openbsd" + }, + { + "name": "fontconfig", + "platform": "freebsd | linux | openbsd" + }, + { + "name": "xcursor", + "platform": "linux" + }, + { + "name": "xinerama", + "platform": "linux" + }, + { + "name": "xrandr", + "platform": "linux" + }, + { + "name": "xrender", + "platform": "linux" + } ], "features": { + "alsa": { + "description": "Enable ALSA support", + "dependencies": [ + "alsa" + ] + }, "curl": { - "description": "Enable CURL support", + "description": "Use CURL for network support", + "supports": "freebsd | linux | openbsd", "dependencies": [ - "curl" + { + "name": "curl", + "default-features": false + } ] }, "extras": { - "description": "Enable JUCE Extras such as Projucer, AudioPluginHost, BinaryBuilder." - }, - "freetype": { - "description": "Enable FreeType support", + "description": "Enable JUCE extras such as Projucer, AudioPluginHost, BinaryBuilder.", "dependencies": [ { - "name": "fontconfig", + "name": "juce", + "default-features": false, + "features": [ + "freetype" + ] + }, + { + "name": "juce", + "default-features": false, + "features": [ + "alsa" + ], "platform": "linux" }, + { + "name": "juce", + "default-features": false, + "features": [ + "curl" + ], + "platform": "freebsd | linux | openbsd" + } + ] + }, + "fontconfig": { + "description": "Enable Fontconfig support", + "dependencies": [ + "fontconfig", + { + "name": "juce", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, + "freetype": { + "description": "Enable FreeType support", + "dependencies": [ "freetype" ] }, "jack": { "description": "Enable JACK audio support", + "dependencies": [ + "jack2" + ] + }, + "juceaide": { + "description": "Build the juceaide tool", + "supports": "native", "dependencies": [ { - "name": "jack2", - "platform": "linux" + "name": "juce", + "default-features": false, + "features": [ + "freetype" + ] } ] }, "ladspa": { "description": "Enable LADSPA plugin host support." }, - "opengl": { - "description": "Enable OpenGL support", + "web-browser": { + "description": "Enable WebBrowser support", "dependencies": [ - "opengl" + { + "name": "webview2", + "platform": "windows" + } ] }, - "web-browser": { - "description": "Enable WebBrowser support" - }, "xcursor": { "description": "Enable XCursor support" }, "xinerama": { "description": "Enable Xinerama support", "dependencies": [ - { - "name": "libxinerama", - "platform": "linux" - } + "libxinerama" ] }, "xrandr": { "description": "Enable XRandR support", "dependencies": [ - { - "name": "libxrandr", - "platform": "linux" - } + "libxrandr" ] }, "xrender": { "description": "Enable XRender support", "dependencies": [ - { - "name": "libxrender", - "platform": "linux" - } + "libxrender" ] } } diff --git a/ports/kdreports/fix-cmake-config.patch b/ports/kdreports/fix-cmake-config.patch new file mode 100644 index 00000000000000..9bca8c49b6b2cc --- /dev/null +++ b/ports/kdreports/fix-cmake-config.patch @@ -0,0 +1,19 @@ +diff --git a/src/KDReportsConfig.cmake.in b/src/KDReportsConfig.cmake.in +index fa26517..49b9054 100644 +--- a/src/KDReportsConfig.cmake.in ++++ b/src/KDReportsConfig.cmake.in +@@ -9,10 +9,10 @@ + + include(CMakeFindDependencyMacro) + +-find_dependency(Qt@Qt_VERSION_MAJOR@Core @QT_MIN_VERSION@) +-find_dependency(Qt@Qt_VERSION_MAJOR@Widgets @QT_MIN_VERSION@) +-find_dependency(Qt@Qt_VERSION_MAJOR@PrintSupport @QT_MIN_VERSION@) +-find_dependency(Qt@Qt_VERSION_MAJOR@Xml @QT_MIN_VERSION@) ++find_dependency(Qt@QT_VERSION_MAJOR@Core @QT_MIN_VERSION@) ++find_dependency(Qt@QT_VERSION_MAJOR@Widgets @QT_MIN_VERSION@) ++find_dependency(Qt@QT_VERSION_MAJOR@PrintSupport @QT_MIN_VERSION@) ++find_dependency(Qt@QT_VERSION_MAJOR@Xml @QT_MIN_VERSION@) + + if (@KDChart_FOUND@) + find_dependency(KDChart) diff --git a/ports/kdreports/fix-license-text.patch b/ports/kdreports/fix-license-text.patch new file mode 100644 index 00000000000000..83062a3a5e8bee --- /dev/null +++ b/ports/kdreports/fix-license-text.patch @@ -0,0 +1,10 @@ +diff --git a/LICENSE.txt b/LICENSE.txt +index 110b884..db69306 100644 +--- a/LICENSE.txt ++++ b/LICENSE.txt +@@ -3,4 +3,4 @@ License + The KD Reports Software is © 2007 Klarälvdalens Datakonsult AB (KDAB), + and is available under the terms of the MIT license. + +-See the full license text in the LICENSES folder. ++See the full license text provided below in this file. diff --git a/ports/kdreports/portfile.cmake b/ports/kdreports/portfile.cmake new file mode 100644 index 00000000000000..dc3afdb2fca23b --- /dev/null +++ b/ports/kdreports/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDAB/KDReports + REF "kdreports-${VERSION}" + SHA512 f9b3785d71c68d032a0e1420ba3adae517994d257a02df69aaffcff4a8909b24d081c91b4cc9e1cc00311768f92e63b9288a99cfaac8422ebd1cae7321b3edbb + HEAD_REF master + PATCHES + "fix-cmake-config.patch" + "fix-license-text.patch" +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDReports_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKDReports_QT6=ON + -DKDReports_STATIC=${KDReports_STATIC} + -DKDReports_TESTS=OFF + -DKDReports_EXAMPLES=OFF + -DKDReports_DOCS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KDChart-qt6=ON +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME KDReports-qt6 CONFIG_PATH lib/cmake/KDReports-qt6) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt" + "${SOURCE_PATH}/LICENSES/MIT.txt" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/kdreports/usage b/ports/kdreports/usage new file mode 100644 index 00000000000000..eeb3be510045d0 --- /dev/null +++ b/ports/kdreports/usage @@ -0,0 +1,4 @@ +kdreports provides CMake targets: + + find_package(KDReports-qt6 CONFIG REQUIRED) + target_link_libraries(main PRIVATE KDReports::kdreports) diff --git a/ports/kdreports/vcpkg.json b/ports/kdreports/vcpkg.json new file mode 100644 index 00000000000000..3e954b356affee --- /dev/null +++ b/ports/kdreports/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "kdreports", + "version": "2.3.0", + "description": "KD Reports is a Qt tool that lets you easily create printable reports by providing all of the necessary features for a variety of applications.", + "homepage": "https://github.com/KDAB/KDReports", + "license": "MIT", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "widgets" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/kdsingleapplication/fix-license-text.patch b/ports/kdsingleapplication/fix-license-text.patch new file mode 100644 index 00000000000000..9607cb61993697 --- /dev/null +++ b/ports/kdsingleapplication/fix-license-text.patch @@ -0,0 +1,12 @@ +diff --git a/LICENSE.txt b/LICENSE.txt +index 12ee586..ac0144d 100644 +--- a/LICENSE.txt ++++ b/LICENSE.txt +@@ -1,6 +1,6 @@ + KDSingleApplication is (C) 2019-2023, Klarälvdalens Datakonsult AB, + and is available under the terms of the MIT license. + +-See the full license text in the LICENSES folder. ++See the full license text provided below in this file. + + Contact KDAB at to inquire about commercial licensing. diff --git a/ports/kdsingleapplication/portfile.cmake b/ports/kdsingleapplication/portfile.cmake index 3fb1f1f4340ee6..62e5c60624a657 100644 --- a/ports/kdsingleapplication/portfile.cmake +++ b/ports/kdsingleapplication/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 12540e70014f04b20529d19bc41bf089580c8a82e407511979017020d3f1d96c60112b208d5abe1e6c4e90ed65d3b0ca9dc2f09f20c8b580c3b8a17ae9a84ae0 HEAD_REF master + PATCHES "fix-license-text.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSingleApplication_STATIC) @@ -25,13 +26,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") -file( - COPY +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt" "${SOURCE_PATH}/LICENSES/MIT.txt" - DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES/" ) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/kdsingleapplication/vcpkg.json b/ports/kdsingleapplication/vcpkg.json index 42dcdd03ee3acd..81fc46104abced 100644 --- a/ports/kdsingleapplication/vcpkg.json +++ b/ports/kdsingleapplication/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kdsingleapplication", "version": "1.1.0", + "port-version": 1, "description": "KDSingleApplication is a helper class for single-instance policy applications.", "homepage": "https://github.com/KDAB/KDSingleApplication", "license": "MIT", diff --git a/ports/kdsoap/fix-license-text.patch b/ports/kdsoap/fix-license-text.patch new file mode 100644 index 00000000000000..7222a281a01160 --- /dev/null +++ b/ports/kdsoap/fix-license-text.patch @@ -0,0 +1,10 @@ +diff --git a/LICENSE.txt b/LICENSE.txt +index 50ea704..bf81343 100644 +--- a/LICENSE.txt ++++ b/LICENSE.txt +@@ -11,4 +11,4 @@ available under any license. + Various other freely distributable files are contained in the unittests + and are not used in the library code itself. + +-See the full license texts in the LICENSES folder. ++See the full license texts provided below in this file. diff --git a/ports/kdsoap/portfile.cmake b/ports/kdsoap/portfile.cmake index 3b56a95c0253b8..ebbc752f72a124 100644 --- a/ports/kdsoap/portfile.cmake +++ b/ports/kdsoap/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES "fix-license-text.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC) @@ -32,4 +33,17 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt" + "${SOURCE_PATH}/LICENSES/GPL-2.0-only.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-Microsoft.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-Novell.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-OASIS.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-SportingExchange.txt" + "${SOURCE_PATH}/LICENSES/MIT.txt" + "${SOURCE_PATH}/LICENSES/W3C.txt" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/kdsoap/usage b/ports/kdsoap/usage new file mode 100644 index 00000000000000..113f7b808a4a9e --- /dev/null +++ b/ports/kdsoap/usage @@ -0,0 +1,7 @@ +kdsoap provides CMake targets: + + find_package(KDSoap-qt6 CONFIG REQUIRED) + # kdsoap library + target_link_libraries(main PRIVATE KDSoap::kdsoap) + # kdsoap-server library + target_link_libraries(main PRIVATE KDSoap::kdsoap-server) diff --git a/ports/kdsoap/vcpkg.json b/ports/kdsoap/vcpkg.json index ecadec916a5511..61bdcb540ca093 100644 --- a/ports/kdsoap/vcpkg.json +++ b/ports/kdsoap/vcpkg.json @@ -1,13 +1,17 @@ { "name": "kdsoap", "version": "2.2.0", + "port-version": 1, "description": "A Qt-based client-side and server-side SOAP component", "homepage": "https://www.kdab.com/products/kd-soap", "license": "MIT", "dependencies": [ { "name": "qtbase", - "default-features": false + "default-features": false, + "features": [ + "network" + ] }, { "name": "vcpkg-cmake", diff --git a/ports/kdstatemachineeditor/portfile.cmake b/ports/kdstatemachineeditor/portfile.cmake new file mode 100644 index 00000000000000..fcfc30d32d0fe0 --- /dev/null +++ b/ports/kdstatemachineeditor/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDAB/KDStateMachineEditor + REF v${VERSION} + SHA512 dedd7166f434689cd5acf4ee3172169d3f77182269d3187f0a7a12966467dd5c7733e3ff64cd1fd03b0f3866c2aafa37cc3f2d7b8a3f4a5d8a7592da039de7af + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" VCPKG_BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKDSME_QT6=ON + -DKDSME_INTERNAL_GRAPHVIZ=OFF + -DKDSME_DOCS=OFF + -DKDSME_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DBUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME KDSME-qt6 CONFIG_PATH lib/cmake/KDSME-qt6) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt" + "${SOURCE_PATH}/LICENSES/GPL-3.0-or-later.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-CISST.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-Qt-Commercial.txt" + "${SOURCE_PATH}/LICENSES/GPL-3.0-only.txt" + "${SOURCE_PATH}/LICENSES/LGPL-2.1-only.txt" + "${SOURCE_PATH}/LICENSES/LicenseRef-KDAB-KDStateMachineEditor.txt" + "${SOURCE_PATH}/LICENSES/MIT.txt" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/kdstatemachineeditor/usage b/ports/kdstatemachineeditor/usage new file mode 100644 index 00000000000000..46ac26996c3a50 --- /dev/null +++ b/ports/kdstatemachineeditor/usage @@ -0,0 +1,11 @@ +kdstatemachineeditor provides CMake targets: + + find_package(KDSME-qt6 CONFIG REQUIRED) + # Core library + target_link_libraries(main PRIVATE KDSME::Core) + # View library + target_link_libraries(main PRIVATE KDSME::View) + # Debug interface client library + target_link_libraries(main PRIVATE KDSME::DebugInterfaceClient) + # Debug interface server library + target_link_libraries(main PRIVATE KDSME::DebugInterfaceSource) diff --git a/ports/kdstatemachineeditor/vcpkg.json b/ports/kdstatemachineeditor/vcpkg.json new file mode 100644 index 00000000000000..a8486d983f0f94 --- /dev/null +++ b/ports/kdstatemachineeditor/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "kdstatemachineeditor", + "version": "2.0.0", + "description": "KDStateMachineEditor is a library for visualizing and editing state charts.", + "homepage": "https://github.com/KDAB/KDStateMachineEditor", + "license": "LGPL-2.1-only", + "dependencies": [ + "graphviz", + "qt5compat", + { + "name": "qtbase", + "default-features": false, + "features": [ + "testlib", + "widgets" + ] + }, + "qtdeclarative", + "qtremoteobjects", + "qtscxml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/kealib/portfile.cmake b/ports/kealib/portfile.cmake index 745117af3918a9..0475ded0285486 100644 --- a/ports/kealib/portfile.cmake +++ b/ports/kealib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ubarsc/kealib REF "kealib-${VERSION}" - SHA512 be69354d23d2233f9a8b8809e07f0601341e89c29d1c6419fdc69bba2d07c90ccf5f74b4a8bf55164d2f2f95ca23f2865b899133a8db10b6054a38fc57de890e + SHA512 6dc624d25c6ae0e9787a367dc359cb12e4871048852474ab8dece4fbac2c4f925ddb5d28adc7495005132f5358357737c09d62898940f33a80cbd7d1464bdfb6 HEAD_REF master PATCHES no-kea-config-script.diff diff --git a/ports/kealib/vcpkg.json b/ports/kealib/vcpkg.json index 536b7b52ebb480..0a4d2f9d550215 100644 --- a/ports/kealib/vcpkg.json +++ b/ports/kealib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kealib", - "version": "1.6.0", + "version": "1.6.1", "description": "KEALib provides an implementation of the GDAL data model using HDF5.", "homepage": "https://github.com/ubarsc/kealib", "license": "MIT", diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index fa6b846a1a0c16..2dc67843df6a05 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -20,7 +20,9 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Plotting CONFIG_PATH lib/cmake/KF5Plott vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 56dcca670b5283..13d5bdba7e1611 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.98.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5texteditor/portfile.cmake b/ports/kf5texteditor/portfile.cmake index 226943eb73d4f0..3889db5c4e5bea 100644 --- a/ports/kf5texteditor/portfile.cmake +++ b/ports/kf5texteditor/portfile.cmake @@ -17,13 +17,17 @@ if(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(DATAROOT "share") endif() - file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data") - file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data") + file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*") + endif() file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/data") file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/${DATAROOT}/kservicetypes5/*") else() - file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share") - file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share") + file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*") + endif() file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/share") file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/share/kservicetypes5/*") endif() diff --git a/ports/kf5texteditor/vcpkg.json b/ports/kf5texteditor/vcpkg.json index 819d1c7a203c77..39e372f8380f30 100644 --- a/ports/kf5texteditor/vcpkg.json +++ b/ports/kf5texteditor/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5texteditor", "version": "5.98.0", - "port-version": 1, + "port-version": 2, "description": "Full text editor component", "homepage": "https://api.kde.org/frameworks/ktexteditor/html/", "dependencies": [ diff --git a/ports/krb5/portfile.cmake b/ports/krb5/portfile.cmake index 59b05c44c2b5a6..d698b906d7d36e 100644 --- a/ports/krb5/portfile.cmake +++ b/ports/krb5/portfile.cmake @@ -51,7 +51,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ) vcpkg_copy_tools( TOOL_NAMES ${tools} - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" AUTO_CLEAN ) foreach(tool_name ${tools}) @@ -112,4 +112,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() +if(VCPKG_BUILD_TYPE) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/NOTICE") diff --git a/ports/krb5/vcpkg.json b/ports/krb5/vcpkg.json index 689b74a9eb09e1..73dae7a9104b44 100644 --- a/ports/krb5/vcpkg.json +++ b/ports/krb5/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "krb5", "version": "1.21.3", - "port-version": 1, + "port-version": 2, "description": [ "Kerberos is a network authentication protocol.", "It is designed to provide strong authentication for client/server applications by using secret-key cryptography.", @@ -11,5 +11,11 @@ ], "homepage": "https://web.mit.edu/kerberos/", "license": "MIT", - "supports": "linux | osx | (x64 & windows & !static & !uwp)" + "supports": "linux | osx | (x64 & windows & !static & !uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/kubazip/fix_targets.patch b/ports/kubazip/fix_targets.patch index fc0a11e8f11120..255632eeb4f2de 100644 --- a/ports/kubazip/fix_targets.patch +++ b/ports/kubazip/fix_targets.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf86d70..c2bc2f9 100644 +index 804df5e..5498bb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ @@ -8,7 +8,7 @@ index cf86d70..c2bc2f9 100644 -project(zip +project(kubazip LANGUAGES C - VERSION "0.2.3") + VERSION "0.3.0") set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) @@ -46,11 +46,11 @@ endif() @@ -24,13 +24,7 @@ index cf86d70..c2bc2f9 100644 enable_testing() add_subdirectory(test) endif() -@@ -69,12 +69,12 @@ if (MSVC) - elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic") - endif (MSVC) +@@ -74,7 +74,7 @@ endif (MSVC) #### set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") diff --git a/ports/kubazip/portfile.cmake b/ports/kubazip/portfile.cmake index b7cba8bf6b8bdb..c22f145a1dae2f 100644 --- a/ports/kubazip/portfile.cmake +++ b/ports/kubazip/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kuba--/zip REF "v${VERSION}" - SHA512 959805452f566b24ee78bc56794403733d19e86885a7f94581fca4218817a65ea4ea8b79457a452e0cc06992dc2165b3ff90360cec5f43cd8c0f934027ee9fd5 + SHA512 dd516f2e6765e49c00063bd72b49d97bc6f1254921045269b534a801e41e0728171cbf09a73713b236f40c4cf30b5473e74579b82962004b79166b38ad6a3e0d HEAD_REF master PATCHES fix_targets.patch @@ -18,4 +18,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kubazip) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/UNLICENSE") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/kubazip/vcpkg.json b/ports/kubazip/vcpkg.json index aee73b083b412d..02b67e7b592423 100644 --- a/ports/kubazip/vcpkg.json +++ b/ports/kubazip/vcpkg.json @@ -1,9 +1,9 @@ { "name": "kubazip", - "version": "0.2.6", + "version": "0.3.3", "description": "A portable, simple zip library written in C", "homepage": "https://github.com/kuba--/zip", - "license": "Unlicense", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index b103ca843295e7..d7cb8c27f20044 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -1,18 +1,11 @@ -vcpkg_download_distfile(REDUCE_REQUIRED_C_SANDARD - URLS https://github.com/DanBloomberg/leptonica/commit/23aef077a8dd631de80cb457384e0aa5338e85a4.patch?full_index=1 - FILENAME leptonica-reduce-c-standard-23aef077a8dd631de80cb457384e0aa5338e85a4.patch - SHA512 e309730b959c58b2c063bfd40434da22c79061ece48f2d8a388364a49e2a12a85b74b755e8b837d8fdeee9c187379460a85a9e5cf84f09f0c4649f280a0c9536 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DanBloomberg/leptonica REF "${VERSION}" - SHA512 968a88d2074717e6f379d2f9b8f7f0d5193fe9b8856051e09e2b31c939689b196a4a9b2cde595ce76ff8ae2784680ef5e68c40709c051d3d23738e862968016f + SHA512 49e387eae37fda02242ff093c6effa92f59e0761640c71a5c79f0c02923486dc96472ff99a17763cbecc6396966cbc5c0d7f5c8fd3a61f9a65a34339f930735a HEAD_REF master PATCHES fix-pc-and-config.patch - "${REDUCE_REQUIRED_C_SANDARD}" ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json index 88927c6d79d083..48f90ad214ba62 100644 --- a/ports/leptonica/vcpkg.json +++ b/ports/leptonica/vcpkg.json @@ -1,7 +1,6 @@ { "name": "leptonica", - "version": "1.84.1", - "port-version": 1, + "version": "1.85.0", "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", "license": null, diff --git a/ports/level-zero/portfile.cmake b/ports/level-zero/portfile.cmake index f05a0d5fd6d1a0..ae3587693cb213 100644 --- a/ports/level-zero/portfile.cmake +++ b/ports/level-zero/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/level-zero REF "v${VERSION}" - SHA512 83d97ffe43c21286a845bb9d11504414972c944d9b06975ba9e7680802a92a260b6246f3605ed32e5e5dec358972fbb5cab49543559dc36cb164a9c3b6a69d73 + SHA512 45ce777712ed4dad766a4de6808acaf2588345907c6dc039c5c2f56076b6ecbd0cdcddae6c14531f3e8b6b261b7d4f0302f82ff629f98fc62f5b03cfeb633d2d HEAD_REF master ) diff --git a/ports/level-zero/vcpkg.json b/ports/level-zero/vcpkg.json index 28f8280d96e075..60c56a7c766a31 100644 --- a/ports/level-zero/vcpkg.json +++ b/ports/level-zero/vcpkg.json @@ -1,6 +1,6 @@ { "name": "level-zero", - "version": "1.17.45", + "version": "1.19.2", "description": "oneAPI Level Zero Specification Headers and Loader.", "homepage": "https://github.com/oneapi-src/level-zero", "license": "MIT", diff --git a/ports/libcap/portfile.cmake b/ports/libcap/portfile.cmake index 1d156f6428e891..ba3089b8104752 100644 --- a/ports/libcap/portfile.cmake +++ b/ports/libcap/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${VERSION}.tar.xz" "https://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${VERSION}.tar.xz" FILENAME "libcap-${VERSION}.tar.xz" - SHA512 59bb6781d96776595ad3df890f4e5188380634eabbb6128f3a5307946b01cf3bd19dee8a29d3e501de1d9e1c6ed0092c4cd5adc91da227a1260c1f4356cc0bf3 + SHA512 8ab72cf39bf029656b2a4a5972a0da4ab4b46a3d8a8da66d6cde925e06fe34df2fa5fc4d0b62c9cec4972b0b2678fdac6ef9421b6fb83c2a5bf869cf8d5fdb16 ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/libcap/vcpkg.json b/ports/libcap/vcpkg.json index 842efa03ba2332..46718575baf2e4 100644 --- a/ports/libcap/vcpkg.json +++ b/ports/libcap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcap", - "version": "2.71", + "version": "2.73", "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.", "homepage": "https://sites.google.com/site/fullycapable/", "license": "BSD-3-Clause OR GPL-2.0-only", diff --git a/ports/libdeflate/portfile.cmake b/ports/libdeflate/portfile.cmake index d86ebc5e9cb990..d8f63abe9c7658 100644 --- a/ports/libdeflate/portfile.cmake +++ b/ports/libdeflate/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ebiggers/libdeflate REF "v${VERSION}" - SHA512 ca3ec7eb3e44da13164f33e56c856dbffc4ccc7b86d995afca6a23fa3f201b766d08a047871407e14a7964dd3da843be23c316e51d981cdd98f25166092de3a9 + SHA512 c1effb9c5ee8d65bc12ae3d0669a4a394acace13cc146300ed24a7f12a0ec058f66729e1ffbae268711bdcc4151143752ab2d56a099dd6394b2735e8e2f1b671 HEAD_REF master PATCHES remove_wrong_c_flags_modification.diff diff --git a/ports/libdeflate/vcpkg.json b/ports/libdeflate/vcpkg.json index aa95ab6b0d8502..bb18d66d299d87 100644 --- a/ports/libdeflate/vcpkg.json +++ b/ports/libdeflate/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdeflate", - "version": "1.22", + "version": "1.23", "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.", "homepage": "https://github.com/ebiggers/libdeflate", "license": "MIT", diff --git a/ports/libdshowcapture/portfile.cmake b/ports/libdshowcapture/portfile.cmake index 79633e0f7fab1a..c33902a0f06a19 100644 --- a/ports/libdshowcapture/portfile.cmake +++ b/ports/libdshowcapture/portfile.cmake @@ -13,12 +13,16 @@ vcpkg_cmake_configure( vcpkg_cmake_build(TARGET libdshowcapture) # Copy files -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libdshowcapture" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/dshowcapture.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/ports/libdshowcapture/vcpkg.json b/ports/libdshowcapture/vcpkg.json index 643b10dc840fda..4d1214a3400dae 100644 --- a/ports/libdshowcapture/vcpkg.json +++ b/ports/libdshowcapture/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libdshowcapture", "version": "0.6.0", - "port-version": 3, + "port-version": 4, "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.", "supports": "windows & !uwp", "dependencies": [ diff --git a/ports/libgpg-error/android.diff b/ports/libgpg-error/android.diff new file mode 100644 index 00000000000000..81389098a76661 --- /dev/null +++ b/ports/libgpg-error/android.diff @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index ce369af..95cbba2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -633,6 +633,7 @@ if test x"$gl_use_threads" = xno; then + AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host]) + elif test x$cross_compiling = xyes; then + case $host in ++ *-*-linux-android* | \ + *-*-gnu* | *-*-linux-gnu* | *-*-linux-musl*) + AC_CHECK_TOOL(OBJDUMP, [objdump]) + if test -n "$OBJDUMP"; then diff --git a/ports/libgpg-error/mingw.diff b/ports/libgpg-error/mingw.diff new file mode 100644 index 00000000000000..b1f25c89c2474e --- /dev/null +++ b/ports/libgpg-error/mingw.diff @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 4de263a..9aa0f69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -200,6 +200,10 @@ esac + AX_CC_FOR_BUILD + + AH_BOTTOM([ ++#if defined(__MINGW32__) && !defined(_WIN32_WINNT) ++#define _WIN32_WINNT 0x0600 /* for STARTUPINFOEX */ ++#endif ++ + /* Force using of NLS for W32 even if no libintl has been found. This is + okay because we have our own gettext implementation for W32. */ + #if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS) diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 9c85d1191d25ef..4530f7b7451867 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -4,15 +4,18 @@ vcpkg_download_distfile(tarball "https://mirrors.dotsrc.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2" FILENAME "libgpg-error-${VERSION}.tar.bz2" - SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30 + SHA512 4489f615c6a0389577a7d1fd7d3917517bb2fe032abd9a6d87dfdbd165dabcf53f8780645934020bf27517b67a064297475888d5b368176cf06bc22f1e735e2b ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${tarball}" PATCHES + android.diff cross-tools.patch gpgrt-config.patch + mingw.diff pkgconfig-libintl.patch + win32-nls.diff ) vcpkg_list(SET options) @@ -27,13 +30,17 @@ if(VCPKG_CROSSCOMPILING) set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}") endif() +if(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND options "--disable-threads") +endif() + vcpkg_configure_make( AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${options} - --disable-tests --disable-doc + --disable-tests ) vcpkg_install_make() diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index eb5a83e664f6fc..f2c13e5a295965 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,8 +1,8 @@ { "name": "libgpg-error", - "version": "1.47", - "description": "A common dependency of all GnuPG components", - "homepage": "https://gnupg.org/software/libgpg-error/index.html", + "version": "1.51", + "description": "A runtime library for GnuPG and other software which likes to use it.", + "homepage": "https://gnupg.org/software/libgpg-error/", "license": "LGPL-2.1-or-later", "supports": "!windows | mingw", "dependencies": [ diff --git a/ports/libgpg-error/win32-nls.diff b/ports/libgpg-error/win32-nls.diff new file mode 100644 index 00000000000000..82f6546f292c9f --- /dev/null +++ b/ports/libgpg-error/win32-nls.diff @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 0f07509..65e058a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -105,6 +105,7 @@ gen-ChangeLog: + + if HAVE_W32_SYSTEM + install-data-hook: ++install-data-hook-orig: + set -e; \ + for i in $$(sed -e '/^#/d' -e 's/#.*//' $(top_srcdir)/po/LINGUAS); do \ + $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \ +diff --git a/configure.ac b/configure.ac +index 9aa0f69..ce369af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -207,7 +207,7 @@ AH_BOTTOM([ + /* Force using of NLS for W32 even if no libintl has been found. This is + okay because we have our own gettext implementation for W32. */ + #if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS) +-#define ENABLE_NLS 1 ++/* keep NLS controlled by libgpg-error[nls] */ + #endif + + /* Connect the generic estream-printf.c to our framework. */ diff --git a/ports/libgpod/configure.ac.patch b/ports/libgpod/configure.ac.patch deleted file mode 100644 index 53ca42c2db5316..00000000000000 --- a/ports/libgpod/configure.ac.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a52ac3a78..ac5cf03f4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,7 +42,7 @@ AC_CHECK_FUNCS([localtime_r]) - AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include ]) - dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed - dnl by libgpod sqlite code --PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gobject-2.0 sqlite3 libplist >= 1.0) -+PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 sqlite3 libplist >= 1.0) - - dnl ************************************************** - dnl we've copied gchecksum from glib 2.16. Only use the diff --git a/ports/libgpod/portfile.cmake b/ports/libgpod/portfile.cmake deleted file mode 100644 index b5ff21b533f472..00000000000000 --- a/ports/libgpod/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO fadingred/libgpod - REF 4a8a33ef4bc58eee1baca6793618365f75a5c3fa - SHA512 b7a120c1106c1205e8de2808de5ac4ff1cf189943017939a5ea4eded4e1ceef44557587e69a8591cc5249f8c8dbf0cbdcce1dd309d33a0e9207b0560abe3ae39 - HEAD_REF master - PATCHES configure.ac.patch -) - -vcpkg_execute_required_process( - COMMAND intltoolize --force --copy --automake - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME intltoolize-${TARGET_TRIPLET} -) -vcpkg_execute_required_process( - COMMAND gtkdocize --copy - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME gtkdocize-${TARGET_TRIPLET} -) -vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - --without-hal - --disable-gdk-pixbuf - --disable-pygobject - --disable-more-warnings - --disable-libxml - --disable-gtk-doc-html -) -vcpkg_install_make() -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(COPY ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgpod/vcpkg.json b/ports/libgpod/vcpkg.json deleted file mode 100644 index 550993c5705e51..00000000000000 --- a/ports/libgpod/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "libgpod", - "version-date": "2019-08-29", - "port-version": 4, - "description": "libgpod is a library meant to abstract access to an iPod content.", - "homepage": "https://github.com/fadingred/libgpod", - "supports": "!windows & !osx", - "dependencies": [ - "glib", - "libplist", - "sqlite3" - ] -} diff --git a/ports/libheif/fix-gcc8.patch b/ports/libheif/fix-gcc8.patch new file mode 100644 index 00000000000000..9efd35d687063c --- /dev/null +++ b/ports/libheif/fix-gcc8.patch @@ -0,0 +1,33 @@ +diff --git a/libheif/bitstream.cc b/libheif/bitstream.cc +index 9063718..f459fcc 100644 +--- a/libheif/bitstream.cc ++++ b/libheif/bitstream.cc +@@ -25,6 +25,12 @@ + #include + #include + ++#if ((defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__PGI)) && __GNUC__ < 9) || (defined(__clang__) && __clang_major__ < 10) ++#include ++#else ++#include ++#endif ++ + #define MAX_UVLC_LEADING_ZEROS 20 + + #define AVOID_FUZZER_FALSE_POSITIVE 0 +diff --git a/libheif/codecs/uncompressed/decoder_abstract.cc b/libheif/codecs/uncompressed/decoder_abstract.cc +index bbe4692..3c9aacd 100644 +--- a/libheif/codecs/uncompressed/decoder_abstract.cc ++++ b/libheif/codecs/uncompressed/decoder_abstract.cc +@@ -35,6 +35,11 @@ + #include "unc_codec.h" + #include "decoder_abstract.h" + ++#if ((defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__PGI)) && __GNUC__ < 9) || (defined(__clang__) && __clang_major__ < 10) ++#include ++#else ++#include ++#endif + + AbstractDecoder::AbstractDecoder(uint32_t width, uint32_t height, const std::shared_ptr cmpd, const std::shared_ptr uncC) : + m_width(width), diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 1b7e78c72a2bcf..70a83e429542d8 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES gdk-pixbuf.patch + fix-gcc8.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 48a9b9cda0640c..5380d55837df12 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libheif", "version": "1.19.5", - "port-version": 1, + "port-version": 2, "description": "libheif is an HEIF and AVIF file format decoder and encoder.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/ports/libical/portfile.cmake b/ports/libical/portfile.cmake index 8698d09c92726e..9dc13c0b38463c 100644 --- a/ports/libical/portfile.cmake +++ b/ports/libical/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libical/libical REF "v${VERSION}" - SHA512 53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 + SHA512 32e5cac219801b40d8691deae6efae6fdaa64ca0968a72af5b27647958d44d79626c26c4e3675cfb284c2f1039c237c61ba2dd6030e9b1ea6a9d69296424240d ) vcpkg_find_acquire_program(PERL) @@ -39,4 +39,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libical/vcpkg.json b/ports/libical/vcpkg.json index 79767be4baa771..938347ae030f94 100644 --- a/ports/libical/vcpkg.json +++ b/ports/libical/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libical", - "version": "3.0.18", + "version": "3.0.19", "description": "Reference implementation of the iCalendar data type and serialization format", "homepage": "https://github.com/libical/libical", "license": "MPL-2.0", diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 2f96553a4d42ac..8a42c5d337a8b8 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -28,11 +28,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() set(ENV{GTKDOCIZE} true) -vcpkg_configure_make( +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG + AUTORECONF COPY_SOURCE # include dir order problem - USE_WRAPPERS OPTIONS ${options} --disable-gtk-doc @@ -47,7 +46,7 @@ vcpkg_configure_make( "CFLAGS=\$CFLAGS -I${CURRENT_INSTALLED_DIR}/include" ) -vcpkg_install_make() +vcpkg_make_install() vcpkg_fixup_pkgconfig() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index 824238d9b166d7..7bc3d0b2245b06 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,13 +1,17 @@ { "name": "libidn2", "version": "2.3.7", - "port-version": 1, + "port-version": 2, "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "license": null, "dependencies": [ "libiconv", - "libunistring" + "libunistring", + { + "name": "vcpkg-make", + "host": true + } ], "features": { "nls": { diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch index 37b9e0cab70adc..01721f146c1c97 100644 --- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch +++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ff9c9c27..d3fbad30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -217,6 +217,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) +@@ -224,6 +224,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) boolean_number(ENABLE_SHARED) option(ENABLE_STATIC "Build static libraries" TRUE) boolean_number(ENABLE_STATIC) @@ -15,36 +15,36 @@ index ff9c9c27..d3fbad30 100644 option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE) -@@ -721,6 +727,7 @@ if(WITH_TURBOJPEG) +@@ -734,6 +740,7 @@ if(WITH_TURBOJPEG) LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") endif() + if(ENABLE_EXECUTABLES) - add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) + add_executable(tjunittest src/tjunittest.c src/tjutil.c src/md5/md5.c + src/md5/md5hl.c) target_link_libraries(tjunittest turbojpeg) +@@ -752,9 +759,11 @@ if(WITH_TURBOJPEG) -@@ -732,9 +739,11 @@ if(WITH_TURBOJPEG) - - add_executable(tjexample tjexample.c) - target_link_libraries(tjexample turbojpeg) + add_executable(tjtran src/tjtran.c) + target_link_libraries(tjtran turbojpeg) - + endif() + if(INSTALL_DOCS) - add_custom_target(tjdoc COMMAND doxygen -s doxygen.config - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + add_custom_target(tjdoc COMMAND doxygen -s ../doc/doxygen.config + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src) + endif() endif() if(ENABLE_STATIC) -@@ -755,6 +764,7 @@ if(WITH_TURBOJPEG) +@@ -776,6 +785,7 @@ if(WITH_TURBOJPEG) set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) endif() + if(ENABLE_EXECUTABLES) - add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c - md5/md5hl.c) + add_executable(tjunittest-static src/tjunittest.c src/tjutil.c + src/md5/md5.c src/md5/md5hl.c) target_link_libraries(tjunittest-static turbojpeg-static) -@@ -764,6 +774,7 @@ if(WITH_TURBOJPEG) +@@ -785,6 +795,7 @@ if(WITH_TURBOJPEG) if(UNIX) target_link_libraries(tjbench-static m) endif() @@ -52,58 +52,58 @@ index ff9c9c27..d3fbad30 100644 endif() endif() -@@ -782,13 +793,15 @@ if(ENABLE_STATIC) - add_library(cjpeg16-static OBJECT rdgif.c rdppm.c) +@@ -803,12 +814,14 @@ if(ENABLE_STATIC) + add_library(cjpeg16-static OBJECT src/rdppm.c) set_property(TARGET cjpeg16-static PROPERTY COMPILE_FLAGS "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED") + if(ENABLE_EXECUTABLES) - add_executable(cjpeg-static cjpeg.c cdjpeg.c rdbmp.c rdgif.c rdppm.c - rdswitch.c rdtarga.c $ + add_executable(cjpeg-static src/cjpeg.c src/cdjpeg.c src/rdbmp.c src/rdgif.c + src/rdppm.c src/rdswitch.c src/rdtarga.c $ $) set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${CDJPEG_COMPILE_FLAGS}) target_link_libraries(cjpeg-static jpeg-static) -- + endif() -+ + # Compile a separate version of these source files with 12-bit and 16-bit # data precision. - add_library(djpeg12-static OBJECT rdcolmap.c wrgif.c wrppm.c) -@@ -797,6 +810,7 @@ if(ENABLE_STATIC) - add_library(djpeg16-static OBJECT wrppm.c) +@@ -818,6 +831,7 @@ if(ENABLE_STATIC) + add_library(djpeg16-static OBJECT src/wrppm.c) set_property(TARGET djpeg16-static PROPERTY COMPILE_FLAGS "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED") + if(ENABLE_EXECUTABLES) - add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrbmp.c - wrgif.c wrppm.c wrtarga.c $ - $) -@@ -810,11 +824,14 @@ if(ENABLE_STATIC) + add_executable(djpeg-static src/djpeg.c src/cdjpeg.c src/rdcolmap.c + src/rdswitch.c src/wrbmp.c src/wrgif.c src/wrppm.c src/wrtarga.c + $ $) +@@ -832,11 +846,14 @@ if(ENABLE_STATIC) - add_executable(example-static example.c) + add_executable(example-static src/example.c) target_link_libraries(example-static jpeg-static) + endif() endif() +if(ENABLE_EXECUTABLES) - add_executable(rdjpgcom rdjpgcom.c) + add_executable(rdjpgcom src/rdjpgcom.c) - add_executable(wrjpgcom wrjpgcom.c) + add_executable(wrjpgcom src/wrjpgcom.c) +endif() ############################################################################### -@@ -1730,8 +1747,10 @@ if(WITH_TURBOJPEG) +@@ -1971,9 +1988,11 @@ if(WITH_TURBOJPEG) + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) + if(ENABLE_EXECUTABLES) install(TARGETS tjbench RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) + endif() - if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND + if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC_LIKE AND CMAKE_C_LINKER_SUPPORTS_PDB) install(FILES "$" -@@ -1742,7 +1761,7 @@ if(WITH_TURBOJPEG) +@@ -1984,7 +2003,7 @@ if(WITH_TURBOJPEG) install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib) @@ -112,12 +112,12 @@ index ff9c9c27..d3fbad30 100644 if(GENERATOR_IS_MULTI_CONFIG) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") else() -@@ -1752,15 +1771,17 @@ if(WITH_TURBOJPEG) +@@ -1994,15 +2013,17 @@ if(WITH_TURBOJPEG) DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin RENAME tjbench${EXE}) endif() endif() + if(INSTALL_HEADERS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/turbojpeg.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include) + endif() endif() @@ -131,7 +131,7 @@ index ff9c9c27..d3fbad30 100644 if(GENERATOR_IS_MULTI_CONFIG) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") else() -@@ -1775,9 +1796,12 @@ if(ENABLE_STATIC) +@@ -2017,9 +2038,12 @@ if(ENABLE_STATIC) endif() endif() @@ -142,63 +142,65 @@ index ff9c9c27..d3fbad30 100644 +if(INSTALL_DOCS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg - ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.c - ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c -@@ -1790,8 +1814,9 @@ if(WITH_JAVA) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java + ${CMAKE_CURRENT_SOURCE_DIR}/README.md + ${CMAKE_CURRENT_SOURCE_DIR}/src/example.c +@@ -2038,8 +2062,9 @@ if(WITH_JAVA) + ${CMAKE_CURRENT_SOURCE_DIR}/java/TJTran.java DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc) endif() +endif() -if(UNIX OR MINGW) +if((UNIX OR MINGW) AND INSTALL_DOCS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 - ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 - ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1 -@@ -1814,11 +1839,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/cjpeg.1 + ${CMAKE_CURRENT_SOURCE_DIR}/doc/djpeg.1 + ${CMAKE_CURRENT_SOURCE_DIR}/doc/jpegtran.1 +@@ -2063,12 +2088,13 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME} COMPONENT lib) +if(INSTALL_HEADERS) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h - ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h - ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/jerror.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/jmorecfg.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/jpeglib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include) - +endif() include(cmakescripts/BuildPackages.cmake) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" + diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt index eaed9e95..74d53696 100644 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt -@@ -88,12 +88,13 @@ set_property(TARGET cjpeg12 PROPERTY COMPILE_FLAGS - add_library(cjpeg16 OBJECT ../rdgif.c ../rdppm.c) +@@ -94,12 +94,13 @@ set_property(TARGET cjpeg12 PROPERTY COMPILE_FLAGS + add_library(cjpeg16 OBJECT ../src/rdppm.c) set_property(TARGET cjpeg16 PROPERTY COMPILE_FLAGS "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED") +if(ENABLE_EXECUTABLES) - add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c - ../rdswitch.c ../rdtarga.c $ - $) + add_executable(cjpeg ../src/cjpeg.c ../src/cdjpeg.c ../src/rdbmp.c + ../src/rdgif.c ../src/rdppm.c ../src/rdswitch.c ../src/rdtarga.c + $ $) set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${CDJPEG_COMPILE_FLAGS}) target_link_libraries(cjpeg jpeg) - +endif() # Compile a separate version of these source files with 12-bit and 16-bit data # precision. - add_library(djpeg12 OBJECT ../rdcolmap.c ../wrgif.c ../wrppm.c) -@@ -102,6 +103,7 @@ set_property(TARGET djpeg12 PROPERTY COMPILE_FLAGS - add_library(djpeg16 OBJECT ../wrppm.c) + add_library(djpeg12 OBJECT ../src/rdcolmap.c ../src/wrgif.c ../src/wrppm.c) +@@ -108,6 +109,7 @@ set_property(TARGET djpeg12 PROPERTY COMPILE_FLAGS + add_library(djpeg16 OBJECT ../src/wrppm.c) set_property(TARGET djpeg16 PROPERTY COMPILE_FLAGS "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED") +if(ENABLE_EXECUTABLES) - add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c - ../wrbmp.c ../wrgif.c ../wrppm.c ../wrtarga.c $ - $) -@@ -117,14 +119,16 @@ target_link_libraries(example jpeg) + add_executable(djpeg ../src/djpeg.c ../src/cdjpeg.c ../src/rdcolmap.c + ../src/rdswitch.c ../src/wrbmp.c ../src/wrgif.c ../src/wrppm.c + ../src/wrtarga.c $ $) +@@ -124,14 +126,16 @@ target_link_libraries(example jpeg) - add_executable(jcstest ../jcstest.c) + add_executable(jcstest ../src/jcstest.c) target_link_libraries(jcstest jpeg) - +endif() @@ -211,6 +213,6 @@ index eaed9e95..74d53696 100644 install(TARGETS cjpeg djpeg jpegtran RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) +endif() - if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND + if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC_LIKE AND CMAKE_C_LINKER_SUPPORTS_PDB) install(FILES "$" diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index cfc900705b5832..617cb4a3d3721f 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo REF "${VERSION}" - SHA512 f43e1b6b9d048e29e381796c71e1c34a04c0f1c52c1f462db9f9930cfc75d69a50861be2570a6a4adc26a4183b6601300fd9d5553c06bc042f0d32fc1e408ed9 + SHA512 5712d318e222f1ffcd2f748b0f2c32b3859253a4ed4e13ae134f4445e0ca06efc258c7653b6924b39815ae078f6a9177e098c89684d2c886161a0a4118122e8d HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 55b815820460bd..c5555b50750d8a 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjpeg-turbo", - "version": "3.0.4", + "version": "3.1.0", "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/ports/libmagic/0003-Fix-WIN32-macro-checks.patch b/ports/libmagic/0003-Fix-WIN32-macro-checks.patch index e90beb4d40975e..7b88b1f98f9cb6 100644 --- a/ports/libmagic/0003-Fix-WIN32-macro-checks.patch +++ b/ports/libmagic/0003-Fix-WIN32-macro-checks.patch @@ -1,14 +1,5 @@ -From 2fffeb273ea46c1e91536f3d660982de785c8d49 Mon Sep 17 00:00:00 2001 -From: Long Nguyen -Date: Sat, 8 May 2021 20:52:59 +0700 -Subject: [PATCH 03/14] Fix WIN32 macro checks - ---- - src/file.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - diff --git a/src/file.h b/src/file.h -index 299ac0c..2c365a6 100644 +index a67e8ff..9115c5b 100644 --- a/src/file.h +++ b/src/file.h @@ -82,7 +82,7 @@ @@ -20,7 +11,7 @@ index 299ac0c..2c365a6 100644 #include #endif /* Do this here and now, because struct stat gets re-defined on solaris */ -@@ -95,7 +95,7 @@ +@@ -99,7 +99,7 @@ #define MAGIC "/etc/magic" #endif @@ -29,15 +20,12 @@ index 299ac0c..2c365a6 100644 #define PATHSEP ';' #else #define PATHSEP ':' -@@ -103,7 +103,7 @@ - +@@ -108,7 +108,7 @@ #define file_private static --#if HAVE_VISIBILITY && !defined(WIN32) -+#if HAVE_VISIBILITY && !defined(_WIN32) - #define file_public __attribute__ ((__visibility__("default"))) - #ifndef file_protected - #define file_protected __attribute__ ((__visibility__("hidden"))) --- -2.29.2.windows.2 - + #if HAVE_VISIBILITY +-# if defined(WIN32) ++# if defined(_WIN32) + # define file_public __declspec(dllexport) + # ifndef file_protected + # define file_protected diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index c6d775fda7d7b0..910051a7368a18 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -21,8 +21,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO file/file - REF FILE5_45 - SHA512 fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea + REF FILE5_46 + SHA512 9165bb5bdbe7b8fccac0c8675d4eb251a286ab2ab7a79e6f8ed98d36fa0928b889cf109c1da3a5cfff64d1b1006b5d73934c2d420484adae6f4c8e26a9ede18f HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index 3e6c1598409622..0beae3b4629384 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmagic", - "version": "5.45", - "port-version": 3, + "version": "5.46", "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "license": "BSD-2-Clause", diff --git a/ports/libmediainfo/msvc-arm.diff b/ports/libmediainfo/msvc-arm.diff deleted file mode 100644 index c7bef0750090bc..00000000000000 --- a/ports/libmediainfo/msvc-arm.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h -index d3ac0f9..eeefa40 100644 ---- a/Source/ThirdParty/aes-gladman/aesopt.h -+++ b/Source/ThirdParty/aes-gladman/aesopt.h -@@ -183,7 +183,7 @@ Issue Date: 20/12/2007 - AES_REV_DKS must NOT be defined when such assembler files are - built - */ --#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) -+#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 ) - # define INTEL_AES_POSSIBLE - #endif - -diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h -index b44c5cb..6ba31c1 100644 ---- a/Source/ThirdParty/aes-gladman/brg_endian.h -+++ b/Source/ThirdParty/aes-gladman/brg_endian.h -@@ -101,6 +101,7 @@ Issue Date: 20/12/2007 - defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \ - defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \ - defined( vax ) || defined( vms ) || defined( VMS ) || \ -+ defined( _M_ARM64 ) || defined ( _M_ARM ) || \ - defined( __VMS ) || defined( _M_X64 ) - # define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN - diff --git a/ports/libmediainfo/no-windows-namespace.diff b/ports/libmediainfo/no-windows-namespace.diff deleted file mode 100644 index 6f3918a8733df4..00000000000000 --- a/ports/libmediainfo/no-windows-namespace.diff +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/Source/MediaInfo/MediaInfo_Internal.cpp b/Source/MediaInfo/MediaInfo_Internal.cpp -index 05e0d53..1da1ef5 100644 ---- a/Source/MediaInfo/MediaInfo_Internal.cpp -+++ b/Source/MediaInfo/MediaInfo_Internal.cpp -@@ -66,12 +66,14 @@ - #if MEDIAINFO_ADVANCED && defined(MEDIAINFO_FILE_YES) - #include - #ifdef WINDOWS -- namespace WindowsNamespace -- { -+ #ifndef WIN32_LEAN_AND_MEAN -+ #define WIN32_LEAN_AND_MEAN -+ #endif -+ #ifndef NOMINMAX -+ #define NOMINMAX -+ #endif - #include - #undef Yield -- #undef max -- } - #else - #include - #include -@@ -973,7 +975,7 @@ static void CtrlC_Received() - } - - #ifdef WINDOWS --static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD SignalType) -+static BOOL WINAPI SignalHandler(DWORD SignalType) - { - if (SignalType==CTRL_C_EVENT) - { -@@ -986,12 +988,12 @@ static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD Signa - - static void CtrlC_Register() - { -- WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, TRUE); -+ SetConsoleCtrlHandler(SignalHandler, TRUE); - } - - static void CtrlC_Unregister() - { -- WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, FALSE); -+ SetConsoleCtrlHandler(SignalHandler, FALSE); - } - #else //WINDOWS - static void SignalHandler(int SignalType) -@@ -1445,7 +1447,7 @@ void MediaInfo_Internal::Entry() - } - - #ifdef WINDOWS -- WindowsNamespace::Sleep(0); -+ Sleep(0); - #elif defined(_POSIX_PRIORITY_SCHEDULING) - sched_yield(); - #endif //_POSIX_PRIORITY_SCHEDULING diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index 460820d6cc60ad..bc730b27f80be0 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -3,12 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib REF "v${MEDIAINFO_VERSION}" - SHA512 51b940f577aa88d24d00dcf00cc90dfb7e8fb38e19c96517bea59ffb92877b7c8af9dcc0d93e152c707ce06725958e43dd8f64b85f099140fc8f536cea5b21b5 + SHA512 efcf796a679aa91e9003ecc655401d856ee9de3c01e03236f0ea09525d725fa7bb7fc0a1816d97482c7774c2209ec74420086775a59d6f4b5309107b22e67c31 HEAD_REF master PATCHES - msvc-arm.diff dependencies.diff - no-windows-namespace.diff ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index dc8605f3956237..0f552b47bed924 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmediainfo", - "version": "24.11", + "version": "24.12", "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ diff --git a/ports/libnick/portfile.cmake b/ports/libnick/portfile.cmake index a3308bb9656bc8..aeff1dabf87744 100644 --- a/ports/libnick/portfile.cmake +++ b/ports/libnick/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NickvisionApps/libnick REF "${VERSION}" - SHA512 7ee279de436161ecb960f8a8cb7bf929c38523d08b67af03c4849eb14f9f8d2821d661b4ae767b2e6c94e181acd4a3fb82d77c534c18c5ae77acdfffcdfd2f21 + SHA512 1a6c3f82702dc1062107010c93081d92ca93a304ab2e4839ec8f4cd6ec031a964567702e34cf227301cd1e6ca6b7c146b53646e17ec2428d433e4e44572486bc HEAD_REF main ) diff --git a/ports/libnick/vcpkg.json b/ports/libnick/vcpkg.json index 3c9e9283c02685..1e0bac330cb097 100644 --- a/ports/libnick/vcpkg.json +++ b/ports/libnick/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnick", - "version": "2024.11.1", + "version": "2024.12.0", "maintainers": "Nicholas Logozzo nlogozzo225@gmail.com", "description": "A cross-platform base for native Nickvision applications.", "homepage": "https://github.com/NickvisionApps/libnick", diff --git a/ports/libsecret/portfile.cmake b/ports/libsecret/portfile.cmake index 1a3295f8cff953..5265db578fc1de 100644 --- a/ports/libsecret/portfile.cmake +++ b/ports/libsecret/portfile.cmake @@ -20,9 +20,8 @@ vcpkg_configure_meson( ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES secret-tool AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# There is no option to disable building secret-tool, so remove the executable. -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json index 0b35e6701ead07..482e3df467337f 100644 --- a/ports/libsecret/vcpkg.json +++ b/ports/libsecret/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libsecret", "version": "0.21.4", + "port-version": 1, "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", "license": "LGPL-2.1-or-later", - "supports": "!(windows | uwp | osx)", + "supports": "!android & !ios & !osx & !windows", "dependencies": [ "glib", { diff --git a/ports/libtorch/fix-sleef.patch b/ports/libtorch/fix-sleef.patch index a6d608a5bc8171..8b42b745e2cecc 100644 --- a/ports/libtorch/fix-sleef.patch +++ b/ports/libtorch/fix-sleef.patch @@ -20,3 +20,65 @@ index f3281d3cb..c8b6ed30e 100644 set(CMAKE_C_FLAGS_DEBUG ${OLD_CMAKE_C_FLAGS_DEBUG}) set(CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS}) +diff --git a/aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h b/aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h +index f3281d3cb..c8b6ed30e 100644 +--- a/aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h ++++ b/aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h +@@ -21,6 +21,17 @@ inline namespace CPU_CAPABILITY { + + #if defined(CPU_CAPABILITY_AVX2) && !defined(_MSC_VER) + ++#ifndef SLEEF_CONST ++#if (defined(__GNUC__) || defined(__CLANG__)) && !defined(__INTEL_COMPILER) ++#define SLEEF_CONST const ++#else ++#define SLEEF_CONST ++#endif ++#define SLEEF_CONST_OLD SLEEF_CONST ++#else ++#define SLEEF_CONST_OLD ++#endif ++ + // bfloat16 conversion + static inline void cvtbf16_fp32(const __m128i& a, __m256& o) { + o = _mm256_castsi256_ps(_mm256_slli_epi32(_mm256_cvtepu16_epi32(a), 16)); +@@ -266,7 +277,7 @@ public: + } + return b; + } +- Vectorized map(const __m256 (*const vop)(__m256)) const { ++ Vectorized map(SLEEF_CONST __m256 (*SLEEF_CONST_OLD vop)(__m256)) const { + __m256 lo, hi; + cvt_to_fp32(values, lo, hi); + const auto o1 = vop(lo); + diff --git a/aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h b/aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h +index f3281d3cb..c8b6ed30e 100644 +--- a/aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h ++++ b/aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h +@@ -18,6 +18,17 @@ inline namespace CPU_CAPABILITY { + + #if defined(CPU_CAPABILITY_AVX512) && !defined(_MSC_VER) + ++#ifndef SLEEF_CONST ++#if (defined(__GNUC__) || defined(__CLANG__)) && !defined(__INTEL_COMPILER) ++#define SLEEF_CONST const ++#else ++#define SLEEF_CONST ++#endif ++#define SLEEF_CONST_OLD SLEEF_CONST ++#else ++#define SLEEF_CONST_OLD ++#endif ++ + // bfloat16 conversion + static inline void cvtbf16_fp32(const __m256i& a, __m512& o) { + o = _mm512_castsi512_ps(_mm512_slli_epi32(_mm512_cvtepu16_epi32(a), 16)); +@@ -345,7 +356,7 @@ public: + } + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wignored-qualifiers" +- Vectorized map(const __m512 (*const vop)(__m512)) const { ++ Vectorized map(SLEEF_CONST __m512 (*SLEEF_CONST_OLD vop)(__m512)) const { + __m512 lo, hi; + cvt_to_fp32(values, lo, hi); + const auto o1 = vop(lo); diff --git a/ports/libtorch/no-abs-path.patch b/ports/libtorch/no-abs-path.patch new file mode 100644 index 00000000000000..7468556e8abe69 --- /dev/null +++ b/ports/libtorch/no-abs-path.patch @@ -0,0 +1,25 @@ +diff --git a/caffe2/core/macros.h.in b/caffe2/core/macros.h.in +index 997752ede3..7209b9a63e 100644 +--- a/caffe2/core/macros.h.in ++++ b/caffe2/core/macros.h.in +@@ -35,7 +35,7 @@ + // Useful build settings that are recorded in the compiled binary + #define CAFFE2_BUILD_STRINGS { \ + {"TORCH_VERSION", "${TORCH_VERSION}"}, \ +- {"CXX_COMPILER", "${CMAKE_CXX_COMPILER}"}, \ ++ {"CXX_COMPILER", "${cxx_compiler}"}, \ + {"CXX_FLAGS", "${CMAKE_CXX_FLAGS}"}, \ + {"BUILD_TYPE", "${CMAKE_BUILD_TYPE}"}, \ + {"BLAS_INFO", "${BLAS_INFO}"}, \ +diff --git a/cmake/Codegen.cmake b/cmake/Codegen.cmake +index 6fa2ab6ea1..07c449c02b 100644 +--- a/cmake/Codegen.cmake ++++ b/cmake/Codegen.cmake +@@ -36,6 +36,7 @@ endfunction() + ################################################################################ + + # ---[ Write the macros file ++cmake_path(GET CMAKE_CXX_COMPILER FILENAME cxx_compiler) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/../caffe2/core/macros.h.in + ${CMAKE_BINARY_DIR}/caffe2/core/macros.h) diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index 785ce85c1ab856..4dc05e8dc48706 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -38,6 +38,7 @@ vcpkg_from_github( force-cuda-include.patch fix-aten-cutlass.patch fix-build-error-with-fmt11.patch + no-abs-path.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index c8c639f2ad4831..1d2b9770749453 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "2.1.2", - "port-version": 7, + "port-version": 9, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/ports/libxdf/fix-pugixml-dependency.patch b/ports/libxdf/fix-pugixml-dependency.patch deleted file mode 100644 index 5b888b9866df7a..00000000000000 --- a/ports/libxdf/fix-pugixml-dependency.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ca070dfdd96db5c9eb9a5a88d1193f25b13e01f3 Mon Sep 17 00:00:00 2001 -From: myd7349 -Date: Mon, 31 Jul 2023 23:50:40 +0800 -Subject: [PATCH] Fix missing pugixml dependency in generated CMake package - file - ---- - CMakeLists.txt | 14 ++++++++++++-- - libxdfConfig.cmake.in | 9 +++++++++ - 2 files changed, 21 insertions(+), 2 deletions(-) - create mode 100644 libxdfConfig.cmake.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98cc03f..42f9a91 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,18 +43,28 @@ target_include_directories(xdf PUBLIC - $ - $ - ) -+include(CMakePackageConfigHelpers) - include(GNUInstallDirs) -+configure_package_config_file( -+ ${CMAKE_CURRENT_LIST_DIR}/libxdfConfig.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/libxdfConfig.cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+) - install(TARGETS xdf -- EXPORT "${PROJECT_NAME}Config" -+ EXPORT "${PROJECT_NAME}Targets" - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) --install(EXPORT "${PROJECT_NAME}Config" -+install(EXPORT "${PROJECT_NAME}Targets" - COMPONENT ${PROJECT_NAME} - NAMESPACE "XDF::" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxdfConfig.cmake -+ COMPONENT ${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+) - - # set(CPACK_STRIP_FILES ON) - # set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) -diff --git a/libxdfConfig.cmake.in b/libxdfConfig.cmake.in -new file mode 100644 -index 0000000..84331f0 ---- /dev/null -+++ b/libxdfConfig.cmake.in -@@ -0,0 +1,9 @@ -+@PACKAGE_INIT@ -+ -+include(CMakeFindDependencyMacro) -+ -+find_dependency(pugixml) -+ -+if(NOT TARGET XDF::xdf) -+ include("${CMAKE_CURRENT_LIST_DIR}/libxdfTargets.cmake") -+endif() --- -2.30.1.windows.1 - diff --git a/ports/libxdf/portfile.cmake b/ports/libxdf/portfile.cmake index ac5f9d409ac916..cb567774b47ca4 100644 --- a/ports/libxdf/portfile.cmake +++ b/ports/libxdf/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xdf-modules/libxdf REF "v${VERSION}" - SHA512 81ff3598442d3ea166ec54b74248ad7b7eca5fcfdb72526978966398ad9e6524883183e71b68e349c46c2705779bf2b4922ce097f01afe7a62faa449ab8fa075 + SHA512 17b68a307118a1a1375ad1a4717d5bd83515daea51623f617d0c5673435fb79df2bbc7445504b274495481b089f93b10bec025a05ef641478eff77e36d420e4c HEAD_REF main - PATCHES - fix-pugixml-dependency.patch ) vcpkg_cmake_configure( diff --git a/ports/libxdf/vcpkg.json b/ports/libxdf/vcpkg.json index c2075708db13e6..9d96bc1fdb12d2 100644 --- a/ports/libxdf/vcpkg.json +++ b/ports/libxdf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libxdf", - "version": "0.99.8", + "version": "0.99.9", "description": "C++ library for loading multimodal, multi-rate signals stored in XDF files.", "homepage": "https://xdf-modules.github.io/libxdf/", "license": "BSD-2-Clause", diff --git a/ports/libxfont/portfile.cmake b/ports/libxfont/portfile.cmake index a4af82e27908d7..4769a7bfb33868 100644 --- a/ports/libxfont/portfile.cmake +++ b/ports/libxfont/portfile.cmake @@ -35,10 +35,12 @@ if(VCPKG_TARGET_IS_WINDOWS) file(READ "${_file}" _contents) string(REPLACE "-lm" "" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") - set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc") - file(READ "${_file}" _contents) - string(REPLACE "-lm" "" _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") + if(NOT VCPKG_BUILD_TYPE) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc") + file(READ "${_file}" _contents) + string(REPLACE "-lm" "" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/libxfont/vcpkg.json b/ports/libxfont/vcpkg.json index 8fac451fbcc40b..c200e478fc32e6 100644 --- a/ports/libxfont/vcpkg.json +++ b/ports/libxfont/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxfont", "version": "2.0.5", + "port-version": 1, "description": "X font handling library for server & utilities", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfont", "license": null, diff --git a/ports/libxml2/fix_ios_compilation.patch b/ports/libxml2/fix_ios_compilation.patch new file mode 100644 index 00000000000000..16a2423f5fcf4c --- /dev/null +++ b/ports/libxml2/fix_ios_compilation.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a279c8..8e771ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ if (NOT MSVC) + check_include_files(fcntl.h HAVE_FCNTL_H) + check_function_exists(fpclass HAVE_FPCLASS) + check_function_exists(ftime HAVE_FTIME) +- check_function_exists(getentropy HAVE_GETENTROPY) ++ check_symbol_exists(getentropy "sys/random.h" HAVE_GETENTROPY) + check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) + check_library_exists(history append_history "" HAVE_LIBHISTORY) + check_library_exists(readline readline "" HAVE_LIBREADLINE) +@@ -149,7 +149,6 @@ if (NOT MSVC) + check_function_exists(stat HAVE_STAT) + check_include_files(stdint.h HAVE_STDINT_H) + check_include_files(sys/mman.h HAVE_SYS_MMAN_H) +- check_include_files(sys/random.h HAVE_SYS_RANDOM_H) + check_include_files(sys/select.h HAVE_SYS_SELECT_H) + check_include_files(sys/socket.h HAVE_SYS_SOCKET_H) + check_include_files(sys/stat.h HAVE_SYS_STAT_H) +diff --git a/config.h.cmake.in b/config.h.cmake.in +index 2f4aeba..79f1cdb 100644 +--- a/config.h.cmake.in ++++ b/config.h.cmake.in +@@ -69,9 +69,6 @@ + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_SYS_MMAN_H 1 + +-/* Define to 1 if you have the header file. */ +-#cmakedefine HAVE_SYS_RANDOM_H 1 +- + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_SYS_SELECT_H 1 + +diff --git a/configure.ac b/configure.ac +index 48cd2f0..0f09c61 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -304,7 +304,6 @@ AC_CHECK_HEADERS([stdint.h]) + AC_CHECK_HEADERS([fcntl.h unistd.h sys/stat.h]) + AC_CHECK_HEADERS([sys/mman.h]) + AC_CHECK_HEADERS([sys/time.h sys/timeb.h]) +-AC_CHECK_HEADERS([sys/random.h]) + AC_CHECK_HEADERS([dl.h dlfcn.h]) + AC_CHECK_HEADERS([glob.h]) + AM_CONDITIONAL(WITH_GLOB, test "$ac_cv_header_glob_h" = "yes") +@@ -317,9 +316,7 @@ AH_VERBATIM([HAVE_MUNMAP_AFTER],[/* mmap() is no good without munmap() */ + # undef /**/ HAVE_MMAP + #endif]) + +-AC_CHECK_DECL([getentropy], +- [AC_DEFINE([HAVE_GETENTROPY], [1], [getentropy])], [], +- [#include ]) ++AC_CHECK_DECLS([getentropy], [], [], [#include ]) + + dnl + dnl Checks for inet libraries +diff --git a/dict.c b/dict.c +index 49e1c6b..46bb4d4 100644 +--- a/dict.c ++++ b/dict.c +@@ -928,13 +928,11 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) { + #define WIN32_LEAN_AND_MEAN + #include + #include +-#elif defined(HAVE_GETENTROPY) ++#elif HAVE_GETENTROPY + #ifdef HAVE_UNISTD_H + #include + #endif +- #ifdef HAVE_SYS_RANDOM_H +- #include +- #endif ++ #include + #else + #include + #endif +@@ -965,7 +963,7 @@ xmlInitRandom(void) { + "error code %lu\n", GetLastError()); + abort(); + } +-#elif defined(HAVE_GETENTROPY) ++#elif HAVE_GETENTROPY + while (1) { + if (getentropy(globalRngState, sizeof(globalRngState)) == 0) + break; diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 0ee0da9b3e4425..e62bc9d2a4c9a7 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( PATCHES disable-docs.patch fix_cmakelist.patch + fix_ios_compilation.patch ${FIX_COMPATIBILITY_PATCH} ${ADD_MISSING_BCRYPT_PATCH} ) diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 2e8ba05ad4ad36..dc1d0938356016 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxml2", "version": "2.13.5", + "port-version": 1, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", "license": "MIT", diff --git a/ports/lief/fix-cmakelists.patch b/ports/lief/fix-cmakelists.patch new file mode 100644 index 00000000000000..bb087a6f1538d1 --- /dev/null +++ b/ports/lief/fix-cmakelists.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc2b679..4ec92b9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,19 +113,7 @@ message(STATUS "CMAKE_CXX_IMPLICIT_LINK_LIBRARIES: ${CMAKE_CXX_IMPLICIT_LINK_LIB + message(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") + message(STATUS "CMAKE_MSVC_RUNTIME_LIBRARY: ${CMAKE_MSVC_RUNTIME_LIBRARY}") + +-if(LIEF_INSTALL) +- if(UNIX) +- include(GNUInstallDirs) +- set(CMAKE_INSTALL_LIBDIR "lib") +- else() +- set(CMAKE_INSTALL_LIBDIR "lib") +- set(CMAKE_INSTALL_DATADIR "share") + set(CMAKE_INSTALL_INCLUDEDIR "include") +- set(CMAKE_INSTALL_BINDIR "bin") +- set(CMAKE_INSTALL_DATAROOTDIR "share") +- message(STATUS "Setting installation destination to: ${CMAKE_INSTALL_PREFIX}") +- endif() +-endif() + + # LIEF Source definition + # ====================== +@@ -318,7 +306,9 @@ else() + ${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/internal/span.hpp) + endif() + +-target_link_libraries(LIB_LIEF PRIVATE lief_spdlog) ++find_package(fmt CONFIG REQUIRED) ++find_package(spdlog CONFIG REQUIRED) ++target_link_libraries(LIB_LIEF PRIVATE fmt::fmt spdlog::spdlog) + + if(ANDROID AND LIEF_LOGGING) + target_link_libraries(LIB_LIEF PUBLIC log) +@@ -507,11 +497,11 @@ if(LIEF_INSTALL) + endif() + + install( +- TARGETS LIB_LIEF lief_spdlog ++ TARGETS LIB_LIEF + EXPORT LIEFExport + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + install( diff --git a/ports/lief/fix-liefconfig-cmake-in.patch b/ports/lief/fix-liefconfig-cmake-in.patch new file mode 100644 index 00000000000000..637686f1466812 --- /dev/null +++ b/ports/lief/fix-liefconfig-cmake-in.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/LIEFConfig.cmake.in b/cmake/LIEFConfig.cmake.in +index dba7363..7f88f98 100644 +--- a/cmake/LIEFConfig.cmake.in ++++ b/cmake/LIEFConfig.cmake.in +@@ -69,7 +69,7 @@ macro(LIEF_load_targets lib_type) + return() + endif () + +- if("${lib_type}" STREQUAL "static") ++ if(1) + # Need to find all dependencies even if they're private when LIEF is + # compiled statically + include(CMakeFindDependencyMacro) +@@ -93,6 +93,10 @@ macro(LIEF_load_targets lib_type) + if(NOT @LIEF_DISABLE_FROZEN@ AND @LIEF_OPT_FROZEN_EXTERNAL@) + find_dependency(frozen) + endif() ++ ++ find_dependency(tl-expected) ++ find_dependency(fmt) ++ check_required_components(lief) + endif() + + # Include the respective targets file diff --git a/ports/lief/fix-vcpkg-includes.patch b/ports/lief/fix-vcpkg-includes.patch new file mode 100644 index 00000000000000..1bcbdcac4bc6e1 --- /dev/null +++ b/ports/lief/fix-vcpkg-includes.patch @@ -0,0 +1,52 @@ +diff --git a/src/BinaryStream/BinaryStream.cpp b/src/BinaryStream/BinaryStream.cpp +index 83e618c..6447b7b 100644 +--- a/src/BinaryStream/BinaryStream.cpp ++++ b/src/BinaryStream/BinaryStream.cpp +@@ -15,7 +15,7 @@ + */ + #include "LIEF/BinaryStream/BinaryStream.hpp" + #include "LIEF/DWARF/enums.hpp" +-#include "third-party/utfcpp.hpp" ++#include + + #include + #include +diff --git a/src/PE/Builder.cpp b/src/PE/Builder.cpp +index 8cbe7b2..994e9bf 100644 +--- a/src/PE/Builder.cpp ++++ b/src/PE/Builder.cpp +@@ -21,7 +21,7 @@ + + #include "logging.hpp" + +-#include "third-party/utfcpp.hpp" ++#include + + + #include "LIEF/PE/Builder.hpp" +diff --git a/src/logging.cpp b/src/logging.cpp +index 39936fe..f5e1345 100644 +--- a/src/logging.cpp ++++ b/src/logging.cpp +@@ -20,7 +20,7 @@ + #include "logging.hpp" + + #include "spdlog/spdlog.h" +-#include "spdlog/fmt/bundled/args.h" ++#include + #include "spdlog/sinks/stdout_color_sinks.h" + #include "spdlog/sinks/basic_file_sink.h" + #include "spdlog/sinks/android_sink.h" +diff --git a/src/utils.cpp b/src/utils.cpp +index 0acbba1..b624a1d 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -22,7 +22,7 @@ + #include "LIEF/utils.hpp" + #include "LIEF/errors.hpp" + +-#include "third-party/utfcpp.hpp" ++#include + + #include "LIEF/config.h" + #include "logging.hpp" diff --git a/ports/lief/portfile.cmake b/ports/lief/portfile.cmake new file mode 100644 index 00000000000000..a9b196904a3574 --- /dev/null +++ b/ports/lief/portfile.cmake @@ -0,0 +1,71 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lief-project/LIEF + REF ${VERSION} + SHA512 776d26bc5d8ec7bca823d1c0fc821b0efc2411976901e1fca0ffecbc64591798e9e21a483c1637e9877bdd921dc463ffaef4eeb6a76d9dd8463c97c5f50834d4 + HEAD_REF master + PATCHES + fix-cmakelists.patch + fix-liefconfig-cmake-in.patch + fix-vcpkg-includes.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/third-party") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "c-api" LIEF_C_API # C API + "enable-json" LIEF_ENABLE_JSON # Enable JSON-related APIs + "extra-warnings" LIEF_EXTRA_WARNINGS # Enable extra warning from the compiler + "logging" LIEF_LOGGING # Enable logging + "logging-debug" LIEF_LOGGING_DEBUG # Enable debug logging + + "use-ccache" LIEF_USE_CCACHE # Use ccache to speed up compilation + + "elf" LIEF_ELF # Build LIEF with ELF module + "pe" LIEF_PE # Build LIEF with PE module + "macho" LIEF_MACHO # Build LIEF with MachO module + + "oat" LIEF_OAT # Build LIEF with OAT module + "dex" LIEF_DEX # Build LIEF with DEX module + "vdex" LIEF_VDEX # Build LIEF with VDEX module + "art" LIEF_ART # Build LIEF with ART module +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIEF_EXAMPLES=OFF + + # Build with external vcpkg dependencies + -DLIEF_OPT_MBEDTLS_EXTERNAL=ON + -DLIEF_EXTERNAL_SPDLOG=ON + -DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON + -DLIEF_OPT_FROZEN_EXTERNAL=ON + -DLIEF_OPT_EXTERNAL_SPAN=ON + -DLIEF_OPT_UTFCPP_EXTERNAL=ON + -DLIEF_OPT_EXTERNAL_EXPECTED=ON + -DLIEF_DISABLE_FROZEN=OFF + -DLIEF_DISABLE_EXCEPTIONS=OFF + + "-DLIEF_EXTERNAL_SPAN_DIR=${_VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/include/tcb" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/LIEF") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lief/LIEFConfig.cmake" + [[include("${LIEF_${lib_type}_export}")]] + [[include("${CMAKE_CURRENT_LIST_DIR}/LIEFExport-${lib_type}.cmake")]] +) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/lief/vcpkg.json b/ports/lief/vcpkg.json new file mode 100644 index 00000000000000..43769dd2807b22 --- /dev/null +++ b/ports/lief/vcpkg.json @@ -0,0 +1,79 @@ +{ + "name": "lief", + "version-semver": "0.16.1", + "description": "LIEF - Library to Instrument Executable Formats", + "homepage": "https://lief.quarkslab.com", + "license": "Apache-2.0", + "dependencies": [ + "fmt", + "frozen", + "mbedtls", + "spdlog", + "tcb-span", + "tl-expected", + "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "art", + "dex", + "elf", + "enable-json", + "logging", + "macho", + "oat", + "pe", + "vdex" + ], + "features": { + "art": { + "description": "Build LIEF with ART module" + }, + "c-api": { + "description": "C API" + }, + "dex": { + "description": "Build LIEF with DEX module" + }, + "elf": { + "description": "Build LIEF with ELF module" + }, + "enable-json": { + "description": "Enable JSON-related APIs", + "dependencies": [ + "nlohmann-json" + ] + }, + "extra-warnings": { + "description": "Enable extra warning from the compiler" + }, + "logging": { + "description": "Enable logging" + }, + "logging-debug": { + "description": "Enable debug logging" + }, + "macho": { + "description": "Build LIEF with MachO module" + }, + "oat": { + "description": "Build LIEF with OAT module" + }, + "pe": { + "description": "Build LIEF with PE module" + }, + "use-ccache": { + "description": "Use ccache to speed up compilation" + }, + "vdex": { + "description": "Build LIEF with VDEX module" + } + } +} diff --git a/ports/lilv/portfile.cmake b/ports/lilv/portfile.cmake index 39e27f57090c6b..8d62a2b556ad4c 100644 --- a/ports/lilv/portfile.cmake +++ b/ports/lilv/portfile.cmake @@ -7,15 +7,34 @@ vcpkg_from_gitlab( HEAD_REF master ) +set(options "") +if("tools" IN_LIST FEATURES) + list(APPEND options -Dtools=enabled) +else() + list(APPEND options -Dtools=disabled) +endif() + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${options} + -Dbindings_cpp=enabled + -Dbindings_py=disabled + -Ddocs=disabled -Dtests=disabled ) vcpkg_install_meson() -vcpkg_copy_tools(TOOL_NAMES lv2info lv2ls AUTO_CLEAN) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES lv2apply lv2bench lv2info lv2ls AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/etc" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/lilv/vcpkg.json b/ports/lilv/vcpkg.json index 4c13f2b84b42ea..1cce4e42faa936 100644 --- a/ports/lilv/vcpkg.json +++ b/ports/lilv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lilv", "version": "0.24.24", + "port-version": 1, "description": "Lilv is a C library for simple use of LV2 plugins in applications.", "homepage": "https://drobilla.net/software/lilv", "license": "ISC", @@ -13,6 +14,16 @@ { "name": "vcpkg-tool-meson", "host": true + }, + "zix" + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!windows", + "dependencies": [ + "libsndfile" + ] } - ] + } } diff --git a/ports/log4cxx/fix-find-package.patch b/ports/log4cxx/fix-find-package.patch index aed15f1559e4d2..f92da1c8ec9f27 100644 --- a/ports/log4cxx/fix-find-package.patch +++ b/ports/log4cxx/fix-find-package.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b1c0d52..62c4fb43 100644 +index 498d0b5..22815a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,7 +70,7 @@ find_package( Threads REQUIRED ) - include("${CMAKE_CURRENT_LIST_DIR}/src/cmake/FindLibFuzzer.cmake") +@@ -67,7 +67,7 @@ find_package(APR-Util REQUIRED) + find_package( Threads REQUIRED ) # Find expat for XML parsing -find_package(EXPAT REQUIRED) diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 5c21452733ed7f..553bf70d6ca8c8 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,20 +1,13 @@ vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz" FILENAME "apache-log4cxx-${VERSION}.tar.gz" - SHA512 bd481d69e29b3c8908bbc91489bf4e752e6edb147404454c0e88fd8f107d68ae5a98e220ab912692e555ca071d1cff7fb99ffa51194cfa7d070593ce6285d2b0 -) - -vcpkg_download_distfile(MAKE_PKG_CONFIG_SUPPORT_OPT_IN - URLS https://github.com/apache/logging-log4cxx/commit/4642a50c70b6cbd9b68d7e8dace9c049c8198b07.patch?full_index=1 - SHA512 4b3628d98d233a2e68d1183a8bb2156c2f1e6f80ab50cfe75a6df799d14bc3c7ba028fbb7ff524c56530a2260be37fd9f3d089422027987b5c8c36e9978c254c - FILENAME Make_pkg_config_support_opt_in-4642a50c70b6cbd9b68d7e8dace9c049c8198b07.patch + SHA512 0956fd034fd1a98d2e48ed461578c1e85da02d176850a580195b6a60b959feaf402a2743cc84ccb5d467dd924ee46422b8a7b39d2be9ee131e4e275e65ba839c ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES fix-find-package.patch - ${MAKE_PKG_CONFIG_SUPPORT_OPT_IN} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -48,5 +41,4 @@ ${_contents}" file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index f99f36ebf7bc90..e5f04a4fc03e87 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "log4cxx", - "version": "1.3.0", + "version": "1.3.1", "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "license": "Apache-2.0", diff --git a/ports/ls-qpack/cmake-config.diff b/ports/ls-qpack/cmake-config.diff new file mode 100644 index 00000000000000..cecde595743ac9 --- /dev/null +++ b/ports/ls-qpack/cmake-config.diff @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 86510b3..acca8be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,10 +36,9 @@ if(LSQPACK_XXH) + target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) + set(LSQPACK_DEPENDS "") + else() +- find_package(PkgConfig REQUIRED) +- pkg_check_modules(XXH REQUIRED IMPORTED_TARGET libxxhash) +- target_link_libraries(ls-qpack PUBLIC PkgConfig::XXH) +- set(LSQPACK_DEPENDS "libxxhash") ++ find_package(xxHash CONFIG REQUIRED) ++ target_link_libraries(ls-qpack PRIVATE xxHash::xxhash) ++ set(LSQPACK_DEPENDS "libxxhash") + endif() + + if(WIN32) +@@ -125,10 +124,14 @@ endif() + include(GNUInstallDirs) + configure_file(lsqpack.pc.in lsqpack.pc @ONLY) + ++configure_file(ls-qpack-config.cmake.in ls-qpack-config.cmake @ONLY) + install(TARGETS ls-qpack EXPORT ls-qpack-config + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ls-qpack-config.cmake" ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ls-qpack) + install( + EXPORT ls-qpack-config ++ FILE ls-qpack-targets.cmake + NAMESPACE ls-qpack:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ls-qpack + ) +diff --git a/ls-qpack-config.cmake.in b/ls-qpack-config.cmake.in +new file mode 100644 +index 0000000..533e076 +--- /dev/null ++++ b/ls-qpack-config.cmake.in +@@ -0,0 +1,5 @@ ++if(NOT "@BUILD_SHARED_LIBS@" AND NOT "@LSQPACK_XXH@") ++ include(CMakeFindDependencyMacro) ++ find_dependency(xxHash CONFIG) ++endif() ++include("${CMAKE_CURRENT_LIST_DIR}/ls-qpack-targets.cmake") diff --git a/ports/ls-qpack/emscripten.diff b/ports/ls-qpack/emscripten.diff new file mode 100644 index 00000000000000..57ef1a0964d88d --- /dev/null +++ b/ports/ls-qpack/emscripten.diff @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bcb58e3..320144b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ else() + set(LSQPACK_DEPENDS "libxxhash") + endif() + +-if(WIN32) ++if(WIN32 OR EMSCRIPTEN) + target_include_directories(ls-qpack PUBLIC + $ + $ +@@ -149,6 +149,6 @@ if(LSQPACK_BIN) + DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +-if(WIN32) ++if(WIN32 OR EMSCRIPTEN) + install(DIRECTORY wincompat/sys DESTINATION include) + endif() diff --git a/ports/ls-qpack/mingw.diff b/ports/ls-qpack/mingw.diff new file mode 100644 index 00000000000000..b3560295108586 --- /dev/null +++ b/ports/ls-qpack/mingw.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1369bd1..bcb58e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ if(WIN32) + ) + endif() + +-if(WIN32) ++if(MSVC) + target_compile_options(ls-qpack PRIVATE + /Wall + /wd4100 # unreffed parameter diff --git a/ports/ls-qpack/pkgconfig.diff b/ports/ls-qpack/pkgconfig.diff new file mode 100644 index 00000000000000..7141ad8724a42c --- /dev/null +++ b/ports/ls-qpack/pkgconfig.diff @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 32eed1c..1369bd1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -123,6 +123,8 @@ endif() + + include(GNUInstallDirs) + configure_file(lsqpack.pc.in lsqpack.pc @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lsqpack.pc" ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + configure_file(ls-qpack-config.cmake.in ls-qpack-config.cmake @ONLY) + install(TARGETS ls-qpack EXPORT ls-qpack-config +@@ -149,7 +151,4 @@ endif() + + if(WIN32) + install(DIRECTORY wincompat/sys DESTINATION include) +-else() +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lsqpack.pc" +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() +diff --git a/lsqpack.pc.in b/lsqpack.pc.in +index 7eac772..7c65072 100644 +--- a/lsqpack.pc.in ++++ b/lsqpack.pc.in +@@ -7,6 +7,6 @@ Name: @PROJECT_NAME@ + Description: @CMAKE_PROJECT_DESCRIPTION@ + URL: @CMAKE_PROJECT_HOMEPAGE_URL@ + Version: @PROJECT_VERSION@ +-Requires: @LSQPACK_DEPENDS@ ++Requires.private: @LSQPACK_DEPENDS@ + Cflags: -I"${includedir}" +-Libs: -L"${libdir}" -llsqpack ++Libs: -L"${libdir}" -lls-qpack diff --git a/ports/ls-qpack/portfile.cmake b/ports/ls-qpack/portfile.cmake index c97fda3b4b1e7a..2717fd74035da5 100644 --- a/ports/ls-qpack/portfile.cmake +++ b/ports/ls-qpack/portfile.cmake @@ -6,16 +6,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO litespeedtech/ls-qpack REF "v${VERSION}" - SHA512 74d4b2ea96bf0de43009cc121c8e57caff83be53c613236b01dce4ac4c12505d0d9fec07d9152ca62166947a160de2ab3f7bf19fb203a60b44507516a927ecb8 + SHA512 951056564be6f2a2562001ad1a83731df41a1c8b8d91bf44e138c962befe2af1919daf0d94b57b05b49bb83656334c00ed2c642d81075f1e0cece1a46b31006b HEAD_REF master + PATCHES + cmake-config.diff + pkgconfig.diff + mingw.diff + emscripten.diff ) - -vcpkg_find_acquire_program(PKGCONFIG) +file(REMOVE_RECURSE "${SOURCE_PATH}/deps") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DLSQPACK_TESTS=OFF -DLSQPACK_BIN=OFF -DLSQPACK_XXH=OFF @@ -31,12 +34,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(READ "${CURRENT_PACKAGES_DIR}/share/ls-qpack/ls-qpack-config.cmake" cmake_config) -file(WRITE "${CURRENT_PACKAGES_DIR}/share/ls-qpack/ls-qpack-config.cmake" -"include(CMakeFindDependencyMacro) -find_dependency(PkgConfig) -pkg_check_modules(XXH REQUIRED IMPORTED_TARGET libxxhash) -${cmake_config} -") - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ls-qpack/vcpkg.json b/ports/ls-qpack/vcpkg.json index eac85cee64d50c..50e5e0c66cc8f0 100644 --- a/ports/ls-qpack/vcpkg.json +++ b/ports/ls-qpack/vcpkg.json @@ -1,10 +1,9 @@ { "name": "ls-qpack", - "version": "2.5.5", + "version": "2.6.0", "description": "QPACK compression library for use with HTTP/3", "homepage": "https://github.com/litespeedtech/ls-qpack", "license": "MIT", - "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/mchehab-zbar/c99.patch b/ports/mchehab-zbar/c99.patch deleted file mode 100644 index 8b906fcaa99a39..00000000000000 --- a/ports/mchehab-zbar/c99.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/zbar/symbol.c b/zbar/symbol.c -index 27dbc87..1059a72 100644 ---- a/zbar/symbol.c -+++ b/zbar/symbol.c -@@ -100,40 +100,29 @@ const char *zbar_get_orientation_name (zbar_orientation_t orient) - - int _zbar_get_symbol_hash (zbar_symbol_type_t sym) - { -- static const signed char hash[ZBAR_CODE128 + 1] = { -- [0 ... ZBAR_CODE128] = -1, -- -- /* [ZBAR_FOO] = 0, is empty */ -- [ZBAR_SQCODE] = 1, -- [ZBAR_CODE128] = 2, -- [ZBAR_EAN13] = 3, -- [ZBAR_UPCA] = 4, -- [ZBAR_EAN8] = 5, -- [ZBAR_UPCE] = 6, -- [ZBAR_ISBN13] = 7, -- [ZBAR_ISBN10] = 8, -- [ZBAR_CODE39] = 9, -- [ZBAR_I25] = 10, -- [ZBAR_PDF417] = 11, -- [ZBAR_QRCODE] = 12, -- [ZBAR_DATABAR] = 13, -- [ZBAR_DATABAR_EXP] = 14, -- [ZBAR_CODE93] = 15, -- [ZBAR_EAN2] = 16, -- [ZBAR_EAN5] = 17, -- [ZBAR_COMPOSITE] = 18, -- [ZBAR_CODABAR] = 19, -- -- /* Please update NUM_SYMS accordingly */ -- }; -- int h; -- -- assert (sym >= ZBAR_PARTIAL && sym <= ZBAR_CODE128); -- -- h = hash[sym]; -- assert (h >= 0 && h < NUM_SYMS); -- -- return h; -+ switch(sym) -+ { -+ default: return -1; -+ case ZBAR_SQCODE: return 1; -+ case ZBAR_CODE128: return 2; -+ case ZBAR_EAN13: return 3; -+ case ZBAR_UPCA: return 4; -+ case ZBAR_EAN8: return 5; -+ case ZBAR_UPCE: return 6; -+ case ZBAR_ISBN13: return 7; -+ case ZBAR_ISBN10: return 8; -+ case ZBAR_CODE39: return 9; -+ case ZBAR_I25: return 10; -+ case ZBAR_PDF417: return 11; -+ case ZBAR_QRCODE: return 12; -+ case ZBAR_DATABAR: return 13; -+ case ZBAR_DATABAR_EXP: return 14; -+ case ZBAR_CODE93: return 15; -+ case ZBAR_EAN2: return 16; -+ case ZBAR_EAN5: return 17; -+ case ZBAR_COMPOSITE: return 18; -+ case ZBAR_CODABAR: return 19; -+ } - } - - void _zbar_symbol_free (zbar_symbol_t *sym) -diff --git a/zbar/window/win.c b/zbar/window/win.c -index b949f65..7edcfa2 100644 ---- a/zbar/window/win.c -+++ b/zbar/window/win.c -@@ -194,7 +194,7 @@ int _zbar_window_draw_polygon (zbar_window_t *w, - win_set_rgb(hdc, rgb); - - point_t org = w->scaled_offset; -- POINT gdipts[npts + 1]; -+ POINT* gdipts = malloc((npts + 1) * sizeof(POINT)); - int i; - for(i = 0; i < npts; i++) { - point_t p = window_scale_pt(w, pts[i]); -@@ -204,6 +204,7 @@ int _zbar_window_draw_polygon (zbar_window_t *w, - gdipts[npts] = gdipts[0]; - - Polyline(hdc, gdipts, npts + 1); -+ free(gdipts); - return(0); - } - diff --git a/ports/mchehab-zbar/issue219.patch b/ports/mchehab-zbar/issue219.patch deleted file mode 100644 index 2f86a7c3aa356e..00000000000000 --- a/ports/mchehab-zbar/issue219.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c -index 8cfa848..ffb972e 100644 ---- a/zbar/decoder/databar.c -+++ b/zbar/decoder/databar.c -@@ -695,7 +695,7 @@ lookup_sequence (databar_segment_t *seg, - seq[i++] = s; - } - dbprintf(2, "}"); -- seq[n] = -1; -+ if (n<22) {seq[n]=-1;} /* https://github.com/mchehab/zbar/issues/219 */ - return(fixed < 1); - } - diff --git a/ports/mchehab-zbar/portfile.cmake b/ports/mchehab-zbar/portfile.cmake index 9992aaaaf3e420..6fd8a5230ae8d8 100644 --- a/ports/mchehab-zbar/portfile.cmake +++ b/ports/mchehab-zbar/portfile.cmake @@ -2,11 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mchehab/zbar REF "${VERSION}" - SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb + SHA512 2dd607afbb1e52346bfb740f916c8616112d14153f071f82458b7c653f647b332290a5089543abebfe1c7679eae98b349a84777185d61cfb9ff275bfecc6e08f HEAD_REF master PATCHES - c99.patch - issue219.patch windows.patch x64.patch ) @@ -17,10 +15,9 @@ if("nls" IN_LIST FEATURES) else() vcpkg_list(APPEND options "--disable-nls") set(ENV{AUTOPOINT} true) # true, the program + set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/\"") # Simulate the relevant effects of (interactive) `gettextize`. file(TOUCH "${SOURCE_PATH}/po/Makefile.in.in") - file(GLOB_RECURSE m4_files "${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/*.m4") - file(INSTALL ${m4_files} DESTINATION "${SOURCE_PATH}/config") endif() vcpkg_configure_make( diff --git a/ports/mchehab-zbar/vcpkg.json b/ports/mchehab-zbar/vcpkg.json index c56b3f779e3c04..94ac20a0d23fa0 100644 --- a/ports/mchehab-zbar/vcpkg.json +++ b/ports/mchehab-zbar/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mchehab-zbar", - "version": "0.23.90", - "port-version": 5, + "version": "0.23.93", "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.", "homepage": "https://github.com/mchehab/zbar", "license": "LGPL-2.1-or-later", diff --git a/ports/mchehab-zbar/windows.patch b/ports/mchehab-zbar/windows.patch index 877099bf2ac68e..ad38e35376170c 100644 --- a/ports/mchehab-zbar/windows.patch +++ b/ports/mchehab-zbar/windows.patch @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index c8fea14..eb0a097 100644 +index f0f9723..9e79db9 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION], @@ -11,45 +11,17 @@ index c8fea14..eb0a097 100644 AM_CXXFLAGS="$AM_CFLAGS" AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_CFLAGS]) -diff --git a/zbar/libzbar.rc b/zbar/libzbar.rc -index 413635b..c241f82 100644 ---- a/zbar/libzbar.rc -+++ b/zbar/libzbar.rc -@@ -17,8 +17,7 @@ VS_VERSION_INFO VERSIONINFO - VALUE "InternalName", "libzbar" - VALUE "OriginalFilename", "libzbar-" XSTR(LIB_VERSION_MAJOR) ".dll" - -- VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." \ -- XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION) -+ VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION) - VALUE "ProductVersion", PACKAGE_VERSION - - VALUE "FileDescription", "Bar code reader library" diff --git a/zbar/processor.h b/zbar/processor.h -index d5e9fef..54d6584 100644 +index a8289e0..8a7e33c 100644 --- a/zbar/processor.h +++ b/zbar/processor.h -@@ -27,7 +27,9 @@ - #ifdef HAVE_INTTYPES_H - # include +@@ -29,7 +29,9 @@ #endif --#include -+#ifndef WIN32 -+# include -+#endif #include #include ++#ifndef WIN32 + #include ++#endif -diff --git a/zbar/thread.h b/zbar/thread.h -index 96d6415..252d3f2 100644 ---- a/zbar/thread.h -+++ b/zbar/thread.h -@@ -35,7 +35,7 @@ - # define HAVE_THREADS - # define ZTHREAD DWORD WINAPI - --typedef ZTHREAD (zbar_thread_proc_t)(void*); -+typedef ZTHREAD zbar_thread_proc_t(void*); - - typedef DWORD zbar_thread_id_t; - + #include + #include "error.h" diff --git a/ports/mchehab-zbar/x64.patch b/ports/mchehab-zbar/x64.patch index c8eefac8edf2c0..abd6b7b9871a0a 100644 --- a/ports/mchehab-zbar/x64.patch +++ b/ports/mchehab-zbar/x64.patch @@ -1,18 +1,18 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c -index 7f7336f..e9ffc45 100644 +index 6c41b7f..cbf0bb7 100644 --- a/zbar/decoder.c +++ b/zbar/decoder.c @@ -25,6 +25,7 @@ - #include /* malloc, calloc, free */ - #include /* snprintf */ - #include /* memset, strlen */ -+#include /* offsetof */ + #include /* snprintf */ + #include /* malloc, calloc, free */ + #include /* memset, strlen */ ++#include /* offsetof */ #include -@@ -113,7 +114,7 @@ void zbar_decoder_destroy (zbar_decoder_t *dcode) +@@ -113,7 +114,7 @@ void zbar_decoder_destroy(zbar_decoder_t *dcode) - void zbar_decoder_reset (zbar_decoder_t *dcode) + void zbar_decoder_reset(zbar_decoder_t *dcode) { - memset(dcode, 0, (long)&dcode->buf_alloc - (long)dcode); + memset(dcode, 0, offsetof(zbar_decoder_t, buf_alloc)); diff --git a/ports/meekrosoft-fff/portfile.cmake b/ports/meekrosoft-fff/portfile.cmake new file mode 100644 index 00000000000000..3c1589520eee1b --- /dev/null +++ b/ports/meekrosoft-fff/portfile.cmake @@ -0,0 +1,12 @@ +set(VCPKG_BUILD_TYPE release) # Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO meekrosoft/fff + REF "v${VERSION}" + SHA512 92890152f37e9e8b3961be2b8d2633f374ce1a16f4d78d8c6ea070a5ca35c08a75b71227465133b6ffd5bfb481246a73df4109f8b141fa83c7e22b0d31e6f903 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/fff.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/meekrosoft-fff/vcpkg.json b/ports/meekrosoft-fff/vcpkg.json new file mode 100644 index 00000000000000..61de59e87af913 --- /dev/null +++ b/ports/meekrosoft-fff/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "meekrosoft-fff", + "version": "1.1", + "description": "A testing micro framework for creating function test doubles", + "homepage": "https://github.com/meekrosoft/fff", + "license": "MIT" +} diff --git a/ports/mimicpp/portfile.cmake b/ports/mimicpp/portfile.cmake index 84b25c4f0175bb..cf17aa9e368609 100644 --- a/ports/mimicpp/portfile.cmake +++ b/ports/mimicpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DNKpp/mimicpp REF "v${VERSION}" - SHA512 48e17ed91d14cd466ad7216849363953793ee3a8d2fa2619600c6177eebcb04e6cd458eff7cbc1a589ae31eebfbb3fa862c430a5ef09e8e0dfbe601f540ae0dc + SHA512 e713c9d6accc2d1b4cf5b87f46537ec6fe0827b4b3ab9c3bcf437616b51859b229a8abc1fe1dbe41a76992289c4c5160a888a5e5a193cb43f8c6297a5700b529 HEAD_REF main ) diff --git a/ports/mimicpp/vcpkg.json b/ports/mimicpp/vcpkg.json index d68d0ed73eb1b1..42213ee950a2dd 100644 --- a/ports/mimicpp/vcpkg.json +++ b/ports/mimicpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimicpp", - "version": "4", + "version": "5", "description": "mimic++, a modern and (mostly) macro free mocking framework.", "homepage": "https://github.com/DNKpp/mimicpp", "license": "BSL-1.0", diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 28cffcd4d15eb1..fc22051883b69e 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/mlpack REF "${VERSION}" - SHA512 fd1612a2689e7e54bcbebb0b9da7d20aa6fe2fce395d544d476136d8de7f63a638bbbbab1bc2d00991649bcdf66ee6493ffdeed28c42121f98c82ee208c35947 + SHA512 2be9c3b8e2874ebbf9e39ade1d65774e1d7d08eea1427d592ef9f49f6a35a1441585749e043e058cbcb8f5e7eae4cf589b0f4931c59ae6c0fed74c32bac0f4b3 HEAD_REF master ) diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index dc3a5470d941fc..7e18c4be046846 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mlpack", - "version": "4.5.0", + "version": "4.5.1", "description": "mlpack is an intuitive, fast, and flexible header-only C++ machine learning library with bindings to other languages.", "homepage": "https://github.com/mlpack/mlpack", "license": "BSD-3-Clause", diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 83c480393e01c5..4a3854f105a7a9 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-dependencies.patch fix-include-directory.patch fix-mingw.patch + remove_abs_patch.cmake ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") file(TOUCH "${SOURCE_PATH}/src/utf8proc-editable") diff --git a/ports/mongo-c-driver/remove_abs_patch.cmake b/ports/mongo-c-driver/remove_abs_patch.cmake new file mode 100644 index 00000000000000..f68db18f4bf09e --- /dev/null +++ b/ports/mongo-c-driver/remove_abs_patch.cmake @@ -0,0 +1,13 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index 6e295d68fb..54ab225ba7 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -474,7 +474,7 @@ if (NOT WIN32) + mongoc_get_accept_args (MONGOC_SOCKET_ARG2 MONGOC_SOCKET_ARG3) + endif () + +-set (MONGOC_CC ${CMAKE_C_COMPILER}) ++cmake_path(GET CMAKE_C_COMPILER FILENAME MONGOC_CC) + set (MONGOC_USER_SET_CFLAGS ${CMAKE_C_FLAGS}) + set (MONGOC_USER_SET_LDFLAGS ${CMAKE_EXE_LINKER_FLAGS}) + diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index 144c98b692f395..ab334c1be405d7 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mongo-c-driver", "version": "1.29.1", + "port-version": 1, "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index f3d6a44c4125a9..22e2e6fed74dbb 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 620112ab91ad5fc0eb900b4b271cf40bac92ec728f0da2053dd42a80cc444910c3784f83c638b5aa1323cfa57308622b034b5c9275c4d2c92cbbbd7bb3eb1b08 + SHA512 7b6564cb5087b03886f3c99aa5da9e87a898b1bd1098393a7668e39d673d6203a39f7fa95e5bef995f5e53c18654ef1806823cf643a994a8c19a1df75b9eb306 HEAD_REF master PATCHES fix-dependencies.patch @@ -10,20 +10,9 @@ vcpkg_from_github( file(WRITE "${SOURCE_PATH}/build/VERSION_CURRENT" "${VERSION}") -# This port offered C++17 ABI alternative via features. -# This was reduced to boost only. -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - boost BSONCXX_POLY_USE_BOOST - INVERTED_FEATURES - boost BSONCXX_POLY_USE_STD - boost CMAKE_DISABLE_FIND_PACKAGE_Boost -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} "-DCMAKE_PROJECT_MONGO_CXX_DRIVER_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DBSONCXX_HEADER_INSTALL_DIR=include -DENABLE_TESTS=OFF @@ -31,7 +20,6 @@ vcpkg_cmake_configure( -DMONGOCXX_HEADER_INSTALL_DIR=include -DNEED_DOWNLOAD_C_DRIVER=OFF MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Boost BSONCXX_HEADER_INSTALL_DIR MONGOCXX_HEADER_INSTALL_DIR ) diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index b169fed42065de..54a35e19992034 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.11.0", + "version": "4.0.0", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", @@ -15,18 +15,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "boost": { - "description": [ - "Enables the Boost C++17 polyfill for bsoncxx.", - "Warning: This feature changes the ABI." - ], - "dependencies": [ - "boost-optional", - "boost-smart-ptr", - "boost-utility" - ] - } - } + ] } diff --git a/ports/msh3/dependencies_fix.patch b/ports/msh3/dependencies_fix.patch index db8eb244b8b051..4cde5fad7bcb54 100644 --- a/ports/msh3/dependencies_fix.patch +++ b/ports/msh3/dependencies_fix.patch @@ -1,45 +1,56 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4bd7155..b7adecc 100644 +index d8a81ab..edf5651 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,7 +72,7 @@ target_include_directories(msh3_headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -28,9 +28,6 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + if (WIN32) +- # Statically link the OS included part of the runtime. +- set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +- set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(QUIC_COMMON_DEFINES WIN32_LEAN_AND_MEAN SECURITY_WIN32) + # TODO - Get these to work on Linux + list(APPEND MSH3_COMMON_DEFINES VER_BUILD_ID=${MSH3_VER_BUILD_ID}) +@@ -66,7 +63,8 @@ target_include_directories(msh3_headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) option(LSQPACK_TESTS "Build tests" OFF) option(LSQPACK_BIN "Build binaries" OFF) -add_subdirectory(ls-qpack) +find_package(ls-qpack CONFIG REQUIRED) ++add_library(ls-qpack ALIAS ls-qpack::ls-qpack) # Configure and build msquic dependency. if (WIN32) -@@ -83,8 +83,9 @@ endif() +@@ -76,9 +74,11 @@ else() + endif() set(QUIC_BUILD_SHARED ON CACHE BOOL "Builds MsQuic as a dynamic library") set(QUIC_ENABLE_LOGGING ON CACHE BOOL "Enable MsQuic logging") - set(CMAKE_BUILD_TYPE "Release") +-set(CMAKE_BUILD_TYPE "Release") -add_subdirectory(msquic) -target_compile_features(inc INTERFACE cxx_std_20) +find_package(msquic CONFIG REQUIRED) -+ -+target_compile_features(msh3_headers INTERFACE cxx_std_20) ++# polyfill ++add_library(inc ALIAS msquic) ++add_library(platform ALIAS msquic) ++add_library(warnings ALIAS msquic) # Build msh3 library (and cmd line tool). add_subdirectory(lib) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index ab7fc24..c488486 100644 +index 4d7aeb7..6da8e1a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -7,10 +7,7 @@ else() +@@ -7,6 +7,8 @@ else() set(SOURCES msh3.cpp) endif() add_library(msh3 SHARED ${SOURCES}) --target_link_libraries(msh3 PRIVATE inc warnings msquic ls-qpack msh3_headers) --if (NOT BUILD_SHARED_LIBS) -- target_link_libraries(msh3 PRIVATE base_link) --endif() -+target_link_libraries(msh3 PRIVATE msquic ls-qpack::ls-qpack msh3_headers) - if (MSH3_SERVER_SUPPORT) - target_link_libraries(msh3 PRIVATE platform) # For selfsign APIs - endif() -@@ -26,7 +23,11 @@ elseif (CX_PLATFORM STREQUAL "darwin") ++target_compile_features(msh3 PRIVATE cxx_std_20) ++target_include_directories(msh3 PUBLIC $) + target_link_libraries(msh3 PRIVATE inc warnings msquic ls-qpack msh3_headers) + if (NOT BUILD_SHARED_LIBS) + target_link_libraries(msh3 PRIVATE base_link) +@@ -24,12 +26,16 @@ elseif (CX_PLATFORM STREQUAL "darwin") PROPERTIES LINK_FLAGS "-exported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/darwin/exports.txt\"") endif() @@ -50,10 +61,35 @@ index ab7fc24..c488486 100644 + LIBRARY DESTINATION lib +) install(FILES ../msh3.h DESTINATION include) - configure_file(msh3-config.cmake.in ${CMAKE_BINARY_DIR}/msh3-config.cmake) +-configure_file(msh3-config.cmake.in ${CMAKE_BINARY_DIR}/msh3-config.cmake) ++configure_file(msh3-config.cmake.in ${CMAKE_BINARY_DIR}/msh3-config.cmake @ONLY) install(FILES ${CMAKE_BINARY_DIR}/msh3-config.cmake DESTINATION share/msh3) + install(EXPORT msh3 DESTINATION share/msh3) +-configure_file(libmsh3.pc.in ${CMAKE_BINARY_DIR}/libmsh3.pc) +-if(NOT WIN32) ++configure_file(libmsh3.pc.in ${CMAKE_BINARY_DIR}/libmsh3.pc @ONLY) ++if(1) + install(FILES ${CMAKE_BINARY_DIR}/libmsh3.pc DESTINATION lib/pkgconfig) + endif() +diff --git a/lib/libmsh3.pc.in b/lib/libmsh3.pc.in +index f156204..aad76ab 100644 +--- a/lib/libmsh3.pc.in ++++ b/lib/libmsh3.pc.in +@@ -4,10 +4,10 @@ + prefix=/usr/local + exec_prefix=${prefix} + libdir=${exec_prefix}/lib +-includedir=${exec_prefix}/include ++includedir=${prefix}/include + + Name: libmsh3 + Description: Minimal HTTP/3 client on top of MsQuic + Version: 0.1.0 + Libs: -L${libdir} -lmsh3 +-Cflags: -I${includedir}/libmsh3 ++Cflags: -I${includedir} diff --git a/lib/msh3-config.cmake.in b/lib/msh3-config.cmake.in -index b4a54bf..a6a0fd2 100644 +index b4a54bf..540d56d 100644 --- a/lib/msh3-config.cmake.in +++ b/lib/msh3-config.cmake.in @@ -1,4 +1,4 @@ @@ -61,4 +97,4 @@ index b4a54bf..a6a0fd2 100644 @FILENAME_DEP_REPLACE@ -include(${SELF_DIR}/msh3.cmake) -+include(${CMAKE_INSTALL_PREFIX}/share/msh3/msh3.cmake) ++include("${CMAKE_CURRENT_LIST_DIR}/msh3.cmake") diff --git a/ports/msh3/portfile.cmake b/ports/msh3/portfile.cmake index 80a4323e28596a..2696a98861bb86 100644 --- a/ports/msh3/portfile.cmake +++ b/ports/msh3/portfile.cmake @@ -1,20 +1,18 @@ -set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nibanks/msh3 REF v${VERSION} - SHA512 e6ba4e8f4ce5cd3f586d61739148bf75dfddbe70f399b2e498e7d416c8d730a5f8c2c38f0eabe687049bb7525df44f5f511515ec578bc3832989f73961cdda72 + SHA512 dedd8be43e44b4bebbf601d76b1f3b0135501330ed128ca710de942ef7d9142a21f1c1eb9efecf57881e72d93d68c7c2c085bc35d402eac5eabc57e77773be6b HEAD_REF main PATCHES dependencies_fix.patch + width-exceeds-type.diff ) -vcpkg_find_acquire_program(PKGCONFIG) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) vcpkg_cmake_install() diff --git a/ports/msh3/vcpkg.json b/ports/msh3/vcpkg.json index ee931458263acc..8e5dccd0150282 100644 --- a/ports/msh3/vcpkg.json +++ b/ports/msh3/vcpkg.json @@ -1,11 +1,10 @@ { "name": "msh3", - "version": "0.6.0", - "port-version": 1, + "version": "0.7.0", "description": "Minimal HTTP/3 library", "homepage": "https://github.com/nibanks/msh3", "license": "MIT", - "supports": "!uwp", + "supports": "!(static & staticcrt)", "dependencies": [ "ls-qpack", "msquic", diff --git a/ports/msh3/width-exceeds-type.diff b/ports/msh3/width-exceeds-type.diff new file mode 100644 index 00000000000000..fabd7900c4c5fd --- /dev/null +++ b/ports/msh3/width-exceeds-type.diff @@ -0,0 +1,32 @@ +diff --git a/msh3.h b/msh3.h +index ebbdc20..c31b1b9 100644 +--- a/msh3.h ++++ b/msh3.h +@@ -374,7 +374,11 @@ typedef struct MSH3_REQUEST_EVENT { + bool AppCloseInProgress : 1; + bool ConnectionShutdownByApp : 1; + bool ConnectionClosedRemotely : 1; +- bool RESERVED : 5; ++ bool RESERVED : 1; ++ bool RESERVED_2 : 1; ++ bool RESERVED_3 : 1; ++ bool RESERVED_4 : 1; ++ bool RESERVED_5 : 1; + uint64_t ConnectionErrorCode; + MSH3_STATUS ConnectionCloseStatus; + } SHUTDOWN_COMPLETE; +@@ -487,7 +491,13 @@ typedef struct MSH3_LISTENER_EVENT { + union { + struct { + bool AppCloseInProgress : 1; +- bool RESERVED : 7; ++ bool RESERVED : 1; ++ bool RESERVED_2 : 1; ++ bool RESERVED_3 : 1; ++ bool RESERVED_4 : 1; ++ bool RESERVED_5 : 1; ++ bool RESERVED_6 : 1; ++ bool RESERVED_7 : 1; + } SHUTDOWN_COMPLETE; + struct { + MSH3_CONNECTION* Connection; diff --git a/ports/msquic/all_headers.patch b/ports/msquic/all_headers.patch deleted file mode 100644 index fb231040899ae6..00000000000000 --- a/ports/msquic/all_headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt -index d0592a320..07df9daf7 100644 ---- a/src/bin/CMakeLists.txt -+++ b/src/bin/CMakeLists.txt -@@ -269,6 +269,8 @@ set(PUBLIC_HEADERS - ../inc/msquic_posix.h - ../inc/quic_sal_stub.h) - -+file(GLOB PUBLIC_HEADERS "../inc/*.h" "../inc/*.hpp") -+ - install(TARGETS msquic EXPORT msquic - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib diff --git a/ports/msquic/exports-for-msh3.diff b/ports/msquic/exports-for-msh3.diff new file mode 100644 index 00000000000000..2daf4bc08663cf --- /dev/null +++ b/ports/msquic/exports-for-msh3.diff @@ -0,0 +1,56 @@ +diff --git a/src/bin/darwin/exports.txt b/src/bin/darwin/exports.txt +index e90b06e..c221d2c 100644 +--- a/src/bin/darwin/exports.txt ++++ b/src/bin/darwin/exports.txt +@@ -1,2 +1,6 @@ + _MsQuicOpenVersion + _MsQuicClose ++_CxPlatGetSelfSignedCert ++_CxPlatFreeSelfSignedCert ++_CxPlatLogAssert ++_quic_bugcheck +diff --git a/src/bin/linux/exports.txt b/src/bin/linux/exports.txt +index e11806a..424c443 100644 +--- a/src/bin/linux/exports.txt ++++ b/src/bin/linux/exports.txt +@@ -1,5 +1,9 @@ + msquic + { + global: MsQuicOpenVersion; MsQuicClose; ++ CxPlatGetSelfSignedCert; ++ CxPlatFreeSelfSignedCert; ++ CxPlatLogAssert; ++ quic_bugcheck; + local: *; + }; +diff --git a/src/bin/linux/init.c b/src/bin/linux/init.c +index 29bfa14..61bbc48 100644 +--- a/src/bin/linux/init.c ++++ b/src/bin/linux/init.c +@@ -9,8 +9,15 @@ Abstract: + + --*/ + ++#define QUIC_TEST_APIS 1 + #include "quic_platform.h" + ++void MsQuickChainLoadPlatformSymbolsNoOp() ++{ ++ QUIC_CREDENTIAL_CONFIG* SelfSignedCertParams = (QUIC_CREDENTIAL_CONFIG*)CxPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE, NULL); ++ CxPlatFreeSelfSignedCert(SelfSignedCertParams); ++} ++ + void + MsQuicLibraryLoad( + void +diff --git a/src/bin/winuser/msquic.def.in b/src/bin/winuser/msquic.def.in +index afaed5d..fa7d19a 100644 +--- a/src/bin/winuser/msquic.def.in ++++ b/src/bin/winuser/msquic.def.in +@@ -3,3 +3,6 @@ LIBRARY @QUIC_LIBRARY_NAME@ + EXPORTS + MsQuicOpenVersion + MsQuicClose ++ CxPlatGetSelfSignedCert ++ CxPlatFreeSelfSignedCert ++ CxPlatLogAssert diff --git a/ports/msquic/fix-install.patch b/ports/msquic/fix-install.patch index 5b462577402073..9ffb36f53223d6 100644 --- a/ports/msquic/fix-install.patch +++ b/ports/msquic/fix-install.patch @@ -1,38 +1,24 @@ diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt -index 2376823..d0592a3 100644 +index 18048e3..4fcd161 100644 --- a/src/bin/CMakeLists.txt +++ b/src/bin/CMakeLists.txt -@@ -253,14 +253,14 @@ endif() +@@ -11,6 +11,7 @@ endif() + if(BUILD_SHARED_LIBS) - target_include_directories(msquic PUBLIC - $ -- $) -+ $) - else() - target_include_directories(msquic_static INTERFACE - $ -- $) -+ $) - target_include_directories(msquic INTERFACE - $ -- $) -+ $) + add_library(msquic SHARED ${SOURCES}) ++ target_include_directories(msquic PUBLIC $) + target_link_libraries(msquic PRIVATE core msquic_platform inc warnings logging base_link main_binary_link_args) + set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME}) + if (NOT WIN32) +@@ -261,7 +262,10 @@ if(WIN32) endif() - set(PUBLIC_HEADERS -@@ -269,11 +269,10 @@ set(PUBLIC_HEADERS - ../inc/msquic_posix.h - ../inc/quic_sal_stub.h) - --if(BUILD_SHARED_LIBS) -- install(TARGETS msquic EXPORT msquic DESTINATION lib) --else() -- install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib) --endif() -+install(TARGETS msquic EXPORT msquic + if(BUILD_SHARED_LIBS) +- install(TARGETS msquic msquic_platform inc logging_inc warnings main_binary_link_args ${OTHER_TARGETS} EXPORT msquic DESTINATION lib) ++ install(TARGETS msquic EXPORT msquic + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) - install(FILES ${PUBLIC_HEADERS} DESTINATION include) - - configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake) + else() + install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib) + endif() diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake index c356c2f537ffa3..f0be5326f4fe83 100644 --- a/ports/msquic/portfile.cmake +++ b/ports/msquic/portfile.cmake @@ -1,32 +1,37 @@ +# Upstream supports static linkage, but the port doesn't: +# - There is a vendored fork of OpenSSL, needed for QUIC. +# - Exported config needs fixes. vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH QUIC_SOURCE_PATH REPO microsoft/msquic REF "v${VERSION}" - SHA512 51afee7e28a7d6ae1b5491edd635e0c88a92a00bacedeaac632a0f19762e9940c9b819a9d33072d3553c004acd4ec0cdf645301f712b408498053de065b2b1cf + SHA512 c6e4b5f5d9b7e92469a6733a99eaf677909a5b2287869f0bbcc61fbcda6db4a6e920b327ede43fc9b1b0a3d09518c568dc1f38ad5fbb3ace14c1c031012b9968 HEAD_REF master PATCHES fix-install.patch # Adjust install path of build outputs fix-uwp-crt.patch # https://github.com/microsoft/msquic/pull/4373 fix-comparing-system-processor-with-win32.patch # https://github.com/microsoft/msquic/pull/4374 - all_headers.patch + uwp-link-libs.diff + exports-for-msh3.diff ) -# This avoids a link error on x86-windows: -# LINK : fatal error LNK1268: inconsistent option 'NODEFAULTLIB:libucrt.lib' specified with /USEPROFILE but not with /GENPROFILE -file(REMOVE "${QUIC_SOURCE_PATH}/src/bin/winuser/pgo_x86/msquic.pgd") - -vcpkg_from_github( - OUT_SOURCE_PATH OPENSSL_SOURCE_PATH - REPO quictls/openssl - REF openssl-3.1.7-quic1 - SHA512 230f48a4ef20bfd492b512bd53816a7129d70849afc1426e9ce813273c01884d5474552ecaede05231ca354403f25e2325c972c9c7950ae66dae310800bd19e7 - HEAD_REF openssl-3.1.7+quic -) - -file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl3") -file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl3") +set(QUIC_TLS "schannel") +if("0-rtt" IN_LIST FEATURES) + set(QUIC_TLS "openssl3") + vcpkg_from_github( + OUT_SOURCE_PATH OPENSSL_SOURCE_PATH + REPO quictls/openssl + REF openssl-3.1.7-quic1 + SHA512 230f48a4ef20bfd492b512bd53816a7129d70849afc1426e9ce813273c01884d5474552ecaede05231ca354403f25e2325c972c9c7950ae66dae310800bd19e7 + HEAD_REF openssl-3.1.7+quic + ) + if(NOT EXISTS "${QUIC_SOURCE_PATH}/submodules/openssl3/Configure") + file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl3") + file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl3") + endif() +endif() vcpkg_from_github( OUT_SOURCE_PATH XDP_WINDOWS @@ -35,36 +40,44 @@ vcpkg_from_github( SHA512 1b26487fa79c8796d4b0d5e09f4fc9acb003d8e079189ec57a36ff03c9c2620829106fdbc4780e298872826f3a97f034d40e04d00a77ded97122874d13bfb145 HEAD_REF main ) - -file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/xdp-for-windows") -file(RENAME "${XDP_WINDOWS}" "${QUIC_SOURCE_PATH}/submodules/xdp-for-windows") +if(NOT EXISTS "${QUIC_SOURCE_PATH}/submodules/xdp-for-windows/published/external") + # headers only + file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/xdp-for-windows") + file(COPY "${XDP_WINDOWS}/published/external" DESTINATION "${QUIC_SOURCE_PATH}/submodules/xdp-for-windows/published") +endif() vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") -if(NOT VCPKG_HOST_IS_WINDOWS) +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_find_acquire_program(JOM) + cmake_path(GET JOM PARENT_PATH jom_dir) + vcpkg_add_to_path("${jom_dir}") +else() find_program(MAKE make) - get_filename_component(MAKE_EXE_PATH "${MAKE}" DIRECTORY) - vcpkg_add_to_path(PREPEND "${MAKE_EXE_PATH}") + cmake_path(GET MAKE PARENT_PATH make_dir) + vcpkg_add_to_path("${make_dir}") endif() if(VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(NASM) - get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) - vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") + cmake_path(GET NASM PARENT_PATH nasm_dir) + vcpkg_add_to_path("${nasm_dir}") endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" QUIC_BUILD_SHARED) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_cmake_configure( SOURCE_PATH "${QUIC_SOURCE_PATH}" OPTIONS -DQUIC_SOURCE_LINK=OFF - -DQUIC_TLS=openssl3 + -DQUIC_TLS=${QUIC_TLS} -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF -DQUIC_BUILD_PERF=OFF -DQUIC_BUILD_TEST=OFF + "-DQUIC_BUILD_SHARED=${QUIC_BUILD_SHARED}" "-DQUIC_STATIC_LINK_CRT=${STATIC_CRT}" "-DQUIC_STATIC_LINK_PARTIAL_CRT=${STATIC_CRT}" "-DQUIC_UWP_BUILD=${VCPKG_TARGET_IS_UWP}" @@ -73,7 +86,35 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -vcpkg_install_copyright(FILE_LIST "${QUIC_SOURCE_PATH}/LICENSE") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/debug/include" + +set(platform "") +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(platform "CX_PLATFORM_DARWIN") +elseif(NOT VCPKG_TARGET_IS_WINDOWS) + set(platform "CX_PLATFORM_LINUX") +endif() +if(platform) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quic_platform.h" + "#elif ${platform}" + "#elif 1 +#ifndef ${platform} +#define ${platform} +#endif") +elseif(VCPKG_TARGET_IS_UWP) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quic_platform.h" + "#elif _WIN32" + "#elif 1 +#ifndef QUIC_UWP_BUILD +#define QUIC_UWP_BUILD +#endif +#ifndef QUIC_RESTRICTED_BUILD +#define QUIC_RESTRICTED_BUILD +#endif") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) + +vcpkg_install_copyright(FILE_LIST "${QUIC_SOURCE_PATH}/LICENSE" "${QUIC_SOURCE_PATH}/THIRD-PARTY-NOTICES") diff --git a/ports/msquic/uwp-link-libs.diff b/ports/msquic/uwp-link-libs.diff new file mode 100644 index 00000000000000..3dc68923ea58cc --- /dev/null +++ b/ports/msquic/uwp-link-libs.diff @@ -0,0 +1,47 @@ +diff --git a/src/inc/CMakeLists.txt b/src/inc/CMakeLists.txt +index 48edebd..0a59ee6 100644 +--- a/src/inc/CMakeLists.txt ++++ b/src/inc/CMakeLists.txt +@@ -40,7 +40,7 @@ endif() + + if(WIN32) + if(QUIC_UWP_BUILD) +- target_link_libraries(base_link INTERFACE OneCore ws2_32 ntdll) ++ target_link_libraries(base_link INTERFACE OneCoreUap ws2_32 ntdll) + elseif(QUIC_GAMECORE_BUILD) + target_link_libraries(base_link INTERFACE ntdll advapi32) + if(NOT QUIC_EXTERNAL_TOOLCHAIN) +diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt +index 4a573ae..6fb5887 100644 +--- a/src/platform/CMakeLists.txt ++++ b/src/platform/CMakeLists.txt +@@ -60,7 +60,9 @@ if("${CX_PLATFORM}" STREQUAL "windows") + msquic_platform + PUBLIC + wbemuuid) ++ if(NOT QUIC_UWP_BUILD) + target_link_libraries(msquic_platform PUBLIC winmm) ++ endif() + elseif(QUIC_LINUX_XDP_ENABLED) + find_library(NL_LIB nl-3) + find_library(NL_ROUTE_LIB nl-route-3) +diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt +index 4bf8117..4468b19 100644 +--- a/submodules/CMakeLists.txt ++++ b/submodules/CMakeLists.txt +@@ -59,13 +59,13 @@ if (WIN32) + if (QUIC_UWP_BUILD) + # Translate target architecture into corresponding OpenSSL build flag + if (${SYSTEM_PROCESSOR} STREQUAL "arm64") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM-UWP") + elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") + set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") + elseif (${SYSTEM_PROCESSOR} STREQUAL "x86") + set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ONECORE") + elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-ONECORE") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-UWP") + else() + message(FATAL_ERROR "Unknown Generator Platform ${SYSTEM_PROCESSOR}") + endif() diff --git a/ports/msquic/vcpkg.json b/ports/msquic/vcpkg.json index 999620c8a1806f..0a263d79787e09 100644 --- a/ports/msquic/vcpkg.json +++ b/ports/msquic/vcpkg.json @@ -1,12 +1,19 @@ { "name": "msquic", - "version": "2.4.5", + "version": "2.4.7", "port-version": 1, "description": "Cross-platform, C implementation of the IETF QUIC protocol", "homepage": "https://github.com/microsoft/msquic", "license": "MIT", - "supports": "!((static & staticcrt) | uwp)", + "supports": "!mingw & !(static & staticcrt)", "dependencies": [ + { + "name": "msquic", + "features": [ + "0-rtt" + ], + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true @@ -15,5 +22,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "0-rtt": { + "description": [ + "Enable 0-RTT connection support.", + "This feature requires the use of (a fork of) OpenSSL 3 also on Windows." + ], + "license": "Apache-2.0" + } + } } diff --git a/ports/muparser/portfile.cmake b/ports/muparser/portfile.cmake index 23be2ecea43f8f..178176057acfc0 100644 --- a/ports/muparser/portfile.cmake +++ b/ports/muparser/portfile.cmake @@ -1,16 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beltoforion/muparser - REF 59e0ce1e0d35d42713af67788f19797945d81364 # v2.3.4 - SHA512 4d0261b9c155b2697ce7222d87ff19be781919e93154bf69455ce36432f66abe2a1ea80a59f7526990f7859f78259014ef56702aa5c7db2ac8c28c8e9491e1f5 + REF "v${VERSION}" + SHA512 48610dd112b5c8e1ea7615e29c9f9ca185091392b651794de039c14edfad4c62a6ae1d087393fdfd8d03a99f94a6e71275b86ddc8027234d322030bc7c25223e HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp ENABLE_OPENMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DENABLE_SAMPLES=OFF - -DENABLE_OPENMP=OFF -DENABLE_WIDE_CHAR=OFF ) @@ -20,9 +24,6 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/muparser") vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDef.h" "#if defined(_UNICODE)" "#if 0") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDLL.h" "#ifndef _UNICODE" "#if 1") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 0") else() diff --git a/ports/muparser/vcpkg.json b/ports/muparser/vcpkg.json index 6032c402d495a6..eb7b4a3fd00ecf 100644 --- a/ports/muparser/vcpkg.json +++ b/ports/muparser/vcpkg.json @@ -1,6 +1,6 @@ { "name": "muparser", - "version": "2.3.4", + "version": "2.3.5", "description": "Fast math parser library", "homepage": "https://github.com/beltoforion/muparser", "license": "BSD-2-Clause", @@ -14,5 +14,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "openmp": { + "description": "Enable OpenMP for multithreading" + } + } } diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index a2bd427ea362fc..e0532a42b323a9 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 507e4c5c558105fa9b9f4f5971d380c7759290524e674161e6944ead194bfe11ae5ba4af5203ab1a93502e2e6d763547aa67edc12a3ec8556501d056b5889042 + SHA512 e4ccad969819ed1a44015f3868da71dc855b0385e4399d606bb73c20cfbc4e5b86964919a64b661f88a46773435de0850ff53d1bf93cc9d5d3530179bd52dd5f HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index dcd4b9fcb90614..85c809f4602844 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.12.09.00", + "version-string": "2024.12.23.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebook/mvfst", "license": "MIT", diff --git a/ports/nanojsonc/portfile.cmake b/ports/nanojsonc/portfile.cmake index 0b9fc7806af858..a5e1b1aba3a0d7 100644 --- a/ports/nanojsonc/portfile.cmake +++ b/ports/nanojsonc/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-source-patterns/nanojsonc REF "${VERSION}" - SHA512 306fce8f90c1e5b9031f3f2b1cec5430722477425766fc05e430cceb03bb85188f2c451c0c7d34aed49b506e6a2cd835e419792362f992acbafc0b099fbe4b5e + SHA512 4cb73a0dc42bc6dbc106ed7bf7d22dbbadf3d92d2055d4b96990b62822978c09e580a87ca1666cf0b915b994fada6a1f6b803eb98d8da6b021a0a2c410d538ff HEAD_REF main ) diff --git a/ports/nanojsonc/vcpkg.json b/ports/nanojsonc/vcpkg.json index 48eb35f0ebb164..48109cd78fa874 100644 --- a/ports/nanojsonc/vcpkg.json +++ b/ports/nanojsonc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nanojsonc", - "version": "1.0.0", + "version": "1.1.0", "maintainers": "Saad Shams", "description": "Event-Driven JSON Parser for C", "homepage": "https://github.com/open-source-patterns/nanojsonc", diff --git a/ports/nanoprintf/portfile.cmake b/ports/nanoprintf/portfile.cmake index 6cbda191cd86e2..dbb06e02dcebb3 100644 --- a/ports/nanoprintf/portfile.cmake +++ b/ports/nanoprintf/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO charlesnicholson/nanoprintf REF "v${VERSION}" - SHA512 a82da24fcd176c385c8c2d1666416bcbafc3bf3e1b9e1365c8ffd7a0158485c7af6b0dbf7cd0821a7af55238784cd682a0f22fe37527b91ea3f3eaa702c61c46 + SHA512 4b0dffdbb0dc98b5e48b6f0d1d8a39407899a1601a47a4688879c6d47398c65bbe11ae4a06f70ee66d5c600ca0fad859cd11359be906181c722479555ec05ae1 HEAD_REF master ) diff --git a/ports/nanoprintf/vcpkg.json b/ports/nanoprintf/vcpkg.json index 7ed266d05662d4..e25cdfb95b1d6d 100644 --- a/ports/nanoprintf/vcpkg.json +++ b/ports/nanoprintf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nanoprintf", - "version": "0.3.4", + "version": "0.5.3", "description": "A tiny embeddable printf replacement written in C99", "homepage": "https://github.com/charlesnicholson/nanoprintf" } diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index a6bd0b8b604b11..908a4e1640445f 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 c5f8188b7c74a8162b4526d0d317f94db934eb75335c6ccc4f289d3e3592edb099b7cdc72d966db68140be99c3b6ebf34f5814d62a52b0dc4040d79fab2351cf + SHA512 558c8fc75a27030ec39888f75fc29c0087ab82dfc485be7b87edb1adedd89dbcec9e2800d7936a67f563fa1d84fc5f8f5728cbbb79de406f4f430dbc4b102af4 HEAD_REF main PATCHES ) @@ -10,8 +10,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SFPARSE_SOURCE_PATH REPO ngtcp2/sfparse - REF c2e010d064d58f7775aca1aa29df20dd2f534a9a - SHA512 5556878d9bfd190e537064e069ca71e76aa0e3bc9fc1d5eef24f1b413a6d3abc584024fb81e188d8ae148673db279e665064cb9971cf04568148782152bd9702 + REF 930bdf8421f29cf0109f0f1baaafffa376973ed5 + SHA512 67e1005d4ccf054a47dcb5f813429c7fc12e708cff19f5144447bf1d0863b107dec66e402e1cb223f1492762d38420b48b1e4c03849d69db1ebbb265e7b891ac HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index 1d24fdf6aa8e3b..bfd196824ce2ec 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "1.6.0", + "version": "1.7.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index e223a9df48714f..3f49e16c603e96 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 0fa71544d70080ed9b0373383aaf985c7ed162913a480371affb3131cb3bb55e9a9653896da3801f5b1d121fc654232f5e463298f8070413f309bb4a514898f8 + SHA512 ad435ff9462e4cf824122f2fc92c3998f430ac791ccc7ede464e51cb7beaa87f16d262b5dc3b2d32125864204a7c51b12712373296d030b14fe89dc50b7a9243 HEAD_REF main ) diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 434ef172fb477a..00e0dec5579624 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "1.9.1", + "version": "1.10.0", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/ports/nyan-lang/portfile.cmake b/ports/nyan-lang/portfile.cmake index ded5706d55c248..eee8bd867d5618 100644 --- a/ports/nyan-lang/portfile.cmake +++ b/ports/nyan-lang/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(VERSION 0.3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SFTtech/nyan REF "v${VERSION}" - SHA512 53411795142aa2dfd197d4e550a9de4f2e68519426a228d7e9fe162e8f113886ae5febbceef8daa643c60a9089ede4b5c8dda9c136617357b58279cc732efba6 + SHA512 2549e69f88f42b00bc9618c24031d5ff9588eb9249c973bc5eedb51634be619ad0e7118f1fb7f3abb31553763c0c95ce222e0f95f8e628e7b453b5c862b6bb7c HEAD_REF master ) diff --git a/ports/nyan-lang/vcpkg.json b/ports/nyan-lang/vcpkg.json index 3dcc1439db11da..93598fd8246b23 100644 --- a/ports/nyan-lang/vcpkg.json +++ b/ports/nyan-lang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nyan-lang", - "version": "0.3", + "version": "0.3.1", "description": "nyan is a data description language, It is a mixture of python, json, patch, wml, yaml and some new ideas.", "homepage": "https://github.com/SFTtech/nyan", "license": "LGPL-3.0-or-later", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 47fb0735771c34..8ac59576bbdfb1 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -53,6 +53,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "ade" WITH_ADE "calib3d" BUILD_opencv_calib3d + "carotene" WITH_CAROTENE "contrib" WITH_CONTRIB "cuda" WITH_CUBLAS "cuda" WITH_CUDA diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 9292a8baf91d96..56c8d886856d76 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.10.0", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -33,6 +33,9 @@ "calib3d": { "description": "calib3d module" }, + "carotene": { + "description": "carotene module" + }, "contrib": { "description": "opencv_contrib module", "dependencies": [ diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index e221f10104a2be..35187716907549 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openexr REF "v${VERSION}" - SHA512 78f237ce5ec6a4f122d0609bf48c2a9dfcb701e3ce5587906050fbf32d2115dae1984e7cce0f554edda0bd7ec35e4c7aacfc3d1dfb51ea8aa9feebb7f2b3db59 + SHA512 0c43337fda2979b328202488a43711afb5d680781c933aa0d74970a3dcda1135fbd01228cb10e81e4628c0d19da2d3e5b781e147d609cdc8a796d2a51a90932f HEAD_REF main ) diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index 079323ea15ca95..b2630382ec7073 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openexr", - "version": "3.3.1", + "version": "3.3.2", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/ports/openfbx/CMakeLists.txt b/ports/openfbx/CMakeLists.txt index 820b4442c2b799..9339b26d0c3a6c 100644 --- a/ports/openfbx/CMakeLists.txt +++ b/ports/openfbx/CMakeLists.txt @@ -6,10 +6,11 @@ set(CMAKE_CXX_STANDARD 11) include(GNUInstallDirs) -find_package(miniz REQUIRED) +find_package(libdeflate REQUIRED) add_library(openfbx src/ofbx.cpp) -target_link_libraries(openfbx PRIVATE miniz::miniz) +target_link_libraries(openfbx PRIVATE $,libdeflate::libdeflate_shared,libdeflate::libdeflate_static>) + target_include_directories(openfbx PUBLIC diff --git a/ports/openfbx/unofficial-openfbxConfig.cmake.in b/ports/openfbx/unofficial-openfbxConfig.cmake.in index 421787837f23e3..88e675917e9e16 100644 --- a/ports/openfbx/unofficial-openfbxConfig.cmake.in +++ b/ports/openfbx/unofficial-openfbxConfig.cmake.in @@ -1,8 +1,8 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(miniz) +find_dependency(libdeflate) include("${CMAKE_CURRENT_LIST_DIR}/unofficial-openfbxTargets.cmake") -check_required_components(miniz) +check_required_components(libdeflate) diff --git a/ports/openfbx/vcpkg.json b/ports/openfbx/vcpkg.json index 28f8685267f7af..a75946b3915f78 100644 --- a/ports/openfbx/vcpkg.json +++ b/ports/openfbx/vcpkg.json @@ -1,11 +1,12 @@ { "name": "openfbx", "version-date": "2024-05-08", + "port-version": 1, "description": "Lightweight open source FBX importer", "homepage": "https://github.com/nem0/OpenFBX", "license": "MIT", "dependencies": [ - "miniz", + "libdeflate", { "name": "vcpkg-cmake", "host": true diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake index e1067ff4fa9e54..5b3b32f1d04b6d 100644 --- a/ports/openmvg/portfile.cmake +++ b/ports/openmvg/portfile.cmake @@ -78,8 +78,10 @@ vcpkg_cmake_install() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/openMVG/") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/openMVG/cmake" "${CURRENT_PACKAGES_DIR}/share/openMVG/cmake") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG/cmake" "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/cmake") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG/cmake" "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/cmake") +endif() vcpkg_cmake_config_fixup() diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index ce69a4cd4be53b..e7405bc6e7c31c 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openmvg", "version": "2.1", + "port-version": 1, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": "MPL-2.0-no-copyleft-exception", "supports": "(x86 | x64 | arm64) & !xbox", diff --git a/ports/orange-math/portfile.cmake b/ports/orange-math/portfile.cmake new file mode 100644 index 00000000000000..5fa9c76272fd22 --- /dev/null +++ b/ports/orange-math/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orange-cpp/omath + REF "v${VERSION}" + SHA512 467b1abbdf5b9a7f49ed50824eaa4641f05d6088e84f40320b5c82a1bdbf685cc8d0f0a4f4ab6be49e3a8ed13103ee3e808dde3b556a00742f7b53c519c183e3 + HEAD_REF master +) + +file(READ "${SOURCE_PATH}/cmake/omathConfig.cmake.in" cmake_config) + +file(WRITE "${SOURCE_PATH}/cmake/omathConfig.cmake.in" +"${cmake_config} +check_required_components(omath) +") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOMATH_BUILD_TESTS=OFF + -DOMATH_THREAT_WARNING_AS_ERROR=OFF + -DOMATH_BUILD_AS_SHARED_LIBRARY=${BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/omath" PACKAGE_NAME "omath") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/orange-math/vcpkg.json b/ports/orange-math/vcpkg.json new file mode 100644 index 00000000000000..e2f116468103c1 --- /dev/null +++ b/ports/orange-math/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "orange-math", + "version": "1.0.1", + "description": "General purpose math library", + "homepage": "https://github.com/orange-cpp/omath", + "license": "MIT", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/pdal-dimbuilder/portfile.cmake b/ports/pdal-dimbuilder/portfile.cmake index 44383dbd887c4b..e40a008cff8a59 100644 --- a/ports/pdal-dimbuilder/portfile.cmake +++ b/ports/pdal-dimbuilder/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( #[[ Attention: pdal must be updated together with pdal-dimbuilder #]] - SHA512 1f9c4383fdbd4e10ef0b30b7148386692f8bd5f19b57a0323d92f2dc55a14fbc6a0d4d60c16c9604cbd3837c0ae8e3c88baebdefd534273952f92f01c5703554 + SHA512 7296fc73521bb3c01ea515a565f2b54402e08c147dd2d51ea09d611c59e502700b561f7495cb8cb36bf0b59b88dc3ed08ed068991bd739c16265a36e8c95b613 HEAD_REF master PATCHES namespace-nl.diff diff --git a/ports/pdal-dimbuilder/vcpkg.json b/ports/pdal-dimbuilder/vcpkg.json index 16bd99f5d69636..4a6664c04a902a 100644 --- a/ports/pdal-dimbuilder/vcpkg.json +++ b/ports/pdal-dimbuilder/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pdal-dimbuilder", - "version": "2.8.1", + "version": "2.8.3", "description": "A tool used by the PDAL build process", "homepage": "https://pdal.io/", "license": "BSD-3-Clause", diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 16267fc97fdb02..0c59a6746f910b 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( #[[ Attention: pdal-dimbuilder must be updated together with pdal #]] - SHA512 1f9c4383fdbd4e10ef0b30b7148386692f8bd5f19b57a0323d92f2dc55a14fbc6a0d4d60c16c9604cbd3837c0ae8e3c88baebdefd534273952f92f01c5703554 + SHA512 7296fc73521bb3c01ea515a565f2b54402e08c147dd2d51ea09d611c59e502700b561f7495cb8cb36bf0b59b88dc3ed08ed068991bd739c16265a36e8c95b613 HEAD_REF master PATCHES dependencies.diff diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index bc7eff9173dbae..e299793f076941 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pdal", - "version": "2.8.1", + "version": "2.8.3", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index f1041796e6ed27..1e99b950c5c9b2 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -23,6 +23,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) "PDCURSES_SRCDIR=${PDCURSES_SRCDIR}" WIDE=Y UTF8=Y + PLATFORM=${VCPKG_TARGET_ARCHITECTURE} ${DLL_OPTION} OPTIONS_RELEASE "CFLAGS=-D_CRT_SECURE_NO_WARNINGS" diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json index c9a136e3cfe797..f4ef1412402219 100644 --- a/ports/pdcurses/vcpkg.json +++ b/ports/pdcurses/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdcurses", "version": "3.9", - "port-version": 6, + "port-version": 7, "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", "homepage": "https://pdcurses.org/", "license": null, diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 3d98b0375f92e3..8a41bc4044d328 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -2,15 +2,15 @@ # Port for Omniverse PhysX 5 - NVIDIA Corporation # Written by Marco Alesiani # Note: this port is NOT officially supported by NVIDIA. -# This port is also not a replacement for the 'physx' port: the newest Omniverse PhysX dropped support -# for many platforms so the old one will continue to be community maintained to support all previous platforms. +# This port is also not a replacement for the old 'physx' port: the newest Omniverse PhysX dropped support +# for many platforms so older versions are still needed to support all previous platforms. ############################################################################################################### vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIA-Omniverse/PhysX - REF 105.1-physx-5.3.0 # newest tag - SHA512 fa3897738aed583f0498587365aafc77107351d72888058d0b725bd39de1c33b37c99294b6346be165eaf3aa3c6228ca7ddb0a3b18e522c1fb79e2559d70b551 + REF 106.4-physx-5.5.0 # newest tag + SHA512 93ad438db81e9dc095741c837c0e797b56b35d6b77c7d1b1367b11bcbcb4ee1b8ff2affc27624d06829ac5e979f08d506fe727851fc383724e6633b775752d82 HEAD_REF main ) @@ -25,23 +25,20 @@ else() set(VCPKG_LINK_CRT_STATICALLY FALSE) endif() -# Target platform detection for packman (the NVIDIA dependency downloader) and CMake options settings +# Adjust CMake options settings based on the target platform if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(PLATFORM_OPTIONS -DPX_BUILDSNIPPETS=OFF -DPX_BUILDPVDRUNTIME=OFF -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS} ) - set(targetPlatform "linux") elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(PLATFORM_OPTIONS -DPX_BUILDSNIPPETS=OFF -DPX_BUILDPVDRUNTIME=OFF -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS} ) - set(targetPlatform "linuxAarch64") elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(PLATFORM_OPTIONS -DPX_BUILDSNIPPETS=OFF -DPX_BUILDPVDRUNTIME=OFF @@ -49,27 +46,19 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") -DNV_USE_STATIC_WINCRT=${VCPKG_LINK_CRT_STATICALLY} -DPX_FLOAT_POINT_PRECISE_MATH=OFF ) - - # Note: it would have been more correct to specify "win64" here, but we specify this so that packman can download - # the right dependencies on windows (see the "platforms" field in the dependencies.xml), that will also later - # set up the correct PM_xxx environment variables that we can pass to the cmake generation invocation to find - # whatever the PhysX project needs. Note that vc17(2022) is not required: the latest repo is guaranteed to work - # with vc15, vc16 and vc17 on x64 Windows. The binaries for these platforms downloaded by packman should be the same. - set(targetPlatform "vc17win64") else() message(FATAL_ERROR "Unsupported platform/architecture combination") endif() - ######################## Download required deps ############################## set($ENV{PM_PATHS} "") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.1-5.3.4207.33265367-windows-public.7z" + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%405.5.0.2aa3c8a3-release-106.4-windows-public.7z" FILENAME "PhysXGpu.7z" - SHA512 010b4c135026a15710b2e0d0d503197456f8f9d2eb291b32df65aa3dbeff09ba0877c52af1724f7a9384af727657d247cabf9c330e11c7ae1e1be5d1b89dce81 + SHA512 84f2ba50ae89ebc959d8e35e99750a9fefddd51ba13d0bd96eac08d91b3de658508cb712e4ba253ed2d1be68589e0860747bf0bb324cbb2312574eb686aca06b ) # 7z might not be preinstalled on Win machines @@ -82,11 +71,19 @@ if(VCPKG_TARGET_IS_WINDOWS) LOGNAME "extract-PhysXGpu" ) else() - vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.1-5.3.4207.33265367-linux-x86_64-public.7z" - FILENAME "PhysXGpu.7z" - SHA512 a6209a7d4218e80c3cbeec10a80ca3aaa08793469ddcf01ed8bc4582beef0b13697e1bb91f3a59cfdbdfe9652fe22d7569be4de9f0d08a9525a60951c2989acd - ) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%405.5.0.2aa3c8a3-release-106.4-linux-aarch64-public.7z" + FILENAME "PhysXGpu.7z" + SHA512 92f47df4b7d6e1da21249acd4d13ce54a8ad6d5d21d9bb65e6a1af8b83494d22eb621fe77cde2fcea61ad56048894c9b73cded7193c7519ff62ee7e23c6d83e3 + ) + else() + vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%405.5.0.2aa3c8a3-release-106.4-linux-x86_64-public.7z" + FILENAME "PhysXGpu.7z" + SHA512 4728bd0c37f1c931e31b1aa3354d45f157ca4930199840cb98524f02fa0422f7e6f72dce860111c6494b0bde8944a758e9dd8940d7015057e528d4db98d6bd0c + ) + endif() vcpkg_extract_source_archive(PHYSXGPU_SOURCE_PATH NO_REMOVE_ONE_LEVEL @@ -100,9 +97,9 @@ list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXGpu_PATH}) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXDevice%4018.12.7.4.7z" + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXDevice%4018.12.7.6.7z" FILENAME "PhysXDevice.7z" - SHA512 c20eb2f1e0dcb9d692cb718ca7e3a332291e72a09614f37080f101e5ebc1591033029f0f1e6fba33a17d4c9f59f13e561f3fc81cee34cd53d50b579c01dd3f3c + SHA512 0b75ea060a63f307a63ebfd5867cec06ab431a4b1a41e65d0a1ff7be115daf9ce080222128bdeb6d424ffa0aa9343c495455e814be424db1ce11cce8e760d5ff ) set(ENV{PM_PhysXDevice_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXDevice_dep") @@ -117,7 +114,7 @@ endif() message(STATUS "Extracted dependency to $ENV{PM_PhysXDevice_PATH}") list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXDevice_PATH}) -if(targetPlatform STREQUAL "vc17win64") +if(VCPKG_TARGET_IS_WINDOWS) set(ENV{PM_freeglut_PATH} "${CURRENT_BUILDTREES_DIR}/freeglut_dep") file(MAKE_DIRECTORY "$ENV{PM_freeglut_PATH}") vcpkg_download_distfile(ARCHIVE @@ -135,45 +132,31 @@ if(targetPlatform STREQUAL "vc17win64") list(APPEND ENV{PM_PATHS} $ENV{PM_freeglut_PATH}) endif() -######################## Now generate ALL cmake parameters according to our distribution ############################## +######################## Now generate ALL CMake parameters according to our distribution ############################## set(PHYSX_ROOT_DIR "${SOURCE_PATH}/physx") # Set common parameters set(common_params -DCMAKE_PREFIX_PATH=$ENV{PM_PATHS} -DPHYSX_ROOT_DIR=${PHYSX_ROOT_DIR} -DPX_OUTPUT_LIB_DIR=${PHYSX_ROOT_DIR} -DPX_OUTPUT_BIN_DIR=${PHYSX_ROOT_DIR}) -# Set platform and compiler specific parameters -if(targetPlatform STREQUAL "linuxAarch64") +# Set platform and compiler specific parameters (physx expects binaries to live in these locations) +if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/linux-aarch64/PhysX) set(platformCMakeParams -DTARGET_BUILD_PLATFORM=linux -DPX_OUTPUT_ARCH=arm) -elseif(targetPlatform STREQUAL "linux") +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/linux/PhysX) set(platformCMakeParams -DTARGET_BUILD_PLATFORM=linux -DPX_OUTPUT_ARCH=x86) -elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win64 +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") # Note: this will work for any Win64, default is vc17win64 set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/vc17win64/PhysX) set(platformCMakeParams -DTARGET_BUILD_PLATFORM=windows -DPX_OUTPUT_ARCH=x86) endif() -# Also make sure the packman-downloaded GPU driver is found as a binary +# Also make sure the downloaded GPU driver is found as a binary list(APPEND platformCMakeParams -DPHYSX_PHYSXGPU_PATH=$ENV{PM_PhysXGpu_PATH}/bin) -# Anyway the above only works for clang, see -# source/compiler/cmake/linux/CMakeLists.txt:164 -# to avoid problems, we copy _immediately_ the extra binaries -if(targetPlatform STREQUAL "linuxAarch64") - file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.aarch64/checked/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.aarch64/debug") - file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.aarch64/release/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.aarch64/release") -elseif(targetPlatform STREQUAL "linux") - file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.clang/checked/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.clang/debug") - file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.clang/release/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.clang/release") -elseif(targetPlatform STREQUAL "vc17win64") - file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/win.x86_64.vc141.mt/checked/PhysXGpu_64.dll" DESTINATION "${SOURCE_PATH}/physx/bin/vc17win64/debug") - file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/win.x86_64.vc141.mt/release/PhysXGpu_64.dll" DESTINATION "${SOURCE_PATH}/physx/bin/vc17win64/release") -endif() - set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams}) -# Finally invoke cmake to configure the PhysX project +# Finally invoke physx's CMake to configure the PhysX project vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" GENERATOR "${generator}" @@ -201,7 +184,7 @@ message("[PHYSX BUILD COMPLETED] Extracting build artifacts to vcpkg installatio # Artifacts paths are similar to //[artifact] however vcpkg expects # libraries, binaries and headers to be respectively in ${CURRENT_PACKAGES_DIR}/lib or ${CURRENT_PACKAGES_DIR}/debug/lib, # ${CURRENT_PACKAGES_DIR}/bin or ${CURRENT_PACKAGES_DIR}/debug/bin and ${CURRENT_PACKAGES_DIR}/include. -# This function accepts a DIRECTORY named variable specifying the 'lib' or 'bin' destination directory and a SUFFIXES named +# This function accepts a variable named DIRECTORY specifying the 'lib' or 'bin' destination directory and a SUFFIXES named # variable which specifies a list of suffixes to extract in that folder (e.g. all the .lib or .pdb) function(copy_in_vcpkg_destination_folder_physx_artifacts) macro(_copy_up _IN_DIRECTORY _OUT_DIRECTORY) @@ -218,16 +201,22 @@ function(copy_in_vcpkg_destination_folder_physx_artifacts) cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN}) _copy_up("bin/*/release" "${_fpa_DIRECTORY}") # could be physx/bin/linux.clang/release or physx/bin/win.x86_64.vc142.mt/release - _copy_up("bin/*/debug" "debug/${_fpa_DIRECTORY}") + if(NOT VCPKG_BUILD_TYPE) + _copy_up("bin/*/debug" "debug/${_fpa_DIRECTORY}") + endif() endfunction() # Create output directories file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Packman also downloads the Gpu driver shared library, so we'll place it in bin and debug/bin + # We'll also place the Gpu driver shared library in bin and debug/bin file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() endif() copy_in_vcpkg_destination_folder_physx_artifacts( @@ -248,9 +237,9 @@ endif() # This is a 3rd party "optional functionality" dependency. file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") set(GPULIBNAMES "") -if(targetPlatform STREQUAL "linuxAarch64" OR targetPlatform STREQUAL "linux") +if(VCPKG_TARGET_IS_LINUX) # Both for arm and x64 list(APPEND GPULIBNAMES "libPhysXGpu_64.so" "libPhysXDevice64.so") -elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win64 +elseif(VCPKG_TARGET_IS_WINDOWS) list(APPEND GPULIBNAMES "PhysXGpu_64.dll" "PhysXDevice64.dll") endif() @@ -288,8 +277,11 @@ file(REMOVE_RECURSE # Install the cmake config that users will use, replace -if any- only @variables@ configure_file("${CMAKE_CURRENT_LIST_DIR}/omniverse-physx-sdk-config.cmake" "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk/unofficial-omniverse-physx-sdk-config.cmake" @ONLY) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share/") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") + file(COPY "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share/") +endif() +# Fixup to repackage the CMake config as 'unofficial-omniverse-physx-sdk' vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-omniverse-physx-sdk CONFIG_PATH share/omniverse-physx-sdk) @@ -298,7 +290,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) -if(targetPlatform STREQUAL "vc17win64") +if(VCPKG_TARGET_IS_WINDOWS) # Remove freeglut (cannot be skipped in public release builds, but unnecessary) file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/freeglut.dll" diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index 5d098b177307b4..dc3913c0679177 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "physx", - "version": "5.3.0", + "version": "5.5.0", "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port is NOT officially supported by NVIDIA.", "homepage": "https://github.com/NVIDIA-Omniverse/PhysX", "license": "BSD-3-Clause", diff --git a/ports/poco/0001-static-pcre.patch b/ports/poco/0001-static-pcre.patch index 4469310e2b3ac4..f6b85fa31894af 100644 --- a/ports/poco/0001-static-pcre.patch +++ b/ports/poco/0001-static-pcre.patch @@ -1,10 +1,10 @@ diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt -index f504bc1..226dadb 100644 +index 5898d22..d8df9dc 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt -@@ -109,6 +109,23 @@ set_target_properties(Foundation +@@ -101,6 +101,23 @@ set_target_properties(Foundation if(POCO_UNBUNDLED) - target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB) + target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB Utf8Proc::Utf8Proc) target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) + add_definitions( + -D_pcre2_utf8_table1=_poco_pcre2_utf8_table1 @@ -23,6 +23,6 @@ index f504bc1..226dadb 100644 + -D_pcre2_utt_names_8=_poco_pcre2_utt_names_8 + -D_pcre2_utt_size_8=_poco_pcre2_utt_size_8 + ) + else() + target_compile_definitions(Foundation PUBLIC UTF8PROC_STATIC) endif(POCO_UNBUNDLED) - - target_include_directories(Foundation diff --git a/ports/poco/0003-fix-dependency.patch b/ports/poco/0003-fix-dependency.patch index a17e6e8d28e479..b2055ff14092fd 100644 --- a/ports/poco/0003-fix-dependency.patch +++ b/ports/poco/0003-fix-dependency.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c552091..8842c76 100644 +index 861c27c..d2701ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -90,8 +90,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) +@@ -80,8 +80,6 @@ option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" OFF) if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) find_package(OpenSSL REQUIRED) @@ -11,7 +11,7 @@ index c552091..8842c76 100644 endif() if(OPENSSL_FOUND) -@@ -121,24 +119,19 @@ else() +@@ -111,24 +109,19 @@ else() option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) endif() @@ -44,7 +44,7 @@ index c552091..8842c76 100644 endif() if(PostgreSQL_FOUND) -@@ -223,6 +216,9 @@ include(DefinePlatformSpecifc) +@@ -260,6 +253,9 @@ include(DefinePlatformSpecific) # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file set(Poco_COMPONENTS "") @@ -54,7 +54,7 @@ index c552091..8842c76 100644 if(ENABLE_TESTS) add_subdirectory(CppUnit) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) -@@ -351,8 +347,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Prometheus AND ENABLE_PROMETHEUS) +@@ -392,8 +388,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Prometheus AND ENABLE_PROMETHEUS) list(APPEND Poco_COMPONENTS "Prometheus") endif() @@ -68,27 +68,11 @@ index c552091..8842c76 100644 list(APPEND Poco_COMPONENTS "PDF") endif() -@@ -492,15 +491,6 @@ install( - Devel - ) - --if(POCO_UNBUNDLED) -- install(FILES cmake/FindPCRE2.cmake -- DESTINATION "${PocoConfigPackageLocation}") -- install(FILES cmake/V39/FindEXPAT.cmake -- DESTINATION "${PocoConfigPackageLocation}/V39") -- install(FILES cmake/V313/FindSQLite3.cmake -- DESTINATION "${PocoConfigPackageLocation}/V313") --endif() -- - message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") - message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") - if(BUILD_SHARED_LIBS) diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt -index 0772af6..ec82d76 100644 +index 95e5019..d7bd537 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt -@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE) +@@ -73,7 +73,7 @@ else(ENABLE_DATA_SQLITE) message(STATUS "SQLite Support Disabled") endif() @@ -98,7 +82,7 @@ index 0772af6..ec82d76 100644 add_subdirectory(MySQL) else() diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt -index ce411cf..5a30b7c 100644 +index 0ea8701..3c8a426 100644 --- a/Data/MySQL/CMakeLists.txt +++ b/Data/MySQL/CMakeLists.txt @@ -21,7 +21,7 @@ set_target_properties(DataMySQL @@ -124,7 +108,7 @@ index 2386590..81b2c8e 100644 #endif diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt -index 3a176d7..d8055cb 100644 +index 7141112..0c73beb 100644 --- a/Data/SQLite/CMakeLists.txt +++ b/Data/SQLite/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") @@ -136,7 +120,7 @@ index 3a176d7..d8055cb 100644 else() # sqlite3 POCO_SOURCES(SQLITE_SRCS sqlite3 -@@ -43,7 +43,7 @@ target_include_directories(DataSQLite +@@ -39,7 +39,7 @@ target_include_directories(DataSQLite ) if(POCO_UNBUNDLED) @@ -146,7 +130,7 @@ index 3a176d7..d8055cb 100644 POCO_UNBUNDLED SQLITE_THREADSAFE=1 diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt -index 123657a..9856c55 100644 +index cf66250..89e6c8f 100644 --- a/XML/CMakeLists.txt +++ b/XML/CMakeLists.txt @@ -20,7 +20,7 @@ endif() diff --git a/ports/poco/0005-fix-error-c3861.patch b/ports/poco/0005-fix-error-c3861.patch index dc029c6007e860..36bcd9a5eed880 100644 --- a/ports/poco/0005-fix-error-c3861.patch +++ b/ports/poco/0005-fix-error-c3861.patch @@ -1,7 +1,7 @@ -diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h -index e0c8455..363654c 100644 ---- a/XML/include/Poco/XML/ParserEngine.h -+++ b/XML/include/Poco/XML/ParserEngine.h +diff --git a/XML/src/ParserEngine.h b/XML/src/ParserEngine.h +index f74b553..c638778 100644 +--- a/XML/src/ParserEngine.h ++++ b/XML/src/ParserEngine.h @@ -19,6 +19,7 @@ #include "Poco/XML/XML.h" @@ -9,4 +9,4 @@ index e0c8455..363654c 100644 +#include #include #else - #include "Poco/XML/expat.h" + #include "expat.h" diff --git a/ports/poco/0007-find-pcre2.patch b/ports/poco/0007-find-pcre2.patch index 6ad4785b99cb33..638750b5f32291 100644 --- a/ports/poco/0007-find-pcre2.patch +++ b/ports/poco/0007-find-pcre2.patch @@ -1,29 +1,15 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8842c76..b887168 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -491,6 +491,11 @@ install( - Devel - ) - -+if(POCO_UNBUNDLED) -+ install(FILES cmake/FindPCRE2.cmake -+ DESTINATION "${PocoConfigPackageLocation}") -+endif() -+ - message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") - message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") - if(BUILD_SHARED_LIBS) diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt -index 226dadb..a3765a7 100644 +index d8df9dc..fe2b000 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt -@@ -35,8 +35,11 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) +@@ -27,9 +27,12 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) # If POCO_UNBUNDLED is enabled we try to find the required packages # The configuration will fail if the packages are not found if(POCO_UNBUNDLED) - find_package(PCRE2 REQUIRED) find_package(ZLIB REQUIRED) +- find_package(Utf8Proc REQUIRED) ++ find_package(unofficial-utf8proc CONFIG REQUIRED) + include(SelectLibraryConfigurations) + find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) + find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) @@ -31,12 +17,12 @@ index 226dadb..a3765a7 100644 #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library POCO_SOURCES(SRCS RegExp -@@ -107,7 +110,7 @@ set_target_properties(Foundation +@@ -99,7 +102,7 @@ set_target_properties(Foundation ) if(POCO_UNBUNDLED) -- target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB) -+ target_link_libraries(Foundation PUBLIC ${PCRE2_LIBRARY} ZLIB::ZLIB) +- target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB Utf8Proc::Utf8Proc) ++ target_link_libraries(Foundation PUBLIC ${PCRE2_LIBRARY} ZLIB::ZLIB utf8proc) target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) add_definitions( -D_pcre2_utf8_table1=_poco_pcre2_utf8_table1 diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 2786cfdde4e9b1..4540dfbc18cc37 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco REF "poco-${VERSION}-release" - SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92 + SHA512 4475a0ede5d06e4ce9537295fec92fa39b8fd5635d1cfb38498be4f707bc62b4a8b57672d2a15b557114e4115cc45480d27d0c856b7bd982eeec7adad9ff2582 HEAD_REF devel PATCHES # Fix embedded copy of pcre in static linking mode @@ -33,7 +33,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS crypto ENABLE_CRYPTO netssl ENABLE_NETSSL pdf ENABLE_PDF - sqlite3 ENABLE_DATA_SQLITE postgresql ENABLE_DATA_POSTGRESQL ) diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index dd891170cb8304..a7254d3a4c95be 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,7 +1,6 @@ { "name": "poco", - "version": "1.13.3", - "port-version": 1, + "version": "1.14.0", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", @@ -9,6 +8,8 @@ "dependencies": [ "expat", "pcre2", + "sqlite3", + "utf8proc", { "name": "vcpkg-cmake", "host": true @@ -64,12 +65,6 @@ "dependencies": [ "libpqxx" ] - }, - "sqlite3": { - "description": "Sqlite3 support for POCO", - "dependencies": [ - "sqlite3" - ] } } } diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index 337e2902f40f77..78d41147fc7a2c 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp REF "v${VERSION}" - SHA512 8c15492054189b736e502258c30aaaae0fac3c9ea61907260e6e3cd29fe4077451f9e49fd580508aa6e21691209545d9cf87011be5b046fa097a53a133167553 + SHA512 e397f25c7a62d410d19be5e926cfb38175c89755e4ff9d67f06b905036daa82b0dfbe21fcc69438fc1c1e5d04f120ef7ff983ca9411ab198a3911992efb00093 HEAD_REF master ) diff --git a/ports/prometheus-cpp/vcpkg.json b/ports/prometheus-cpp/vcpkg.json index a4a8fffa17b055..763137fc4d4c40 100644 --- a/ports/prometheus-cpp/vcpkg.json +++ b/ports/prometheus-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "prometheus-cpp", - "version-semver": "1.2.4", + "version-semver": "1.3.0", "description": "Prometheus Client Library for Modern C++", "license": "MIT", "dependencies": [ diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 091ba12563073c..ab44f3e98ee2b5 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 297a1d652d1a92194d96e14e443981f289b5b60651f530976d1ec6f9a01a8333aa0610cf41831aeb2369346fa2aa621f49620259a95743146f9a6b7a92a0de98 + SHA512 8b7c16735e214730db2ce29f9aa37e9a947fedcf003b3fc6389ae7b24019a65c0f812afd9e1e71dbc31f5b33cf78792f2996462caea57e6333af002ecf86565f HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index f8ddc503c183ad..6b46b973ae3814 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.12.09.00", + "version-string": "2024.12.23.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/ptex/portfile.cmake b/ports/ptex/portfile.cmake index bb0abba4261a74..4ed1d3e2c04af2 100644 --- a/ports/ptex/portfile.cmake +++ b/ports/ptex/portfile.cmake @@ -24,9 +24,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ptex ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/ptex.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ptex.pc") -file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ptex.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") +if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ptex.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") +endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") diff --git a/ports/ptex/vcpkg.json b/ports/ptex/vcpkg.json index f946667f3eb1b2..682b7c1915b9b3 100644 --- a/ports/ptex/vcpkg.json +++ b/ports/ptex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ptex", "version": "2.4.3", + "port-version": 1, "description": "Per-Face Texture Mapping for Production Rendering.", "homepage": "https://github.com/wdas/ptex", "license": "BSD-3-Clause", diff --git a/ports/qtbase/macdeployqt-symlinks.patch b/ports/qtbase/macdeployqt-symlinks.patch new file mode 100644 index 00000000000000..ce6fe71f642111 --- /dev/null +++ b/ports/qtbase/macdeployqt-symlinks.patch @@ -0,0 +1,33 @@ +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 6ff269b..caffd44 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1,4 +1,5 @@ + // Copyright (C) 2016 The Qt Company Ltd. ++ + // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + #include + #include +@@ -85,7 +86,21 @@ + } + } + +- if (QFile::copy(from, to)) { ++ QFileInfo fromFileInfo(from); ++ ++ if (fromFileInfo.isSymLink()) { ++ const QString fromSymLinkTarget = fromFileInfo.absoluteDir().relativeFilePath(fromFileInfo.symLinkTarget()); ++ if (QFile::link(fromSymLinkTarget, to)) { ++ return copyFilePrintStatus(fromFileInfo.absoluteDir().absoluteFilePath(fromSymLinkTarget), QFileInfo(to).absoluteDir().absoluteFilePath(fromSymLinkTarget)); ++ } ++ else { ++ LogError() << "symlink copy failed from" << from; ++ LogError() << " to" << to; ++ return false; ++ } ++ ++ } ++ else if (QFile::copy(from, to)) { + QFile dest(to); + dest.setPermissions(dest.permissions() | QFile::WriteOwner | QFile::WriteUser); + LogNormal() << " copied:" << from; diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index b2cc13d0d38d46..de590a1a67d4a9 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -22,6 +22,7 @@ set(${PORT}_PATCHES fix-host-aliasing.patch fix_deploy_windows.patch fix-link-lib-discovery.patch + macdeployqt-symlinks.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index b41e62a2c83a68..bcb7a4ee6252c3 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.8.1", + "port-version": 1, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index cd6d453e650c41..4ed0070642ce2a 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -50,10 +50,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") - - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw") endif() vcpkg_copy_pdbs() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 80a2cb8879d57b..9c42753c9a7970 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "realsense2", "version": "2.56.2", - "port-version": 1, + "port-version": 2, "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", diff --git a/ports/recycle/portfile.cmake b/ports/recycle/portfile.cmake index 597585a900e570..01438f69ea40e4 100644 --- a/ports/recycle/portfile.cmake +++ b/ports/recycle/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO steinwurf/recycle REF "${VERSION}" - SHA512 7fff2d8d8da0613d330d58b0f82fafd7fc20b78ac2588ba9743dc8033f130acaf29b37f4c2c02f8b39fc8d5b352f589c6e8398420161124a7143ca4ca6521512 + SHA512 c30cd3d388eeeea6a3db344e0e448878686c4a7bc106260c7de9d1eeb3477435eb1783bca09151356ba51200ecf14182891f97a38943959032c54b17ea0abac3 ) vcpkg_cmake_configure( diff --git a/ports/recycle/vcpkg.json b/ports/recycle/vcpkg.json index 2f48481b3b4b9f..5dbd9178daff8b 100644 --- a/ports/recycle/vcpkg.json +++ b/ports/recycle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "recycle", - "version": "6.0.0", + "version": "7.0.0", "description": "Simple resource pool for recycling resources in C++", "homepage": "https://github.com/steinwurf/recycle", "license": "BSD-3-Clause", diff --git a/ports/ruapu/portfile.cmake b/ports/ruapu/portfile.cmake new file mode 100644 index 00000000000000..9d218548fa6c0e --- /dev/null +++ b/ports/ruapu/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library +set(VCPKG_BUILD_TYPE release) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nihui/ruapu + REF "${VERSION}" + SHA512 efc74fde9e08637a5a888cfcbca000c1e7fe8095be5e59415c54c535cc2be496a4efe8aa66aac5dfbb1ae3385ba7762eb8bfd83ddbdf21720c7561707c287e45 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/ruapu.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ruapu/vcpkg.json b/ports/ruapu/vcpkg.json new file mode 100644 index 00000000000000..d0bb5e67a666c4 --- /dev/null +++ b/ports/ruapu/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ruapu", + "version": "0.1.0", + "description": "Detect CPU features with single-file", + "homepage": "https://github.com/nihui/ruapu", + "license": "MIT" +} diff --git a/ports/ryu/CMakeLists.txt b/ports/ryu/CMakeLists.txt new file mode 100644 index 00000000000000..2a7b5a160d06a9 --- /dev/null +++ b/ports/ryu/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.30) +project(ryu LANGUAGES C) + +add_library(ryu + "ryu/f2s.c" + "ryu/d2s.c" + "ryu/d2s.h" + "ryu/d2s_full_table.h" + "ryu/d2s_intrinsics.h" + "ryu/digit_table.h" + "ryu/common.h" + "ryu/ryu.h" +) + +target_include_directories(ryu PUBLIC + $ + $ +) + +add_library(ryu_printf + "ryu/d2fixed.c" + "ryu/d2s_intrinsics.h" + "ryu/d2fixed_full_table.h" + "ryu/digit_table.h" + "ryu/common.h" + "ryu/ryu2.h" +) + +target_include_directories(ryu_printf PUBLIC + $ + $ +) + +if(NOT "${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL ".lib") + set_target_properties(ryu PROPERTIES OUTPUT_NAME "libryu") + set_target_properties(ryu_printf PROPERTIES OUTPUT_NAME "libryu_printf") +endif() + +if(INSTALL_HEADERS) + install(FILES "ryu/ryu.h" "ryu/ryu2.h" DESTINATION "include/ryu") +endif() + +install(TARGETS ryu ryu_printf EXPORT ryuTargets + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +install(EXPORT ryuTargets + FILE ryuConfig.cmake + NAMESPACE RYU:: + DESTINATION share/ryu +) diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake index 826730a3b6d52e..28bb5cbee0a0b3 100644 --- a/ports/ryu/portfile.cmake +++ b/ports/ryu/portfile.cmake @@ -1,107 +1,22 @@ -function(bazel_build build_type) - set(c_flags "${VCPKG_COMBINED_C_FLAGS_RELEASE}") - set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") - set(log_suffix "rel") - if (${build_type} STREQUAL "debug") - set(c_flags "${VCPKG_COMBINED_C_FLAGS_DEBUG}") - set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") - set(log_suffix "dbg") - set(destination_modifier "/debug") - endif () - - separate_arguments(conly_opts NATIVE_COMMAND "${c_flags}") - separate_arguments(link_opts NATIVE_COMMAND "${linker_flags}") - - if (DEFINED ENV{CC}) - list(JOIN conly_opts ":" joined_opts) - set(ENV{BAZEL_CXXOPTS} "${joined_opts}") - list(JOIN link_opts ":" joined_opts) - set(ENV{BAZEL_LINKOPTS} "${joined_opts}") - endif () - - list(TRANSFORM conly_opts PREPEND "--conlyopt=") - list(TRANSFORM link_opts PREPEND "--linkopt=") - - vcpkg_execute_build_process( - COMMAND "${BAZEL}" --batch ${BAZEL_OUTPUT} build ${BAZEL_COMPILER} ${BAZEL_CPU} ${conly_opts} ${link_opts} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME "build-${TARGET_TRIPLET}-${log_suffix}" - ) - - if ("${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL ".lib") - file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/ryu.lib" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") - file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") - else () - file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/libryu.a" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") - file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") - endif () -endfunction() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ulfjack/ryu - REF v2.0 - SHA512 88a0cca74a4889e8e579987abdc75a6ac87c1cdae557e5a15c29dbfd65733f9e591d6569e97a9374444918475099087f8056e696a97c9be24e38eb737e2304c2 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO ulfjack/ryu + REF v2.0 + SHA512 88a0cca74a4889e8e579987abdc75a6ac87c1cdae557e5a15c29dbfd65733f9e591d6569e97a9374444918475099087f8056e696a97c9be24e38eb737e2304c2 + HEAD_REF master ) -find_program(BAZEL bazel PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" REQUIRED) -get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) -vcpkg_add_to_path(PREPEND "${BAZEL_DIR}") -set(ENV{BAZEL_BIN_PATH} "${BAZEL}") - -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") -if (VCPKG_HOST_IS_WINDOWS) - if (VCPKG_DETECTED_MSVC) - set(ENV{BAZEL_VC} "$ENV{VCInstallDir}") - elseif (VCPKG_TARGET_IS_MINGW) - if (NOT "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") - message(FATAL_ERROR "${TARGET_TRIPLET} is not supported on Windows!") - endif () - set(BAZEL_COMPILER "--compiler=mingw-gcc") - # BAZEL_SH can be propagated to the build environment using VCPKG_KEEP_ENV_VARS - if (NOT DEFINED ENV{BAZEL_SH}) - message("BAZEL_SH is not specified, trying to guess...") - get_filename_component(DIR "${VCPKG_DETECTED_CMAKE_C_COMPILER}" DIRECTORY) - # Bazel expects Mingw-w64 to be installed in MSYS2 (pacman -S mingw-w64-x86_64-toolchain). - # From BAZEL_SH it finds MSYS2 root, adds "mingw64" to the root and uses this path as the location of Mingw-w64. - # It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory - # whose name ends with "mingw64", such as c:\mingw64 or c:\TDM-GCC-64\mingw64. - string(REGEX REPLACE /mingw64/bin$ "" MSYS2_ROOT "${DIR}") - set(ENV{BAZEL_SH} "${MSYS2_ROOT}/usr/bin/bash.exe") - message("BAZEL_SH $ENV{BAZEL_SH}") - endif () - else () - message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!") - endif () - if ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") - set(BAZEL_CPU "--cpu=x64_x86_windows") - elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") - set(BAZEL_CPU "--cpu=x64_windows") - elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM") - set(BAZEL_CPU "--cpu=x64_arm_windows") - elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64") - set(BAZEL_CPU "--cpu=arm64_windows") - else () - message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!") - endif () -else () - if (NOT DEFINED ENV{USER}) - set(ENV{USER} "root") - set(BAZEL_OUTPUT "--output_user_root=/tmp/bazel") - endif () - set(ENV{BAZEL_USE_CPP_ONLY_TOOLCHAIN} "1") - set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") -endif () +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -bazel_build("release") -if (NOT VCPKG_BUILD_TYPE) - bazel_build("debug") -endif () +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + -DINSTALL_HEADERS=ON +) -file(INSTALL "${SOURCE_PATH}/LICENSE-Boost" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/ryu/ryu.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/ryu") -file(INSTALL "${SOURCE_PATH}/ryu/ryu2.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/ryu") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-Apache2" "${SOURCE_PATH}/LICENSE-Boost") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake deleted file mode 100644 index 76e489d19245d5..00000000000000 --- a/ports/ryu/ryuConfig.cmake +++ /dev/null @@ -1,26 +0,0 @@ -function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - set(${NAMESPACE}_${LIB_NAME}_FOUND 1) -endfunction() - -get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(ROOT "${ROOT}" PATH) -get_filename_component(ROOT "${ROOT}" PATH) - -if (TRUE) -find_library(RYU_RELEASE_LIB ryu PATHS "${ROOT}/lib" NO_DEFAULT_PATH) -find_library(RYU_DEBUG_LIB ryu PATHS "${ROOT}/debug/lib" NO_DEFAULT_PATH) -find_library(RYUPF_RELEASE_LIB ryu_printf PATHS "${ROOT}/lib" NO_DEFAULT_PATH) -find_library(RYUPF_DEBUG_LIB ryu_printf PATHS "${ROOT}/debug/lib" NO_DEFAULT_PATH) -set_library_target("RYU" "ryu" "${RYU_DEBUG_LIB}" "${RYU_RELEASE_LIB}" "${ROOT}/include/") -set_library_target("RYU" "ryu_printf" "${RYUPF_DEBUG_LIB}" "${RYUPF_RELEASE_LIB}" "${ROOT}/include/") -else() -set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/") -set_library_target("RYU" "ryu_printf" "${ROOT}/debug/lib/libryu_printf.a" "${ROOT}/lib/libryu_printf.a" "${ROOT}/include/") -endif() diff --git a/ports/ryu/usage b/ports/ryu/usage index b398f27638cdcf..fd4af1801a75a6 100644 --- a/ports/ryu/usage +++ b/ports/ryu/usage @@ -1,4 +1,4 @@ The package ryu provides CMake targets: find_package(ryu CONFIG REQUIRED) - target_link_libraries(main PRIVATE RYU::ryu) + target_link_libraries(main PRIVATE RYU::ryu RYU::ryu_printf) diff --git a/ports/ryu/vcpkg.json b/ports/ryu/vcpkg.json index 95a3a8e7710585..6dfac7d52fe58c 100644 --- a/ports/ryu/vcpkg.json +++ b/ports/ryu/vcpkg.json @@ -1,16 +1,17 @@ { "name": "ryu", "version": "2.0", - "port-version": 9, + "port-version": 10, "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.", "homepage": "https://github.com/ulfjack/ryu", + "license": "Apache-2.0 OR BSL-1.0", "dependencies": [ { - "name": "vcpkg-cmake-get-vars", + "name": "vcpkg-cmake", "host": true }, { - "name": "vcpkg-tool-bazel", + "name": "vcpkg-cmake-config", "host": true } ] diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index ffd1270cf1e5d3..760df2dc9d65e2 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls REF "v${VERSION}" - SHA512 10a6dcf6669ca97d65f009a692075c858b9b344c535487f64b4b2046f0cda0241c884fdc3d8f054a3bf85d080582a1000b6edca2b3bf98f7aa62857ac97443b2 + SHA512 17f49a114a3e3934cea2ebff47198417927d405194f901540380844f9481d11ccff2219b3512bd20a1f3d1945515b637b609aceaaa3b55701574df1d859125ec PATCHES fix-cmake-target-path.patch ) diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index c4f2080ca4e820..abb4a4c17e0354 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "s2n", - "version": "1.5.5", + "version": "1.5.9", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "license": "Apache-2.0", diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 7718dc2b91b01c..9caef15c54a8ae 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 a7e363d6ce119d88a34c3503107c338eb59f0faaedb107f66ebbc7ce4cb89500ff53fc9fad4ffdde5aa5235f6d72e9ed4bf978432e35752340dc1735518d8b0d + SHA512 559e831720e27ed2bf0702c7fc29a3c2dfa553e2c74b8c7adbc3f5071a5eea0e434127fc8cf9d8f29aa668ab627c84dc13194227203aab085a437684e4591895 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 5903c5461acaad..1d0ab2059357ef 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.7.16", + "version": "0.7.17", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/ports/sese/portfile.cmake b/ports/sese/portfile.cmake index ca3973290dc96d..9151afdff26000 100644 --- a/ports/sese/portfile.cmake +++ b/ports/sese/portfile.cmake @@ -51,6 +51,9 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sese") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_BUILD_TYPE) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() remove_empty_directories_recursive("${CURRENT_PACKAGES_DIR}/include/sese") diff --git a/ports/sese/vcpkg.json b/ports/sese/vcpkg.json index 958c7a87897559..7821b6c8643754 100644 --- a/ports/sese/vcpkg.json +++ b/ports/sese/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sese", "version": "2.3.0", - "port-version": 2, + "port-version": 3, "description": "A cross-platform framework for basic components.", "homepage": "https://github.com/libsese/sese", "license": "Apache-2.0", diff --git a/ports/shiva/find_python_and_no_copy_dll.patch b/ports/shiva/find_python_and_no_copy_dll.patch deleted file mode 100644 index 31f447daa890ef..00000000000000 --- a/ports/shiva/find_python_and_no_copy_dll.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt -index eef14ee..30130ba 100644 ---- a/modules/python/CMakeLists.txt -+++ b/modules/python/CMakeLists.txt -@@ -1,10 +1,10 @@ - include(CMakeSources.cmake) - set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - -+find_package(Python COMPONENTS Interpreter Development) - find_package(pybind11 CONFIG REQUIRED) - -- --if (WIN32) -+if (FALSE) - ## We need pyton dll - file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll) - -@@ -19,6 +19,6 @@ endif () - - CREATE_MODULE(shiva::pyscripting "${MODULE_SOURCES}" ${MODULE_PATH} "python") - --target_link_libraries(pyscripting INTERFACE shiva::ecs shiva::input pybind11::embed pybind11::module) -+target_link_libraries(pyscripting INTERFACE shiva::ecs shiva::input pybind11::embed pybind11::module Python::Module) - - AUTO_TARGETS_MODULE_INSTALL(pyscripting) diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake deleted file mode 100644 index ad653af733b30f..00000000000000 --- a/ports/shiva/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Milerius/shiva - REF ${VERSION} - SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 - HEAD_REF master - PATCHES find_python_and_no_copy_dll.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DSHIVA_BUILD_TESTS=OFF - "-DPYTHON_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_EXECUTABLE_SUFFIX}" -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json deleted file mode 100644 index 2b9f53608c5694..00000000000000 --- a/ports/shiva/vcpkg.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "shiva", - "version": "1.0", - "port-version": 7, - "description": "Modern C++ Game Engine", - "homepage": "https://github.com/Milerius/shiva", - "license": "MIT", - "supports": "!(static & windows)", - "dependencies": [ - "boost-dll", - "boost-filesystem", - "boost-stacktrace", - "entt", - "lua", - { - "name": "luafilesystem", - "platform": "windows" - }, - "nlohmann-json", - "pybind11", - "python3", - "sol2", - "spdlog", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake index e51e0374f9c282..81ae80f7e524e5 100644 --- a/ports/sleef/portfile.cmake +++ b/ports/sleef/portfile.cmake @@ -1,22 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO shibatch/sleef - REF 3.5.1 - SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128 + REF ${VERSION} + SHA512 0f42c4132523f87c9e214bd9eb965e77b84c80e9a63588ed854796fccd2b9affb849a74e5f95f7b0161ba6281ca7ff509d510b42950dc38a6b8175cf6745ab07 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_LIBM=ON - -DBUILD_DFT=ON - -DBUILD_QUAD=ON - -DBUILD_GNUABI_LIBS=${VCPKG_TARGET_IS_LINUX} - -DBUILD_TESTS=OFF - -DBUILD_INLINE_HEADERS=OFF + -DSLEEF_BUILD_LIBM=ON + -DSLEEF_BUILD_DFT=ON + -DSLEEF_BUILD_QUAD=ON + -DSLEEF_BUILD_GNUABI_LIBS=${VCPKG_TARGET_IS_LINUX} + -DSLEEF_BUILD_TESTS=OFF + -DSLEEF_BUILD_INLINE_HEADERS=OFF ) + vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleef) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json index 60b71ed05f49e0..0bf22c21ae83fd 100644 --- a/ports/sleef/vcpkg.json +++ b/ports/sleef/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sleef", - "version": "3.5.1", - "port-version": 4, + "version": "3.7", "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", "homepage": "https://sleef.org/", "license": "BSL-1.0", @@ -10,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index f2131e32724f2d..10cd171ea1e2c2 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -18,9 +18,9 @@ file(GLOB TCLSH_CMD file(TO_NATIVE_PATH "${TCLSH_CMD}" TCLSH_CMD) file(TO_NATIVE_PATH "${SOURCE_PATH}" SOURCE_PATH_NAT) -# Determine TCL version (e.g. [path]tclsh90s.exe -> 90) +# Determine TCL version (e.g. [path]tclsh90sx.exe -> 90) string(REGEX REPLACE ^.*tclsh "" TCLVERSION ${TCLSH_CMD}) -string(REGEX REPLACE [A-Za-z]?${VCPKG_HOST_EXECUTABLE_SUFFIX}$ "" TCLVERSION ${TCLVERSION}) +string(REGEX REPLACE [A-Za-z]*${VCPKG_HOST_EXECUTABLE_SUFFIX}$ "" TCLVERSION ${TCLVERSION}) list(APPEND NMAKE_OPTIONS TCLSH_CMD="${TCLSH_CMD}" diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index dcb1e30e28027b..358bcb689dce7b 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlcipher", "version": "4.6.1", + "port-version": 1, "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "license": null, diff --git a/ports/sse2neon/portfile.cmake b/ports/sse2neon/portfile.cmake index 09fdb9f8c291c5..6907846f4672a1 100644 --- a/ports/sse2neon/portfile.cmake +++ b/ports/sse2neon/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DLTcollab/sse2neon REF "v${VERSION}" - SHA512 a93d2bfc0f2fe955eb0f1acfc85fdf6ef1f61254944554c0eb93f668233d9046c9c40786b182c31d4e6a181a9eaa366e9ba35c8062be791031e429d108f23cbc + SHA512 3266c3ddf82770c89508ffd52998247e2b2d97029e1c68314e60a8c58563f91240528a1ebaccd5f756f5a10b98094e9e4e88db2e000d12d04ac910db911df730 HEAD_REF master ) diff --git a/ports/sse2neon/vcpkg.json b/ports/sse2neon/vcpkg.json index 24f5c763fd5bcf..820d0f9c11868e 100644 --- a/ports/sse2neon/vcpkg.json +++ b/ports/sse2neon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sse2neon", - "version": "1.7.0", + "version": "1.8.0", "description": "A translator from Intel SSE intrinsics to Arm/Aarch64 NEON implementation", "homepage": "https://github.com/DLTcollab/sse2neon", "license": "MIT" diff --git a/ports/stringzilla/portfile.cmake b/ports/stringzilla/portfile.cmake index cedadf2aa802c6..83f5f4bfaabac5 100644 --- a/ports/stringzilla/portfile.cmake +++ b/ports/stringzilla/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ashvardanian/StringZilla REF "v${VERSION}" - SHA512 a97ed147be78164b01e61ff4aeae8efb8eba23204edf48ed7701786cbc85b8c6d09f1802aa3cf0f65ca140bdccb4e8c3518a56b2b910466fc8d040f2b0293716 + SHA512 bb5dd5301a952e2ca9d64089f1380a9828942159a41c2997f70724768144b6f7a4fb4d5a304f5c3d4b2cf8584c279d6641a6854924cc12d06a844cdbe42c7ab8 HEAD_REF master ) diff --git a/ports/stringzilla/vcpkg.json b/ports/stringzilla/vcpkg.json index 892400210e7006..1d853142ae39d7 100644 --- a/ports/stringzilla/vcpkg.json +++ b/ports/stringzilla/vcpkg.json @@ -1,8 +1,7 @@ { "name": "stringzilla", - "version": "3.10.5", + "version": "3.11.3", "description": "StringZilla is the GodZilla of string libraries, using SIMD and SWAR to accelerate string operations on modern CPUs.", "homepage": "https://github.com/ashvardanian/StringZilla", - "license": "Apache-2.0", - "supports": "!x86" + "license": "Apache-2.0" } diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index 21f746ad3ab429..0a173f5a0b2516 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -12,10 +14,13 @@ vcpkg_from_github( 0001-fix-visual-studio.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_STATIC_LIBS=ON + -DINSTALL_CMAKE_DIR:STRING=share/${PORT} + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_EXTRAS=OFF @@ -34,41 +39,15 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup() -if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -endif() - -vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake" - "\${STXXL_CMAKE_DIR}/../include" - "\${STXXL_CMAKE_DIR}/../../include" - IGNORE_UNCHANGED -) - -if(CMAKE_HOST_WIN32) - set(EXECUTABLE_SUFFIX ".exe") -else() - set(EXECUTABLE_SUFFIX "") -endif() - -file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +vcpkg_copy_tools(TOOL_NAMES stxxl_tool AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/bin" ) -# Handle copyright -configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) - -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json index 4becfa1a972c88..4b43f280018d35 100644 --- a/ports/stxxl/vcpkg.json +++ b/ports/stxxl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "stxxl", "version-date": "2018-11-15", - "port-version": 8, + "port-version": 9, "description": "Standard Template Library for Extra Large Data Sets", "supports": "!uwp", "dependencies": [ diff --git a/ports/taglib/disable-wchar-t-check-emscripten.patch b/ports/taglib/disable-wchar-t-check-emscripten.patch deleted file mode 100644 index a6163e1092d3c9..00000000000000 --- a/ports/taglib/disable-wchar-t-check-emscripten.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 477e4cee4389b4b692734b7dc1669d9cfae62f61 Mon Sep 17 00:00:00 2001 -Date: Sat, 2 Mar 2024 23:38:50 +0100 -Subject: [PATCH] Disable wchar_t check when targeting Emscripten - ---- - ConfigureChecks.cmake | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index 7d2ff95..2dc1891 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -19,9 +19,11 @@ if(NOT ${SIZEOF_LONGLONG} EQUAL 8) - message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.") - endif() - --check_type_size("wchar_t" SIZEOF_WCHAR_T) --if(${SIZEOF_WCHAR_T} LESS 2) -- message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.") -+if(NOT EMSCRIPTEN) -+ check_type_size("wchar_t" SIZEOF_WCHAR_T) -+ if(${SIZEOF_WCHAR_T} LESS 2) -+ message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.") -+ endif() - endif() - - check_type_size("float" SIZEOF_FLOAT) --- -2.43.0 - diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index 27ce3785282fdc..7ce843b991cf7e 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib REF "v${VERSION}" - SHA512 099d02b2eab033f5702a8cb03e70752d7523c6f8c2f3eebdd0bcd939eafbdca3f2a6c82452983904b5822cfa45f2707ed866c3419508df9d43bf5c0b3a476f6c + SHA512 79f333dbe8ed44076010e33803e3418410516df4b70203962bbefea81ce0a6989a54a9791022488e64f1876573580cbe93920da4b2a7277d6a3f48c946e518fc HEAD_REF master - PATCHES - disable-wchar-t-check-emscripten.patch ) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index 9e673be4e890e2..61367dfd05d71c 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "taglib", - "version": "2.0", - "port-version": 2, + "version": "2.0.2", "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1-only OR MPL-1.1", diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake index c44722175e7aed..efcdb2b56a9d2b 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO texus/TGUI REF "v${VERSION}" - SHA512 a117c1c23b6811370f58069b3d6a7fb73930455f7d456ffd53e2abd161d637968cecca653d42ea8a055d53f8af8c5e10f66528e2bb5091e04a28ceb3b774d7ff + SHA512 24aa59b5eb225987247384dfdfc8bdce1d755cc7daeda6fdff9046eea77a0f2e686d5b03d24cbbd20e7d6d90ae809eae90467a2b1d923de1e2ecf668e28bcff4 HEAD_REF 1.x PATCHES devendor-stb.patch diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index 72827c528029f5..6cf37328897106 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tgui", - "version": "1.6.1", + "version": "1.7.0", "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "license": "Zlib", diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index c650fa268a1dda..eed3b459d525d6 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg REF "v${VERSION}" - SHA512 29e6bae24e244ff62569363b5fce894a8b23775d40487b05dde96fa184fe37c1c70c0b28275467103f3bf10362be5b105b1fdc89ece6d8f840171fedd3b7e6ac + SHA512 e81dd47a48772653598f647c6f625e9072e2d70641185c969679db92b34a23738b1bb57360ee44bf97fd39b25b14d59805b981c7e8a6efb9b920d551638dcc5f HEAD_REF master ) diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index 029069af8ebeb1..49ceae4a440b9d 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "thorvg", - "version": "0.15.3", + "version": "0.15.6", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", diff --git a/ports/tinyexr/fixtargets.patch b/ports/tinyexr/fixtargets.patch index 867438426f2341..7823f5156502ee 100644 --- a/ports/tinyexr/fixtargets.patch +++ b/ports/tinyexr/fixtargets.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d03e7e..be416f5 100644 +index b7f97b0..2afd0e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,20 @@ set(SAMPLE_TARGET "test_tinyexr") @@ -40,13 +40,13 @@ index 6d03e7e..be416f5 100644 @@ -43,7 +54,7 @@ target_link_libraries(${BUILD_TARGET} ${TINYEXR_EXT_LIBRARIES} ${CMAKE_DL_LIBS}) # Increase warning level for clang. - IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set_source_files_properties(${TINYEXR_SOURCES} PROPERTIES COMPILE_FLAGS "-Weverything -Werror -Wno-padded -Wno-c++98-compat-pedantic -Wno-documentation -Wno-unused-member-function") -+ set_source_files_properties(${TINYEXR_SOURCES} PROPERTIES COMPILE_FLAGS "-Weverything -Wno-padded -Wno-c++98-compat-pedantic -Wno-documentation -Wno-unused-member-function") - ENDIF () - - if (TINYEXR_BUILD_SAMPLE) -@@ -72,3 +83,32 @@ if (TINYEXR_BUILD_SAMPLE) + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC) +- set(CLANG_COMPILE_FLAGS "-Weverything -Werror -Wno-padded -Wno-c++98-compat-pedantic -Wno-documentation -Wno-unused-member-function") ++ set(CLANG_COMPILE_FLAGS "-Weverything -Wno-padded -Wno-c++98-compat-pedantic -Wno-documentation -Wno-unused-member-function") + if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 16) + set(CLANG_COMPILE_FLAGS "${CLANG_COMPILE_FLAGS} -Wno-unsafe-buffer-usage") + endif() +@@ -76,3 +87,32 @@ if (TINYEXR_BUILD_SAMPLE) endif(WIN32) endif (TINYEXR_BUILD_SAMPLE) diff --git a/ports/tinyexr/portfile.cmake b/ports/tinyexr/portfile.cmake index a4568787f30fc9..b4cc941679afb6 100644 --- a/ports/tinyexr/portfile.cmake +++ b/ports/tinyexr/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinyexr REF "v${VERSION}" - SHA512 583404c77009ec88d75accf006f90ee8972d2205bbae41e460d2cbb9a54d9382735a82eba0657fcc5f4e8b3b0fadd51449cec440529570e75c307eb7f0fcc8fb + SHA512 19187cbd703c7a2f9e5322a123453cbd56d2b842d1e8f026831d405e9356b8f2a7fde5a2c6b601ee3a28f0a00293d635245b8b70bf03375cce56b5b816d5d54a HEAD_REF master PATCHES fixtargets.patch diff --git a/ports/tinyexr/vcpkg.json b/ports/tinyexr/vcpkg.json index 173e0e4f023ac9..f9ea4ead7dc641 100644 --- a/ports/tinyexr/vcpkg.json +++ b/ports/tinyexr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinyexr", - "version": "1.0.8", + "version": "1.0.9", "description": "Library to load and save OpenEXR(.exr) images", "homepage": "https://github.com/syoyo/tinyexr", "license": "BSD-3-Clause", diff --git a/ports/tomsolver/portfile.cmake b/ports/tomsolver/portfile.cmake index 0cef15d4991208..40af0e9805aabb 100644 --- a/ports/tomsolver/portfile.cmake +++ b/ports/tomsolver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tomwillow/tomsolver REF "${VERSION}" - SHA512 332301dc8df2756818e709655f726193dd424fb04fba2e18b4264fa078120a6da9cc6a164c930a440439b1b34f7f6a8afc9263db5e8c16e6cd99391296ab0296 + SHA512 00e1b961b1e6730bf74209622a44f932b5221c15995c53bcea9de5b84ba7d75549c095658bcb5729d4a38bf60104b5c5a8fa97015f13977341fcdd62643f35c2 HEAD_REF master ) diff --git a/ports/tomsolver/vcpkg.json b/ports/tomsolver/vcpkg.json index bfb9ce34297c63..e3663428c03516 100644 --- a/ports/tomsolver/vcpkg.json +++ b/ports/tomsolver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tomsolver", - "version": "1.0.0", + "version": "1.0.1", "description": "Simplest, Well-tested, Non-linear equations solver library.", "homepage": "https://github.com/tomwillow/tomsolver", "license": "MIT", diff --git a/ports/ucoro/cmake-install.patch b/ports/ucoro/cmake-install.patch new file mode 100644 index 00000000000000..64804e94877b5c --- /dev/null +++ b/ports/ucoro/cmake-install.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 663044e..9121cb3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,8 +15,31 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + add_compile_options(-foptimize-sibling-calls) + endif() + ++include(GNUInstallDirs) ++ + add_library(ucoro INTERFACE) +-target_include_directories(ucoro INTERFACE include) ++target_include_directories(ucoro INTERFACE $ ++ $) ++ ++option(UCORO_BUILD_TESTING "Build the tests" ON) ++if (UCORO_BUILD_TESTING) ++ enable_testing() ++ add_subdirectory(tests) ++endif() + +-enable_testing() +-add_subdirectory(tests) ++install( ++ TARGETS ucoro ++ EXPORT ucoroTargets ++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++) ++install( ++ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ucoro ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++) ++# generate config.cmake ++install( ++ EXPORT ucoroTargets ++ FILE ucoro-config.cmake ++ NAMESPACE ucoro:: ++ DESTINATION "share/ucoro" ++) diff --git a/ports/ucoro/portfile.cmake b/ports/ucoro/portfile.cmake new file mode 100644 index 00000000000000..468ea7c9023874 --- /dev/null +++ b/ports/ucoro/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO avplayer/ucoro + REF "v${VERSION}" + SHA512 c3436b436ef1ebb3d47a65db9603842293bdb6451bc6fb738a63d61a63b52901e223f46625d956303566dc52dfb38ffb2c6ce20016c18b444f9cb3e2e701e613 + HEAD_REF main + PATCHES + cmake-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUCORO_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ucoro/vcpkg.json b/ports/ucoro/vcpkg.json new file mode 100644 index 00000000000000..6f1428d8550324 --- /dev/null +++ b/ports/ucoro/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ucoro", + "version": "1.0", + "description": "It is a minimized C++20 coroutine library.", + "homepage": "https://github.com/avplayer/ucoro", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/unicorn/fix-build.patch b/ports/unicorn/fix-build.patch index 6e1cafcd496260..348e2bdb0e48c2 100644 --- a/ports/unicorn/fix-build.patch +++ b/ports/unicorn/fix-build.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4110ae5..a86b207 100644 +index 3fcde11..1acc0b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -109,7 +109,7 @@ if(MSVC) - add_compile_options($<$:/wd4267>) - +@@ -128,7 +128,7 @@ if(MSVC) # handle msvcrt setting being passed in CMAKE_C_FLAGS -- if(DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) -+ if(NOT CMAKE_MSVC_RUNTIME_LIBRARY) - # do not support other methods of setting this (it would be more conformant, tho) - message(FATAL_ERROR "please set msvcrt via CMAKE_C_FLAGS") - endif() -@@ -1431,7 +1431,7 @@ if(UNICORN_BUILD_TESTS) + if(CMAKE_C_FLAGS MATCHES "[/-]M[TD]d?") + # ensure CMAKE_MSVC_RUNTIME_LIBRARY is not already defined +- if(DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) ++ if(NOT CMAKE_MSVC_RUNTIME_LIBRARY) + message(FATAL_ERROR "please set the runtime library via either CMAKE_C_FLAGS or CMAKE_MSVC_RUNTIME_LIBRARY, not both") + endif() + +@@ -1486,7 +1486,7 @@ if(UNICORN_BUILD_TESTS) endif() diff --git a/ports/unicorn/fix-msvc-shared.patch b/ports/unicorn/fix-msvc-shared.patch new file mode 100644 index 00000000000000..46e54b93e330aa --- /dev/null +++ b/ports/unicorn/fix-msvc-shared.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1acc0b5..a4b70d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1427,9 +1427,8 @@ endif() + if (BUILD_SHARED_LIBS) + if (MSVC) + # Avoid the import lib built by MVSC clash with our archive. +- set_target_properties(unicorn PROPERTIES ARCHIVE_OUTPUT_NAME "unicorn-import") ++ set_target_properties(unicorn PROPERTIES ARCHIVE_OUTPUT_NAME "unicorn") + endif() +- bundle_static_library(unicorn_static unicorn_archive unicorn) + else() + # Rename the "static" lib to avoid filename clash. + set_target_properties(unicorn PROPERTIES OUTPUT_NAME "unicorn-static") +@@ -1496,7 +1495,9 @@ if(UNICORN_INSTALL) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + endif() +- install(FILES $ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(NOT(BUILD_SHARED_LIBS)) ++ install(FILES $ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif() + install(FILES ${UNICORN_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/unicorn) + if (ATOMIC_LINKAGE_FIX) + set(ATOMIC_LINK_PKG_CONFIG " -latomic") diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 70f6b2180cf309..8be86475cf9e67 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -1,32 +1,39 @@ -if(VCPKG_CRT_LINKAGE STREQUAL "dynamic" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "unicorn can currently only be built with /MT or /MTd (static CRT linkage)") -endif() - -# Note: this is safe because unicorn is a C library and takes steps to avoid memory allocate/free across the DLL boundary. -set(VCPKG_CRT_LINKAGE "static") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF "${VERSION}.post1" - SHA512 8694d6bc92e3424a8ad050316413d53e56e0f55e7cad7517fb3e98e670a0f1768b060ead8f195da13607cec89a964364f05a8b9d0dc074f4ac5e51026f8343ad + REF "${VERSION}" + SHA512 d6184b87a0fb729397ec2ac2cb8bfd9d10c9d4276e49efa681c66c7c54d1a325305a920332a708e68989cc299d0d1a543a1ceeaf552a9b44ec93084f7bf85ef2 HEAD_REF master PATCHES fix-build.patch + fix-msvc-shared.patch ) +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" + "-lpthread" + " " + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" + "-lpthread -lm" + " " + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUNICORN_BUILD_TESTS=OFF - ) +) vcpkg_cmake_install() - vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/unicorn/vcpkg.json b/ports/unicorn/vcpkg.json index 5ffa0d52b01e41..b108213cb45e49 100644 --- a/ports/unicorn/vcpkg.json +++ b/ports/unicorn/vcpkg.json @@ -1,10 +1,10 @@ { "name": "unicorn", - "version": "2.0.1", + "version": "2.1.1", "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", "homepage": "https://github.com/unicorn-engine/unicorn", "license": "GPL-2.0-only", - "supports": "windows & !uwp & !arm", + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/usd/003-fix-dep.patch b/ports/usd/003-fix-dep.patch new file mode 100644 index 00000000000000..8abd30dbffb729 --- /dev/null +++ b/ports/usd/003-fix-dep.patch @@ -0,0 +1,139 @@ +diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake +index 1b69cad..9494278 100644 +--- a/cmake/defaults/Packages.cmake ++++ b/cmake/defaults/Packages.cmake +@@ -190,7 +190,8 @@ if (PXR_BUILD_IMAGING) + # --OpenImageIO + if (PXR_BUILD_OPENIMAGEIO_PLUGIN) + set(REQUIRES_Imath TRUE) +- find_package(OpenImageIO REQUIRED) ++ find_package(OpenImageIO CONFIG REQUIRED) ++ set(OIIO_LIBRARIES OpenImageIO::OpenImageIO) + add_definitions(-DPXR_OIIO_PLUGIN_ENABLED) + if (OIIO_idiff_BINARY) + set(IMAGE_DIFF_TOOL ${OIIO_idiff_BINARY} CACHE STRING "Uses idiff for image diffing") +@@ -227,6 +228,7 @@ if (PXR_BUILD_IMAGING) + find_package(Vulkan REQUIRED) + list(APPEND VULKAN_LIBS Vulkan::Vulkan) + ++ if(0) + # Find the extra vulkan libraries we need + set(EXTRA_VULKAN_LIBS shaderc_combined) + if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug") +@@ -236,6 +238,7 @@ if (PXR_BUILD_IMAGING) + find_library("${EXTRA_LIBRARY}_PATH" NAMES "${EXTRA_LIBRARY}" PATHS $ENV{VULKAN_SDK}/lib) + list(APPEND VULKAN_LIBS "${${EXTRA_LIBRARY}_PATH}") + endforeach() ++ endif() + + # Find the OS specific libs we need + if (UNIX AND NOT APPLE) +@@ -249,10 +252,20 @@ if (PXR_BUILD_IMAGING) + else() + message(FATAL_ERROR "VULKAN_SDK not valid") + endif() ++ find_package(unofficial-shaderc CONFIG REQUIRED) ++ find_package(unofficial-spirv-reflect CONFIG REQUIRED) ++ find_package(VulkanMemoryAllocator CONFIG REQUIRED) ++ list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc) ++ list(APPEND VULKAN_LIBS unofficial::spirv-reflect) ++ list(APPEND VULKAN_LIBS GPUOpen::VulkanMemoryAllocator) + endif() + # --Opensubdiv +- set(OPENSUBDIV_USE_GPU ${PXR_BUILD_GPU_SUPPORT}) +- find_package(OpenSubdiv 3 REQUIRED) ++ find_package(OpenSubdiv 3 CONFIG REQUIRED) ++ set(OPENSUBDIV_LIBRARIES OpenSubdiv::osdCPU_static) ++ set(OPENSUBDIV_OSDCPU_LIBRARY OpenSubdiv::osdCPU_static) # For compatibility ++ if(PXR_ENABLE_GL_SUPPORT) ++ list(APPEND OPENSUBDIV_LIBRARIES OpenSubdiv::osdGPU_static) ++ endif() + # --Ptex + if (PXR_ENABLE_PTEX_SUPPORT) + find_package(PTex REQUIRED) +diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt +index 97e4228..3eb83be 100644 +--- a/pxr/imaging/hgiVulkan/CMakeLists.txt ++++ b/pxr/imaging/hgiVulkan/CMakeLists.txt +@@ -46,8 +46,6 @@ pxr_library(hgiVulkan + api.h + vulkan.h + +- PRIVATE_CLASSES +- spirv_reflect + + RESOURCE_FILES + plugInfo.json +diff --git a/pxr/imaging/plugin/hioOiio/CMakeLists.txt b/pxr/imaging/plugin/hioOiio/CMakeLists.txt +index 0a055b7..de4b73a 100644 +--- a/pxr/imaging/plugin/hioOiio/CMakeLists.txt ++++ b/pxr/imaging/plugin/hioOiio/CMakeLists.txt +@@ -7,6 +7,7 @@ if (NOT ${PXR_BUILD_GPU_SUPPORT}) + return() + endif() + ++if(0) # No need because OpenImageIO::OpenImageIO already declare its transitive dependencies correctly + # Use the import targets set by Imath's package config + if (Imath_FOUND) + set(__OIIO_IMATH_LIBS "Imath::Imath") +@@ -14,6 +15,7 @@ else() + set(__OIIO_IMATH_INCLUDE ${OPENEXR_INCLUDE_DIRS}) + set(__OIIO_IMATH_LIBS ${OPENEXR_LIBRARIES}) + endif() ++endif() + + pxr_plugin(hioOiio + LIBRARIES +diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in +index 041cd8c..2f89d69 100644 +--- a/pxr/pxrConfig.cmake.in ++++ b/pxr/pxrConfig.cmake.in +@@ -20,6 +20,27 @@ include(CMakeFindDependencyMacro) + + find_dependency(TBB CONFIG) + ++if(@PXR_BUILD_IMAGING@) ++ find_dependency(OpenSubdiv 3 CONFIG) ++ if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@) ++ find_dependency(OpenImageIO CONFIG) ++ endif() ++ if(@PXR_ENABLE_GL_SUPPORT@) ++ find_dependency(OpenGL REQUIRED) ++ endif() ++ if(@PXR_ENABLE_VULKAN_SUPPORT@) ++ if (NOT DEFINED Vulkan_DIR) ++ if (NOT [[@Vulkan_DIR@]] STREQUAL "") ++ set(Vulkan_DIR [[@Vulkan_DIR@]]) ++ endif() ++ endif() ++ find_dependency(Vulkan REQUIRED) ++ find_dependency(unofficial-shaderc CONFIG) ++ find_dependency(unofficial-spirv-reflect CONFIG) ++ find_dependency(VulkanMemoryAllocator CONFIG) ++ endif() ++endif() ++ + # If Python support was enabled for this USD build, find the import + # targets by invoking the appropriate FindPython module. Use the same + # LIBRARY and INCLUDE_DIR settings from the original build if they +@@ -75,17 +96,17 @@ if(@Imath_FOUND@) + set(Imath_DIR [[@Imath_DIR@]]) + endif() + endif() +- find_dependency(Imath) ++ find_dependency(Imath CONFIG) + endif() + +-include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake") ++include("${PXR_CMAKE_DIR}/pxrTargets.cmake") + if (TARGET usd_ms) + set(libs "usd_ms") + else() + set(libs "@PXR_ALL_LIBS@") + endif() + set(PXR_LIBRARIES "") +-set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/include") ++set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/../../include") + string(REPLACE " " ";" libs "${libs}") + foreach(lib ${libs}) + get_target_property(location ${lib} LOCATION) diff --git a/ports/usd/003-vcpkg_find_opensubdiv.patch b/ports/usd/003-vcpkg_find_opensubdiv.patch deleted file mode 100644 index ddd17c2fcf7561..00000000000000 --- a/ports/usd/003-vcpkg_find_opensubdiv.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index ccaabe765..d4eea2988 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -260,8 +260,12 @@ if (PXR_BUILD_IMAGING) - endif() - endif() - # --Opensubdiv -- set(OPENSUBDIV_USE_GPU ${PXR_ENABLE_GL_SUPPORT}) -- find_package(OpenSubdiv 3 REQUIRED) -+ find_package(OpenSubdiv 3 CONFIG REQUIRED) -+ set(OPENSUBDIV_LIBRARIES OpenSubdiv::osdCPU_static) -+ set(OPENSUBDIV_OSDCPU_LIBRARY OpenSubdiv::osdCPU_static) # For compatibility -+ if(PXR_ENABLE_GL_SUPPORT) -+ list(APPEND OPENSUBDIV_LIBRARIES OpenSubdiv::osdGPU_static) -+ endif() - # --Ptex - if (PXR_ENABLE_PTEX_SUPPORT) - find_package(PTex REQUIRED) -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index 041cd8cba..692d045b9 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -20,6 +20,10 @@ include(CMakeFindDependencyMacro) - - find_dependency(TBB CONFIG) - -+if(@PXR_BUILD_IMAGING@) -+ find_dependency(OpenSubdiv 3 CONFIG) -+endif() -+ - # If Python support was enabled for this USD build, find the import - # targets by invoking the appropriate FindPython module. Use the same - # LIBRARY and INCLUDE_DIR settings from the original build if they diff --git a/ports/usd/008-fix_cmake_package.patch b/ports/usd/004-fix_cmake_package.patch similarity index 57% rename from ports/usd/008-fix_cmake_package.patch rename to ports/usd/004-fix_cmake_package.patch index b200106cde8cae..087a6b9e0b21bd 100644 --- a/ports/usd/008-fix_cmake_package.patch +++ b/ports/usd/004-fix_cmake_package.patch @@ -1,8 +1,8 @@ diff --git a/pxr/CMakeLists.txt b/pxr/CMakeLists.txt -index 00cafd3d9..c9faeabf0 100644 +index 4c7301b..94d2f2a 100644 --- a/pxr/CMakeLists.txt +++ b/pxr/CMakeLists.txt -@@ -12,13 +12,31 @@ endif() +@@ -17,13 +17,31 @@ endif() pxr_core_epilogue() @@ -40,24 +40,3 @@ index 00cafd3d9..c9faeabf0 100644 + # NAMESPACE "pxr::" + DESTINATION "${CMAKE_INSTALL_DATADIR}/pxr" +) -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index c8039c310..9e104abb7 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -90,14 +90,14 @@ if(@Imath_FOUND@) - find_dependency(Imath CONFIG) - endif() - --include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake") -+include("${PXR_CMAKE_DIR}/pxrTargets.cmake") - if (TARGET usd_ms) - set(libs "usd_ms") - else() - set(libs "@PXR_ALL_LIBS@") - endif() - set(PXR_LIBRARIES "") --set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/include") -+set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/../../include") - string(REPLACE " " ";" libs "${libs}") - foreach(lib ${libs}) - get_target_property(location ${lib} LOCATION) diff --git a/ports/usd/004-vcpkg_find_openimageio.patch b/ports/usd/004-vcpkg_find_openimageio.patch deleted file mode 100644 index 96023df00ade42..00000000000000 --- a/ports/usd/004-vcpkg_find_openimageio.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index d4eea2988..106fd15e2 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -196,7 +196,8 @@ if (PXR_BUILD_IMAGING) - # --OpenImageIO - if (PXR_BUILD_OPENIMAGEIO_PLUGIN) - set(REQUIRES_Imath TRUE) -- find_package(OpenImageIO REQUIRED) -+ find_package(OpenImageIO CONFIG REQUIRED) -+ set(OIIO_LIBRARIES OpenImageIO::OpenImageIO) - add_definitions(-DPXR_OIIO_PLUGIN_ENABLED) - if (OIIO_idiff_BINARY) - set(IMAGE_DIFF_TOOL ${OIIO_idiff_BINARY} CACHE STRING "Uses idiff for image diffing") -diff --git a/pxr/imaging/plugin/hioOiio/CMakeLists.txt b/pxr/imaging/plugin/hioOiio/CMakeLists.txt -index 0a055b711..de4b73a47 100644 ---- a/pxr/imaging/plugin/hioOiio/CMakeLists.txt -+++ b/pxr/imaging/plugin/hioOiio/CMakeLists.txt -@@ -7,6 +7,7 @@ if (NOT ${PXR_BUILD_GPU_SUPPORT}) - return() - endif() - -+if(0) # No need because OpenImageIO::OpenImageIO already declare its transitive dependencies correctly - # Use the import targets set by Imath's package config - if (Imath_FOUND) - set(__OIIO_IMATH_LIBS "Imath::Imath") -@@ -14,6 +15,7 @@ else() - set(__OIIO_IMATH_INCLUDE ${OPENEXR_INCLUDE_DIRS}) - set(__OIIO_IMATH_LIBS ${OPENEXR_LIBRARIES}) - endif() -+endif() - - pxr_plugin(hioOiio - LIBRARIES -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index 692d045b9..a934c336b 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -22,6 +22,9 @@ find_dependency(TBB CONFIG) - - if(@PXR_BUILD_IMAGING@) - find_dependency(OpenSubdiv 3 CONFIG) -+ if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@) -+ find_dependency(OpenImageIO CONFIG) -+ endif() - endif() - - # If Python support was enabled for this USD build, find the import -@@ -79,7 +82,7 @@ if(@Imath_FOUND@) - set(Imath_DIR [[@Imath_DIR@]]) - endif() - endif() -- find_dependency(Imath) -+ find_dependency(Imath CONFIG) - endif() - - include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake") diff --git a/ports/usd/014-MaterialX_v1.38-39.patch b/ports/usd/005-MaterialX_v1.38-39.patch similarity index 91% rename from ports/usd/014-MaterialX_v1.38-39.patch rename to ports/usd/005-MaterialX_v1.38-39.patch index 0f4797b0b1731f..70927cb3d1a5f6 100644 --- a/ports/usd/014-MaterialX_v1.38-39.patch +++ b/ports/usd/005-MaterialX_v1.38-39.patch @@ -1,8 +1,17 @@ diff --git a/pxr/imaging/hdSt/materialXFilter.cpp b/pxr/imaging/hdSt/materialXFilter.cpp -index 8897c5e72..975017525 100644 +index 4a3977e..0dc43a3 100644 --- a/pxr/imaging/hdSt/materialXFilter.cpp +++ b/pxr/imaging/hdSt/materialXFilter.cpp -@@ -634,26 +634,48 @@ _GetGlTFSurfaceMaterialTag(HdMaterialNode2 const& terminal) +@@ -510,7 +510,7 @@ _UpdatePrimvarNodes( + texCoordName = metadata[SdrNodeMetadata->Primvars]; + } + +- (*mxHdPrimvarMap)[texCoordName] = mx::Type::VECTOR2->getName(); ++ (*mxHdPrimvarMap)[texCoordName] = mx::Type::VECTOR2.getName(); + } + } + } +@@ -628,26 +628,47 @@ _GetGlTFSurfaceMaterialTag(HdMaterialNode2 const& terminal) return materialToken.GetString(); } @@ -10,7 +19,7 @@ index 8897c5e72..975017525 100644 +static const mx::TypeDesc _GetMxTypeDescription(std::string const& typeName) { -+#if MATERIALX_MAJOR_VERSION == 1 && MATERIALX_MINOR_VERSION==38 ++ #if MATERIALX_MAJOR_VERSION == 1 && MATERIALX_MINOR_VERSION==38 + // Add whatever is necessary for current codebase: + static const auto _typeLibrary = + std::map{ @@ -56,13 +65,12 @@ index 8897c5e72..975017525 100644 return typeDescIt->second; } - return nullptr; -+ + return mx::Type::NONE; +#endif } // This function adds a stripped down version of the surfaceshader node to the -@@ -678,32 +700,30 @@ _AddStrippedSurfaceNode( +@@ -672,32 +693,30 @@ _AddStrippedSurfaceNode( if (!mxInputDef) { continue; } @@ -83,7 +91,7 @@ index 8897c5e72..975017525 100644 _AddStrippedSurfaceNode(mxDocument, hdConnectedPath.GetName(), hdConnectedNode, hdNetwork); - mx::InputPtr mxInput = -- mxNode->addInput(mxInput->getName(), mxInput->getType()); +- mxNode->addInput(mxInputDef->getName(), mxInputDef->getType()); + mx::InputPtr mxInput = mxNode->addInputFromNodeDef(mxInputDef->getName()); mxInput->setConnectedNode(mxConnectedNode); } @@ -103,7 +111,7 @@ index 8897c5e72..975017525 100644 mxInput->setValueString(valueStr); } } -@@ -715,16 +735,15 @@ _AddStrippedSurfaceNode( +@@ -709,16 +728,15 @@ _AddStrippedSurfaceNode( if (!mxInputDef) { continue; } @@ -125,19 +133,19 @@ index 8897c5e72..975017525 100644 mxInput->setValueString(HdMtlxConvertToString(paramIt.second)); } } -@@ -787,9 +806,9 @@ _GetMaterialTag( +@@ -781,9 +799,9 @@ _GetMaterialTag( // Outputting anything that is not a surfaceshader will be // considered opaque, unless outputting a color4 or vector4. // XXX This is not fully per USD specs, but is supported by MaterialX. - auto const* typeDesc = -+ auto const typeDesc = ++ auto const typeDesc = _GetMxTypeDescription(activeOutputs.back()->getType()); - if (typeDesc == mx::Type::COLOR4 || typeDesc == mx::Type::VECTOR4) { -+ if (typeDesc.isFloat4()) { ++ if (typeDesc.isFloat4()) { return HdStMaterialTagTokens->translucent.GetString(); } return HdStMaterialTagTokens->defaultMaterialTag.GetString(); -@@ -1100,7 +1119,7 @@ _AddMaterialXParams( +@@ -1094,7 +1112,7 @@ _AddMaterialXParams( // MaterialX parameter Information const auto* variable = paramsBlock[i]; @@ -146,7 +154,7 @@ index 8897c5e72..975017525 100644 // Create a corresponding HdSt_MaterialParam HdSt_MaterialParam param; -@@ -1111,9 +1130,9 @@ _AddMaterialXParams( +@@ -1105,9 +1123,9 @@ _AddMaterialXParams( const auto paramValueIt = mxParamNameToValue.find(variable->getVariable()); if (paramValueIt != mxParamNameToValue.end()) { @@ -159,7 +167,7 @@ index 8897c5e72..975017525 100644 param.fallbackValue = paramValueIt->second; } } -@@ -1124,52 +1143,52 @@ _AddMaterialXParams( +@@ -1118,52 +1136,52 @@ _AddMaterialXParams( const auto varValue = variable->getValue(); std::istringstream valueStream(varValue ? varValue->getValueString() : std::string()); @@ -223,7 +231,7 @@ index 8897c5e72..975017525 100644 GfVec4i val; valueStream >> val[0] >> separator >> val[1] >> separator >> val[2] >> separator >> val[3]; -@@ -1183,7 +1202,7 @@ _AddMaterialXParams( +@@ -1177,7 +1195,7 @@ _AddMaterialXParams( } // For filename inputs, manage the associated texture node @@ -233,17 +241,17 @@ index 8897c5e72..975017525 100644 // annonNodeName_paramName -> annonNodeName std::string mxNodeName = variable->getVariable(); diff --git a/pxr/imaging/hdSt/materialXShaderGen.cpp b/pxr/imaging/hdSt/materialXShaderGen.cpp -index 30674b521..78517b39d 100644 +index 136b096..8ba27b2 100644 --- a/pxr/imaging/hdSt/materialXShaderGen.cpp +++ b/pxr/imaging/hdSt/materialXShaderGen.cpp -@@ -156,13 +156,17 @@ HdStMaterialXShaderGen::_EmitGlslfxHeader(mx::ShaderStage& mxStage) const +@@ -158,13 +158,17 @@ HdStMaterialXShaderGen::_EmitGlslfxHeader(mx::ShaderStage& mxStage) const Base::emitString(R"( "attributes": {)" "\n", mxStage); std::string line = ""; unsigned int i = 0; for (mx::StringMap::const_reference primvarPair : _mxHdPrimvarMap) { - const mx::TypeDesc *mxType = mx::TypeDesc::get(primvarPair.second); - if (mxType == nullptr) { + const mx::TypeDesc mxType = getMxTypeDesc(primvarPair.second); -+ if (mxTypeIsNone(mxType)) { ++ if (mxTypeIsNone(mxType)) { TF_WARN("MaterialX geomprop '%s' has unknown type '%s'", primvarPair.first.c_str(), primvarPair.second.c_str()); } @@ -258,7 +266,7 @@ index 30674b521..78517b39d 100644 line += " \"" + primvarPair.first + "\": {\n"; line += " \"type\": \"" + type + "\"\n"; -@@ -285,12 +289,15 @@ HdStMaterialXShaderGen::_EmitMxSurfaceShader( +@@ -287,12 +291,15 @@ HdStMaterialXShaderGen::_EmitMxSurfaceShader( if (outputConnection) { std::string finalOutput = outputConnection->getVariable(); @@ -274,7 +282,7 @@ index 30674b521..78517b39d 100644 if (mxGraph.hasClassification( mx::ShaderNode::Classification::SURFACE)) { -@@ -311,7 +318,7 @@ HdStMaterialXShaderGen::_EmitMxSurfaceShader( +@@ -313,7 +320,7 @@ HdStMaterialXShaderGen::_EmitMxSurfaceShader( } } else { @@ -283,7 +291,7 @@ index 30674b521..78517b39d 100644 Base::toVec4(outputSocket->getType(), finalOutput); } emitLine(finalOutputReturn + -@@ -323,7 +330,7 @@ HdStMaterialXShaderGen::_EmitMxSurfaceShader( +@@ -325,7 +332,7 @@ HdStMaterialXShaderGen::_EmitMxSurfaceShader( ? Base::_syntax->getValue( outputSocket->getType(), *outputSocket->getValue()) : Base::_syntax->getDefaultValue(outputSocket->getType()); @@ -292,7 +300,7 @@ index 30674b521..78517b39d 100644 std::string finalOutput = outputSocket->getVariable() + "_tmp"; emitLine(Base::_syntax->getTypeName(outputSocket->getType()) + " " + finalOutput + " = " + outputValue, mxStage); -@@ -415,8 +422,8 @@ HdStMaterialXShaderGen::_EmitMxInitFunction( +@@ -417,8 +424,8 @@ HdStMaterialXShaderGen::_EmitMxInitFunction( mxStage.getUniformBlock(mx::HW::PUBLIC_UNIFORMS); for (size_t i = 0; i < paramsBlock.size(); ++i) { const mx::ShaderPort* variable = paramsBlock[i]; @@ -303,7 +311,7 @@ index 30674b521..78517b39d 100644 emitLine(variable->getVariable() + " = HdGet_" + variable->getVariable() + "()", mxStage); } -@@ -622,16 +629,16 @@ HdStMaterialXShaderGen::emitVariableDeclarations( +@@ -624,16 +631,16 @@ HdStMaterialXShaderGen::emitVariableDeclarations( { Base::emitLineBegin(stage); const mx::ShaderPort* variable = block[i]; @@ -323,10 +331,10 @@ index 30674b521..78517b39d 100644 || MxHdVariables.count(variable->getName()) ) { Base::emitVariableDeclaration(variable, mx::EMPTY_STRING, context, stage, false /* assignValue */); -@@ -1349,4 +1356,53 @@ HdStMaterialXShaderGenMsl::_EmitMxFunctions( +@@ -1351,6 +1358,53 @@ HdStMaterialXShaderGenMsl::_EmitMxFunctions( + _EmitDataStructsAndFunctionDefinitions( + mxGraph, mxContext, mxStage, &_tokenSubstitutions); } - - +bool mxTypeIsNone(mx::TypeDesc typeDesc) +{ +#if MATERIALX_MAJOR_VERSION == 1 && MATERIALX_MINOR_VERSION==38 @@ -374,11 +382,11 @@ index 30674b521..78517b39d 100644 + return port->getType(); +#endif +} -+ -+ + + PXR_NAMESPACE_CLOSE_SCOPE diff --git a/pxr/imaging/hdSt/materialXShaderGen.h b/pxr/imaging/hdSt/materialXShaderGen.h -index e61bd13a4..a7f93fdd0 100644 +index e61bd13..a7f93fd 100644 --- a/pxr/imaging/hdSt/materialXShaderGen.h +++ b/pxr/imaging/hdSt/materialXShaderGen.h @@ -192,6 +192,13 @@ private: diff --git a/ports/usd/005-vcpkg_find_shaderc.patch b/ports/usd/005-vcpkg_find_shaderc.patch deleted file mode 100644 index 610bdf84bd048f..00000000000000 --- a/ports/usd/005-vcpkg_find_shaderc.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index 3763c9997..79679ca13 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -233,6 +233,7 @@ if (PXR_BUILD_IMAGING) - find_package(Vulkan REQUIRED) - list(APPEND VULKAN_LIBS Vulkan::Vulkan) - -+ if(0) - # Find the extra vulkan libraries we need - set(EXTRA_VULKAN_LIBS shaderc_combined) - if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug") -@@ -242,6 +243,7 @@ if (PXR_BUILD_IMAGING) - find_library("${EXTRA_LIBRARY}_PATH" NAMES "${EXTRA_LIBRARY}" PATHS $ENV{VULKAN_SDK}/lib) - list(APPEND VULKAN_LIBS "${${EXTRA_LIBRARY}_PATH}") - endforeach() -+ endif() - - # Find the OS specific libs we need - if (APPLE) -@@ -258,6 +260,8 @@ if (PXR_BUILD_IMAGING) - else() - message(FATAL_ERROR "VULKAN_SDK not valid") - endif() -+ find_package(unofficial-shaderc CONFIG REQUIRED) -+ list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc) - endif() - # --Opensubdiv - find_package(OpenSubdiv 3 CONFIG REQUIRED) -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index a934c336b..62bb13a1b 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -25,6 +25,9 @@ if(@PXR_BUILD_IMAGING@) - if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@) - find_dependency(OpenImageIO CONFIG) - endif() -+ if(@PXR_ENABLE_VULKAN_SUPPORT@) -+ find_dependency(unofficial-shaderc CONFIG) -+ endif() - endif() - - # If Python support was enabled for this USD build, find the import diff --git a/ports/usd/006-vcpkg_find_spirv-reflect.patch b/ports/usd/006-vcpkg_find_spirv-reflect.patch deleted file mode 100644 index bde5f90aedcee3..00000000000000 --- a/ports/usd/006-vcpkg_find_spirv-reflect.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index 79679ca13..d1a8169a2 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -261,7 +261,9 @@ if (PXR_BUILD_IMAGING) - message(FATAL_ERROR "VULKAN_SDK not valid") - endif() - find_package(unofficial-shaderc CONFIG REQUIRED) -+ find_package(unofficial-spirv-reflect CONFIG REQUIRED) - list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc) -+ list(APPEND VULKAN_LIBS unofficial::spirv-reflect) - endif() - # --Opensubdiv - find_package(OpenSubdiv 3 CONFIG REQUIRED) -diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt -index 97e422894..d13837e45 100644 ---- a/pxr/imaging/hgiVulkan/CMakeLists.txt -+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt -@@ -46,9 +46,6 @@ pxr_library(hgiVulkan - api.h - vulkan.h - -- PRIVATE_CLASSES -- spirv_reflect -- - RESOURCE_FILES - plugInfo.json - ) -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index 62bb13a1b..d5b0d2f77 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -27,6 +27,7 @@ if(@PXR_BUILD_IMAGING@) - endif() - if(@PXR_ENABLE_VULKAN_SUPPORT@) - find_dependency(unofficial-shaderc CONFIG) -+ find_dependency(unofficial-spirv-reflect CONFIG) - endif() - endif() - diff --git a/ports/usd/009-fix_cmake_hgi_interop.patch b/ports/usd/007-fix_cmake_hgi_interop.patch similarity index 100% rename from ports/usd/009-fix_cmake_hgi_interop.patch rename to ports/usd/007-fix_cmake_hgi_interop.patch diff --git a/ports/usd/007-vcpkg_find_vma.patch b/ports/usd/007-vcpkg_find_vma.patch deleted file mode 100644 index 279e24d5f1d22f..00000000000000 --- a/ports/usd/007-vcpkg_find_vma.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index d1a8169a2..0fb6776a9 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -262,8 +262,10 @@ if (PXR_BUILD_IMAGING) - endif() - find_package(unofficial-shaderc CONFIG REQUIRED) - find_package(unofficial-spirv-reflect CONFIG REQUIRED) -+ find_package(VulkanMemoryAllocator CONFIG REQUIRED) - list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc) - list(APPEND VULKAN_LIBS unofficial::spirv-reflect) -+ list(APPEND VULKAN_LIBS GPUOpen::VulkanMemoryAllocator) - endif() - # --Opensubdiv - find_package(OpenSubdiv 3 CONFIG REQUIRED) -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index d5b0d2f77..c8039c310 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -28,6 +28,7 @@ if(@PXR_BUILD_IMAGING@) - if(@PXR_ENABLE_VULKAN_SUPPORT@) - find_dependency(unofficial-shaderc CONFIG) - find_dependency(unofficial-spirv-reflect CONFIG) -+ find_dependency(VulkanMemoryAllocator CONFIG) - endif() - endif() - diff --git a/ports/usd/011-fix_clang8_compiler_error.patch b/ports/usd/008-fix_clang8_compiler_error.patch similarity index 100% rename from ports/usd/011-fix_clang8_compiler_error.patch rename to ports/usd/008-fix_clang8_compiler_error.patch diff --git a/ports/usd/012-vcpkg_install_folder_conventions.patch b/ports/usd/009-vcpkg_install_folder_conventions.patch similarity index 100% rename from ports/usd/012-vcpkg_install_folder_conventions.patch rename to ports/usd/009-vcpkg_install_folder_conventions.patch diff --git a/ports/usd/013-cmake_export_plugin_as_modules.patch b/ports/usd/010-cmake_export_plugin_as_modules.patch similarity index 100% rename from ports/usd/013-cmake_export_plugin_as_modules.patch rename to ports/usd/010-cmake_export_plugin_as_modules.patch diff --git a/ports/usd/010-fix_missing_find_dependency_vulkan.patch b/ports/usd/010-fix_missing_find_dependency_vulkan.patch deleted file mode 100644 index d7d67b0cdf7a8a..00000000000000 --- a/ports/usd/010-fix_missing_find_dependency_vulkan.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index 9e104abb7..2aa4a3bd3 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -26,6 +26,12 @@ if(@PXR_BUILD_IMAGING@) - find_dependency(OpenImageIO CONFIG) - endif() - if(@PXR_ENABLE_VULKAN_SUPPORT@) -+ if (NOT DEFINED Vulkan_DIR) -+ if (NOT [[@Vulkan_DIR@]] STREQUAL "") -+ set(Vulkan_DIR [[@Vulkan_DIR@]]) -+ endif() -+ endif() -+ find_dependency(Vulkan REQUIRED) - find_dependency(unofficial-shaderc CONFIG) - find_dependency(unofficial-spirv-reflect CONFIG) - find_dependency(VulkanMemoryAllocator CONFIG) diff --git a/ports/usd/016-TBB-2022.patch b/ports/usd/011-TBB-2022.patch similarity index 100% rename from ports/usd/016-TBB-2022.patch rename to ports/usd/011-TBB-2022.patch diff --git a/ports/usd/012-fix-find-vulkan.patch b/ports/usd/012-fix-find-vulkan.patch new file mode 100644 index 00000000000000..412e9e7c6b73e6 --- /dev/null +++ b/ports/usd/012-fix-find-vulkan.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake +index 9494278..473bb62 100644 +--- a/cmake/defaults/Packages.cmake ++++ b/cmake/defaults/Packages.cmake +@@ -218,13 +218,6 @@ if (PXR_BUILD_IMAGING) + endif() + if (PXR_ENABLE_VULKAN_SUPPORT) + message(STATUS "Enabling experimental feature Vulkan support") +- if (EXISTS $ENV{VULKAN_SDK}) +- # Prioritize the VULKAN_SDK includes and packages before any system +- # installed headers. This is to prevent linking against older SDKs +- # that may be installed by the OS. +- # XXX This is fixed in cmake 3.18+ +- include_directories(BEFORE SYSTEM $ENV{VULKAN_SDK} $ENV{VULKAN_SDK}/include $ENV{VULKAN_SDK}/lib $ENV{VULKAN_SDK}/source) +- set(ENV{PATH} "$ENV{VULKAN_SDK}:$ENV{VULKAN_SDK}/include:$ENV{VULKAN_SDK}/lib:$ENV{VULKAN_SDK}/source:$ENV{PATH}") + find_package(Vulkan REQUIRED) + list(APPEND VULKAN_LIBS Vulkan::Vulkan) + +@@ -249,9 +242,6 @@ if (PXR_BUILD_IMAGING) + endif() + + add_definitions(-DPXR_VULKAN_SUPPORT_ENABLED) +- else() +- message(FATAL_ERROR "VULKAN_SDK not valid") +- endif() + find_package(unofficial-shaderc CONFIG REQUIRED) + find_package(unofficial-spirv-reflect CONFIG REQUIRED) + find_package(VulkanMemoryAllocator CONFIG REQUIRED) diff --git a/ports/usd/015-fix_missing_find_dependency_opengl.patch b/ports/usd/015-fix_missing_find_dependency_opengl.patch deleted file mode 100644 index 1f1a94646b1fb5..00000000000000 --- a/ports/usd/015-fix_missing_find_dependency_opengl.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in -index 2aa4a3bd3..2f89d690c 100644 ---- a/pxr/pxrConfig.cmake.in -+++ b/pxr/pxrConfig.cmake.in -@@ -25,6 +25,9 @@ if(@PXR_BUILD_IMAGING@) - if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@) - find_dependency(OpenImageIO CONFIG) - endif() -+ if(@PXR_ENABLE_GL_SUPPORT@) -+ find_dependency(OpenGL REQUIRED) -+ endif() - if(@PXR_ENABLE_VULKAN_SUPPORT@) - if (NOT DEFINED Vulkan_DIR) - if (NOT [[@Vulkan_DIR@]] STREQUAL "") diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index 71f866fa805c5e..f6d97aa08d3859 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -6,29 +6,30 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) string(REGEX REPLACE "^([0-9]+)[.]([0-9])\$" "\\1.0\\2" USD_VERSION "${VERSION}") +vcpkg_download_distfile(MSVC_PATCH + URLS https://github.com/PixarAnimationStudios/OpenUSD/commit/b677b238ba596f31f252d38dd5172d3e869d193e.patch?full_index=1 + FILENAME fix-msvc.patch + SHA512 1dc8e6559d322f861fd0f0673679358cbc259ddf0ac4cf3a1306557ee8a4a9fdd362d57101b30bb9367abf889e13bbcba6b40fbb571c07899c5b5a8431adcb74 +) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/OpenUSD REF "v${USD_VERSION}" - SHA512 7d4404980579c4de3c155386184ca9d2eb96756ef6e090611bae7b4c21ad942c649f73a39b74ad84d0151ce6b9236c4b6c0c555e8e36fdd86304079e1c2e5cbe + SHA512 77c9601f4a689248448049660ef0083fc99e2a4c2e7a260814831bdfee8e9844f64b5b2aed88a9f907fe4ebcf6a532bb7dce80bb11c1f54c31066b07aa96b851 HEAD_REF release PATCHES 001-fix_rename_find_package_to_find_dependency.patch # See PixarAnimationStudios/OpenUSD#3205 002-vcpkg_find_tbb.patch # See PixarAnimationStudios/OpenUSD#3207 - 003-vcpkg_find_opensubdiv.patch - 004-vcpkg_find_openimageio.patch - 005-vcpkg_find_shaderc.patch - 006-vcpkg_find_spirv-reflect.patch - 007-vcpkg_find_vma.patch - 008-fix_cmake_package.patch - 009-fix_cmake_hgi_interop.patch - 010-fix_missing_find_dependency_vulkan.patch - 011-fix_clang8_compiler_error.patch - 012-vcpkg_install_folder_conventions.patch - 013-cmake_export_plugin_as_modules.patch - 014-MaterialX_v1.38-39.patch # PixarAnimationStudios/OpenUSD#3159 - 015-fix_missing_find_dependency_opengl.patch - 016-TBB-2022.patch # Accomodate oneapi-src/oneTBB#1345 changes + 003-fix-dep.patch + 004-fix_cmake_package.patch + 005-MaterialX_v1.38-39.patch + "${MSVC_PATCH}" + 007-fix_cmake_hgi_interop.patch + 008-fix_clang8_compiler_error.patch + 009-vcpkg_install_folder_conventions.patch + 010-cmake_export_plugin_as_modules.patch + 011-TBB-2022.patch + 012-fix-find-vulkan.patch ) # Changes accompanying 006-vcpkg_find_spirv-reflect.patch @@ -118,8 +119,10 @@ if(VCPKG_TARGET_IS_WINDOWS) # Move all dlls to bin file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + if(NOT VCPKG_BUILD_TYPE) + file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL}) string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM}) file(RENAME ${CURRENT_FROM} ${CURRENT_TO}) @@ -132,7 +135,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endfunction() # fix dll path for cmake - file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll") + if(NOT VCPKG_BUILD_TYPE) + file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll") + endif() file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll") # fix plugInfo.json for runtime diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index 041c309b439adb..5a4f13539ea74f 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "usd", - "version": "24.8", + "version": "24.11", "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, diff --git a/ports/utf8-range/portfile.cmake b/ports/utf8-range/portfile.cmake index 33d89567365daa..15d4f4b72bef80 100644 --- a/ports/utf8-range/portfile.cmake +++ b/ports/utf8-range/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf REF "v${VERSION}" - SHA512 a188d109f317c0cff1d57c3d81b307ff46db816774af2eb4edc39b136725bb3ed70fafbcffcdf9465f6f948a1e7dfc0175f75b17acd414e5ae543939a510688a + SHA512 18b49716ac15800f4ed970a2b2dc3235299933e1ab34edbffd0c1eeabd1ade37b3ea50d90b9a814211aa83ee7a335d9dae1763a088f8899ff64341911d3678c1 HEAD_REF main PATCHES fix-cmake.patch diff --git a/ports/utf8-range/vcpkg.json b/ports/utf8-range/vcpkg.json index 4f010420055a88..ec0a7f1ed586f2 100644 --- a/ports/utf8-range/vcpkg.json +++ b/ports/utf8-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utf8-range", - "version": "5.28.3", + "version": "5.29.1", "description": "Fast UTF-8 validation with Range algorithm (NEON+SSE4+AVX2)", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "MIT", diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index c054263be53e37..d42d0f628d253f 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemtrif/utfcpp REF "v${VERSION}" - SHA512 49ca33bfb2ee44515f555184b51191f7b706a228fb84ddc62e1e6b59c7d69a5ff836f38694daad0012a0f651b6199451974fe44ebe80081df00cf8c2759e3249 + SHA512 53c59f2e04fe5d36faf98a238b94f774834a34982d481a8170ee144f7f8c2d4ba249a732d90654922944c1075c578690c327091883398c533d604bf49f4a6ecf HEAD_REF master ) diff --git a/ports/utfcpp/vcpkg.json b/ports/utfcpp/vcpkg.json index 256a723f76b2ee..aebf2ce675b52b 100644 --- a/ports/utfcpp/vcpkg.json +++ b/ports/utfcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utfcpp", - "version": "4.0.5", + "version": "4.0.6", "description": "UTF-8 with C++ in a Portable Way", "homepage": "https://github.com/nemtrif/utfcpp", "license": "BSL-1.0", diff --git a/ports/v-hacd/CMakeLists.txt b/ports/v-hacd/CMakeLists.txt deleted file mode 100644 index f4451ecaa89c29..00000000000000 --- a/ports/v-hacd/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) - -project(VHACD) - -# Determine if VHACD is built as a subproject (using add_subdirectory) -# or if it is the master project. -set(MASTER_PROJECT OFF) -if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) - set(MASTER_PROJECT ON) - message(STATUS "CMake version: ${CMAKE_VERSION}") -endif () - -option(NO_OPENCL "NO_OPENCL" OFF) -option(NO_OPENMP "NO_OPENMP" OFF) - -message("NO_OPENCL " ${NO_OPENCL}) -message("NO_OPENMP " ${NO_OPENMP}) - -add_subdirectory(src) \ No newline at end of file diff --git a/ports/v-hacd/fix-cmake.patch b/ports/v-hacd/fix-cmake.patch deleted file mode 100644 index 46c53da114ceab..00000000000000 --- a/ports/v-hacd/fix-cmake.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2bbb283..2f7eb52 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,12 +1 @@ --cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) --project(VHACD) --option(NO_OPENCL "NO_OPENCL" OFF) --option(NO_OPENMP "NO_OPENMP" OFF) -- --message("NO_OPENCL " ${NO_OPENCL}) --message("NO_OPENMP " ${NO_OPENMP}) -- --#set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/output" CACHE PATH "project install prefix" FORCE) --set(CMAKE_COMMON_INC "${CMAKE_SOURCE_DIR}/../scripts/cmake_common.cmake") --add_subdirectory ("${CMAKE_SOURCE_DIR}/VHACD_Lib") --add_subdirectory ("${CMAKE_SOURCE_DIR}/test") -+add_subdirectory ("${CMAKE_CURRENT_SOURCE_DIR}/VHACD_Lib") -\ No newline at end of file -diff --git a/src/VHACD_Lib/CMakeLists.txt b/src/VHACD_Lib/CMakeLists.txt -index 46fc1b1..2260fdc 100644 ---- a/src/VHACD_Lib/CMakeLists.txt -+++ b/src/VHACD_Lib/CMakeLists.txt -@@ -1,77 +1,79 @@ -+cmake_minimum_required(VERSION 3.10.0) -+ - project(VHACD_LIB CXX C) --include(${CMAKE_COMMON_INC}) -+include("${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/cmake_common.cmake") -+ -+set(CMAKE_CXX_STANDARD 11) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -+set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?") -+message("[VHACD] \t LIB_TYPE " ${LIB_TYPE}) -+add_library(vhacd ${LIB_TYPE} ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES} ${PROJECT_CL_FILES}) - - if (NOT NO_OPENCL) - #include(FindOpenCL OPTIONAL) -- find_package(OpenCL) -+ find_package(OpenCL REQUIRED) - endif() - if (NOT NO_OPENMP) - #include(FindOpenMP OPTIONAL) -- find_package(OpenMP) -+ find_package(OpenMP REQUIRED) - endif() - if(OPENMP_FOUND) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") -+ target_link_libraries(vhacd PRIVATE OpenMP::OpenMP_CXX) - endif() --set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?") --message("[VHACD] \t LIB_TYPE " ${LIB_TYPE}) --add_library(vhacd ${LIB_TYPE} ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES} ${PROJECT_CL_FILES}) - - if (OpenCL_FOUND) -- target_include_directories(vhacd PRIVATE "${OpenCL_INCLUDE_DIR}") -- target_link_libraries(vhacd PRIVATE "${OpenCL_LIBRARY}") -+ target_link_libraries(vhacd PRIVATE OpenCL::OpenCL) - target_compile_definitions(vhacd PRIVATE -DOPENCL_FOUND=1 ) - target_compile_definitions(vhacd PRIVATE -DOPENCL_CL_FILES="${PROJECT_CL_FILES}" ) - endif() - -- - target_include_directories(vhacd PUBLIC -+ $ -+ $) -+ -+target_include_directories(vhacd PRIVATE - $ -- $ # /include/mylib - ) - - - message("[VHACD] \t -> CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX}) - install(TARGETS vhacd EXPORT vhacd-targets DESTINATION lib) --install(FILES ${PROJECT_INC_FILES} DESTINATION include) --install(FILES ${PROJECT_INL_FILES} DESTINATION include) -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/public/VHACD.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/) -+ - - - set(VHACD_LIB_VERSION 3.2.0) - include(CMakePackageConfigHelpers) - write_basic_package_version_file( -- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config-version.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config-version.cmake" - VERSION ${VHACD_LIB_VERSION} - COMPATIBILITY AnyNewerVersion - ) - --export(EXPORT vhacd-targets NAMESPACE :: -- FILE "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-targets.cmake" -+export(EXPORT vhacd-targets NAMESPACE vhacd:: -+ FILE "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-targets.cmake" - ) - - configure_file(cmake/vhacd-config.cmake -- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config.cmake" - COPYONLY - ) - - set(ConfigPackageLocation lib/cmake/vhacd) - install(EXPORT vhacd-targets - FILE -- vhacd-targets.cmake -+ v-hacd-targets.cmake - DESTINATION - ${ConfigPackageLocation} -- NAMESPACE :: -+ NAMESPACE vhacd:: - ) - install( - FILES -- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config-version.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config-version.cmake" - DESTINATION - ${ConfigPackageLocation} - COMPONENT - Devel - ) - - -diff --git a/src/VHACD_Lib/cmake/vhacd-config.cmake b/src/VHACD_Lib/cmake/vhacd-config.cmake -index 8fc5c58..7677f58 100644 ---- a/src/VHACD_Lib/cmake/vhacd-config.cmake -+++ b/src/VHACD_Lib/cmake/vhacd-config.cmake -@@ -1,4 +1,4 @@ - - find_package(OpenCL) - find_package(OpenMP) --include("${CMAKE_CURRENT_LIST_DIR}/vhacd-targets.cmake") -\ No newline at end of file -+include("${CMAKE_CURRENT_LIST_DIR}/v-hacd-targets.cmake") -\ No newline at end of file diff --git a/ports/v-hacd/portfile.cmake b/ports/v-hacd/portfile.cmake index c22697eba643ca..aed23ba2a94561 100644 --- a/ports/v-hacd/portfile.cmake +++ b/ports/v-hacd/portfile.cmake @@ -1,43 +1,11 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kmammou/v-hacd - REF 1a49edf29c69039df15286181f2f27e17ceb9aef - SHA512 14157e5fd9cbfeb44735dc2952d7b4f43337ea2243f3b690125dda27e3bb8328cc38050415c7150cf11fbd85c5258c3aaa8899f306ce118f78a4d5e6139ef0f0 + REF "v${VERSION}" + SHA512 b974c490897a1901d6975c75222a167a70f9e2a37e0c548aeb6a346cb0154ec1415947d47d69a729c0c4d9345aed70d3c09d4bf297beacfae66ceb4c8c89c6d0 HEAD_REF master - PATCHES - fix-cmake.patch -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(LIB_TYPE "SHARED") -else() - set(LIB_TYPE "STATIC") -endif() - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - openmp NO_OPENMP - opencl NO_OPENCL ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DLIB_TYPE=${LIB_TYPE} -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vhacd) - -vcpkg_copy_pdbs() - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/include/VHACD.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/v-hacd/vcpkg.json b/ports/v-hacd/vcpkg.json index 0cd67b71ae0a7e..d24b38962f5873 100644 --- a/ports/v-hacd/vcpkg.json +++ b/ports/v-hacd/vcpkg.json @@ -1,29 +1,7 @@ { "name": "v-hacd", - "version": "3.2.0", - "port-version": 4, + "version": "4.1.0", "description": "The V-HACD library decomposes a 3D surface into a set of \"near\" convex parts.", "homepage": "https://github.com/kmammou/v-hacd", - "supports": "!arm", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "opencl": { - "description": "Builds opencl enabled lib", - "dependencies": [ - "opencl" - ] - }, - "openmp": { - "description": "Builds openmp enabled lib" - } - } + "supports": "!arm" } diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake new file mode 100644 index 00000000000000..1b1d146f31faf4 --- /dev/null +++ b/ports/vcpkg-make/portfile.cmake @@ -0,0 +1,43 @@ +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + +set(automake_version 1.17) +vcpkg_download_distfile(ARCHIVE + URLS https://ftp.gnu.org/gnu/automake/automake-${automake_version}.tar.gz + https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/automake/automake-${automake_version}.tar.gz + FILENAME automake-${automake_version}.tar.gz + SHA512 11357dfab8cbf4b5d94d9d06e475732ca01df82bef1284888a34bd558afc37b1a239bed1b5eb18a9dbcc326344fb7b1b301f77bb8385131eb8e1e118b677883a +) + +vcpkg_extract_source_archive( + automake_source + ARCHIVE "${ARCHIVE}" +) + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_scripts.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) + +file(INSTALL + "${automake_source}/lib/ar-lib" + "${automake_source}/lib/compile" + DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers" +) + +vcpkg_install_copyright( + COMMENT [[ +The cmake scripts are under vcpkg's MIT license terms, see LICENSE.txt below. +The port also installs shell scripts from GNU Automake. +These scripts are under GPL-2.0-or-later, see COPYING below. +]] + FILE_LIST + "${VCPKG_ROOT_DIR}/LICENSE.txt" + "${automake_source}/COPYING" +) diff --git a/ports/vcpkg-make/vcpkg-port-config.cmake b/ports/vcpkg-make/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..9bce16b97003ab --- /dev/null +++ b/ports/vcpkg-make/vcpkg-port-config.cmake @@ -0,0 +1,6 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_scripts.cmake") diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json new file mode 100644 index 00000000000000..59046f78a10ecc --- /dev/null +++ b/ports/vcpkg-make/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-make", + "version-date": "2024-12-27", + "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure", + "license": null, + "supports": "native", + "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ] +} diff --git a/ports/vcpkg-make/vcpkg_make.cmake b/ports/vcpkg-make/vcpkg_make.cmake new file mode 100644 index 00000000000000..ee3ec778fce9b2 --- /dev/null +++ b/ports/vcpkg-make/vcpkg_make.cmake @@ -0,0 +1,277 @@ +# Be aware of https://github.com/microsoft/vcpkg/pull/31228 +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake") + +function(vcpkg_run_shell) + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "WORKING_DIRECTORY;LOGNAME" + "SHELL;COMMAND;SAVE_LOG_FILES" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + z_vcpkg_required_args(SHELL WORKING_DIRECTORY COMMAND LOGNAME) + + + set(extra_opts "") + if(arg_SAVE_LOG_FILES) + set(extra_opts SAVE_LOG_FILES ${arg_SAVE_LOG_FILES}) + endif() + + # In the construction of the shell command, we need to handle environment variable assignments and configure options differently: + # + # 1. Environment variable assignments (e.g., CC, CXX, etc.): + # - These must not be quoted. + # - If the environment variable names (e.g., CC, CXX, CC_FOR_BUILD) are quoted, the shell will treat them as part of the value, breaking the declaration. + # - For example, CC='/usr/bin/gcc' is valid, but "CC='/usr/bin/gcc'" would cause an error because the shell would try to use the entire quoted string as the variable name. + # + # 2. Options passed to the configure script: + # - The options should be quoted to ensure that any option containing spaces or special characters is treated as a single argument. + # - For instance, --prefix=/some path/with spaces would break if not quoted, as the shell would interpret each word as a separate argument. + # - By quoting the options like "--prefix=/some path/with spaces", we ensure they are passed correctly to the configure script as a single argument. + # + # The resulting command should look something like this: + # V=1 CC='/Library/Developer/CommandLineTools/usr/bin/cc -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk -arch arm64' + # CXX='/Library/Developer/CommandLineTools/usr/bin/c++ -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk -arch arm64' + # CC_FOR_BUILD='/Library/Developer/CommandLineTools/usr/bin/cc -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk -arch arm64' + # CPP_FOR_BUILD='/Library/Developer/CommandLineTools/usr/bin/cc -E -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk -arch arm64' + # CXX_FOR_BUILD='/Library/Developer/CommandLineTools/usr/bin/c++ -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk -arch arm64' + # .... + # ./../src/8bc98c3a0d-84009aba94.clean/configure "--enable-pic" "--disable-lavf" "--disable-swscale" "--disable-avs" ... + vcpkg_list(JOIN arg_COMMAND " " arg_COMMAND) + vcpkg_execute_required_process( + COMMAND ${arg_SHELL} -c "${arg_COMMAND}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + LOGNAME "${arg_LOGNAME}" + ${extra_opts} + ) +endfunction() + +function(vcpkg_run_shell_as_build) + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "WORKING_DIRECTORY;LOGNAME" + "SHELL;COMMAND;NO_PARALLEL_COMMAND;SAVE_LOG_FILES" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + z_vcpkg_required_args(SHELL WORKINK_DIRECTORY COMMAND LOGNAME) + + set(extra_opts "") + if(arg_SAVE_LOG_FILES) + set(extra_opts SAVE_LOG_FILES ${arg_SAVE_LOG_FILES}) + endif() + + list(JOIN arg_COMMAND " " cmd) + list(JOIN arg_NO_PARALLEL_COMMAND " " no_par_cmd) + vcpkg_execute_build_process( + COMMAND ${arg_SHELL} -c "${cmd}" + NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + LOGNAME "${arg_LOGNAME}" + ${extra_opts} + ) +endfunction() + +function(vcpkg_run_autoreconf shell_cmd work_dir) + find_program(AUTORECONF NAMES autoreconf) + if(NOT AUTORECONF) + message(FATAL_ERROR "${PORT} currently requires the following programs from the system package manager: + autoconf automake autoconf-archive + On Debian and Ubuntu derivatives: + sudo apt-get install autoconf automake autoconf-archive + On recent Red Hat and Fedora derivatives: + sudo dnf install autoconf automake autoconf-archive + On Arch Linux and derivatives: + sudo pacman -S autoconf automake autoconf-archive + On Alpine: + apk add autoconf automake autoconf-archive + On macOS: + brew install autoconf automake autoconf-archive\n") + endif() + message(STATUS "Generating configure for ${TARGET_TRIPLET}") + vcpkg_run_shell( + SHELL ${shell_cmd} + COMMAND "${AUTORECONF}" -vfi + WORKING_DIRECTORY "${work_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" + ) + message(STATUS "Finished generating configure for ${TARGET_TRIPLET}") +endfunction() + +function(vcpkg_make_setup_win_msys msys_out) + list(APPEND msys_require_packages autoconf-wrapper automake-wrapper binutils libtool make which) + vcpkg_insert_msys_into_path(msys PACKAGES ${msys_require_packages}) + find_program(PKGCONFIG NAMES pkgconf NAMES_PER_DIR PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" NO_DEFAULT_PATH) + set("${msys_out}" "${msys}" PARENT_SCOPE) +endfunction() + +function(vcpkg_make_get_shell out_var) + set(shell_options "") + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_make_setup_win_msys(msys_root) + set(shell_options --noprofile --norc --debug) + set(shell_cmd "${msys_root}/usr/bin/bash.exe") + endif() + find_program(shell_cmd NAMES bash sh zsh REQUIRED) + set("${out_var}" "${shell_cmd}" ${shell_options} PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_get_configure_triplets out) + cmake_parse_arguments(PARSE_ARGV 1 arg + "" + "COMPILER_NAME" + "" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + # --build: the machine you are building on + # --host: the machine you are building for + # --target: the machine that CC will produce binaries for + # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler + # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host + z_vcpkg_make_determine_target_arch(TARGET_ARCH) + z_vcpkg_make_determine_host_arch(BUILD_ARCH) + + set(build_triplet_opt "") + if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_IS_WINDOWS) + # This is required since we are running in a msys + # shell which will be otherwise identified as ${BUILD_ARCH}-pc-msys + set(build_triplet_opt "--build=${BUILD_ARCH}-pc-mingw32") + endif() + + set(host_triplet "") + if(VCPKG_CROSSCOMPILING) + if(VCPKG_TARGET_IS_WINDOWS) + if(NOT TARGET_ARCH MATCHES "${BUILD_ARCH}" OR NOT CMAKE_HOST_WIN32) + set(host_triplet_opt "--host=${TARGET_ARCH}-pc-mingw32") + elseif(VCPKG_TARGET_IS_UWP) + # Needs to be different from --build to enable cross builds. + set(host_triplet_opt "--host=${TARGET_ARCH}-unknown-mingw32") + endif() + elseif(VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_OSX AND NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}") + set(host_triplet_opt "--host=${TARGET_ARCH}-apple-darwin") + elseif(VCPKG_TARGET_IS_LINUX) + if("${arg_COMPILER_NAME}" MATCHES "([^\/]*)-gcc$" AND CMAKE_MATCH_1 AND NOT CMAKE_MATCH_1 MATCHES "^gcc") + set(host_triplet_opt "--host=${CMAKE_MATCH_1}") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + endif() + endif() + + set(output "${build_triplet_opt};${host_triplet_opt}") + string(STRIP "${output}" output) + set("${out}" "${output}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_prepare_env config) + cmake_parse_arguments(PARSE_ARGV 1 arg + "ADD_BIN_TO_PATH" + "" + "" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + # Used by CL + vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") + # Used by GCC + vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") + vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") + + # Flags should be set in the toolchain instead (Setting this up correctly requires a function named vcpkg_determined_cmake_compiler_flags which can also be used to setup CC and CXX etc.) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_backup_env_variables(VARS _CL_ _LINK_) + # TODO: Should be CPP flags instead -> rewrite when vcpkg_determined_cmake_compiler_flags defined + if(VCPKG_TARGET_IS_UWP) + # Be aware that configure thinks it is crosscompiling due to: + # error while loading shared libraries: VCRUNTIME140D_APP.dll: + # cannot open shared object file: No such file or directory + # IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper + # is to use the CL and LINK environment variables !!! + # (This is due to libtool and compiler wrapper using the same set of options to pass those variables around) + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir) + set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") + set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") + set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + endif() + endif() + + # Setup environment + set(ENV{CPPFLAGS} "${CPPFLAGS_${config}}") + set(ENV{CPPFLAGS_FOR_BUILD} "${CPPFLAGS_${config}}") + set(ENV{CFLAGS} "${CFLAGS_${config}}") + set(ENV{CFLAGS_FOR_BUILD} "${CFLAGS_${config}}") + set(ENV{CXXFLAGS} "${CXXFLAGS_${config}}") + set(ENV{RCFLAGS} "${RCFLAGS_${config}}") + set(ENV{LDFLAGS} "${LDFLAGS_${config}}") + set(ENV{LDFLAGS_FOR_BUILD} "${LDFLAGS_${config}}") + if(ARFLAGS_${config} AND NOT (arg_USE_WRAPPERS AND VCPKG_TARGET_IS_WINDOWS)) + # Target windows with wrappers enabled cannot forward ARFLAGS since it breaks the wrapper + set(ENV{ARFLAGS} "${ARFLAGS_${config}}") + endif() + + if(LINK_ENV_${config}) + set(ENV{_LINK_} "${LINK_ENV_${config}}") + endif() + + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${config}}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${config}}/lib") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${config}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${config}}/lib/manual-link") + endif() + endforeach() +endfunction() + +function(z_vcpkg_make_restore_env) + # Only variables which are inspected in vcpkg_make_prepare_env need to be restored here. + # Rest is restored add the end of configure. + vcpkg_restore_env_variables(VARS + LIBRARY_PATH LIB LIBPATH + PATH + ) +endfunction() + +function(vcpkg_make_run_configure) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ADD_BIN_TO_PATH" + "CONFIG;SHELL;WORKING_DIRECTORY;CONFIGURE_PATH;CONFIGURE_ENV" + "OPTIONS" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + z_vcpkg_required_args(SHELL CONFIG WORKING_DIRECTORY CONFIGURE_PATH) + + vcpkg_prepare_pkgconfig("${arg_CONFIG}") + + set(prepare_env_opts "") + + z_vcpkg_make_prepare_env("${arg_CONFIG}" ${prepare_env_opts}) + + vcpkg_list(SET tmp) + foreach(element IN LISTS arg_OPTIONS) + string(REPLACE [["]] [[\"]] element "${element}") + vcpkg_list(APPEND tmp "\"${element}\"") + endforeach() + vcpkg_list(JOIN tmp " " "arg_OPTIONS") + set(command ${arg_CONFIGURE_ENV} ${arg_CONFIGURE_PATH} ${arg_OPTIONS}) + + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${arg_CONFIG}}") + vcpkg_run_shell( + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + LOGNAME "config-${TARGET_TRIPLET}-${suffix_${arg_CONFIG}}" + SAVE_LOG_FILES config.log + SHELL ${arg_SHELL} + COMMAND V=1 ${command} + ) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB_RECURSE libtool_files "${arg_WORKING_DIRECTORY}*/libtool") + foreach(lt_file IN LISTS libtool_files) + file(READ "${lt_file}" _contents) + string(REPLACE ".dll.lib" ".lib" _contents "${_contents}") + file(WRITE "${lt_file}" "${_contents}") + endforeach() + endif() + z_vcpkg_make_restore_env() + vcpkg_restore_pkgconfig() +endfunction() diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake new file mode 100644 index 00000000000000..575f3b81f8089d --- /dev/null +++ b/ports/vcpkg-make/vcpkg_make_common.cmake @@ -0,0 +1,660 @@ +include_guard(GLOBAL) + +### Mapping variables +macro(z_vcpkg_make_set_common_vars) + set(path_suffix_RELEASE "") + set(path_suffix_DEBUG "/debug") + set(suffix_RELEASE "rel") + set(suffix_DEBUG "dbg") + foreach(config IN ITEMS RELEASE DEBUG) + set("workdir_${config}" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${config}}") + endforeach() + set(buildtypes release) + if(NOT VCPKG_BUILD_TYPE) + list(APPEND buildtypes debug) + endif() +endmacro() + +### +macro(z_vcpkg_make_get_cmake_vars) + cmake_parse_arguments(vmgcv_arg # Not just arg since macros don't define their own var scope. + "" "" "LANGUAGES" ${ARGN} + ) + + z_vcpkg_get_global_property(has_cmake_vars_file "make_cmake_vars_file" SET) + + if(NOT has_cmake_vars_file) + if(vmgcv_arg_LANGUAGES) + # Escape semicolons to prevent CMake from splitting LANGUAGES list when passing as -D option. + string(REPLACE ";" "\;" vmgcv_arg_langs "${vmgcv_arg_LANGUAGES}") + list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_LANGUAGES=${vmgcv_arg_langs}") + unset(langs) + endif() + + list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_DEFAULT_VARS_TO_CHECK=CMAKE_LIBRARY_PATH_FLAG") + vcpkg_cmake_get_vars(cmake_vars_file) + z_vcpkg_set_global_property(make_cmake_vars_file "${cmake_vars_file}") + else() + z_vcpkg_get_global_property(cmake_vars_file "make_cmake_vars_file") + endif() + + include("${cmake_vars_file}") +endmacro() + +### normalize architectures +function(z_vcpkg_make_determine_arch out_var value) + if(${value} MATCHES "^(amd|AMD|x)64$") + set(${out_var} x86_64 PARENT_SCOPE) + elseif(${value} MATCHES "^(x|X)86$") + set(${out_var} i686 PARENT_SCOPE) + elseif(${value} MATCHES "^(ARM|arm)64$") + set(${out_var} aarch64 PARENT_SCOPE) + elseif(${value} MATCHES "^(ARM|arm)$") + set(${out_var} arm PARENT_SCOPE) + elseif(${value} MATCHES "^(x86_64|i686|aarch64)$" OR NOT VCPKG_TARGET_IS_WINDOWS) + # Do nothing and assume valid architecture + set("${out_var}" "${value}" PARENT_SCOPE) + else() + message(FATAL_ERROR "Unsupported architecture '${value}' in '${CMAKE_CURRENT_FUNCTION}'!" ) + endif() +endfunction() + +function(z_vcpkg_make_determine_host_arch out_var) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(arch $ENV{PROCESSOR_ARCHITEW6432}) + elseif(DEFINED ENV{PROCESSOR_ARCHITECTURE}) + set(arch $ENV{PROCESSOR_ARCHITECTURE}) + else() + z_vcpkg_make_get_cmake_vars(#[[ LANGUAGES .... ]]) + set(arch "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + endif() + z_vcpkg_make_determine_arch("${out_var}" "${arch}") + set("${out_var}" "${${out_var}}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_determine_target_arch out_var) + list(LENGTH VCPKG_OSX_ARCHITECTURES osx_archs_num) + if(osx_archs_num GREATER_EQUAL 2 AND VCPKG_TARGET_IS_OSX) + set(${out_var} "universal") + else() + z_vcpkg_make_determine_arch(${out_var} "${VCPKG_TARGET_ARCHITECTURE}") + endif() + set("${out_var}" "${${out_var}}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_prepare_compile_flags) + cmake_parse_arguments(PARSE_ARGV 0 arg + "DISABLE_CPPFLAGS;NO_FLAG_ESCAPING;DISABLE_MSVC_WRAPPERS" + "COMPILER_FRONTEND;CONFIG;FLAGS_OUT" + "LANGUAGES" + ) + + z_vcpkg_unparsed_args(FATAL_ERROR) + + if(NOT DEFINED arg_LANGUAGES) + set(arg_LANGUAGES "C" "CXX") + endif() + + set(var_suffix "${arg_CONFIG}") + set(CFLAGS "") + set(CXXFLAGS "") + + # separate_aruments is needed to remove outer quotes from detected cmake variables. + # (e.g. Android NDK has "--sysroot=...") + foreach(lang IN LISTS arg_LANGUAGES) + if(NOT "${VCPKG_COMBINED_${lang}_FLAGS_${var_suffix}}" STREQUAL "") + separate_arguments(${lang}FLAGS NATIVE_COMMAND "${VCPKG_COMBINED_${lang}_FLAGS_${var_suffix}}") + else() + set(${lang}FLAGS "") + endif() + vcpkg_list(APPEND flags ${lang}FLAGS) + endforeach() + + separate_arguments(LDFLAGS NATIVE_COMMAND "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${var_suffix}}") + separate_arguments(ARFLAGS NATIVE_COMMAND "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${var_suffix}}") + set(RCFLAGS "${VCPKG_COMBINED_RC_FLAGS_${var_suffix}}") + + foreach(var IN ITEMS ABIFLAGS LDFLAGS ARFLAGS RCFLAGS) + vcpkg_list(APPEND flags ${var}) + endforeach() + + set(ABIFLAGS "") + set(pattern "") + foreach(arg IN LISTS CFLAGS) + if(NOT pattern STREQUAL "") + vcpkg_list(APPEND pattern "${arg}") + elseif(arg MATCHES "^--(sysroot|target)=.") + vcpkg_list(SET pattern "${arg}") + elseif(arg MATCHES "^-(isysroot|m32|m64|m?[Aa][Rr][Cc][Hh]|target)\$") + vcpkg_list(SET pattern "${arg}") + continue() + else() + continue() + endif() + vcpkg_list(APPEND ABIFLAGS "${pattern}") + list(REMOVE_ITEM CFLAGS "${pattern}") + list(REMOVE_ITEM CXXFLAGS "${pattern}") + list(REMOVE_ITEM LDFLAGS "${pattern}") + set(pattern "") + endforeach() + + # Filter common CPPFLAGS out of CFLAGS and CXXFLAGS + if(NOT arg_DISABLE_CPPFLAGS) + set(CPPFLAGS "") + set(pattern "") + foreach(arg IN LISTS CXXFLAGS) + if(NOT pattern STREQUAL "") + vcpkg_list(APPEND pattern "${arg}") + elseif(arg MATCHES "^-(D|isystem).") + vcpkg_list(SET pattern "${arg}") + elseif(arg MATCHES "^-(D|isystem)\$") + vcpkg_list(SET pattern "${arg}") + continue() + else() + continue() + endif() + string(FIND "${CFLAGS}" "${pattern} " index) + if(NOT index STREQUAL "-1") + vcpkg_list(APPEND CPPFLAGS ${pattern}) + list(REMOVE_ITEM CFLAGS "${pattern}") + list(REMOVE_ITEM CXXFLAGS "${pattern}") + list(REMOVE_ITEM LDFLAGS "${pattern}") + endif() + endforeach() + set(pattern "") + foreach(arg IN LISTS CFLAGS) + if(NOT pattern STREQUAL "") + vcpkg_list(APPEND pattern "${arg}") + elseif(arg MATCHES "^-(D|isystem)\$") + vcpkg_list(SET pattern "${arg}") + continue() + elseif(arg MATCHES "^-(D|isystem).") + vcpkg_list(SET pattern "${arg}") + else() + continue() + endif() + string(FIND "${CXXFLAGS}" "${pattern} " index) + if(NOT index STREQUAL "-1") + vcpkg_list(APPEND CPPFLAGS ${pattern}) + list(REMOVE_ITEM CFLAGS "${pattern}") + list(REMOVE_ITEM CXXFLAGS "${pattern}") + list(REMOVE_ITEM LDFLAGS "${pattern}") + endif() + vcpkg_list(SET pattern) + endforeach() + endif() + + # libtool tries to filter CFLAGS passed to the link stage via a allow list. + + # This approach is flawed since it fails to pass flags unknown to libtool + # but required for linking to the link stage (e.g. -fsanitize=). + # libtool has an -R option so we need to guard against -RTC by using -Xcompiler. + # While configuring there might be a lot of unknown compiler option warnings + # due to that; just ignore them. + set(compiler_flag_escape "") + if(arg_COMPILER_FRONTEND STREQUAL "MSVC" AND NOT arg_NO_FLAG_ESCAPING) + set(compiler_flag_escape "-Xcompiler") + endif() + if(compiler_flag_escape) + list(TRANSFORM CFLAGS PREPEND "${compiler_flag_escape};") + list(TRANSFORM CXXFLAGS PREPEND "${compiler_flag_escape};") + endif() + + set(library_path_flag "${VCPKG_DETECTED_CMAKE_LIBRARY_PATH_FLAG}") + set(linker_flag_escape "") + if(arg_COMPILER_FRONTEND STREQUAL "MSVC" AND NOT arg_NO_FLAG_ESCAPING) + # Removed by libtool + set(linker_flag_escape "-Xlinker") + if(NOT arg_DISABLE_MSVC_WRAPPERS) + set(linker_flag_escape "-Xlinker -Xlinker -Xlinker") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(STRIP "$ENV{_LINK_} ${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${var_suffix}}" LINK_ENV) + else() + string(STRIP "$ENV{_LINK_} ${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${var_suffix}}" LINK_ENV) + endif() + endif() + if(linker_flag_escape) + string(STRIP "${linker_flag_escape}" linker_flag_escape_stripped) + string(REPLACE " " ";" linker_flag_escape_stripped "${linker_flag_escape_stripped}") + list(TRANSFORM LDFLAGS PREPEND "${linker_flag_escape_stripped};") + endif() + string(REPLACE " " "\\ " current_installed_dir_escaped "${CURRENT_INSTALLED_DIR}") + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") + vcpkg_list(PREPEND LDFLAGS "${linker_flag_escape}${library_path_flag}${current_installed_dir_escaped}${path_suffix_${var_suffix}}/lib/manual-link") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") + vcpkg_list(PREPEND LDFLAGS "${linker_flag_escape}${library_path_flag}${current_installed_dir_escaped}${path_suffix_${var_suffix}}/lib") + endif() + + if(ARFLAGS AND NOT arg_COMPILER_FRONTEND STREQUAL "MSVC") + # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?) + # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ? + # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE + vcpkg_list(PREPEND ARFLAGS "cr") + elseif(NOT arg_DISABLE_MSVC_WRAPPERS AND arg_COMPILER_FRONTEND STREQUAL "MSVC") + # The wrapper needs an action and that action needs to be defined AFTER all flags + vcpkg_list(APPEND ARFLAGS "cr") + endif() + + foreach(var IN LISTS flags) + list(JOIN ${var} " " string) + set("${var}_${var_suffix}" "${string}" PARENT_SCOPE) + list(APPEND flags_out "${var}_${var_suffix}") + endforeach() + set("${arg_FLAGS_OUT}" "${flags_out}" PARENT_SCOPE) +endfunction() + +### Prepare environment for configure +function(z_vcpkg_make_prepare_programs out_env) + cmake_parse_arguments(PARSE_ARGV 1 arg + "DISABLE_CPPFLAGS;DISABLE_MSVC_WRAPPERS" + "CONFIG;BUILD_TRIPLET" + "LANGUAGES" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + + z_vcpkg_make_get_cmake_vars(LANGUAGES ${arg_LANGUAGES}) + + macro(z_vcpkg_append_to_configure_environment inoutlist var defaultval) + # Allows to overwrite settings in custom triplets via the environment + if(DEFINED ENV{${var}}) + list(APPEND "${inoutlist}" "${var}='$ENV{${var}}'") + else() + list(APPEND "${inoutlist}" "${var}='${defaultval}'") + endif() + endmacro() + + set(configure_env "") + # Remove full filepaths due to spaces and prepend filepaths to PATH (cross-compiling tools are unlikely on path by default) + if (VCPKG_TARGET_IS_WINDOWS) + set(progs C_COMPILER CXX_COMPILER AR + LINKER RANLIB OBJDUMP + STRIP NM DLLTOOL RC_COMPILER) + list(TRANSFORM progs PREPEND "VCPKG_DETECTED_CMAKE_") + foreach(prog IN LISTS progs) + set(filepath "${${prog}}") + if(filepath MATCHES " ") + # CHECK: Uncertain if the compile wrappers work with absolute paths containing C:\\ + cmake_path(GET filepath FILENAME ${prog}) + vcpkg_insert_program_into_path("${filepath}") + endif() + endforeach() + + if (NOT arg_DISABLE_MSVC_WRAPPERS AND NOT VCPKG_TARGET_IS_MINGW) + z_vcpkg_append_to_configure_environment(configure_env CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + if(NOT arg_BUILD_TRIPLET MATCHES "--host") # TODO: Check if this generates problems with the new triplet approach + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + else() + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() + + z_vcpkg_append_to_configure_environment(configure_env RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + if(VCPKG_DETECTED_CMAKE_AR) + z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib ${VCPKG_DETECTED_CMAKE_AR}") + else() + z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib lib.exe -verbose") + endif() + else() + z_vcpkg_append_to_configure_environment(configure_env CPP "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + if(NOT arg_BUILD_TRIPLET MATCHES "--host") + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + else() + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() + z_vcpkg_append_to_configure_environment(configure_env RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + if(VCPKG_DETECTED_CMAKE_AR) + z_vcpkg_append_to_configure_environment(configure_env AR "${VCPKG_DETECTED_CMAKE_AR}") + else() + z_vcpkg_append_to_configure_environment(configure_env AR "lib.exe -verbose") + endif() + endif() + z_vcpkg_append_to_configure_environment(configure_env LD "${VCPKG_DETECTED_CMAKE_LINKER} -verbose") + if(VCPKG_DETECTED_CMAKE_RANLIB) + z_vcpkg_append_to_configure_environment(configure_env RANLIB "${VCPKG_DETECTED_CMAKE_RANLIB}") # Trick to ignore the RANLIB call + else() + z_vcpkg_append_to_configure_environment(configure_env RANLIB ": RANLIB-disabled") + endif() + if(VCPKG_DETECTED_CMAKE_OBJDUMP) #Objdump is required to make shared libraries. Otherwise define lt_cv_deplibs_check_method=pass_all + z_vcpkg_append_to_configure_environment(configure_env OBJDUMP "${VCPKG_DETECTED_CMAKE_OBJDUMP}") # Trick to ignore the RANLIB call + endif() + if(VCPKG_DETECTED_CMAKE_STRIP) # If required set the ENV variable STRIP in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env STRIP "${VCPKG_DETECTED_CMAKE_STRIP}") + else() + z_vcpkg_append_to_configure_environment(configure_env STRIP ": STRIP-disabled") + list(APPEND arg_OPTIONS ac_cv_prog_ac_ct_STRIP=:) + endif() + if(VCPKG_DETECTED_CMAKE_NM) # If required set the ENV variable NM in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env NM "${VCPKG_DETECTED_CMAKE_NM}") + else() + # Would be better to have a true nm here! Some symbols (mainly exported variables) get not properly imported with dumpbin as nm + # and require __declspec(dllimport) for some reason (same problem CMake has with WINDOWS_EXPORT_ALL_SYMBOLS) + z_vcpkg_append_to_configure_environment(configure_env NM "dumpbin.exe -symbols -headers") + endif() + if(VCPKG_DETECTED_CMAKE_DLLTOOL) # If required set the ENV variable DLLTOOL in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "${VCPKG_DETECTED_CMAKE_DLLTOOL}") + else() + z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "link.exe -verbose -dll") + endif() + + if(NOT "ASM" IN_LIST arg_LANGUAGES ) + z_vcpkg_append_to_configure_environment(configure_env CCAS ": CCAS-disabled") # If required set the ENV variable CCAS in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env AS ": AS-disabled") # If required set the ENV variable AS in the portfile correctly + + else() + set(ccas "${VCPKG_DETECTED_CMAKE_ASM_COMPILER}") + if(VCPKG_DETECTED_CMAKE_ASM_COMPILER_ID STREQUAL "MSVC") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflags "--target=i686-pc-windows-msvc -m32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflags "--target=x86_64-pc-windows-msvc") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(asmflags "--target=arm64-pc-windows-msvc") + endif() + vcpkg_find_acquire_program(CLANG) + set(ccas "${CLANG}") + if(ccas MATCHES " ") + cmake_path(GET ccas PARENT_PATH ccas_dir) + cmake_path(GET ccas FILENAME ccas_filename) + vcpkg_insert_program_into_path("${ccas_dir}") + set(ccas "${ccas_filename}") + endif() + string(APPEND ccas " ${asmflags}") + endif() + z_vcpkg_append_to_configure_environment(configure_env CCAS "${ccas} -c") + z_vcpkg_append_to_configure_environment(configure_env AS "${ccas} -c") + endif() + + else() + # OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++ + vcpkg_list(SET z_vcm_all_tools) + function(z_vcpkg_make_set_env envvar cmakevar) + set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}}") + if(NOT DEFINED ENV{${envvar}} AND NOT prog STREQUAL "") + vcpkg_list(APPEND z_vcm_all_tools "${prog}") + if(ARGN) + string(APPEND prog " ${ARGN}") + endif() + set(z_vcm_all_tools "${z_vcm_all_tools}" PARENT_SCOPE) + endif() + z_vcpkg_append_to_configure_environment(configure_env "${envvar}" "${prog}") + set(configure_env "${configure_env}" PARENT_SCOPE) + endfunction() + + z_vcpkg_make_set_env(CC C_COMPILER ${ABIFLAGS_${arg_CONFIG}}) + z_vcpkg_make_set_env(CXX CXX_COMPILER ${ABIFLAGS_${arg_CONFIG}}) + if(NOT arg_BUILD_TRIPLET MATCHES "--host") + z_vcpkg_make_set_env(CC_FOR_BUILD C_COMPILER ${ABIFLAGS_${arg_CONFIG}}) + z_vcpkg_make_set_env(CPP_FOR_BUILD C_COMPILER "-E" ${ABIFLAGS_${arg_CONFIG}}) + z_vcpkg_make_set_env(CXX_FOR_BUILD CXX_COMPILER ${ABIFLAGS_${arg_CONFIG}}) + else() + set(ENV{CC_FOR_BUILD} "umask 0 | touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CPP_FOR_BUILD} "umask 0 | touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CXX_FOR_BUILD} "umask 0 | touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() + if("ASM" IN_LIST arg_LANGUAGES) + z_vcpkg_make_set_env(CCAS ASM_COMPILER "-c" ${ABIFLAGS_${arg_CONFIG}}) + z_vcpkg_make_set_env(AS ASM_COMPILER "-c" ${ABIFLAGS_${arg_CONFIG}}) + endif() + z_vcpkg_make_set_env(NM NM) + z_vcpkg_make_set_env(RC RC) + z_vcpkg_make_set_env(WINDRES RC) + z_vcpkg_make_set_env(DLLTOOL DLLTOOL) + z_vcpkg_make_set_env(STRIP STRIP) + z_vcpkg_make_set_env(OBJDUMP OBJDUMP) + z_vcpkg_make_set_env(RANLIB RANLIB) + z_vcpkg_make_set_env(AR AR) + z_vcpkg_make_set_env(LD LINKER) + unset(z_vcpkg_make_set_env) + + list(FILTER z_vcm_all_tools INCLUDE REGEX " ") + if(z_vcm_all_tools) + list(REMOVE_DUPLICATES z_vcm_all_tools) + list(JOIN z_vcm_all_tools "\n " tools) + message(STATUS "Warning: Tools with embedded space may be handled incorrectly by configure:\n ${tools}") + endif() + endif() + list(JOIN configure_env " " configure_env) + set("${out_env}" "${configure_env}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_prepare_link_flags) + cmake_parse_arguments(PARSE_ARGV 0 arg + "VCPKG_TRANSFORM_LIBS" + "IN_OUT_VAR" + "" + ) + + set(link_flags ${${arg_IN_OUT_VAR}}) + + if(arg_VCPKG_TRANSFORM_LIBS) + list(TRANSFORM link_flags REPLACE "[.](dll[.]lib|lib|a|so)$" "") + + if(VCPKG_TARGET_IS_WINDOWS) + list(REMOVE_ITEM link_flags "uuid") + endif() + + list(TRANSFORM link_flags REPLACE "^([^-].*)" "-l\\1") + if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # libtool must be told explicitly that there is no dynamic linkage for uuid. + # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld. + list(TRANSFORM link_flags REPLACE "^-luuid\$" "-Wl,-Bstatic,-luuid,-Bdynamic") + endif() + endif() + + set(${arg_IN_OUT_VAR} ${link_flags} PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_prepare_flags) + cmake_parse_arguments(PARSE_ARGV 0 arg + "DISABLE_CPPFLAGS;DISABLE_MSVC_WRAPPERS;NO_FLAG_ESCAPING" + "LIBS_OUT;FRONTEND_VARIANT_OUT;C_COMPILER_NAME" + "LANGUAGES" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + + z_vcpkg_make_get_cmake_vars(LANGUAGES ${arg_LANGUAGES}) + + # ==== LIBS + # TODO: Figure out what to do with other Languages like Fortran + # Remove outer quotes from cmake variables which will be forwarded via makefile/shell variables + # substituted into makefile commands (e.g. Android NDK has "--sysroot=...") + separate_arguments(c_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + separate_arguments(cxx_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + list(REMOVE_ITEM cxx_libs_list ${c_libs_list}) + set(all_libs_list ${cxx_libs_list} ${c_libs_list}) + + # Do lib list transformation from name.lib to -lname if necessary + set(vcpkg_transform_libs VCPKG_TRANSFORM_LIBS) + if(VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC" AND (arg_NO_FLAG_ESCAPING)) + set(vcpkg_transform_libs "") + endif() + + if(VCPKG_TARGET_IS_UWP) + # Avoid libtool choke: "Warning: linker path does not have real file for library -lWindowsApp." + # The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested. + # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. + # It even does unix/dos-short/unix transformation with the path to get rid of spaces. + set(vcpkg_transform_libs "") + endif() + + z_vcpkg_make_prepare_link_flags( + IN_OUT_VAR all_libs_list + ${vcpkg_transform_libs} + ) + + if(all_libs_list) + list(JOIN all_libs_list " " all_libs_string) + if(DEFINED ENV{LIBS}) + set(ENV{LIBS} "$ENV{LIBS} ${all_libs_string}") + else() + set(ENV{LIBS} "${all_libs_string}") + endif() + endif() + + set("${arg_LIBS_OUT}" "${all_libs_string}" PARENT_SCOPE) + + # ==== /LIBS + + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_backup_env_variables(VARS _CL_ _LINK_) + # TODO: Should be CPP flags instead -> rewrite when vcpkg_determined_cmake_compiler_flags defined + if(VCPKG_TARGET_IS_UWP) + # Be aware that configure thinks it is crosscompiling due to: + # error while loading shared libraries: VCRUNTIME140D_APP.dll: + # cannot open shared object file: No such file or directory + # IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper + # is to use the CL and LINK environment variables !!! + # (This is due to libtool and compiler wrapper using the same set of options to pass those variables around) + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir) + set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") + set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + endif() + endif() + + #### + set(flags_opts "") + if(DEFINED arg_LANGUAGES) + list(APPEND flags_opts LANGUAGES ${arg_LANGUAGES}) + endif() + + if(arg_DISABLE_CPPFLAGS) + list(APPEND flags_opts DISABLE_CPPFLAGS) + endif() + + if(arg_DISABLE_MSVC_WRAPPERS) + list(APPEND flags_opts DISABLE_MSVC_WRAPPERS) + endif() + + if(arg_NO_FLAG_ESCAPING) + list(APPEND flags_opts NO_FLAG_ESCAPING) + endif() + + z_vcpkg_make_prepare_compile_flags( + CONFIG RELEASE + COMPILER_FRONTEND "${VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT}" + FLAGS_OUT release_flags_list + ${flags_opts} + ) + if(NOT DEFINED VCPKG_BUILD_TYPE) + list(APPEND all_buildtypes DEBUG) + z_vcpkg_make_prepare_compile_flags( + CONFIG DEBUG + COMPILER_FRONTEND "${VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT}" + FLAGS_OUT debug_flags_list + ${flags_opts} + ) + endif() + + foreach(flag IN LISTS release_flags_list debug_flags_list) + set("${flag}" "${${flag}}" PARENT_SCOPE) + endforeach() + + cmake_path(GET VCPKG_DETECTED_CMAKE_C_COMPILER FILENAME cname) + set("${C_COMPILER_NAME}" "${cname}" PARENT_SCOPE) # needed by z_vcpkg_make_get_configure_triplets + set("${arg_FRONTEND_VARIANT_OUT}" "${VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_make_default_path_and_configure_options out_var) + cmake_parse_arguments(PARSE_ARGV 1 arg + "AUTOMAKE" + "CONFIG;EXCLUDE_FILTER;INCLUDE_FILTER" + "" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + + set(opts "") + string(TOUPPER "${arg_CONFIG}" arg_CONFIG) + + z_vcpkg_make_set_common_vars() + + list(APPEND opts lt_cv_deplibs_check_method=pass_all) + + # Pre-processing windows configure requirements + if (VCPKG_TARGET_IS_WINDOWS) + # Other maybe interesting variables to control + # COMPILE This is the command used to actually compile a C source file. The file name is appended to form the complete command line. + # LINK This is the command used to actually link a C program. + # CXXCOMPILE The command used to actually compile a C++ source file. The file name is appended to form the complete command line. + # CXXLINK The command used to actually link a C++ program. + + # Variables not correctly detected by configure. In release builds. + list(APPEND opts gl_cv_double_slash_root=yes + ac_cv_func_memmove=yes + ac_cv_func_memset=yes + ) + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]64$") + list(APPEND opts gl_cv_host_cpu_c_abi=no) + endif() + endif() + + # Set configure paths + set(current_installed_dir_msys "${CURRENT_INSTALLED_DIR}") + if(CMAKE_HOST_WIN32) + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" current_installed_dir_msys "${current_installed_dir_msys}") + endif() + vcpkg_list(APPEND opts "--prefix=${current_installed_dir_msys}${path_suffix_${arg_CONFIG}}") + + if(arg_CONFIG STREQUAL "RELEASE") + # ${prefix} has an extra backslash to prevent early expansion when calling `bash -c configure "..."`. + vcpkg_list(APPEND opts + # Important: These should all be relative to prefix! + "--bindir=\\\${prefix}/tools/${PORT}/bin" + "--sbindir=\\\${prefix}/tools/${PORT}/sbin" + "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default + "--mandir=\\\${prefix}/share/${PORT}" + "--docdir=\\\${prefix}/share/${PORT}" + "--datarootdir=\\\${prefix}/share/${PORT}") + else() + vcpkg_list(APPEND opts + # Important: These should all be relative to prefix! + "--bindir=\\\${prefix}/../tools/${PORT}${path_suffix_DEBUG}/bin" + "--sbindir=\\\${prefix}/../tools/${PORT}${path_suffix_DEBUG}/sbin" + "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default + "--includedir=\\\${prefix}/../include" + "--mandir=\\\${prefix}/share/${PORT}" + "--docdir=\\\${prefix}/share/${PORT}" + "--datarootdir=\\\${prefix}/share/${PORT}") + endif() + # Setup common options + if(NOT arg_AUTOMAKE) + vcpkg_list(APPEND opts --disable-silent-rules --verbose) + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(APPEND opts --enable-shared --disable-static) + else() + vcpkg_list(APPEND opts --disable-shared --enable-static) + endif() + + if(DEFINED arg_EXCLUDE_FILTER) + list(FILTER opts EXCLUDE REGEX "${arg_EXCLUDE_FILTER}") + endif() + + if(DEFINED arg_INCLUDE_FILTER) + list(FILTER opts INCLUDE REGEX "${arg_INCLUDE_FILTER}") + endif() + + set("${out_var}" ${opts} PARENT_SCOPE) +endfunction() diff --git a/ports/vcpkg-make/vcpkg_make_configure.cmake b/ports/vcpkg-make/vcpkg_make_configure.cmake new file mode 100644 index 00000000000000..d58200fdc1dd0f --- /dev/null +++ b/ports/vcpkg-make/vcpkg_make_configure.cmake @@ -0,0 +1,135 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake") + +function(vcpkg_make_configure) + cmake_parse_arguments(PARSE_ARGV 0 arg + "AUTORECONF;COPY_SOURCE;DISABLE_MSVC_WRAPPERS;DISABLE_CPPFLAGS;DISABLE_DEFAULT_OPTIONS;DISABLE_MSVC_TRANSFORMATIONS" + "SOURCE_PATH" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PRE_CONFIGURE_CMAKE_COMMANDS;LANGUAGES" + ) + + z_vcpkg_unparsed_args(FATAL_ERROR) + + # Can be set in the triplet to append options for configure + if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS) + list(APPEND arg_OPTIONS ${VCPKG_MAKE_CONFIGURE_OPTIONS}) + endif() + if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE) + list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG) + list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG}) + endif() + + set(src_dir "${arg_SOURCE_PATH}") + + z_vcpkg_warn_path_with_spaces() + + set(prepare_flags_opts "") + if(arg_DISABLE_MSVC_WRAPPERS) + list(APPEND prepare_flags_opts "DISABLE_MSVC_WRAPPERS") + endif() + if(arg_DISABLE_CPPFLAGS) + list(APPEND prepare_flags_opts "DISABLE_CPPFLAGS") + endif() + if(DEFINED arg_LANGUAGES) + list(APPEND prepare_flags_opts "LANGUAGES" ${arg_LANGUAGES}) + endif() + + # Create cached cmake vars for this invocation's languages + z_vcpkg_make_get_cmake_vars(LANGUAGES ${arg_LANGUAGES}) + + set(escaping "") + if(arg_DISABLE_MSVC_TRANSFORMATIONS) + set(escaping NO_FLAG_ESCAPING) + endif() + + z_vcpkg_set_global_property(make_prepare_flags_opts "${prepare_flags_opts}") + z_vcpkg_make_prepare_flags(${prepare_flags_opts} ${escaping} C_COMPILER_NAME ccname FRONTEND_VARIANT_OUT frontend) + + if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) + set(BUILD_TRIPLET "${VCPKG_MAKE_BUILD_TRIPLET}") + endif() + if(NOT DEFINED BUILD_TRIPLET) + z_vcpkg_make_get_configure_triplets(BUILD_TRIPLET COMPILER_NAME "${ccname}") + endif() + + if(NOT arg_DISABLE_MSVC_WRAPPERS AND "${frontend}" STREQUAL "MSVC" ) + # Lets assume that wrappers are only required for MSVC like frontends. + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-make/wrappers") + endif() + + vcpkg_make_get_shell(shell_var) + set(shell_cmd "${shell_var}") + + if(arg_AUTORECONF) + vcpkg_run_autoreconf("${shell_cmd}" "${src_dir}") + endif() + + # Backup environment variables + set(cm_FLAGS AR AS CC C CCAS CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R RC UPC Y) + + list(TRANSFORM cm_FLAGS APPEND "FLAGS") + vcpkg_backup_env_variables(VARS + ${cm_FLAGS} + # General backup + PATH + # Used by gcc/linux + C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_LIBRARY_PATH + # Used by cl + INCLUDE LIB LIBPATH _CL_ _LINK_ + ) + z_vcpkg_make_set_common_vars() + + foreach(config IN LISTS buildtypes) + string(TOUPPER "${config}" configup) + set(target_dir "${workdir_${configup}}") + file(REMOVE_RECURSE "${target_dir}") + file(MAKE_DIRECTORY "${target_dir}") + file(RELATIVE_PATH relative_build_path "${target_dir}" "${src_dir}") + if(arg_COPY_SOURCE) + file(COPY "${src_dir}/" DESTINATION "${target_dir}") + set(relative_build_path ".") + endif() + + z_vcpkg_make_prepare_programs(configure_env ${prepare_flags_opts} CONFIG "${configup}" BUILD_TRIPLET "${BUILD_TRIPLET}") + + set(opts "") + if(NOT arg_DISABLE_DEFAULT_OPTIONS) + z_vcpkg_make_default_path_and_configure_options(opts AUTOMAKE CONFIG "${configup}") + vcpkg_list(APPEND arg_OPTIONS ${opts}) + endif() + + set(configure_path_from_wd "./${relative_build_path}/configure") + + foreach(cmd IN LISTS arg_PRE_CONFIGURE_CMAKE_COMMANDS) + cmake_language(CALL ${cmd} ${configup}) + endforeach() + + vcpkg_make_run_configure(SHELL + "${shell_cmd}" + CONFIG + "${configup}" + CONFIGURE_ENV + "${configure_env}" + CONFIGURE_PATH + "${configure_path_from_wd}" + OPTIONS + ${BUILD_TRIPLET} + ${arg_OPTIONS} + ${arg_OPTIONS_${configup}} + WORKING_DIRECTORY + "${target_dir}" + ${extra_configure_opts} + ) + endforeach() + + # Restore environment + vcpkg_restore_env_variables(VARS + ${cm_FLAGS} + C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_LIBRARY_PATH + INCLUDE LIB LIBPATH _CL_ _LINK_ + ) + + find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) +endfunction() diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake new file mode 100644 index 00000000000000..76bfae405193e2 --- /dev/null +++ b/ports/vcpkg-make/vcpkg_make_install.cmake @@ -0,0 +1,134 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake") + +function(vcpkg_make_install) + cmake_parse_arguments(PARSE_ARGV 0 arg + "DISABLE_PARALLEL" + "LOGFILE_ROOT;MAKEFILE;TARGETS" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + + if(NOT DEFINED arg_LOGFILE_ROOT) + set(arg_LOGFILE_ROOT "make") + endif() + + if(NOT DEFINED arg_TARGETS) + set(arg_TARGETS "all;install") + endif() + + if (NOT DEFINED arg_MAKEFILE) + set(arg_MAKEFILE Makefile) + endif() + + # Can be set in the triplet to append options for configure + if(DEFINED VCPKG_MAKE_OPTIONS) + list(APPEND arg_OPTIONS ${VCPKG_MAKE_OPTIONS}) + endif() + if(DEFINED VCPKG_MAKE_OPTIONS_RELEASE) + list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MAKE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MAKE_OPTIONS_DEBUG) + list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MAKE_OPTIONS_DEBUG}) + endif() + + if(CMAKE_HOST_WIN32) + set(Z_VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + else() + string(REPLACE " " "\ " Z_VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + endif() + + vcpkg_make_get_shell(shell_var) + set(shell_cmd "${shell_var}") + + find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) + set(make_command "${Z_VCPKG_MAKE}") + + set(destdir "${CURRENT_PACKAGES_DIR}") + if (CMAKE_HOST_WIN32) + set(path_backup "$ENV{PATH}") + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-make/wrappers") + string(REPLACE " " [[\ ]] vcpkg_package_prefix "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE [[([a-zA-Z]):/]] [[/\1/]] destdir "${vcpkg_package_prefix}") + endif() + + vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS PATH) + + z_vcpkg_make_set_common_vars() + z_vcpkg_get_global_property(prepare_flags_opts "make_prepare_flags_opts") + + z_vcpkg_make_prepare_flags(${prepare_flags_opts}) + + set(prepare_env_opts "") + + foreach(buildtype IN LISTS buildtypes) + string(TOUPPER "${buildtype}" cmake_buildtype) + set(short_buildtype "${suffix_${cmake_buildtype}}") + set(path_suffix "${path_suffix_${cmake_buildtype}}") + + set(working_directory "${workdir_${cmake_buildtype}}") + message(STATUS "Building/Installing ${TARGET_TRIPLET}-${short_buildtype}") + + # Setup environment + z_vcpkg_make_prepare_env("${cmake_buildtype}" ${prepare_env_opts}) + z_vcpkg_make_prepare_programs(configure_env ${prepare_flags_opts} CONFIG "${cmake_buildtype}") + + set(destdir_opt "DESTDIR=${destdir}") + + set(extra_opts "") + if(NOT VCPKG_TARGET_IS_OSX) + set(extra_opts --trace) + endif() + + foreach(target IN LISTS arg_TARGETS) + vcpkg_list(SET make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j ${VCPKG_CONCURRENCY} ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt}) + vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j 1 ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt}) + message(STATUS "Making target '${target}' for ${TARGET_TRIPLET}-${short_buildtype}") + if (arg_DISABLE_PARALLEL) + vcpkg_run_shell_as_build( + WORKING_DIRECTORY "${working_directory}" + LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}" + SHELL ${shell_cmd} + NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line} + ) + else() + vcpkg_run_shell_as_build( + WORKING_DIRECTORY "${working_directory}" + LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}" + SHELL ${shell_cmd} + COMMAND ${configure_env} ${no_parallel_make_cmd_line} + NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line} + ) + endif() + file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) + if(logdata MATCHES "Warning: linker path does not have real file for library") + message(FATAL_ERROR "libtool could not find a file being linked against!") + endif() + endforeach() + + z_vcpkg_make_restore_env() + + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH) + endforeach() + + ## TODO: Fix DESTDIR handling + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" destdir_suffix "${CURRENT_INSTALLED_DIR}") + if (EXISTS "${CURRENT_PACKAGES_DIR}${destdir_suffix}") # <- Means DESTDIR was correctly used; need to move files. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") + file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}_tmp") + file(RENAME "${CURRENT_PACKAGES_DIR}_tmp${destdir_suffix}" "${CURRENT_PACKAGES_DIR}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") + endif() + + # Remove libtool files since they contain absolute paths and are not necessary. + file(GLOB_RECURSE libtool_files "${CURRENT_PACKAGES_DIR}/**/*.la") + if(libtool_files) + file(REMOVE ${libtool_files}) + endif() + + if (CMAKE_HOST_WIN32) + set(ENV{PATH} "${path_backup}") + endif() + + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) +endfunction() diff --git a/ports/vcpkg-make/vcpkg_scripts.cmake b/ports/vcpkg-make/vcpkg_scripts.cmake new file mode 100644 index 00000000000000..49756d7922dd6c --- /dev/null +++ b/ports/vcpkg-make/vcpkg_scripts.cmake @@ -0,0 +1,203 @@ +include_guard(GLOBAL) +function(vcpkg_insert_into_path) + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "PATH_OUT;APPENDED_OUT" + "BEFORE;INSERT" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + cmake_path(CONVERT "$ENV{PATH}" TO_CMAKE_PATH_LIST path_list NORMALIZE) + + string(TOUPPER "${arg_BEFORE}" before_upper) + + set(index 0) + set(appending TRUE) + foreach(item IN LISTS path_list) + string(TOUPPER "${item}" item_upper) + if(item IN_LIST arg_BEFORE OR item_upper IN_LIST before_upper) + set(appending FALSE) + break() + endif() + math(EXPR index "${index} + 1") + endforeach() + + vcpkg_list(INSERT path_list "${index}" ${arg_INSERT}) + + cmake_path(CONVERT "${path_list}" TO_NATIVE_PATH_LIST native_path_list) + set(ENV{PATH} "${native_path_list}") + if(DEFINED arg_PATH_OUT) + set("${arg_PATH_OUT}" "${path_list}" PARENT_SCOPE) + endif() + if(appending) + set("${arg_APPENDED_OUT}" "TRUE" PARENT_SCOPE) + else() + set("${arg_APPENDED_OUT}" "FALSE" PARENT_SCOPE) + endif() +endfunction() + +function(vcpkg_insert_program_into_path prog) + set(filepath "${prog}") + cmake_path(GET filepath FILENAME ${prog}) + find_program(z_vcm_prog_found NAMES "${${prog}}" PATHS ENV PATH NO_DEFAULT_PATH NO_CACHE) + if(NOT z_vcm_prog_found STREQUAL filepath) + cmake_path(GET z_vcm_prog_found PARENT_PATH before_dir) + cmake_path(GET filepath PARENT_PATH dir) + vcpkg_insert_into_path( + INSERT "${dir}" + BEFORE "${before_dir}" + ) + endif() +endfunction() + +function(vcpkg_insert_msys_into_path msys_out) + cmake_parse_arguments(PARSE_ARGV 1 arg + "" + "PATH_OUT" + "PACKAGES" + ) + z_vcpkg_unparsed_args(FATAL_ERROR) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${arg_PACKAGES}) + cmake_path(CONVERT "$ENV{SystemRoot}" TO_CMAKE_PATH_LIST system_root NORMALIZE) + cmake_path(CONVERT "$ENV{LOCALAPPDATA}" TO_CMAKE_PATH_LIST local_app_data NORMALIZE) + file(REAL_PATH "${system_root}" system_root) + + vcpkg_list(SET find_system_dirs + "${system_root}/system32" + "${system_root}/System32" + "${system_root}/system32/" + "${system_root}/System32/" + "${local_app_data}/Microsoft/WindowsApps" + "${local_app_data}/Microsoft/WindowsApps/" + ) + + vcpkg_insert_into_path( + INSERT "${MSYS_ROOT}/usr/bin" + BEFORE ${find_system_dirs} + PATH_OUT path_out + APPENDED_OUT appending + ) + + if(appending) + message(WARNING "Unable to find system dir in the PATH variable! Appending required msys paths!") + endif() + + if(DEFINED arg_PATH_OUT) + set("${arg_PATH_OUT}" "${path_out}" PARENT_SCOPE) + endif() + + set("${msys_out}" "${MSYS_ROOT}" PARENT_SCOPE) +endfunction() + +### Helper macros for argument checking +macro(z_vcpkg_unparsed_args warning_level) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message("${warning_level}" "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() +endmacro() + +macro(z_vcpkg_conflicting_args) + set(conflicting_args_set "") + foreach(z_vcpkg_conflicting_args_index RANGE 0 "${ARGC}") + if(${ARGV${z_vcpkg_conflicting_args_index}}) + list(APPEND conflicting_args_set "${ARGV${z_vcpkg_conflicting_args_index}}") + endif() + endforeach() + list(LENGTH conflicting_args_set conflicting_args_set_length) + if(conflicting_args_set_length GREATER 1) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed conflicting arguments:'${conflicting_args_set}'. Only one of those arguments can be passed") + endif() + unset(conflicting_args_set_length) + unset(conflicting_args_set) + unset(z_vcpkg_conflicting_args_index) +endmacro() + +macro(z_vcpkg_required_args arg) + foreach(arg IN ITEMS ${ARGN}) + if(NOT DEFINED arg_${arg}) + message("FATAL_ERROR" "${CMAKE_CURRENT_FUNCTION} requires argument: ${arg}") + endif() + endforeach() +endmacro() + +function(z_vcpkg_set_global_property property value) + if(NOT ARGN STREQUAL "" AND NOT ARGN MATCHES "^APPEND(_STRING)?$") + message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' called with invalid arguments '${ARGN}'") + endif() + set_property(GLOBAL ${ARGN} PROPERTY "z_vcpkg_global_property_${property}" ${value}) +endfunction() + +function(z_vcpkg_get_global_property outvar property) + if(NOT ARGN STREQUAL "" AND NOT ARGN STREQUAL "SET") + message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' called with invalid arguments '${ARGN}'") + endif() + get_property(outprop GLOBAL PROPERTY "z_vcpkg_global_property_${property}" ${ARGN}) + set(${outvar} "${outprop}" PARENT_SCOPE) +endfunction() + +function(vcpkg_prepare_pkgconfig config) + set(subdir "") + if(config MATCHES "(DEBUG|debug)") + set(subdir "/debug") + endif() + + z_vcpkg_get_global_property(has_backup "make-pkg-config-backup-${envvar}" SET) + if(has_backup) + message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' does not (yet) support recursive backups. Need to restore previous state first!") + endif() + + foreach(envvar IN ITEMS PKG_CONFIG PKG_CONFIG_PATH) + if(DEFINED ENV{${envvar}}) + z_vcpkg_set_global_property("make-pkg-config-backup-${envvar}" "$ENV{${envvar}}") + else() + z_vcpkg_set_global_property("make-pkg-config-backup-${envvar}" "") + endif() + endforeach() + + vcpkg_find_acquire_program(PKGCONFIG) + set(ENV{PKG_CONFIG} "${PKGCONFIG}") + + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} + # After installation, (merged) 'lib' is always searched before 'share'. + "${CURRENT_PACKAGES_DIR}${subdir}/lib/pkgconfig" + "${CURRENT_INSTALLED_DIR}${subdir}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/share/pkgconfig" + "${CURRENT_INSTALLED_DIR}/share/pkgconfig" + ) +endfunction() + +function(vcpkg_restore_pkgconfig) + foreach(envvar IN ITEMS PKG_CONFIG PKG_CONFIG_PATH) + z_vcpkg_get_global_property(has_backup "make-pkg-config-backup-${envvar}" SET) + if(has_backup) + z_vcpkg_get_global_property(backup "make-pkg-config-backup-${envvar}") + set("ENV{${envvar}}" "${backup}") + z_vcpkg_set_global_property("make-pkg-config-backup-${envvar}") + else() + unset("ENV{${envvar}}") + endif() + endforeach() +endfunction() + +function(z_vcpkg_escape_spaces_in_path outvar invar) + string(REPLACE " " "\\ " current_installed_dir_escaped "${invar}") + set("${outvar}" "${current_installed_dir_escaped}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_warn_path_with_spaces) + vcpkg_list(SET z_vcm_paths_with_spaces) + if(CURRENT_BUILDTREES_DIR MATCHES " ") + vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_BUILDTREES_DIR}") + endif() + if(CURRENT_PACKAGES_DIR MATCHES " ") + vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_PACKAGES_DIR}") + endif() + if(CURRENT_INSTALLED_DIR MATCHES " ") + vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_INSTALLED_DIR}") + endif() + if(z_vcm_paths_with_spaces) + # Don't bother with whitespace. The tools will probably fail and I tried very hard trying to make it work (no success so far)! + vcpkg_list(APPEND z_vcm_paths_with_spaces "Please move the path to one without whitespaces!") + list(JOIN z_vcm_paths_with_spaces "\n " z_vcm_paths_with_spaces) + message(STATUS "Warning: Paths with embedded space may be handled incorrectly by configure:\n ${z_vcm_paths_with_spaces}") + endif() +endfunction() diff --git a/ports/vcpkg-make/wrappers/cl_cpp_wrapper b/ports/vcpkg-make/wrappers/cl_cpp_wrapper new file mode 100644 index 00000000000000..fb83f7b886c758 --- /dev/null +++ b/ports/vcpkg-make/wrappers/cl_cpp_wrapper @@ -0,0 +1,95 @@ +#!/usr/bin/bash +# cl_cpp_wrapper +# Wrapper around MS's cl.exe to make it act more like Unix cpp + +PATH="$PATH:/usr/bin" + +case $MACHTYPE in + *-msys) + slash="-" + ;; + *) + slash="/" + ;; +esac + +# prog specifies the program that should be run cl.exe +prog=cl.exe +debug= +cppopt=("${slash}nologo") +cppopt+=("${slash}E") +verbose= +shared_index=-1 + +processargs() +{ +### Run through every option and convert it to the proper MS one +while test $# -gt 0; do + case "$1" in + -D*) optarg= ;; + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + gotparam=1 + case "$1" in + --help) + usage + exit 0 + ;; + --verbose) + verbose=1 + ;; + -*) + # Remaining '-' options are passed to the compiler + if test x$optarg != x ; then + cppopt+=("${slash}${1:1}=$optarg") + else + cppopt+=("${slash}${1:1}") + fi + ;; + + /*) + # All '/' options are assumed to be for cpp and are passed through + cppopt+=("${slash}${1:1}") + ;; + + *) + file=$1 + #cppopt+=("$1") + ;; + esac + shift +done +} + +# Whitespace in paths is dealt with by setting IFS and using bash arrays + +# processargs $CPP_FLAGS +IFS="" +processargs $@ + +if test x$V = x1 ; then + verbose=1 +fi + +if test -n "$verbose" ; then + echo -n "$prog" + for opt in "${cppopt[@]}" ; do + echo -n " \"$opt\"" + done + echo "" +fi + +[ $# -ge 1 -a -f "$1" ] && input="$file" || input="-" + +input_file="${file:-/proc/self/fd/0}" +if [ "$input_file" == "/proc/self/fd/0" ]; then + # CL does not support reading from STDIN so it is wrapped here. + tmpout=cpp_wrapper_$RANDOM.h + /usr/bin/cp $input_file $tmpout + exec $prog ${cppopt[@]} $tmpout + rm -f $tmpout +else + exec $prog ${cppopt[@]} $input_file +fi + diff --git a/ports/vcpkg-make/wrappers/windres-rc b/ports/vcpkg-make/wrappers/windres-rc new file mode 100644 index 00000000000000..93e0b127d39500 --- /dev/null +++ b/ports/vcpkg-make/wrappers/windres-rc @@ -0,0 +1,122 @@ +#! /bin/sh +# Wrapper for windres to rc which do not understand '-i -o --output-format'. +# cvtres is invoked by the linker +scriptversion=2022-08-24.12; # UTC + + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN* | MSYS*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/* | msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_windres_wrapper rc args... +# Adjust compile command to suit rc instead of windres +func_windres_wrapper () +{ + # Assume a capable shell + bin= + in= + out= + + for arg + do + if test -z "$bin"; then + bin=$1 + elif test -n "$eat"; then + eat= + else + case $1 in + --output-format=*) + ;; + --define*) + eat=1 + set -- "$@" "-d $2" + ;; + --include-dir*) + eat=1 + func_file_conv "$2" + set -- "$@" "-I $file" + ;; + -o) + eat=1 + func_file_conv "$2" + out="$file" + echo "OUTPUT:$file" + ;; + *.obj) + func_file_conv "$1" + out="$file" + echo "OUTPUT:$file" + ;; + -i) + eat=1 + func_file_conv "$2" mingw + in="$file" + echo "INPUT:$file" + ;; + -*) + set -- "$@" "${1//\\\"/\"}" + ;; + *) + # libtool reorders arguments; save unqualified one as input + func_file_conv "$1" + in="$file" + echo "INPUT:$file" + ;; + esac + fi + shift + done + echo "$bin" "$@" -fo "$out" "$in" + exec "$bin" "$@" -fo "$out" "$in" + exit 1 +} + +eat= + +func_windres_wrapper "$@" diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index d8c90f0ac372f9..84b6813daf846a 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -14,7 +14,7 @@ set(ref "${program_version}") set(path_to_search "${DOWNLOADS}/tools/meson-${program_version}-${meson_short_hash}") set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") set(download_filename "meson-${ref}.tar.gz") -set(download_sha512 8cbb4af0d057e06c4efd0eb2544aa93cfa73410114f85f346e9fbf92af776f5bb5121f557d228b7cdab7f0ea7963e057b223f17036e2f36f55416fba43683248) +set(download_sha512 541a610a7b49bfcf63502403c9b987178234cddddc181fad588c99f773a68a9fd91cf0629ec6bb424b3c931afee90b96f979ce7e8d990d53f644ac457d342b7f) find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 1763118847a479..3e50ca5af7b9f9 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "1.6.0", + "version": "1.6.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/ports/vincentlaucsb-csv-parser/portfile.cmake b/ports/vincentlaucsb-csv-parser/portfile.cmake index 73690c15ed8141..9d32fdd62fbb09 100644 --- a/ports/vincentlaucsb-csv-parser/portfile.cmake +++ b/ports/vincentlaucsb-csv-parser/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vincentlaucsb/csv-parser REF "${VERSION}" - SHA512 44af73db1762e55f8c93d7f97e3f3b4b550c4f4043ace693d4bdbb41cce0b78450afdcd3fea8c9b4ee60e8100e4160facf72db27c31e3c579e35b6acbb8fff0c + SHA512 ead00b640569da960f5ec70ca2f85fbe0f116643ac6d69951f15d5a2030f1538bbffa1d27dd487be7fc5b8561f374103dfa115d4918534cf9ccd1143b76713b3 HEAD_REF master PATCHES 001-fix-cmake.patch diff --git a/ports/vincentlaucsb-csv-parser/vcpkg.json b/ports/vincentlaucsb-csv-parser/vcpkg.json index 86d264921e3f42..439d8ca2988926 100644 --- a/ports/vincentlaucsb-csv-parser/vcpkg.json +++ b/ports/vincentlaucsb-csv-parser/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vincentlaucsb-csv-parser", - "version": "2.2.3", - "port-version": 1, + "version": "2.3.0", "description": "A modern C++ library for reading, writing, and analyzing CSV (and similar) files.", "homepage": "https://github.com/vincentlaucsb/csv-parser", "license": "MIT", diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 7786f545f15441..20fe8879ba5af4 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 bce1eab40d2df36d46bd9e5c1a1507540c29ef30d5f575a3cce62e351d0d1561f8f52d76d3ff82ea8ca4ab3872903799bbb6ab16859ab31f23ccfa8f290110b3 + SHA512 2efde642bf484ff41f19656d58674bc00c46118582d4387992971781be9707de9c10e7f64b8a6d08bd33cf10c62c2d3b40a9b98e8581f2ab6ee49b9975a55ab7 HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 7832b5d4a93c88..de5a2f18ba891d 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.12.09.00", + "version-string": "2024.12.23.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/ports/winsparkle/portfile.cmake b/ports/winsparkle/portfile.cmake index a0ae2724c81779..e218f15fd43977 100644 --- a/ports/winsparkle/portfile.cmake +++ b/ports/winsparkle/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/vslavik/winsparkle/releases/download/v0.8.1/WinSparkle-0.8.1.zip" - FILENAME "winsparkle-081.zip" - SHA512 05588793272618ca13fe884620f1ed421276b011a906f15c92f4879b1787c71b175ae1a170b80fe2adfdb7669eac90c38fac929a9bcf382388983f9aea25ba9c + URLS "https://github.com/vslavik/winsparkle/releases/download/v${VERSION}/WinSparkle-${VERSION}.zip" + FILENAME "winsparkle-v${VERSION}.zip" + SHA512 5ed99a73541f5a590f20ff1e7953284ca00da15df388319b3a96e87c69bb99aaeb5d5eb5e814a6245cf2e4389e0eb5a53ff8657d3eb0717e35f8fe526be911dc ) vcpkg_extract_source_archive( diff --git a/ports/winsparkle/vcpkg.json b/ports/winsparkle/vcpkg.json index 3eda505ab808de..eb672be854c11a 100644 --- a/ports/winsparkle/vcpkg.json +++ b/ports/winsparkle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winsparkle", - "version": "0.8.1", + "version": "0.8.3", "description": "WinSparkle is an easy-to-use software update library for Windows developers.", "homepage": "https://winsparkle.org", "license": "MIT", diff --git a/ports/x264/allow-clang-cl.patch b/ports/x264/allow-clang-cl.patch index fd363b64ea1a24..c4fe44ddb01f80 100644 --- a/ports/x264/allow-clang-cl.patch +++ b/ports/x264/allow-clang-cl.patch @@ -11,6 +11,5 @@ index 6f95e2314..e677e36f4 100644 # Standard Microsoft Visual Studio compiler=CL compiler_style=MS -+ CFLAGS="$CPPFLAGS $CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" -- CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" + CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" cpp_check '' '' '_MSC_VER > 1800 || (_MSC_VER == 1800 && _MSC_FULL_VER >= 180030324)' || die "Microsoft Visual Studio support requires Visual Studio 2013 Update 2 or newer" diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 993e5a2f745c05..c6383f06363eb1 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -26,36 +26,13 @@ vcpkg_from_gitlab( configure.patch ) -# Ensure that 'ENV{PATH}' leads to tool 'name' exactly at 'filepath'. -function(ensure_tool_in_path name filepath) - unset(program_found CACHE) - find_program(program_found "${name}" PATHS ENV PATH NO_DEFAULT_PATH NO_CACHE) - if(NOT filepath STREQUAL program_found) - cmake_path(GET filepath PARENT_PATH parent_path) - vcpkg_add_to_path(PREPEND "${parent_path}") - endif() -endfunction() - -# Ensure that parent-scope variable 'var' doesn't contain a space, -# updating 'ENV{PATH}' and 'var' if needed. -function(transform_path_no_space var) - set(path "${${var}}") - if(path MATCHES " ") - cmake_path(GET path FILENAME program_name) - set("${var}" "${program_name}" PARENT_SCOPE) - ensure_tool_in_path("${program_name}" "${path}") - endif() +function(add_cross_prefix) + if(configure_env MATCHES "CC=([^\/]*-)gcc$") + vcpkg_list(APPEND arg_OPTIONS "--cross-prefix=${CMAKE_MATCH_1}") + endif() + set(arg_OPTIONS "${arg_OPTIONS}" PARENT_SCOPE) endfunction() -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") - -transform_path_no_space(VCPKG_DETECTED_CMAKE_C_COMPILER) -set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") - -vcpkg_list(SET OPTIONS) - -vcpkg_list(SET EXTRA_ARGS) set(nasm_archs x86 x64) set(gaspp_archs arm arm64) if(NOT "asm" IN_LIST FEATURES) @@ -64,10 +41,8 @@ elseif(NOT "$ENV{AS}" STREQUAL "") # Accept setting from triplet elseif(VCPKG_TARGET_ARCHITECTURE IN_LIST nasm_archs) vcpkg_find_acquire_program(NASM) - transform_path_no_space(NASM) - list(APPEND EXTRA_ARGS CONFIGURE_ENVIRONMENT_VARIABLES AS) - set(AS "${NASM}") # for CONFIGURE_ENVIRONMENT_VARIABLES - set(ENV{AS} "${NASM}") # for non-WIN32 + vcpkg_insert_program_into_path("${NASM}") + set(ENV{AS} "${NASM}") elseif(VCPKG_TARGET_ARCHITECTURE IN_LIST gaspp_archs AND VCPKG_TARGET_IS_WINDOWS AND VCPKG_HOST_IS_WINDOWS) vcpkg_find_acquire_program(GASPREPROCESSOR) list(FILTER GASPREPROCESSOR INCLUDE REGEX gas-preprocessor) @@ -93,11 +68,14 @@ if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS --extra-cflags=-D_WIN32_WINNT=0x0A00) endif() -vcpkg_configure_make( +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - NO_ADDITIONAL_PATHS - DETERMINE_BUILD_TRIPLET - ${EXTRA_ARGS} + DISABLE_CPPFLAGS # Build is not using CPP/CPPFLAGS + DISABLE_MSVC_WRAPPERS + LANGUAGES ASM C CXX # Requires NASM to compile + DISABLE_MSVC_TRANSFORMATIONS # disable warnings about unknown -Xcompiler/-Xlinker flags + PRE_CONFIGURE_CMAKE_COMMANDS + add_cross_prefix OPTIONS ${OPTIONS} --enable-pic @@ -116,7 +94,7 @@ vcpkg_configure_make( --disable-cli ) -vcpkg_install_make() +vcpkg_make_install() if("tool" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) @@ -149,4 +127,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") \ No newline at end of file diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 3d02a3ec9c9f5e..c8a41629324c80 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,13 +1,14 @@ { "name": "x264", "version": "0.164.3108", + "port-version": 1, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", "supports": "!xbox", "dependencies": [ { - "name": "vcpkg-cmake-get-vars", + "name": "vcpkg-make", "host": true } ], diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index 49d637d0c45f36..e62f00c8655b45 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -1,17 +1,9 @@ -vcpkg_download_distfile( - WIN_PATCHES - URLS "https://github.com/xtensor-stack/xsimd/pull/1040/commits/e8cb862e434eb1e367afb83e1a3685bccff3e566.diff?full_index=1" - FILENAME "xsimd-e8cb862e434eb1e367afb83e1a3685bccff3e566.patch" - SHA512 e584033fb79c602a19222c177d5db28f9887dd17e741844d57f2236a5749ac4c02cc0740f8011ca990602887a6ee3dd21ae0b695455c447686b1a6c8bda2e092 -) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd REF "${VERSION}" - SHA512 cdc42ddad3353297cf25ea2b6b3f09967f5f388efc26241f2997979fdbbac072819ff771145bc5bfa86cb326cca84b4119e8e6e3f658407961cf203a40603a7f + SHA512 a446aa29364c12785b9fc600341cd21b8fcf3cff6e07f6093b5cd3669a0c26397ccd75f0504c52da7f1843e2844e8b909bebbe1e64f0f2d8355f0ee0eadf1263 HEAD_REF master - PATCHES - "${WIN_PATCHES}" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -31,6 +23,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json index 2c6b88c5740e7c..66077643cb64e7 100644 --- a/ports/xsimd/vcpkg.json +++ b/ports/xsimd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xsimd", - "version": "13.0.0", - "port-version": 1, + "version": "13.1.0", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", "license": "BSD-3-Clause", diff --git a/ports/yalantinglibs/portfile.cmake b/ports/yalantinglibs/portfile.cmake index b6a9a7dd6e26e9..5210fba3c5d4d9 100644 --- a/ports/yalantinglibs/portfile.cmake +++ b/ports/yalantinglibs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alibaba/yalantinglibs REF "${VERSION}" - SHA512 2454d18d398e358f099518a12b704ebe32160f760afdbe9cb2c34bb9d3e98eccff6489b6bedf3382423c24d642010f998528fc9739741b62d60383351ce6f3a7 + SHA512 357b6789fe32ad4ca89933ba94d7f92ef65bc52497a918d76d7a3b5cc70b3f63efb26306de3783f6450d2d61e0ff2da6a23278a2d9862a2eec6287ca21396c23 HEAD_REF main ) diff --git a/ports/yalantinglibs/vcpkg.json b/ports/yalantinglibs/vcpkg.json index 13ef5c978a4592..d9b82c52161a17 100644 --- a/ports/yalantinglibs/vcpkg.json +++ b/ports/yalantinglibs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yalantinglibs", - "version": "0.3.10", + "version": "0.3.11", "description": "A Collection of C++20 libraries, include struct_pack, struct_json, struct_xml, struct_yaml, struct_pb, easylog, coro_rpc, coro_http and async_simple", "homepage": "https://github.com/alibaba/yalantinglibs", "license": "Apache-2.0", diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index 3bbb91a8b8313b..6c3afdefcd1f59 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga REF "v${VERSION}" - SHA512 04fdb398a402c499cc876ccb36a3edfd741ee4013f0ac6b5b33ce495add1d3b76c09d7672b3e3842e5e50c0d7f42a97b19fd7e8085c6fa964c063a161d9a0fe2 + SHA512 41ca044dcc7e404d5d3b052a85a650713bd31950a010a14658e25b1d065fffa16239cb93d2b00845d4e8443169ae50a91ad36080305f1be93e53ed481603a78b HEAD_REF master PATCHES disable_tests.patch diff --git a/ports/yoga/vcpkg.json b/ports/yoga/vcpkg.json index 45065db4b9bd12..21f6ccddcd38a4 100644 --- a/ports/yoga/vcpkg.json +++ b/ports/yoga/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yoga", - "version": "3.1.0", + "version": "3.2.1", "description": "Yoga is a cross-platform layout engine which implements Flexbox", "homepage": "https://github.com/facebook/yoga", "license": "MIT", diff --git a/ports/zfp/portfile.cmake b/ports/zfp/portfile.cmake index aeddc5442c1cbc..e39062778dd1e8 100644 --- a/ports/zfp/portfile.cmake +++ b/ports/zfp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LLNL/zfp - REF f39af72648a2aeb88e9b2cca8c64f51b493ad5f4 #1.0.0 - SHA512 943c147a5170defe8e40c6b5ffc736dcc5a4fd33ab5b3e71aab9194821d68e4b6d093f11c76532ae011cbee44c861b04feb01e36789a9858b10ebfa808416e92 + REF "${VERSION}" + SHA512 5bbd98ed2f98e75c654afa863cab3023abb2eeb8f203f9049c75d5dbdf4b364cfb5c8378e10e6aaeaf13242315ad4949b06619810a67b3adaed095b7e8a48d5a HEAD_REF master ) @@ -39,4 +39,4 @@ endif() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zfp/vcpkg.json b/ports/zfp/vcpkg.json index ff4fd5501f8852..b04090b9eabf1e 100644 --- a/ports/zfp/vcpkg.json +++ b/ports/zfp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zfp", - "version": "1.0.0", - "port-version": 2, + "version": "1.0.1", "description": "Zfp is an open source C/C++ library for compressed numerical arrays that support high throughput read and write random access. zfp also supports streaming compression of integer and floating-point data, e.g., for applications that read and write large data sets to and from disk. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.", "homepage": "https://github.com/LLNL/zfp", "license": "BSD-3-Clause", diff --git a/ports/zix/fix-win32.patch b/ports/zix/fix-win32.patch deleted file mode 100644 index a05ed74e5ea10e..00000000000000 --- a/ports/zix/fix-win32.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/benchmark/bench.h b/benchmark/bench.h -index bcfe077..b247e17 100644 ---- a/benchmark/bench.h -+++ b/benchmark/bench.h -@@ -15,6 +15,21 @@ bench_elapsed_s(const BenchmarkTime* start, const BenchmarkTime* end) - ((double)(end->tv_nsec - start->tv_nsec) * 0.000000001)); - } - -+#ifdef _WIN32 -+#include -+ -+static inline BenchmarkTime bench_start(void) { -+ BenchmarkTime start_t; -+ QueryPerformanceCounter(&start_t); -+ return start_t; -+} -+ -+static inline double bench_end(const BenchmarkTime* start_t) { -+ BenchmarkTime end_t; -+ QueryPerformanceCounter(&end_t); -+ return bench_elapsed_s(start_t, &end_t); -+} -+#else - static inline BenchmarkTime - bench_start(void) - { -@@ -30,5 +45,6 @@ bench_end(const BenchmarkTime* start_t) - clock_gettime(CLOCK_REALTIME, &end_t); - return bench_elapsed_s(start_t, &end_t); - } -+#endif - - #endif // BENCH_H diff --git a/ports/zix/portfile.cmake b/ports/zix/portfile.cmake index e7b69ca6e2fecc..dd9a11d3ad90c3 100644 --- a/ports/zix/portfile.cmake +++ b/ports/zix/portfile.cmake @@ -4,18 +4,19 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 806b6b2e48bd0f1205958a63dd8aea73edb4b791c158cf9087c8fb2fad1111459ee6ed06428e04962ec98da4c38796b5c419573e0ffb65bdc5e7a1342387ef79 HEAD_REF main - PATCHES - fix-win32.patch ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dbenchmarks=disabled + -Ddocs=disabled + -Dtests=disabled + -Dtests_cpp=disabled ) vcpkg_install_meson() - vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") - -vcpkg_fixup_pkgconfig() diff --git a/ports/zix/vcpkg.json b/ports/zix/vcpkg.json index b83e443be07edc..0f5b9b8f51a4d7 100644 --- a/ports/zix/vcpkg.json +++ b/ports/zix/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zix", "version": "0.4.2", + "port-version": 1, "description": "Zix is a lightweight C library of portability wrappers and data structures.", "homepage": "https://github.com/drobilla/zix", "supports": "!uwp", diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 5c59efc39e908d..d20d58e7fa4cf6 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:noble-20241011 +FROM ubuntu:noble-20241118.1 -ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb +ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip # Add apt packages @@ -13,7 +13,7 @@ ENV APT_PACKAGES="git curl zip unzip tar" ## Common build prereqs ENV APT_PACKAGES="$APT_PACKAGES g++ vim pkg-config cmake ca-certificates" -ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin libltdl-dev gettext automake autoconf-archive" +ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison flex build-essential libtool libtool-bin libltdl-dev gettext automake autoconf-archive" ## Python related ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-venv python3-mako python3-jinja2" diff --git a/scripts/azure-pipelines/android/create-docker-image.ps1 b/scripts/azure-pipelines/android/create-docker-image.ps1 index 496617c8f01681..dcf83580a7ebfe 100644 --- a/scripts/azure-pipelines/android/create-docker-image.ps1 +++ b/scripts/azure-pipelines/android/create-docker-image.ps1 @@ -1,7 +1,7 @@ # Create Docker image for Android $Date = (Get-Date -Format 'yyyy-MM-dd') -$ResourceGroupName = "PrAnd-1ES" +$ResourceGroupName = "PrAnd-WUS" $ContainerRegistryName = "vcpkgandroidwus" $ErrorActionPreference = 'Stop' @@ -14,15 +14,15 @@ try { docker builder prune -f --filter "until=24h" docker build . -t $imageName - + $remote = [string]::Format('{0}.azurecr.io/{1}:{2}', $ContainerRegistryName, $imageName, $Date) docker tag $imageName $remote - + docker push $remote - + #removes from local environment docker rmi --force $remote $imageName - + # pulls and runs ... docker logout } finally { diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 6fbae371878d89..132e66793f35b6 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - linux-docker-image: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2024-10-21' + linux-docker-image: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2024-12-16' parameters: - name: vcpkgToolSha diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 22aaf07b145536..fd7d251d1cce27 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}')) pool: name: PrWin-WUS - demands: ImageVersionOverride -equals 2024.11.18 + demands: ImageVersionOverride -equals 2024.12.16 workspace: clean: resources timeoutInMinutes: 2880 # 2 days diff --git a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 index 068e20bd021461..c3ad34f3e5bd1f 100644 --- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 +++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$AzCliUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.66.0-x64.msi' + $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.67.0-x64.msi' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.66.0-x64.msi?$SasToken" + $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.67.0-x64.msi?$SasToken" } DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart') diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 769efd560f4e6d..a21ab3c0a096d7 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -7,9 +7,9 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { . "$PSScriptRoot/utility-prefix.ps1" } -# See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history -# 17.11.6 -$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/1affe83d-fcd4-41b0-bb9b-d62f64a857c4/1f0413df169150ed2475e7fbb5aa9e4105533a5b3f717c2dcc589203ac84f899/vs_Enterprise.exe' +# See https://learn.microsoft.com/visualstudio/releases/2022/release-history +# 17.12.3 +$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/f2819554-a618-400d-bced-774bb5379965/6dec611eac2a146142b25497888f6b518069eeeb9f5ac32ce29ad5bebd753a64/vs_Enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 11db02b5207e8e..3efa59efcb5417 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,7 +28,9 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1") # Clear this array when moving to a new boost version $defaultPortVersion = 0 $portVersions = @{ - 'boost-build' = 1 + 'boost' = 1; + 'boost-build' = 1; + 'boost-cobalt' = 1 } function Get-PortVersion { @@ -50,6 +52,10 @@ $portData = @{ "mpi" = @{ "description" = "Build with MPI support"; "dependencies" = @("boost-mpi", "boost-graph-parallel", "boost-property-map-parallel"); + }; + "cobalt" = @{ + "description" = "Build boost-cobalt"; + "dependencies" = @("boost-cobalt"); } } }; diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 65bad00886b7f6..0e071e73d52f47 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -178,16 +178,6 @@ c-dbg-macro:arm64-uwp=skip c-dbg-macro:x64-osx=skip c-dbg-macro:arm64-osx=skip c-dbg-macro:x64-linux=skip - -# Needs work -casadi:arm64-android=skip -casadi:x64-android=skip -casadi:arm-neon-android=skip -casadi:x64-windows-static=skip -casadi:x64-windows-static-md=skip -casadi:x64-uwp=skip -casadi:arm64-uwp=skip - casclib:arm64-uwp=fail casclib:x64-uwp=fail catch-classic:arm-neon-android=skip @@ -506,10 +496,12 @@ jemalloc:x64-uwp=fail jinja2cpplight:arm-neon-android=fail jinja2cpplight:arm64-android=fail jinja2cpplight:x64-android=fail +# needs android-29 +juce:arm-neon-android=fail +juce:arm64-android=fail +juce:x64-android=fail kfr:x64-android=fail kfr:x64-uwp=fail -# needs android-24 -kubazip:arm-neon-android=fail lcm:arm-neon-android=fail lcm:arm64-android=fail lcm:arm64-windows-static-md=fail @@ -542,6 +534,10 @@ libdc1394:x64-android=fail libdc1394:arm64-android=fail # 32-bit needs android-24 libflac:arm-neon-android=fail +libfreenect2:arm64-windows=fail +libfreenect2:arm64-windows-static-md=fail +# inline assembly requires more registers than available +libgcrypt:x64-android=fail # error: call to undeclared function 'mktime_z' libgnutls:arm-neon-android=fail libgnutls:arm64-android=fail @@ -553,12 +549,6 @@ libgpg-error:arm-neon-android=fail libgpg-error:arm64-android=fail libgpg-error:x64-android=fail # Missing system libraries on linux to run/prepare autoconf -libgpod:x64-linux=fail -libfreenect2:arm64-windows=fail -libfreenect2:arm64-windows-static-md=fail -libgpod:arm-neon-android=fail -libgpod:arm64-android=fail -libgpod:x64-android=fail libgxps:arm-neon-android=fail libgxps:arm64-android=fail libgxps:x64-android=fail @@ -829,7 +819,6 @@ omplapp:x64-linux=skip # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencc:x64-android=fail -openfbx:arm-neon-android=fail openimageio:arm-neon-android=fail openimageio:arm64-android=fail openimageio:x64-android=fail @@ -998,6 +987,15 @@ rtmidi:arm-neon-android=fail rtmidi:arm64-android=fail rtmidi:x64-android=fail salome-medcoupling:x64-linux=fail +# Visual Studio 17.12 compiler bug, fixed in 17.13: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2242053 +saucer:arm64-windows-static-md=fail +saucer:arm64-windows-static-md=fail +saucer:arm64-windows=fail +saucer:arm64-windows=fail +saucer:x64-windows-static-md=fail +saucer:x64-windows-static=fail +saucer:x64-windows=fail +saucer:x86-windows=fail scintilla:arm-neon-android=fail scintilla:arm64-android=fail scintilla:x64-android=fail @@ -1095,11 +1093,6 @@ spscqueue:x64-android=fail stormlib:arm64-uwp=fail stormlib:x64-uwp=fail stxxl:arm-neon-android=fail -# upstream issue https://github.com/stxxl/stxxl/issues/99 -stxxl:x86-windows=skip -stxxl:x64-windows=skip -stxxl:x64-windows-static=skip -stxxl:x64-windows-static-md=skip systemc:arm64-windows=fail systemc:arm64-windows-static-md=fail systemc:arm64-uwp=fail @@ -1138,7 +1131,6 @@ torch-th:x64-windows-static=fail tvision:arm-neon-android=fail tvision:arm64-android=fail tvision:x64-android=fail -unicorn:x64-windows-static-md=fail # Proper support for a true static usd build is left as a future port improvement. It probably require fiddling with its monolithic mode. usd:x64-windows-static=skip # needs android-24 @@ -1243,6 +1235,7 @@ vcpkg-ci-arrow:x64-windows-static=pass vcpkg-ci-arrow:x64-windows-static-md=pass vcpkg-ci-arrow:x64-osx=pass vcpkg-ci-arrow:x64-linux=pass +vcpkg-ci-aurora-au:x64-linux=pass vcpkg-ci-boost:arm-neon-android=pass vcpkg-ci-boost:arm64-android=pass vcpkg-ci-boost:arm64-uwp=pass diff --git a/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake b/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake index f7c1ffbb798c3d..196b5dd583fb12 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake @@ -1,10 +1,10 @@ set(program_name nuget) set(brew_package_name "nuget") if(CMAKE_HOST_WIN32) - set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") - set(download_filename "nuget.5.11.0.exe") - set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) - set(tool_subdirectory "5.11.0") + set(download_urls "https://dist.nuget.org/win-x86-commandline/v6.11.1/nuget.exe") + set(download_filename "nuget.6.11.1.exe") + set(download_sha512 8E139D1C4A97F35625E261DF07AC5B3ECB6B931907D303E3B0FCCA26EC537FF667FF49CA15CB57909B30A262EA39EF678C4CBF33C99658162E58A6648D336D52) + set(tool_subdirectory "6.11.1") set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") set(raw_executable ON) set(rename_binary_to "nuget.exe") diff --git a/scripts/test_ports/vcpkg-ci-aurora-au/portfile.cmake b/scripts/test_ports/vcpkg-ci-aurora-au/portfile.cmake new file mode 100644 index 00000000000000..4c14b7079faac7 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-aurora-au/portfile.cmake @@ -0,0 +1,7 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project") + +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-aurora-au/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-aurora-au/project/CMakeLists.txt new file mode 100644 index 00000000000000..6e3b93330de3ed --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-aurora-au/project/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.29) + +project(vcpkg-ci-aurora-au LANGUAGES CXX) + +find_package(Au CONFIG REQUIRED) + +add_executable(test_au_client test_au_client.cc) +target_link_libraries(test_au_client PRIVATE Au::au) +target_compile_features(test_au_client PRIVATE cxx_std_14) diff --git a/scripts/test_ports/vcpkg-ci-aurora-au/project/test_au_client.cc b/scripts/test_ports/vcpkg-ci-aurora-au/project/test_au_client.cc new file mode 100644 index 00000000000000..1b5e0fe72c7e05 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-aurora-au/project/test_au_client.cc @@ -0,0 +1,18 @@ +#include + +#include "au/au.hh" +#include "au/io.hh" +#include "au/units/hours.hh" +#include "au/units/meters.hh" +#include "au/units/miles.hh" + +using ::au::symbols::h; +using ::au::symbols::mi; +constexpr auto km = ::au::kilo(::au::symbols::m); + +int main(int argc, char **argv) { + constexpr auto v = 65.0 * mi / h; + std::cout << v << ", in km/h, rounded to nearest integer, is " + << round_as(km / h, v) << std::endl; + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-aurora-au/vcpkg.json b/scripts/test_ports/vcpkg-ci-aurora-au/vcpkg.json new file mode 100644 index 00000000000000..35f87ebbc6ee3e --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-aurora-au/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-ci-aurora-au", + "version-string": "ci", + "description": "Testing packages which provide AURORA-AU", + "license": null, + "dependencies": [ + "aurora-au", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index c85b1f9842876b..f49976bcd83be2 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -116,7 +116,7 @@ "features": [ "aom" ], - "platform": "!(windows & arm & !uwp)" + "platform": "!(windows & arm) & !uwp" }, { "name": "ffmpeg", diff --git a/scripts/test_ports/vcpkg-ci-gmime/portfile.cmake b/scripts/test_ports/vcpkg-ci-gmime/portfile.cmake new file mode 100644 index 00000000000000..90815134a2f618 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gmime/portfile.cmake @@ -0,0 +1,11 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" + OPTIONS + "-DFEATURES=${FEATURES}" + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-gmime/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-gmime/project/CMakeLists.txt new file mode 100644 index 00000000000000..d64e5acf3abaf2 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gmime/project/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 3.10) + +project(vcpkg-ci-gmime C) + +set(CMAKE_C_STANDARD 11) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(gmime REQUIRED IMPORTED_TARGET gmime-3.0) + +add_executable(main main.c) +target_link_libraries(main PRIVATE PkgConfig::gmime) + +if("crypto" IN_LIST FEATURES) + target_compile_definitions(main PRIVATE ENABLE_CRYPTO) +endif() diff --git a/scripts/test_ports/vcpkg-ci-gmime/project/main.c b/scripts/test_ports/vcpkg-ci-gmime/project/main.c new file mode 100644 index 00000000000000..8431aa383eeb6f --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gmime/project/main.c @@ -0,0 +1,26 @@ +#include +#include + +void verify_callback(GMimeObject *parent, GMimeObject *part, gpointer user_data) +{ +#ifdef ENABLE_CRYPTO + if (GMIME_IS_MULTIPART_SIGNED(part)) + { + GMimeMultipartSigned *mps = (GMimeMultipartSigned *)part; + GError *err = NULL; + GMimeSignatureList *signatures = g_mime_multipart_signed_verify(mps, GMIME_VERIFY_NONE, &err); + g_object_unref(signatures); + } +#endif +} + +int main() +{ + g_mime_init(); + GMimeParser *parser = g_mime_parser_new(); + GMimeMessage *message = g_mime_parser_construct_message(parser, NULL); + g_mime_message_foreach(message, verify_callback, NULL); + g_object_unref(message); + g_object_unref(parser); + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-gmime/vcpkg.json b/scripts/test_ports/vcpkg-ci-gmime/vcpkg.json new file mode 100644 index 00000000000000..cbef40d5e73d42 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gmime/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "vcpkg-ci-gmime", + "version-string": "ci", + "description": "Validates gmime", + "dependencies": [ + "gmime", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + { + "name": "crypto", + "platform": "!windows | mingw" + } + ], + "features": { + "crypto": { + "description": "gmime[crypo]", + "dependencies": [ + { + "name": "gmime", + "features": [ + "crypto" + ] + } + ] + } + } +} diff --git a/scripts/test_ports/vcpkg-ci-juce/portfile.cmake b/scripts/test_ports/vcpkg-ci-juce/portfile.cmake new file mode 100644 index 00000000000000..c735c7aed77537 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-juce/portfile.cmake @@ -0,0 +1,8 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" + OPTIONS + "-DWITH_CURL=${VCPKG_TARGET_IS_LINUX}" +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-juce/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-juce/project/CMakeLists.txt new file mode 100644 index 00000000000000..259a88baf2be66 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-juce/project/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.29) +project(juce-test VERSION 1 LANGUAGES C CXX) + +set(CMAKE_CXX_STANDARD 11) + +option(WITH_CURL "Link curl") + +find_package(JUCE CONFIG REQUIRED) + +juce_add_console_app(core + PRODUCT_NAME "vcpkg-ci-juce" + NEEDS_CURL "${WITH_CURL}" +) +target_sources(core PRIVATE main.cpp) +target_link_libraries(core PRIVATE juce::juce_core) + +juce_add_console_app(everything + PRODUCT_NAME "vcpkg-ci-juce" + NEEDS_CURL "${WITH_CURL}" +) +target_sources(everything PRIVATE main.cpp) +file(GLOB all_modules RELATIVE "${JUCE_MODULES_DIR}" "${JUCE_MODULES_DIR}/*") +list(TRANSFORM all_modules PREPEND juce::) +target_link_libraries(everything PRIVATE ${all_modules}) +target_compile_definitions(everything PRIVATE JUCE_WEB_BROWSER=0) diff --git a/scripts/test_ports/vcpkg-ci-juce/project/main.cpp b/scripts/test_ports/vcpkg-ci-juce/project/main.cpp new file mode 100644 index 00000000000000..d7f625de196c76 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-juce/project/main.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + juce::Logger::writeToLog("vcpkg"); + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-juce/vcpkg.json b/scripts/test_ports/vcpkg-ci-juce/vcpkg.json new file mode 100644 index 00000000000000..8033bb2962a122 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-juce/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "vcpkg-ci-juce", + "version-string": "ci", + "description": "Validates juce", + "dependencies": [ + "juce", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "extras" + ], + "features": { + "extras": { + "description": "Install juce[extras]", + "dependencies": [ + { + "name": "juce", + "features": [ + "extras" + ] + } + ] + } + } +} diff --git a/scripts/test_ports/vcpkg-ci-lief/portfile.cmake b/scripts/test_ports/vcpkg-ci-lief/portfile.cmake new file mode 100644 index 00000000000000..62422cac0028d9 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-lief/portfile.cmake @@ -0,0 +1,7 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" +) + +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-lief/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-lief/project/CMakeLists.txt new file mode 100644 index 00000000000000..9c994ed9893fae --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-lief/project/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.24) + +project(vcpkg-ci-lief LANGUAGES C CXX) + +set(CMAKE_CXX_STANDARD 14) + +find_package(LIEF CONFIG REQUIRED) +add_executable(main main.cpp) +target_link_libraries(main PRIVATE LIEF::LIEF) diff --git a/scripts/test_ports/vcpkg-ci-lief/project/main.cpp b/scripts/test_ports/vcpkg-ci-lief/project/main.cpp new file mode 100644 index 00000000000000..881e659baea7c1 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-lief/project/main.cpp @@ -0,0 +1,10 @@ +#include +#include +#include + +int main() +{ + std::cout << "access flags public = " << LIEF::DEX::to_string(LIEF::DEX::access_flags_list[1]) << std::endl; + std::cout << "Version = " << LIEF_VERSION << std::endl; + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-lief/vcpkg.json b/scripts/test_ports/vcpkg-ci-lief/vcpkg.json new file mode 100644 index 00000000000000..d50d4ab9296364 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-lief/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "vcpkg-ci-lief", + "version-string": "ci", + "description": "Testing packages which provide lief", + "license": null, + "dependencies": [ + { + "name": "lief", + "features": [ + "c-api", + "enable-json", + "extra-warnings", + "logging", + "logging-debug", + "use-ccache", + "elf", + "pe", + "macho", + "oat", + "dex", + "vdex", + "art" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake deleted file mode 100644 index 065116c276adcf..00000000000000 --- a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json deleted file mode 100644 index 3eb7d0392939ce..00000000000000 --- a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "vcpkg-ci-mongo-cxx-driver", - "version-date": "2022-11-18", - "description": "Ensures that the vcpkg CI build of mongo-cxx-driver includes feature boost", - "license": "MIT", - "dependencies": [ - { - "name": "mongo-cxx-driver", - "features": [ - "boost" - ] - } - ] -} diff --git a/scripts/test_ports/vcpkg-ci-msh3/portfile.cmake b/scripts/test_ports/vcpkg-ci-msh3/portfile.cmake new file mode 100644 index 00000000000000..dd2570612035c8 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msh3/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-msh3/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-msh3/project/CMakeLists.txt new file mode 100644 index 00000000000000..1455618b347637 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msh3/project/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.10) +project(msh3-test C) + +block() + set(CMAKE_DISABLE_FIND_PACKAGE_PkgConfig 1) + + find_package(msh3 CONFIG REQUIRED) + if(NOT TARGET msh3) + message(SEND_ERROR "No target 'msh3'") + endif() + + add_executable(msh3_cmake main.c) + target_link_libraries(msh3_cmake msh3) +endblock() + +block() + find_package(PkgConfig REQUIRED) + pkg_check_modules(libmsh3 IMPORTED_TARGET REQUIRED libmsh3) + + add_executable(msh3_pkgconfig main.c) + target_link_libraries(msh3_pkgconfig PkgConfig::libmsh3) +endblock() diff --git a/scripts/test_ports/vcpkg-ci-msh3/project/main.c b/scripts/test_ports/vcpkg-ci-msh3/project/main.c new file mode 100644 index 00000000000000..e55b40d053a5ae --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msh3/project/main.c @@ -0,0 +1,8 @@ +#include + +int main() +{ + MSH3_API* api = MsH3ApiOpen(); + if (api) + MsH3ApiClose(api); +} diff --git a/scripts/test_ports/vcpkg-ci-msh3/vcpkg.json b/scripts/test_ports/vcpkg-ci-msh3/vcpkg.json new file mode 100644 index 00000000000000..330016d943a428 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msh3/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "vcpkg-ci-msh3", + "version-string": "ci", + "description": "Validates msh3", + "dependencies": [ + "msh3", + { + "name": "msquic", + "features": [ + "0-rtt" + ], + "platform": "windows & !static" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-orange-math/portfile.cmake b/scripts/test_ports/vcpkg-ci-orange-math/portfile.cmake new file mode 100644 index 00000000000000..62422cac0028d9 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-orange-math/portfile.cmake @@ -0,0 +1,7 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" +) + +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-orange-math/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-orange-math/project/CMakeLists.txt new file mode 100644 index 00000000000000..b06b6d65684475 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-orange-math/project/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.26) + +project(vcpkg-ci-orange-math) + +set(CMAKE_CXX_STANDARD 26) + +add_executable(main main.cpp) + +find_package(omath CONFIG REQUIRED) +target_link_libraries(main PRIVATE omath::omath) diff --git a/scripts/test_ports/vcpkg-ci-orange-math/project/main.cpp b/scripts/test_ports/vcpkg-ci-orange-math/project/main.cpp new file mode 100644 index 00000000000000..66f936fc004a57 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-orange-math/project/main.cpp @@ -0,0 +1,18 @@ +#include +#include +#include + +int main() +{ + omath::pathfinding::NavigationMesh mesh; + + mesh.m_verTextMap[{0.f, 0.f, 0.f}] = { {0.f, 1.f, 0.f} }; + mesh.m_verTextMap[{0.f, 1.f, 0.f}] = { {0.f, 2.f, 0.f} }; + mesh.m_verTextMap[{0.f, 2.f, 0.f}] = { {0.f, 3.f, 0.f} }; + mesh.m_verTextMap[{0.f, 3.f, 0.f}] = {}; + + omath::Vector2 w = omath::Vector2(20.0, 30.0); + std::cout << w.x << "\t" << w.y << std::endl; + + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-orange-math/vcpkg.json b/scripts/test_ports/vcpkg-ci-orange-math/vcpkg.json new file mode 100644 index 00000000000000..dcbdd385f67ac4 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-orange-math/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-ci-orange-math", + "version-string": "ci", + "description": "Testing packages which provide orange-math", + "license": null, + "dependencies": [ + "orange-math", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-ryu/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-ryu/CMakeLists.txt new file mode 100644 index 00000000000000..c69040d5112f32 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ryu/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.30) +project(vcpkg-ci-ryu LANGUAGES C) +find_package(ryu CONFIG REQUIRED) +add_executable(test test.c) +target_link_libraries(test PUBLIC RYU::ryu RYU::ryu_printf) +install(TARGETS test RUNTIME DESTINATION bin/vcpkg-ci-ryu) \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-ryu/portfile.cmake b/scripts/test_ports/vcpkg-ci-ryu/portfile.cmake new file mode 100644 index 00000000000000..a5327e08bc8396 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ryu/portfile.cmake @@ -0,0 +1,9 @@ +set(VCPKG_POLICY_SKIP_ALL_POST_BUILD_CHECKS enabled) +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}") +vcpkg_cmake_install() +if(NOT VCPKG_CROSSCOMPILING) + vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/vcpkg-ci-ryu/test" WORKING_DIRECTORY "." LOGNAME release-test) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/debug/bin/vcpkg-ci-ryu/test" WORKING_DIRECTORY "." LOGNAME debug-test) + endif() +endif() diff --git a/scripts/test_ports/vcpkg-ci-ryu/test.c b/scripts/test_ports/vcpkg-ci-ryu/test.c new file mode 100644 index 00000000000000..b5fbd1fa213961 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ryu/test.c @@ -0,0 +1,21 @@ +#include +#include + +#include +#include + +int main() { + char* result = d2s(3.14); + if (strcmp(result, "3.14E0") != 0) { + printf("Unexpected ryu: %s\n", result); + return 1; + } + + result = d2fixed(3.14159, 1); + if (strcmp(result, "3.1") != 0) { + printf("Unexpected ryu_printf: %s\n", result); + return 2; + } + + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-ryu/vcpkg.json b/scripts/test_ports/vcpkg-ci-ryu/vcpkg.json new file mode 100644 index 00000000000000..4a937cde7db597 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ryu/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "vcpkg-ci-ryu", + "version-date": "2024-12-17", + "dependencies": [ + "ryu", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-unicorn/portfile.cmake b/scripts/test_ports/vcpkg-ci-unicorn/portfile.cmake new file mode 100644 index 00000000000000..6f0a1276f50e25 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-unicorn/portfile.cmake @@ -0,0 +1,10 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-unicorn/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-unicorn/project/CMakeLists.txt new file mode 100644 index 00000000000000..43652cefe0df62 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-unicorn/project/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.5) + +project(vcpkg-ci-unicorn C) + +set(CMAKE_C_STANDARD 11) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(unicorn REQUIRED IMPORTED_TARGET unicorn) + +add_executable(main main.c) + +target_link_libraries(main PRIVATE PkgConfig::unicorn) diff --git a/scripts/test_ports/vcpkg-ci-unicorn/project/main.c b/scripts/test_ports/vcpkg-ci-unicorn/project/main.c new file mode 100644 index 00000000000000..9f7b3eda978806 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-unicorn/project/main.c @@ -0,0 +1,8 @@ +#include + +int main() +{ + uc_engine* uc; + uc_open(UC_ARCH_X86, UC_MODE_32, &uc); + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-unicorn/vcpkg.json b/scripts/test_ports/vcpkg-ci-unicorn/vcpkg.json new file mode 100644 index 00000000000000..71ef60db79d18b --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-unicorn/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-ci-unicorn", + "version-string": "ci", + "description": "Testing packages which provide unicorn", + "license": null, + "dependencies": [ + "unicorn", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-make-tests/portfile.cmake b/scripts/test_ports/vcpkg-make-tests/portfile.cmake new file mode 100644 index 00000000000000..9ec8f2583a4be0 --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/portfile.cmake @@ -0,0 +1,22 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +include("${CMAKE_CURRENT_LIST_DIR}/../unit-test-cmake/portfile.cmake") + +if("z-vcpkg-make-prepare-compile-flags" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_make_prepare_compile_flags.cmake") +endif() + +if("z-vcpkg-make-determine-arch" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_make_determine_arch.cmake") +endif() + +if("z-vcpkg-make-determine-host-arch" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_make_determine_host_arch.cmake") +endif() + +if("z-vcpkg-make-determine-target-arch" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_make_determine_target_arch.cmake") +endif() + +if("z-vcpkg-make-z-adapt-lib-link-names" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_adapt_lib_link_names.cmake") +endif() diff --git a/scripts/test_ports/vcpkg-make-tests/test-z_adapt_lib_link_names.cmake b/scripts/test_ports/vcpkg-make-tests/test-z_adapt_lib_link_names.cmake new file mode 100644 index 00000000000000..6d7258212cb948 --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/test-z_adapt_lib_link_names.cmake @@ -0,0 +1,51 @@ +# Test 1: Basic Transformation +set(all_libs_list "libexample.dll;libutil.a;libutil2.lib;libutil3.so") +set(expected "-llibexample.dll;-llibutil;-llibutil2;-llibutil3") +set(VCPKG_TARGET_IS_WINDOWS FALSE) +set(VCPKG_TARGET_IS_MINGW FALSE) +set(VCPKG_LIBRARY_LINKAGE "static") + +unit_test_check_variable_equal( + [[ z_vcpkg_make_prepare_link_flags(IN_OUT_VAR all_libs_list VCPKG_TRANSFORM_LIBS) ]] + all_libs_list + "${expected}" +) + +# Test 2: Remove uuid on Windows +set(all_libs_list "libexample.dll;uuid.lib") +set(expected "-llibexample.dll") +set(VCPKG_TARGET_IS_WINDOWS TRUE) +set(VCPKG_TARGET_IS_MINGW FALSE) +set(VCPKG_LIBRARY_LINKAGE "static") + +unit_test_check_variable_equal( + [[ z_vcpkg_make_prepare_link_flags(IN_OUT_VAR all_libs_list VCPKG_TRANSFORM_LIBS) ]] + all_libs_list + "${expected}" +) + +# Test 3: MinGW Dynamic Linkage Handling +set(all_libs_list "libexample.so;uuid.a") +set(expected "-llibexample;-Wl,-Bstatic,-luuid,-Bdynamic") +set(VCPKG_TARGET_IS_WINDOWS FALSE) +set(VCPKG_TARGET_IS_MINGW TRUE) +set(VCPKG_LIBRARY_LINKAGE "dynamic") + +unit_test_check_variable_equal( + [[ z_vcpkg_make_prepare_link_flags(IN_OUT_VAR all_libs_list VCPKG_TRANSFORM_LIBS) ]] + all_libs_list + "${expected}" +) + +# Test 4: No Transformation Flag +set(all_libs_list "libexample.dll;uuid.lib") +set(expected "libexample.dll;uuid.lib") +set(VCPKG_TARGET_IS_WINDOWS FALSE) +set(VCPKG_TARGET_IS_MINGW FALSE) +set(VCPKG_LIBRARY_LINKAGE "static") + +unit_test_check_variable_equal( + [[ z_vcpkg_make_prepare_link_flags(IN_OUT_VAR all_libs_list) ]] + all_libs_list + "${expected}" +) diff --git a/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_arch.cmake b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_arch.cmake new file mode 100644 index 00000000000000..5d05e5a9006013 --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_arch.cmake @@ -0,0 +1,28 @@ +set(test_cases + "amd64" "x86_64" + "AMD64" "x86_64" + "x64" "x86_64" + "x86" "i686" + "X86" "i686" + "ARM64" "aarch64" + "arm64" "aarch64" + "ARM" "arm" + "arm" "arm" + "x86_64" "x86_64" + "i686" "i686" + "aarch64" "aarch64" +) + +list(LENGTH test_cases num_items) +math(EXPR num_tests "${num_items} / 2 - 1") + +foreach(idx RANGE 0 ${num_tests}) + math(EXPR input_idx "${idx} * 2") + math(EXPR output_idx "${idx} * 2 + 1") + list(GET test_cases ${input_idx} input) + list(GET test_cases ${output_idx} expected) + + set(result_arch) + z_vcpkg_make_determine_arch(result_arch ${input}) + unit_test_check_variable_equal([[]] result_arch "${expected}") +endforeach() diff --git a/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_host_arch.cmake b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_host_arch.cmake new file mode 100644 index 00000000000000..fe026d0a11a08f --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_host_arch.cmake @@ -0,0 +1,14 @@ +# Test Case 1: x86_64 Architecture (Windows) +set(ENV{PROCESSOR_ARCHITECTURE} "AMD64") +set(result_arch) +z_vcpkg_make_determine_host_arch(result_arch) +unit_test_check_variable_equal([[]] result_arch "x86_64") + +# Test Case 2: i686 Architecture (Windows) +set(ENV{PROCESSOR_ARCHITEW6432} "x86") +set(result_arch) +z_vcpkg_make_determine_host_arch(result_arch) +unit_test_check_variable_equal([[]] result_arch "i686") + +unset(ENV{PROCESSOR_ARCHITECTURE}) +unset(ENV{PROCESSOR_ARCHITEW6432}) diff --git a/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_target_arch.cmake b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_target_arch.cmake new file mode 100644 index 00000000000000..c82221cc496864 --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_determine_target_arch.cmake @@ -0,0 +1,15 @@ +# Test Case 1: Single Target Architecture +set(VCPKG_TARGET_ARCHITECTURE "x86_64") +set(VCPKG_OSX_ARCHITECTURES "x86_64") # Empty for non-OSX +set(result_arch) +z_vcpkg_make_determine_target_arch(result_arch) +unit_test_check_variable_equal([[]] result_arch "x86_64") + +# Test Case 2: Universal Architecture (OSX) +if (VCPKG_HOST_IS_OSX) + set(VCPKG_TARGET_ARCHITECTURE "x86_64") + set(VCPKG_OSX_ARCHITECTURES "x86_64;arm64") + set(result_arch) + z_vcpkg_make_determine_target_arch(result_arch) + unit_test_check_variable_equal([[]] result_arch "universal") +endif() diff --git a/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_prepare_compile_flags.cmake b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_prepare_compile_flags.cmake new file mode 100644 index 00000000000000..89743b8b5f77d5 --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/test-z_vcpkg_make_prepare_compile_flags.cmake @@ -0,0 +1,99 @@ +set(VCPKG_COMBINED_C_FLAGS_Release "-O2 -DNDEBUG") +set(VCPKG_COMBINED_CXX_FLAGS_Release "-O2 -DNDEBUG") +set(VCPKG_COMBINED_C_FLAGS_Debug "-g -O0 -DDEBUG") +set(VCPKG_COMBINED_CXX_FLAGS_Debug "-g -O0 -DDEBUG") +set(VCPKG_COMBINED_SHARED_LINKER_FLAGS_Release "-L/mylibpath") +set(VCPKG_COMBINED_SHARED_LINKER_FLAGS_Debug "-L/debuglibpath") +set(CURRENT_INSTALLED_DIR "C:/vcpkg_installed/x64-windows") + +# Test Case: Release Flag Generation +set(flags_out) +z_vcpkg_make_prepare_compile_flags( + COMPILER_FRONTEND "MSVC" + CONFIG "Release" + FLAGS_OUT flags_out + LANGUAGES "C" "CXX" +) + +set(expected_cflags "-Xcompiler -O2 -Xcompiler -DNDEBUG") +set(expected_cxxflags "-Xcompiler -O2 -Xcompiler -DNDEBUG") +set(expected_ldflags "-Xlinker -Xlinker -Xlinker -L/mylibpath") + +unit_test_check_variable_equal([[]] CFLAGS_Release "${expected_cflags}") +unit_test_check_variable_equal([[]] CXXFLAGS_Release "${expected_cxxflags}") +unit_test_check_variable_equal([[]] LDFLAGS_Release "${expected_ldflags}") + + +# Test Case: Debug flag generation +set(flags_out) +z_vcpkg_make_prepare_compile_flags( + COMPILER_FRONTEND "MSVC" + CONFIG "Debug" + FLAGS_OUT flags_out + LANGUAGES "C" "CXX" +) + +# Expected Debug flags +set(expected_cflags "-Xcompiler -g -Xcompiler -O0 -Xcompiler -DDEBUG") +set(expected_cxxflags "-Xcompiler -g -Xcompiler -O0 -Xcompiler -DDEBUG") +set(expected_ldflags "-Xlinker -Xlinker -Xlinker -L/debuglibpath") + +# Check the values of the Debug flags +unit_test_check_variable_equal([[]] CFLAGS_Debug "${expected_cflags}") +unit_test_check_variable_equal([[]] CXXFLAGS_Debug "${expected_cxxflags}") +unit_test_check_variable_equal([[]] LDFLAGS_Debug "${expected_ldflags}") + +# Test Case: NO_FLAG_ESCAPING (MSVC, Debug) +set(flags_out) +unset(CFLAGS_Debug) +unset(CXXFLAGS_Debug) +unset(LDFLAGS_Debug) +z_vcpkg_make_prepare_compile_flags( + NO_FLAG_ESCAPING + COMPILER_FRONTEND "MSVC" + CONFIG "Debug" + FLAGS_OUT flags_out + LANGUAGES "C" "CXX" +) + +set(expected_cflags "-g -O0 -DDEBUG") +set(expected_cxxflags "-g -O0 -DDEBUG") +set(expected_ldflags "-L/debuglibpath") + +unit_test_check_variable_equal([[]] CFLAGS_Debug "${expected_cflags}") +unit_test_check_variable_equal([[]] CXXFLAGS_Debug "${expected_cxxflags}") +unit_test_check_variable_equal([[]] LDFLAGS_Debug "${expected_ldflags}") + +# Test Case: Different Languages and Compiler Frontend (GCC) +set(flags_out) +z_vcpkg_make_prepare_compile_flags( + COMPILER_FRONTEND "GCC" + CONFIG "Release" + FLAGS_OUT flags_out + LANGUAGES "C" "CXX" "ASM" +) + +unit_test_check_variable_unset([[]] "${ASMFLAGS_Release}") +set(expected_gcc_cflags "-O2 -DNDEBUG") +unit_test_check_variable_equal([[]] expected_gcc_cflags "${CFLAGS_Release}") + +# Test Case: No Languages Defined (Should Default to C;CXX) +set(flags_out) +unset(CFLAGS_Release) +unset(CXXFLAGS_Release) +unset(LDFLAGS_Release) +unset(ASMFLAGS_Release) +z_vcpkg_make_prepare_compile_flags( + COMPILER_FRONTEND "MSVC" + CONFIG "Release" + FLAGS_OUT flags_out +) + +# Verify that both CFLAGS and CXXFLAGS are set since they should default to C and C++ +if(NOT CFLAGS_Release) + message(FATAL_ERROR "CFLAGS_Release not set") +endif() + +if(NOT CXXFLAGS_Release) + message(FATAL_ERROR "CXXFLAGS_Release not set") +endif() \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-make-tests/vcpkg.json b/scripts/test_ports/vcpkg-make-tests/vcpkg.json new file mode 100644 index 00000000000000..661e8421367df4 --- /dev/null +++ b/scripts/test_ports/vcpkg-make-tests/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "vcpkg-make-tests", + "version-string": "0", + "description": "Ensures that the vcpkg-make port functions are unit tested.", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-make", + "host": true + } + ], + "default-features": [ + "z-vcpkg-make-prepare-compile-flags", + "z-vcpkg-make-determine-arch", + "z-vcpkg-make-determine-host-arch", + "z-vcpkg-make-determine-target-arch", + "z-vcpkg-make-z-adapt-lib-link-names" + ], + "features": { + "z-vcpkg-make-prepare-compile-flags": { + "description": "Test the z_vcpkg_make_prepare_compile_flags function" + }, + "z-vcpkg-make-determine-arch":{ + "description": "Test the z_vcpkg_make_determine_arch function" + }, + "z-vcpkg-make-determine-host-arch":{ + "description": "Test the z_vcpkg_make_determine_host_arch function" + }, + "z-vcpkg-make-determine-target-arch":{ + "description": "Test the z_vcpkg_make_determine_target_arch function" + }, + "z-vcpkg-make-z-adapt-lib-link-names":{ + "description": "Test the z_vcpkg_make_z_adapt_lib_link_names function" + } + } + } + \ No newline at end of file diff --git a/triplets/community/arm64-windows-static-md.cmake b/triplets/arm64-windows-static-md.cmake similarity index 100% rename from triplets/community/arm64-windows-static-md.cmake rename to triplets/arm64-windows-static-md.cmake diff --git a/triplets/community/x64-windows-static-md.cmake b/triplets/x64-windows-static-md.cmake similarity index 100% rename from triplets/community/x64-windows-static-md.cmake rename to triplets/x64-windows-static-md.cmake diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index c0420a2fe15095..75cd7bce16a1d1 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a007a23bd2a7017840023c47c4b2cf8e88f76df6", + "version": "1.8.8", + "port-version": 0 + }, { "git-tree": "f65e2f9fbe3059405f79ec9ea833a52ccf098328", "version": "1.8.7", diff --git a/versions/a-/allegro5.json b/versions/a-/allegro5.json index 8268fa139290ac..c48db1f3da9ad8 100644 --- a/versions/a-/allegro5.json +++ b/versions/a-/allegro5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68bc881b999ac9abf8e5a6d7324ab4292a53f7fb", + "version": "5.2.10.0", + "port-version": 0 + }, { "git-tree": "27bd05e0bc710ebb1303d8b59d640bdf8f361497", "version": "5.2.9.1", diff --git a/versions/a-/angle.json b/versions/a-/angle.json index dad20a27bc411d..1b24c0ed347870 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "025eefba308651be2ae69502477d1201dfdf04ea", + "version-string": "chromium_5414", + "port-version": 10 + }, { "git-tree": "b0e6049d392ece97ba5be00c7c3e4410aa78d3f0", "version-string": "chromium_5414", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index dc324ffece46c7..00760ff54cfca3 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b78024e1ea9566d0fcd0c1091558e0f1aac59fdd", + "version-semver": "3.11.0", + "port-version": 0 + }, { "git-tree": "29d864e5f5c61978785ca554e8efcd1d9642010b", "version-semver": "3.9.1", diff --git a/versions/a-/apache-datasketches.json b/versions/a-/apache-datasketches.json index fd49e074eb1999..3c9dff5e6dc7c2 100644 --- a/versions/a-/apache-datasketches.json +++ b/versions/a-/apache-datasketches.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b0afd472cc22cbf3a6b5dcf0d73b0e372a0435f", + "version": "5.1.0", + "port-version": 0 + }, { "git-tree": "3d6fbd6d485c451649477f9496ccaac28e334251", "version": "5.0.2", diff --git a/versions/a-/arpack-ng.json b/versions/a-/arpack-ng.json index 0b71611920baf9..bff2ffc6238659 100644 --- a/versions/a-/arpack-ng.json +++ b/versions/a-/arpack-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "278c6c66052d39f6df0519440ea599b13125116e", + "version": "3.9.1", + "port-version": 1 + }, { "git-tree": "7dd6a7103d3c8f2b5377921d2edc2b29d330a531", "version": "3.9.1", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 8c5f4cefb1fe05..151e231b49f7d9 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "906e1ea198ec813dd0e8f82900c837ad50d97697", + "version": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "18a08cb300f4977e9dc63013f4bcbd2a200667d8", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "4d865e8676a6b5f365872eba731c3a8ab9cc7773", "version": "3.3.0", diff --git a/versions/a-/audiofile.json b/versions/a-/audiofile.json index d4f3bebe04f317..a5a106aa301d5c 100644 --- a/versions/a-/audiofile.json +++ b/versions/a-/audiofile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af5b6cc47eba8f3330b4769643ec814da3be5983", + "version": "1.1.2", + "port-version": 0 + }, { "git-tree": "6f06a6467594b612bfd24dc86f696d07e1c4b500", "version": "1.1.1", diff --git a/versions/a-/aurora-au.json b/versions/a-/aurora-au.json index bcae8431eed9eb..11538a2c7fa01e 100644 --- a/versions/a-/aurora-au.json +++ b/versions/a-/aurora-au.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "91255ce3759e484bab4763b24ea50de15c0ca560", + "version-semver": "0.4.1", + "port-version": 0 + }, + { + "git-tree": "291af3f0c1c91f4c93c000063b601e8a2f0636bd", + "version-semver": "0.4.0", + "port-version": 0 + }, { "git-tree": "843b8ff14fe6b933b9888e9badec1595bdcec3bf", "version-semver": "0.3.5", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index 2251443d2388d0..7f7ec22a0d930e 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0626c208b17cd95760632b920ecd386365638ee9", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "fab2a20a2afd37468953826e9db352ee71ba38d6", "version": "0.7.31", diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json index 67e90bfec8729f..cc245e378d4745 100644 --- a/versions/a-/aws-c-cal.json +++ b/versions/a-/aws-c-cal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cdde2097cab22f8b121239ab9e0484efd564dd7", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "da7748e0883f0c8e02321bc1ef1004041c7fbbf8", "version": "0.7.4", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 77f9f9a84832b5..0b252edaa39cc7 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3f5d0045119455d8dd99017bc4c4c535ec68b37", + "version": "0.10.6", + "port-version": 0 + }, { "git-tree": "6ca8ab15e996d475016dcb8a29cf3558fc4f6568", "version": "0.9.30", diff --git a/versions/a-/aws-c-compression.json b/versions/a-/aws-c-compression.json index 414a8e63b58eeb..f86aeaeeff3a59 100644 --- a/versions/a-/aws-c-compression.json +++ b/versions/a-/aws-c-compression.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a498525014f608149e273dd9477e6880ad9c851", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "8bdfbfedbc64461b1a653d904e8d71e8fe75ed4d", "version": "0.2.19", diff --git a/versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json index 35b06e3ae34ce9..4d28a8a70ca357 100644 --- a/versions/a-/aws-c-event-stream.json +++ b/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d6118e6451f47e0471812ee7cdea2317774a4df", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "3ce2f05af1ef06109a9025033ea8322479473cdd", "version": "0.4.3", diff --git a/versions/a-/aws-c-http.json b/versions/a-/aws-c-http.json index 767dee81e6e1f5..9d45f4240a70d4 100644 --- a/versions/a-/aws-c-http.json +++ b/versions/a-/aws-c-http.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60fbed4d06ee2153dff9742b717bc71c587056e6", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "5ce014beeda67d7d46ad21707433a8f7341a9e77", "version": "0.8.10", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index 7c04a7c1dd7b28..f9189650f14471 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e003c0cc29540c2781aff4df978aa347e34db528", + "version": "0.15.3", + "port-version": 0 + }, { "git-tree": "e61766c04e17d7161154c6a3711adbdd668cd5f4", "version": "0.14.18", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 7113d1b75282c0..386d8d520061ea 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2311d9e3c97821d8027394df1b11a989d0688301", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "dbf87664aa6737a36235a074099574841864cd25", "version": "0.10.7", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index c982660ceb933a..45a14b75b7203d 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c8e850f164e5ed3bb0619429dfa473fad14fd60", + "version": "0.7.7", + "port-version": 0 + }, { "git-tree": "f97ac587659b22375a6dc1b16a87adda99d4662b", "version": "0.6.6", diff --git a/versions/a-/aws-c-sdkutils.json b/versions/a-/aws-c-sdkutils.json index 4da49eb24c5a66..fa5cb05cf3944f 100644 --- a/versions/a-/aws-c-sdkutils.json +++ b/versions/a-/aws-c-sdkutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f598b056368babc76eabd974014b79a58da5f58b", + "version": "0.2.1", + "port-version": 0 + }, { "git-tree": "9160fd89b00f09e336d1efbeb7ece4158d1be332", "version": "0.1.19", diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index 2ddcbb2bdf9f7e..2f25d8ebf8b725 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f21a15b24a1361f3f0a6254b1328797ec831f596", + "version": "0.2.2", + "port-version": 0 + }, { "git-tree": "312d192b55e17423130daac21855dba94d8424d1", "version": "0.1.20", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index a1d96c439b76e4..ca86937160bfcf 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d446e44b0e560c8072e34a82d336f048ba02b60", + "version": "0.29.7", + "port-version": 0 + }, { "git-tree": "5c17e181bec20b7da35cdadf7e4877cf171bbb87", "version": "0.29.6", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 3f035d3c54b9b4..a50ff76789252c 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "65e0677d7ca2f28a8670c577103a7d03b4fbb55a", + "version": "1.11.474", + "port-version": 0 + }, + { + "git-tree": "2ad1c07eff40874cb2714011450ffe1a77fefb38", + "version": "1.11.471", + "port-version": 0 + }, + { + "git-tree": "d6ec576e44d9161027b27b4201c419a2f2ee6980", + "version": "1.11.467", + "port-version": 0 + }, { "git-tree": "d59e22e8a467c7cba1e83fa9fb222eae9cbdfd45", "version": "1.11.460", diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 7c42d33390529d..158356d75e5b28 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f19cdb3144d4296ac862b6e94c9967c056325476", + "version": "1.4.1", + "port-version": 8 + }, { "git-tree": "a684e03aa0836ede2caba93683bee3fd3d1ed15f", "version": "1.4.1", diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index 796e5f1a934a67..6c08e40161ffca 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bc59a4afc477abcc19ae1d0dcc5c4e4884aea6", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "f7a110ba4cae651ef869f470e1165ab60e903aeb", "version": "2.1.5", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index b8fb42fe1021ec..03a9ea10703dbe 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "758978e4f79ff1f27bbf31698e476f451cc9410c", + "version": "4.6.2", + "port-version": 0 + }, { "git-tree": "4cacd1d5f1a465b3ca9d23ebb0b9b4626a26db63", "version": "4.3.7", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 436cd3a786677b..f79d8544e45c78 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d30c99674e87911b853eced815adba9757958b55", + "version-semver": "1.9.1", + "port-version": 0 + }, { "git-tree": "fb5125735472f7f54342eb37ba52a8715178c9f0", "version-semver": "1.9.0", diff --git a/versions/b-/bit7z.json b/versions/b-/bit7z.json index e572935ccf7972..64ed7e6506b73a 100644 --- a/versions/b-/bit7z.json +++ b/versions/b-/bit7z.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "761234aa0ad3687fccc86bf939350659f9d137d6", + "version": "4.0.9", + "port-version": 1 + }, + { + "git-tree": "88073b4adf36aa5b939b9565ec299084e3162e8b", + "version": "4.0.9", + "port-version": 0 + }, { "git-tree": "07fa7b0762a888e367f01bd9ba8674c7a0d7ffdb", "version": "4.0.8", diff --git a/versions/b-/boost-cobalt.json b/versions/b-/boost-cobalt.json index 3c4abc3667c5b3..67251fb50cc02b 100644 --- a/versions/b-/boost-cobalt.json +++ b/versions/b-/boost-cobalt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3195a6c18219720b8c98b5d449ff39b95535122e", + "version": "1.86.0", + "port-version": 1 + }, { "git-tree": "d45758e6c62b46ef436df6cffe7803dfc3ba8f10", "version": "1.86.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index e745a73d06eade..ae6a9d728a6284 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15e0de9e647ed1ddf684158c8dc629544c2fe53b", + "version": "1.86.0", + "port-version": 1 + }, { "git-tree": "e16c1af1e47c7b94ac02c8f3c9ec0f4d3ea8f8f6", "version": "1.86.0", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index d90058ddd4e147..32ef6e71b41a20 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c510dba5b5989297225afde0848cb82ab8ccb1ad", + "version": "5.0.0", + "port-version": 0 + }, { "git-tree": "7abe89f1cf1c33f953c027825b6861abccc4beb7", "version": "4.1.0", diff --git a/versions/b-/buck-yeh-bux-sqlite.json b/versions/b-/buck-yeh-bux-sqlite.json index 3b3be9e279bb99..cc0897cc5a6603 100644 --- a/versions/b-/buck-yeh-bux-sqlite.json +++ b/versions/b-/buck-yeh-bux-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b26398639d9f209f042270dd3406973f4a4e896d", + "version": "1.0.5", + "port-version": 0 + }, { "git-tree": "70a2bfdaeafb4f4193be712ad81e0f9d16ce6294", "version": "1.0.1", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index 3a21625e384a8b..465a165e06ecf9 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c29c8cb5d1b698dbb27a625cb528eb16e1c50aef", + "version": "1.10.2", + "port-version": 0 + }, { "git-tree": "a9fa9a115e82c9c94b0aaebb606bfc58fa995da7", "version": "1.9.0", diff --git a/versions/baseline.json b/versions/baseline.json index 19ce2dcc87562e..336462ab17906c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -73,7 +73,7 @@ "port-version": 7 }, "alembic": { - "baseline": "1.8.7", + "baseline": "1.8.8", "port-version": 0 }, "aliyun-oss-c-sdk": { @@ -85,8 +85,8 @@ "port-version": 4 }, "allegro5": { - "baseline": "5.2.9.1", - "port-version": 1 + "baseline": "5.2.10.0", + "port-version": 0 }, "alpaca": { "baseline": "0.2.1", @@ -134,7 +134,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 9 + "port-version": 10 }, "ankurvdev-embedresource": { "baseline": "0.0.11", @@ -157,11 +157,11 @@ "port-version": 2 }, "aom": { - "baseline": "3.9.1", + "baseline": "3.11.0", "port-version": 0 }, "apache-datasketches": { - "baseline": "5.0.2", + "baseline": "5.1.0", "port-version": 0 }, "approval-tests-cpp": { @@ -238,7 +238,7 @@ }, "arpack-ng": { "baseline": "3.9.1", - "port-version": 0 + "port-version": 1 }, "arrayfire": { "baseline": "3.8.0", @@ -261,7 +261,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "3.3.0", + "baseline": "3.4.1", "port-version": 0 }, "asiochan": { @@ -345,7 +345,7 @@ "port-version": 0 }, "audiofile": { - "baseline": "1.1.1", + "baseline": "1.1.2", "port-version": 0 }, "audit": { @@ -357,8 +357,8 @@ "port-version": 2 }, "aurora-au": { - "baseline": "0.3.5", - "port-version": 1 + "baseline": "0.4.1", + "port-version": 0 }, "autobahn": { "baseline": "20.8.1", @@ -389,51 +389,51 @@ "port-version": 0 }, "aws-c-auth": { - "baseline": "0.7.31", + "baseline": "0.8.0", "port-version": 0 }, "aws-c-cal": { - "baseline": "0.7.4", + "baseline": "0.8.1", "port-version": 0 }, "aws-c-common": { - "baseline": "0.9.30", + "baseline": "0.10.6", "port-version": 0 }, "aws-c-compression": { - "baseline": "0.2.19", + "baseline": "0.3.0", "port-version": 0 }, "aws-c-event-stream": { - "baseline": "0.4.3", + "baseline": "0.5.0", "port-version": 0 }, "aws-c-http": { - "baseline": "0.8.10", + "baseline": "0.9.2", "port-version": 0 }, "aws-c-io": { - "baseline": "0.14.18", + "baseline": "0.15.3", "port-version": 0 }, "aws-c-mqtt": { - "baseline": "0.10.7", + "baseline": "0.11.0", "port-version": 0 }, "aws-c-s3": { - "baseline": "0.6.6", + "baseline": "0.7.7", "port-version": 0 }, "aws-c-sdkutils": { - "baseline": "0.1.19", + "baseline": "0.2.1", "port-version": 0 }, "aws-checksums": { - "baseline": "0.1.20", + "baseline": "0.2.2", "port-version": 0 }, "aws-crt-cpp": { - "baseline": "0.29.6", + "baseline": "0.29.7", "port-version": 0 }, "aws-lambda-cpp": { @@ -441,7 +441,7 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.460", + "baseline": "1.11.474", "port-version": 0 }, "azmq": { @@ -478,7 +478,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 7 + "port-version": 8 }, "azure-macro-utils-c": { "baseline": "2022-01-21", @@ -573,7 +573,7 @@ "port-version": 3 }, "bddisasm": { - "baseline": "2.1.5", + "baseline": "2.2.0", "port-version": 0 }, "bde": { @@ -589,11 +589,11 @@ "port-version": 2 }, "behaviortree-cpp": { - "baseline": "4.3.7", + "baseline": "4.6.2", "port-version": 0 }, "benchmark": { - "baseline": "1.9.0", + "baseline": "1.9.1", "port-version": 0 }, "bento4": { @@ -657,8 +657,8 @@ "port-version": 3 }, "bit7z": { - "baseline": "4.0.8", - "port-version": 0 + "baseline": "4.0.9", + "port-version": 1 }, "bitmagic": { "baseline": "7.13.4", @@ -742,7 +742,7 @@ }, "boost": { "baseline": "1.86.0", - "port-version": 0 + "port-version": 1 }, "boost-accumulators": { "baseline": "1.86.0", @@ -818,7 +818,7 @@ }, "boost-cobalt": { "baseline": "1.86.0", - "port-version": 0 + "port-version": 1 }, "boost-compat": { "baseline": "1.86.0", @@ -1413,7 +1413,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "4.1.0", + "baseline": "5.0.0", "port-version": 0 }, "bsio": { @@ -1421,11 +1421,11 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.9.0", + "baseline": "1.10.2", "port-version": 0 }, "buck-yeh-bux-sqlite": { - "baseline": "1.0.1", + "baseline": "1.0.5", "port-version": 0 }, "bullet3": { @@ -1505,8 +1505,8 @@ "port-version": 0 }, "capnproto": { - "baseline": "1.0.2", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "capstone": { "baseline": "5.0.3", @@ -1516,10 +1516,6 @@ "baseline": "1.2.0", "port-version": 0 }, - "casadi": { - "baseline": "3.6.7", - "port-version": 0 - }, "casclib": { "baseline": "2024-06-05", "port-version": 0 @@ -1782,7 +1778,7 @@ }, "coin-or-cbc": { "baseline": "2024-06-04", - "port-version": 0 + "port-version": 1 }, "coin-or-cgl": { "baseline": "2023-02-01", @@ -1809,7 +1805,7 @@ "port-version": 11 }, "colmap": { - "baseline": "3.10", + "baseline": "3.11.1", "port-version": 0 }, "color-console": { @@ -1917,7 +1913,7 @@ "port-version": 9 }, "cpp-peglib": { - "baseline": "1.9.0", + "baseline": "1.9.1", "port-version": 0 }, "cpp-pinyin": { @@ -1937,7 +1933,7 @@ "port-version": 2 }, "cpp-timsort": { - "baseline": "3.0.0", + "baseline": "3.0.1", "port-version": 0 }, "cppad": { @@ -1977,8 +1973,8 @@ "port-version": 0 }, "cppmicroservices": { - "baseline": "3.7.6", - "port-version": 1 + "baseline": "3.8.4", + "port-version": 0 }, "cppp-reiconv": { "baseline": "2.1.0", @@ -2001,7 +1997,7 @@ "port-version": 4 }, "cpptrace": { - "baseline": "0.7.3", + "baseline": "0.7.4", "port-version": 0 }, "cppunit": { @@ -2046,7 +2042,7 @@ }, "crashpad": { "baseline": "2024-04-11", - "port-version": 4 + "port-version": 5 }, "crashrpt": { "baseline": "1.4.3", @@ -2129,7 +2125,7 @@ "port-version": 13 }, "cuda-api-wrappers": { - "baseline": "0.7.1", + "baseline": "0.8.0", "port-version": 0 }, "cudnn": { @@ -2150,7 +2146,7 @@ }, "curlpp": { "baseline": "2018-06-15", - "port-version": 10 + "port-version": 11 }, "cute-headers": { "baseline": "2019-09-20", @@ -2217,7 +2213,7 @@ "port-version": 0 }, "date": { - "baseline": "2024-05-14", + "baseline": "3.0.3", "port-version": 0 }, "datraw": { @@ -2266,7 +2262,7 @@ }, "dcmtk": { "baseline": "3.6.9", - "port-version": 0 + "port-version": 1 }, "debug-assert": { "baseline": "1.3.4", @@ -2281,8 +2277,8 @@ "port-version": 0 }, "deniskovalchuk-libftp": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.4.1", + "port-version": 0 }, "detours": { "baseline": "4.0.1", @@ -2314,7 +2310,7 @@ }, "directx12-agility": { "baseline": "1.614.1", - "port-version": 0 + "port-version": 1 }, "directxmath": { "baseline": "2024-12-02", @@ -2377,7 +2373,7 @@ "port-version": 0 }, "dlpack": { - "baseline": "0.8", + "baseline": "1.0", "port-version": 0 }, "dmlc": { @@ -2713,7 +2709,7 @@ "port-version": 0 }, "fastio": { - "baseline": "2024-07-05", + "baseline": "2024-12-05", "port-version": 0 }, "fastlz": { @@ -2737,7 +2733,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.12.09.00", + "baseline": "2024.12.23.00", "port-version": 0 }, "fcl": { @@ -2758,11 +2754,11 @@ }, "ffmpeg": { "baseline": "7.1", - "port-version": 1 + "port-version": 2 }, "ffnvcodec": { "baseline": "12.2.72.0", - "port-version": 0 + "port-version": 1 }, "fftw3": { "baseline": "3.3.10", @@ -2789,7 +2785,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.12.09.00", + "baseline": "2024.12.23.00", "port-version": 0 }, "flagpp": { @@ -2842,7 +2838,7 @@ }, "fltk": { "baseline": "1.3.9", - "port-version": 1 + "port-version": 2 }, "fluidlite": { "baseline": "2023-04-18", @@ -2873,7 +2869,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.12.09.00", + "baseline": "2024.12.23.00", "port-version": 0 }, "font-chef": { @@ -2886,7 +2882,7 @@ }, "fontconfig": { "baseline": "2.15.0", - "port-version": 1 + "port-version": 2 }, "foonathan-lexy": { "baseline": "2022.12.1", @@ -2989,8 +2985,8 @@ "port-version": 2 }, "g2o": { - "baseline": "2023-08-06", - "port-version": 0 + "baseline": "2024-12-14", + "port-version": 2 }, "g3log": { "baseline": "2.4", @@ -3033,8 +3029,8 @@ "port-version": 0 }, "gazebo": { - "baseline": "2022-01-20", - "port-version": 5 + "baseline": "11.15.1", + "port-version": 0 }, "gcem": { "baseline": "1.18.0", @@ -3061,11 +3057,11 @@ "port-version": 3 }, "geogram": { - "baseline": "1.8.3", - "port-version": 3 + "baseline": "1.9.2", + "port-version": 0 }, "geographiclib": { - "baseline": "2.4", + "baseline": "2.5", "port-version": 0 }, "geos": { @@ -3137,7 +3133,7 @@ "port-version": 0 }, "glaze": { - "baseline": "4.0.3", + "baseline": "4.2.2", "port-version": 0 }, "glbinding": { @@ -3189,7 +3185,7 @@ "port-version": 3 }, "glslang": { - "baseline": "15.0.0", + "baseline": "15.1.0", "port-version": 0 }, "glui": { @@ -3197,8 +3193,8 @@ "port-version": 4 }, "gmime": { - "baseline": "3.2.6", - "port-version": 6 + "baseline": "3.2.15", + "port-version": 1 }, "gmmlib": { "baseline": "22.5.2", @@ -3221,7 +3217,7 @@ "port-version": 0 }, "google-cloud-cpp": { - "baseline": "2.32.0", + "baseline": "2.33.0", "port-version": 0 }, "google-cloud-cpp-common": { @@ -3310,7 +3306,7 @@ }, "gstreamer": { "baseline": "1.24.7", - "port-version": 1 + "port-version": 3 }, "gtest": { "baseline": "1.15.2", @@ -3357,8 +3353,8 @@ "port-version": 0 }, "gumbo": { - "baseline": "0.10.1", - "port-version": 6 + "baseline": "0.12.3", + "port-version": 0 }, "gz-cmake3": { "baseline": "3.4.1", @@ -3366,7 +3362,7 @@ }, "gz-common5": { "baseline": "5.4.1", - "port-version": 2 + "port-version": 3 }, "gz-fuel-tools8": { "baseline": "8.1.0", @@ -3689,7 +3685,7 @@ "port-version": 0 }, "imageinfo": { - "baseline": "2024-08-05", + "baseline": "2024-12-02", "port-version": 0 }, "imath": { @@ -3701,7 +3697,7 @@ "port-version": 0 }, "imgui": { - "baseline": "1.91.5", + "baseline": "1.91.6", "port-version": 0 }, "imgui-node-editor": { @@ -3790,7 +3786,7 @@ }, "ismrmrd": { "baseline": "1.14.1", - "port-version": 0 + "port-version": 1 }, "itay-grudev-singleapplication": { "baseline": "3.5.1", @@ -3802,7 +3798,7 @@ }, "itpp": { "baseline": "4.3.1", - "port-version": 11 + "port-version": 12 }, "itsy-bitsy": { "baseline": "2022-08-02", @@ -3838,7 +3834,7 @@ }, "jemalloc": { "baseline": "5.3.0", - "port-version": 1 + "port-version": 2 }, "jhasse-poly2tri": { "baseline": "2023-12-27", @@ -3914,7 +3910,7 @@ }, "juce": { "baseline": "8.0.4", - "port-version": 0 + "port-version": 1 }, "jwt-cpp": { "baseline": "0.7.0", @@ -3948,16 +3944,24 @@ "baseline": "2.1.0", "port-version": 1 }, + "kdreports": { + "baseline": "2.3.0", + "port-version": 0 + }, "kdsingleapplication": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "kdsoap": { "baseline": "2.2.0", + "port-version": 1 + }, + "kdstatemachineeditor": { + "baseline": "2.0.0", "port-version": 0 }, "kealib": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "keccak-tiny": { @@ -4086,7 +4090,7 @@ }, "kf5plotting": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5service": { "baseline": "5.98.0", @@ -4106,7 +4110,7 @@ }, "kf5texteditor": { "baseline": "5.98.0", - "port-version": 1 + "port-version": 2 }, "kf5textwidgets": { "baseline": "5.98.0", @@ -4162,14 +4166,14 @@ }, "krb5": { "baseline": "1.21.3", - "port-version": 1 + "port-version": 2 }, "ktx": { "baseline": "4.3.2", "port-version": 0 }, "kubazip": { - "baseline": "0.2.6", + "baseline": "0.3.3", "port-version": 0 }, "kubernetes": { @@ -4241,8 +4245,8 @@ "port-version": 2 }, "leptonica": { - "baseline": "1.84.1", - "port-version": 1 + "baseline": "1.85.0", + "port-version": 0 }, "lerc": { "baseline": "4.0.4", @@ -4253,7 +4257,7 @@ "port-version": 0 }, "level-zero": { - "baseline": "1.17.45", + "baseline": "1.19.2", "port-version": 0 }, "leveldb": { @@ -4361,7 +4365,7 @@ "port-version": 4 }, "libcap": { - "baseline": "2.71", + "baseline": "2.73", "port-version": 0 }, "libcbor": { @@ -4445,7 +4449,7 @@ "port-version": 0 }, "libdeflate": { - "baseline": "1.22", + "baseline": "1.23", "port-version": 0 }, "libdisasm": { @@ -4466,7 +4470,7 @@ }, "libdshowcapture": { "baseline": "0.6.0", - "port-version": 3 + "port-version": 4 }, "libdvdcss": { "baseline": "1.4.3", @@ -4617,17 +4621,13 @@ "port-version": 5 }, "libgpg-error": { - "baseline": "1.47", + "baseline": "1.51", "port-version": 0 }, "libgpiod": { "baseline": "2.1.3", "port-version": 0 }, - "libgpod": { - "baseline": "2019-08-29", - "port-version": 4 - }, "libgta": { "baseline": "1.0.8", "port-version": 5 @@ -4654,7 +4654,7 @@ }, "libheif": { "baseline": "1.19.5", - "port-version": 1 + "port-version": 2 }, "libhsplasma": { "baseline": "2024-03-07", @@ -4669,7 +4669,7 @@ "port-version": 0 }, "libical": { - "baseline": "3.0.18", + "baseline": "3.0.19", "port-version": 0 }, "libice": { @@ -4694,7 +4694,7 @@ }, "libidn2": { "baseline": "2.3.7", - "port-version": 1 + "port-version": 2 }, "libigl": { "baseline": "2.5.0", @@ -4717,7 +4717,7 @@ "port-version": 2 }, "libjpeg-turbo": { - "baseline": "3.0.4", + "baseline": "3.1.0", "port-version": 0 }, "libjuice": { @@ -4785,8 +4785,8 @@ "port-version": 3 }, "libmagic": { - "baseline": "5.45", - "port-version": 3 + "baseline": "5.46", + "port-version": 0 }, "libmariadb": { "baseline": "3.4.1", @@ -4797,7 +4797,7 @@ "port-version": 0 }, "libmediainfo": { - "baseline": "24.11", + "baseline": "24.12", "port-version": 0 }, "libmem": { @@ -4877,7 +4877,7 @@ "port-version": 0 }, "libnick": { - "baseline": "2024.11.1", + "baseline": "2024.12.0", "port-version": 0 }, "libnoise": { @@ -5094,7 +5094,7 @@ }, "libsecret": { "baseline": "0.21.4", - "port-version": 0 + "port-version": 1 }, "libsercomm": { "baseline": "1.3.2", @@ -5238,7 +5238,7 @@ }, "libtorch": { "baseline": "2.1.2", - "port-version": 7 + "port-version": 9 }, "libtorrent": { "baseline": "2.0.10", @@ -5389,7 +5389,7 @@ "port-version": 0 }, "libxdf": { - "baseline": "0.99.8", + "baseline": "0.99.9", "port-version": 0 }, "libxdiff": { @@ -5410,7 +5410,7 @@ }, "libxfont": { "baseline": "2.0.5", - "port-version": 0 + "port-version": 1 }, "libxft": { "baseline": "2.3.4", @@ -5438,7 +5438,7 @@ }, "libxml2": { "baseline": "2.13.5", - "port-version": 0 + "port-version": 1 }, "libxmlmm": { "baseline": "0.6.0", @@ -5528,6 +5528,10 @@ "baseline": "2020-11-24", "port-version": 0 }, + "lief": { + "baseline": "0.16.1", + "port-version": 0 + }, "lightgbm": { "baseline": "4.5.0", "port-version": 0 @@ -5538,7 +5542,7 @@ }, "lilv": { "baseline": "0.24.24", - "port-version": 0 + "port-version": 1 }, "linalg": { "baseline": "2.2", @@ -5609,7 +5613,7 @@ "port-version": 0 }, "log4cxx": { - "baseline": "1.3.0", + "baseline": "1.3.1", "port-version": 0 }, "loguru": { @@ -5621,7 +5625,7 @@ "port-version": 1 }, "ls-qpack": { - "baseline": "2.5.5", + "baseline": "2.6.0", "port-version": 0 }, "ltla-aarand": { @@ -5857,8 +5861,8 @@ "port-version": 0 }, "mchehab-zbar": { - "baseline": "0.23.90", - "port-version": 5 + "baseline": "0.23.93", + "port-version": 0 }, "mcpp": { "baseline": "2.7.2.14", @@ -5888,6 +5892,10 @@ "baseline": "2019-09-25", "port-version": 6 }, + "meekrosoft-fff": { + "baseline": "1.1", + "port-version": 0 + }, "memorymodule": { "baseline": "2019-12-31", "port-version": 3 @@ -5949,7 +5957,7 @@ "port-version": 1 }, "mimicpp": { - "baseline": "4", + "baseline": "5", "port-version": 0 }, "minc": { @@ -6009,7 +6017,7 @@ "port-version": 0 }, "mlpack": { - "baseline": "4.5.0", + "baseline": "4.5.1", "port-version": 0 }, "mman": { @@ -6038,10 +6046,10 @@ }, "mongo-c-driver": { "baseline": "1.29.1", - "port-version": 0 + "port-version": 1 }, "mongo-cxx-driver": { - "baseline": "3.11.0", + "baseline": "4.0.0", "port-version": 0 }, "mongoose": { @@ -6157,8 +6165,8 @@ "port-version": 4 }, "msh3": { - "baseline": "0.6.0", - "port-version": 1 + "baseline": "0.7.0", + "port-version": 0 }, "msinttypes": { "baseline": "2018-02-25", @@ -6173,7 +6181,7 @@ "port-version": 4 }, "msquic": { - "baseline": "2.4.5", + "baseline": "2.4.7", "port-version": 1 }, "mstch": { @@ -6197,7 +6205,7 @@ "port-version": 5 }, "muparser": { - "baseline": "2.3.4", + "baseline": "2.3.5", "port-version": 0 }, "murmur3": { @@ -6209,7 +6217,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.12.09.00", + "baseline": "2024.12.23.00", "port-version": 0 }, "mygui": { @@ -6253,7 +6261,7 @@ "port-version": 5 }, "nanojsonc": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "nanomsg": { @@ -6265,7 +6273,7 @@ "port-version": 0 }, "nanoprintf": { - "baseline": "0.3.4", + "baseline": "0.5.3", "port-version": 0 }, "nanorange": { @@ -6357,7 +6365,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "1.6.0", + "baseline": "1.7.0", "port-version": 0 }, "ngspice": { @@ -6365,7 +6373,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "1.9.1", + "baseline": "1.10.0", "port-version": 0 }, "nifly": { @@ -6477,7 +6485,7 @@ "port-version": 8 }, "nyan-lang": { - "baseline": "0.3", + "baseline": "0.3.1", "port-version": 0 }, "oatpp": { @@ -6674,19 +6682,19 @@ }, "opencv4": { "baseline": "4.10.0", - "port-version": 1 + "port-version": 2 }, "opendnp3": { "baseline": "3.1.1", "port-version": 1 }, "openexr": { - "baseline": "3.3.1", + "baseline": "3.3.2", "port-version": 0 }, "openfbx": { "baseline": "2024-05-08", - "port-version": 0 + "port-version": 1 }, "openfx": { "baseline": "1.4", @@ -6734,7 +6742,7 @@ }, "openmvg": { "baseline": "2.1", - "port-version": 0 + "port-version": 1 }, "openmvs": { "baseline": "2.1.0", @@ -6816,6 +6824,10 @@ "baseline": "0.12+20221121", "port-version": 1 }, + "orange-math": { + "baseline": "1.0.1", + "port-version": 0 + }, "orc": { "baseline": "2.0.0", "port-version": 0 @@ -6941,7 +6953,7 @@ "port-version": 0 }, "pdal": { - "baseline": "2.8.1", + "baseline": "2.8.3", "port-version": 0 }, "pdal-c": { @@ -6949,12 +6961,12 @@ "port-version": 0 }, "pdal-dimbuilder": { - "baseline": "2.8.1", + "baseline": "2.8.3", "port-version": 0 }, "pdcurses": { "baseline": "3.9", - "port-version": 6 + "port-version": 7 }, "pdqsort": { "baseline": "2019-07-30", @@ -7001,7 +7013,7 @@ "port-version": 1 }, "physx": { - "baseline": "5.3.0", + "baseline": "5.5.0", "port-version": 0 }, "picojson": { @@ -7113,8 +7125,8 @@ "port-version": 1 }, "poco": { - "baseline": "1.13.3", - "port-version": 1 + "baseline": "1.14.0", + "port-version": 0 }, "podofo": { "baseline": "0.10.4", @@ -7217,7 +7229,7 @@ "port-version": 1 }, "prometheus-cpp": { - "baseline": "1.2.4", + "baseline": "1.3.0", "port-version": 0 }, "promise-cpp": { @@ -7249,7 +7261,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.12.09.00", + "baseline": "2024.12.23.00", "port-version": 0 }, "psimd": { @@ -7262,7 +7274,7 @@ }, "ptex": { "baseline": "2.4.3", - "port-version": 0 + "port-version": 1 }, "pthread": { "baseline": "3.0.0", @@ -7558,7 +7570,7 @@ }, "qtbase": { "baseline": "6.8.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.8.1", @@ -7886,7 +7898,7 @@ }, "realsense2": { "baseline": "2.56.2", - "port-version": 1 + "port-version": 2 }, "recast": { "baseline": "deprecated", @@ -7897,7 +7909,7 @@ "port-version": 1 }, "recycle": { - "baseline": "6.0.0", + "baseline": "7.0.0", "port-version": 0 }, "redis-plus-plus": { @@ -8076,6 +8088,10 @@ "baseline": "0.9.6+20210811", "port-version": 1 }, + "ruapu": { + "baseline": "0.1.0", + "port-version": 0 + }, "rubberband": { "baseline": "4.0.0", "port-version": 0 @@ -8102,14 +8118,14 @@ }, "ryu": { "baseline": "2.0", - "port-version": 9 + "port-version": 10 }, "s2geometry": { "baseline": "0.11.1", "port-version": 0 }, "s2n": { - "baseline": "1.5.5", + "baseline": "1.5.9", "port-version": 0 }, "safeint": { @@ -8281,7 +8297,7 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.7.16", + "baseline": "0.7.17", "port-version": 0 }, "septag-dmon": { @@ -8310,7 +8326,7 @@ }, "sese": { "baseline": "2.3.0", - "port-version": 2 + "port-version": 3 }, "sf2cute": { "baseline": "0.2.0", @@ -8356,10 +8372,6 @@ "baseline": "1.45", "port-version": 1 }, - "shiva": { - "baseline": "1.0", - "port-version": 7 - }, "shogun": { "baseline": "2023-12-19", "port-version": 1 @@ -8441,8 +8453,8 @@ "port-version": 2 }, "sleef": { - "baseline": "3.5.1", - "port-version": 4 + "baseline": "3.7", + "port-version": 0 }, "sleepy-discord": { "baseline": "2022-02-05", @@ -8650,7 +8662,7 @@ }, "sqlcipher": { "baseline": "4.6.1", - "port-version": 0 + "port-version": 1 }, "sqlite-modern-cpp": { "baseline": "2023-12-03", @@ -8697,7 +8709,7 @@ "port-version": 1 }, "sse2neon": { - "baseline": "1.7.0", + "baseline": "1.8.0", "port-version": 0 }, "stackwalker": { @@ -8761,7 +8773,7 @@ "port-version": 1 }, "stringzilla": { - "baseline": "3.10.5", + "baseline": "3.11.3", "port-version": 0 }, "strong-type": { @@ -8782,7 +8794,7 @@ }, "stxxl": { "baseline": "2018-11-15", - "port-version": 8 + "port-version": 9 }, "suitesparse": { "baseline": "5.8.0", @@ -8817,8 +8829,8 @@ "port-version": 6 }, "taglib": { - "baseline": "2.0", - "port-version": 2 + "baseline": "2.0.2", + "port-version": 0 }, "talib": { "baseline": "0.4.0", @@ -8909,7 +8921,7 @@ "port-version": 4 }, "tgui": { - "baseline": "1.6.1", + "baseline": "1.7.0", "port-version": 0 }, "think-cell-range": { @@ -8925,7 +8937,7 @@ "port-version": 0 }, "thorvg": { - "baseline": "0.15.3", + "baseline": "0.15.6", "port-version": 0 }, "threadpool": { @@ -8989,7 +9001,7 @@ "port-version": 2 }, "tinyexr": { - "baseline": "1.0.8", + "baseline": "1.0.9", "port-version": 0 }, "tinyfiledialogs": { @@ -9097,7 +9109,7 @@ "port-version": 0 }, "tomsolver": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "torch-th": { @@ -9196,6 +9208,10 @@ "baseline": "0.0.8", "port-version": 0 }, + "ucoro": { + "baseline": "1.0", + "port-version": 0 + }, "udt": { "baseline": "4.11", "port-version": 0 @@ -9209,7 +9225,7 @@ "port-version": 0 }, "unicorn": { - "baseline": "2.0.1", + "baseline": "2.1.1", "port-version": 0 }, "unicorn-lib": { @@ -9261,7 +9277,7 @@ "port-version": 1 }, "usd": { - "baseline": "24.8", + "baseline": "24.11", "port-version": 0 }, "usearch": { @@ -9277,7 +9293,7 @@ "port-version": 4 }, "utf8-range": { - "baseline": "5.28.3", + "baseline": "5.29.1", "port-version": 0 }, "utf8h": { @@ -9289,7 +9305,7 @@ "port-version": 0 }, "utfcpp": { - "baseline": "4.0.5", + "baseline": "4.0.6", "port-version": 0 }, "utfz": { @@ -9317,8 +9333,8 @@ "port-version": 0 }, "v-hacd": { - "baseline": "3.2.0", - "port-version": 4 + "baseline": "4.1.0", + "port-version": 0 }, "v8": { "baseline": "9.1.269.39", @@ -9380,6 +9396,10 @@ "baseline": "2024-02-22", "port-version": 0 }, + "vcpkg-make": { + "baseline": "2024-12-27", + "port-version": 0 + }, "vcpkg-msbuild": { "baseline": "2023-08-08", "port-version": 0 @@ -9413,7 +9433,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "vcpkg-tool-mozbuild": { @@ -9457,8 +9477,8 @@ "port-version": 1 }, "vincentlaucsb-csv-parser": { - "baseline": "2.2.3", - "port-version": 1 + "baseline": "2.3.0", + "port-version": 0 }, "visit-struct": { "baseline": "1.1.0", @@ -9589,7 +9609,7 @@ "port-version": 0 }, "wangle": { - "baseline": "2024.12.09.00", + "baseline": "2024.12.23.00", "port-version": 0 }, "wasmedge": { @@ -9673,7 +9693,7 @@ "port-version": 5 }, "winsparkle": { - "baseline": "0.8.1", + "baseline": "0.8.3", "port-version": 0 }, "wintoast": { @@ -9750,7 +9770,7 @@ }, "x264": { "baseline": "0.164.3108", - "port-version": 0 + "port-version": 1 }, "x265": { "baseline": "3.6", @@ -9865,8 +9885,8 @@ "port-version": 4 }, "xsimd": { - "baseline": "13.0.0", - "port-version": 1 + "baseline": "13.1.0", + "port-version": 0 }, "xtensor": { "baseline": "0.25.0", @@ -9901,7 +9921,7 @@ "port-version": 4 }, "yalantinglibs": { - "baseline": "0.3.10", + "baseline": "0.3.11", "port-version": 0 }, "yaml-cpp": { @@ -9933,7 +9953,7 @@ "port-version": 0 }, "yoga": { - "baseline": "3.1.0", + "baseline": "3.2.1", "port-version": 0 }, "yomm2": { @@ -9965,8 +9985,8 @@ "port-version": 2 }, "zfp": { - "baseline": "1.0.0", - "port-version": 2 + "baseline": "1.0.1", + "port-version": 0 }, "zimpl": { "baseline": "3.6.1", @@ -9978,7 +9998,7 @@ }, "zix": { "baseline": "0.4.2", - "port-version": 0 + "port-version": 1 }, "zkpp": { "baseline": "0.2.3", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index 7e430ee7b3bc60..7f1ef47b871450 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e2f4fa657d9e0b8e00e732c697b8550cadb8bdbb", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "34d3e2f7eaa026d154cec3576cffefe6aec1cda1", + "version": "1.0.2", + "port-version": 2 + }, { "git-tree": "38a65f51f26928a3ea7bed90ada2ec4081091a6b", "version": "1.0.2", diff --git a/versions/c-/coin-or-cbc.json b/versions/c-/coin-or-cbc.json index 6b3e7a6df2591a..727ef1c86c8323 100644 --- a/versions/c-/coin-or-cbc.json +++ b/versions/c-/coin-or-cbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0c13a7eef211d2564992a9c2f50f2b7ba0b5659", + "version-date": "2024-06-04", + "port-version": 1 + }, { "git-tree": "090a59c4e81596de0b292188298fc5bbc3d75f84", "version-date": "2024-06-04", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 384a2b8893c8c4..80da556ba77ad8 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e07255def3b7cf947532848a0edfe51f66cd6f66", + "version": "3.11.1", + "port-version": 0 + }, { "git-tree": "29a181de8c80f9008a9a46657a16ed187530a59b", "version": "3.10", diff --git a/versions/c-/cpp-peglib.json b/versions/c-/cpp-peglib.json index 527b7d7712be59..f116355bdaa8ea 100644 --- a/versions/c-/cpp-peglib.json +++ b/versions/c-/cpp-peglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9817053f70c52e2f47411cee3d1293189fd887e0", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "ad61047a51713b6c2a3d1d6be1bf48e4b536bc26", "version": "1.9.0", diff --git a/versions/c-/cpp-timsort.json b/versions/c-/cpp-timsort.json index e49881467cbecb..4a8ca7025e856d 100644 --- a/versions/c-/cpp-timsort.json +++ b/versions/c-/cpp-timsort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f355f33dd3292d81a70517e1fe1ba559844ba413", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "f5a8b81f0e75aa7dfb3545271564bfd1ff8977c3", "version": "3.0.0", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 34f83579fdfc92..49c5d221f6d173 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6139bba03bcfb25bcf76fca8ef1a2b3124eb63a1", + "version": "3.8.4", + "port-version": 0 + }, { "git-tree": "b438280ccc1012bda6457141a3dea8071711ffb9", "version": "3.7.6", diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json index 898b998c924ab4..39a9c5a8d66157 100644 --- a/versions/c-/cpptrace.json +++ b/versions/c-/cpptrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d855e5b820c9ec4659e5a7ec54c97a0e03b5858c", + "version": "0.7.4", + "port-version": 0 + }, { "git-tree": "5e4fd6674adb80ef4f9313d1287febbcdf7c88ee", "version": "0.7.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 3762bad410dd9b..506ad1aa067c17 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d69f9f6012875359ec0ec69b8808f80a4cf944b", + "version-date": "2024-04-11", + "port-version": 5 + }, { "git-tree": "3e260774308b256e5831185d41b76510c7268782", "version-date": "2024-04-11", diff --git a/versions/c-/cuda-api-wrappers.json b/versions/c-/cuda-api-wrappers.json index 1af4971854f2d0..19ddbf10d95223 100644 --- a/versions/c-/cuda-api-wrappers.json +++ b/versions/c-/cuda-api-wrappers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11274aecf51310841c0165bc3d3b6c77525dd38e", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "e1c89070ea5d1eb68494361a8e3c88fa4a15de77", "version": "0.7.1", diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json index d37c54854102c5..37cd89bbef3dd0 100644 --- a/versions/c-/curlpp.json +++ b/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee3e61bbeeae596f013c978b2f2c2550092f3548", + "version-date": "2018-06-15", + "port-version": 11 + }, { "git-tree": "f0a72e60279d7929599cd47abf01c243d7ee0e69", "version-date": "2018-06-15", diff --git a/versions/d-/date.json b/versions/d-/date.json index 4726a611b11762..935d30d66a8e10 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3655f01c9296e57b7d2ab47028498db6d88f7f49", + "version": "3.0.3", + "port-version": 0 + }, { "git-tree": "52f7b2f3a6398c0aa4a073a06c55c1a513b478bb", "version-date": "2024-05-14", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 8cc29a721c658d..3dead66affbb33 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6445ef976bd199730e54bd775a4a4d111aac84c6", + "version": "3.6.9", + "port-version": 1 + }, { "git-tree": "7ebfbdae104c5b87bbb6280f8304be4bf7e87ebb", "version": "3.6.9", diff --git a/versions/d-/deniskovalchuk-libftp.json b/versions/d-/deniskovalchuk-libftp.json index e0f08eb740376b..dc958cca01fb23 100644 --- a/versions/d-/deniskovalchuk-libftp.json +++ b/versions/d-/deniskovalchuk-libftp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dc10866ab80c071876660752ac03872f0488f00", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "924cd332a49b232bf29e9da835f13fec4567182a", "version": "1.4.0", diff --git a/versions/d-/directx12-agility.json b/versions/d-/directx12-agility.json index b33bf6c1773845..214387c5ec056b 100644 --- a/versions/d-/directx12-agility.json +++ b/versions/d-/directx12-agility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "422238025a2834050f475830e846f0a4375a352c", + "version": "1.614.1", + "port-version": 1 + }, { "git-tree": "640cc319351249fe3d6eb031c72abc87655b6d58", "version": "1.614.1", diff --git a/versions/d-/dlpack.json b/versions/d-/dlpack.json index 43d603298ad754..3f37e8e9ba3776 100644 --- a/versions/d-/dlpack.json +++ b/versions/d-/dlpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c96cda5955ba724bee25fcb1c6be4453e48df857", + "version": "1.0", + "port-version": 0 + }, { "git-tree": "935f86ccd4d13dfc3534e81cc898026736249c06", "version": "0.8", diff --git a/versions/f-/fastio.json b/versions/f-/fastio.json index 64ec40c01c3d2c..2579c8c9af6a51 100644 --- a/versions/f-/fastio.json +++ b/versions/f-/fastio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd9f2c4b531f0fb714e89bd073bbd4d569d47120", + "version-date": "2024-12-05", + "port-version": 0 + }, { "git-tree": "f3dc0fd52b1428bad809920801be9a216fd8e0e8", "version-date": "2024-07-05", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 76e38fa8ad68f8..e4fb4265c43b6a 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "54bdaa8f264cb36371a9159c69225a63561a0dcf", + "version-string": "2024.12.23.00", + "port-version": 0 + }, + { + "git-tree": "d1e35db0ff0ab775f3b9f61239b5899bde5d8cb6", + "version-string": "2024.12.16.00", + "port-version": 0 + }, { "git-tree": "7a2d09f9823f05b491be4cf7e4e8209acfa0bc3b", "version-string": "2024.12.09.00", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 9afce4e5e4578c..0dc5687d750a46 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88c48d9d8743bb6641072c4aa50e1da155c2eb50", + "version": "7.1", + "port-version": 2 + }, { "git-tree": "8bf6bad9b522d47e259a13d9033a825a6abd41a9", "version": "7.1", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 6dce36478205ba..b459f45366038a 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90afa3238f852b5b9bc8fee3e259b3a0f0fee91d", + "version": "12.2.72.0", + "port-version": 1 + }, { "git-tree": "5cbb2a7f0ed07795c560971fddd1c6021c37fbfb", "version": "12.2.72.0", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index bcbf5e6876886b..ab846edeb53fd5 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e7456d5d3a013701b454f12bab41012b9dbf2605", + "version-string": "2024.12.23.00", + "port-version": 0 + }, + { + "git-tree": "c8abfbc022ab7db601dfc65559b971111b362216", + "version-string": "2024.12.16.00", + "port-version": 0 + }, { "git-tree": "509724e3f96e3b0b84ac7b8394a31361cf2a1337", "version-string": "2024.12.09.00", diff --git a/versions/f-/fltk.json b/versions/f-/fltk.json index d5af27e0cede91..9887e0f0750b6b 100644 --- a/versions/f-/fltk.json +++ b/versions/f-/fltk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "338d88ae1c146411ee45b68b14f7f72af6b33239", + "version": "1.3.9", + "port-version": 2 + }, { "git-tree": "804b0353b1336322af99c478f62a824a0cabd456", "version": "1.3.9", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index c54b671f2338ab..b3fed50be7a31c 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c2047170fce39d925a840cff13167a3b21bd245c", + "version-string": "2024.12.23.00", + "port-version": 0 + }, + { + "git-tree": "674d15ab14aaa3a9943a005307816ba79b6abbf7", + "version-string": "2024.12.16.00", + "port-version": 0 + }, { "git-tree": "a3cf02384a9fc08f2e904bbe2635c22417c004f3", "version-string": "2024.12.09.00", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 4a082f468947b7..be363b068216b2 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e1bd69ece93d01f14f3f78da93cfeca0f7e8b5f", + "version": "2.15.0", + "port-version": 2 + }, { "git-tree": "443f2cc8005cd715e8786521c1c2cd990a1320a8", "version": "2.15.0", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 2f2d324d070a99..2b0de10b6aba54 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "3c1f1836df83234a33a1f96cb292331f45f1650f", + "version-date": "2024-12-14", + "port-version": 2 + }, + { + "git-tree": "a4cbc27e6ebb4c53963c9cff2b686ea4dc12e4d3", + "version-date": "2024-12-14", + "port-version": 1 + }, + { + "git-tree": "e3c374b6033493e361f78bd082cbbaea6d5790a8", + "version-date": "2024-12-14", + "port-version": 0 + }, + { + "git-tree": "6de83a9660c1f5b6e922a56140584c1dbdaa1643", + "version-date": "2023-08-06", + "port-version": 1 + }, { "git-tree": "be30b61ad0d13087804bc474abea6673ba269a20", "version-date": "2023-08-06", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json index 003ebba8fb3a74..39e132931efc08 100644 --- a/versions/g-/gazebo.json +++ b/versions/g-/gazebo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf7b1a3b9eab1aa4a1ba0fc818a84dcc889d01cb", + "version": "11.15.1", + "port-version": 0 + }, { "git-tree": "c5ff2241343daba9b2e89620fc5502104b459476", "version-date": "2022-01-20", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index f13d9b0a29a2a8..b74c143095d7a0 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84861deff832f4b9ee663513caf8285bff677d44", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "7ecc3086e630018469ee01f4bc48d4dde9372ed8", "version": "1.8.3", diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index 296c2893aaa510..1475d1eebc8bbc 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8950245edd6133b6f42168a24d6c3ab40830f778", + "version": "2.5", + "port-version": 0 + }, { "git-tree": "0e8298595896b923a529fb3fefac902cfa1e2caa", "version": "2.4", diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index de7b950a0dc65a..b0f5898c45ff67 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0de37a617b5372234357ffd665c88455381d97cd", + "version": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "5bbcbfee41a16a8da71e956b03533ce2d0cc1d6f", + "version": "4.2.0", + "port-version": 0 + }, { "git-tree": "59a861998de25e5e4191f419c8c83d0136052775", "version": "4.0.3", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 46dca341d689c9..dabbac770b53ed 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "218e34707c9d9c77a6c853ac61f9df9fb91e2555", + "version": "15.1.0", + "port-version": 0 + }, { "git-tree": "238083db89713c6762c7f785176b28183154deed", "version": "15.0.0", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 4f6711334cb6aa..2d9853aa68cd1c 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "20b88d28331759f09ae3f9f0042b14ea7bd3df96", + "version": "3.2.15", + "port-version": 1 + }, + { + "git-tree": "0317c90380341a0639221bed8e70dbf37de46b0c", + "version": "3.2.15", + "port-version": 0 + }, { "git-tree": "93e8b6f02474e1edb7e99db85020d864ee071ce0", "version": "3.2.6", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 1a126913b3c3e3..8942aad6109bed 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "541916b36ffb283704df2f201a6d12f591cdd361", + "version": "2.33.0", + "port-version": 0 + }, { "git-tree": "64e9d371960f9fd758992954ee20750adf6f1abc", "version": "2.32.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 4f0998ca83e755..92e5ff484b3c62 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8493048108e3a71b0a0271309f86dba4df884394", + "version": "1.24.7", + "port-version": 3 + }, + { + "git-tree": "895e28954cc355e23abad8b4babb540f5de2db6b", + "version": "1.24.7", + "port-version": 2 + }, { "git-tree": "018489638670c73b79e737bb3fe4d1e6452697f9", "version": "1.24.7", diff --git a/versions/g-/gumbo.json b/versions/g-/gumbo.json index b358578d440f12..a5ca2fba4ec916 100644 --- a/versions/g-/gumbo.json +++ b/versions/g-/gumbo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "34c97da27c275c1657e50d6598c72b8aca5cb8cd", + "version": "0.12.3", + "port-version": 0 + }, + { + "git-tree": "6496c7f2e0f20c7f2c469d77e29a02877714b96b", + "version": "0.12.2", + "port-version": 0 + }, { "git-tree": "b0b57c7286bdadcc64d0e4b2f5b5aca951bb1749", "version": "0.10.1", diff --git a/versions/g-/gz-common5.json b/versions/g-/gz-common5.json index e00a0b77ca5d19..d1af186f57230f 100644 --- a/versions/g-/gz-common5.json +++ b/versions/g-/gz-common5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41a407bcf716c1a34f71478a24e9c481f15c255e", + "version": "5.4.1", + "port-version": 3 + }, { "git-tree": "379bf372ab20a993390aaf8c34be3292e43c2ec8", "version": "5.4.1", diff --git a/versions/i-/imageinfo.json b/versions/i-/imageinfo.json index 480d0c8e1d3d0e..b875e833a01861 100644 --- a/versions/i-/imageinfo.json +++ b/versions/i-/imageinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49a738d9a75f95f74ffc75e34f6961c48aebe33d", + "version-date": "2024-12-02", + "port-version": 0 + }, { "git-tree": "b798e4d9bc0316e2a3a267599b498be93e9ab935", "version-date": "2024-08-05", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 66e467519d9869..10ba5c28e13ae0 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61d143dfebf9b720272a52d1d78a3082590f948a", + "version": "1.91.6", + "port-version": 0 + }, { "git-tree": "1b5f147821dea003ee9d733b40bfff23e2c40f04", "version": "1.91.5", diff --git a/versions/i-/ismrmrd.json b/versions/i-/ismrmrd.json index df34dbae6b42b4..4ab26fe09a5f04 100644 --- a/versions/i-/ismrmrd.json +++ b/versions/i-/ismrmrd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5e8f72ee1ce058b1efcac5f9e8be7bafe246fd0", + "version": "1.14.1", + "port-version": 1 + }, { "git-tree": "c903e7a9cc49e7395d37dc5e8587d6dd0196e65a", "version": "1.14.1", diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json index 993791ac59b2d4..b3cf40280cbf1a 100644 --- a/versions/i-/itpp.json +++ b/versions/i-/itpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90c2b246877a97ce4ee4b4f5b7aa55714ac715fd", + "version-semver": "4.3.1", + "port-version": 12 + }, { "git-tree": "deb799807d61211af72ccc732eea3950b2d52b4c", "version-semver": "4.3.1", diff --git a/versions/j-/jemalloc.json b/versions/j-/jemalloc.json index 447406220f96f0..a571e850a50c3c 100644 --- a/versions/j-/jemalloc.json +++ b/versions/j-/jemalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c89a63053caf864aff15f36cf9fa0e6b2ded6bfc", + "version": "5.3.0", + "port-version": 2 + }, { "git-tree": "96ec9736a357ac7af9b108bcc8e9d237cfb18a43", "version": "5.3.0", diff --git a/versions/j-/juce.json b/versions/j-/juce.json index 54b3ac1cf0370e..1f164870d8cc96 100644 --- a/versions/j-/juce.json +++ b/versions/j-/juce.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e35480f559031fb4b98bfa887ebf88291183a6ea", + "version": "8.0.4", + "port-version": 1 + }, { "git-tree": "4b39be2dc5a74f2fc8c2b5943eb0d8afd63f062e", "version": "8.0.4", diff --git a/versions/k-/kdreports.json b/versions/k-/kdreports.json new file mode 100644 index 00000000000000..66f6b74210bf5e --- /dev/null +++ b/versions/k-/kdreports.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "48775584d32659e830bfd206d7e9fd9256d3a802", + "version": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/k-/kdsingleapplication.json b/versions/k-/kdsingleapplication.json index 60ea7295014a6f..9e97e36579b76c 100644 --- a/versions/k-/kdsingleapplication.json +++ b/versions/k-/kdsingleapplication.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ee7be30605e7b02d718073e03de51bcbba9e9ad", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "97d5185143331c6d5e9f744d6aa0164436ae4e6d", "version": "1.1.0", diff --git a/versions/k-/kdsoap.json b/versions/k-/kdsoap.json index 49deb010961074..480c73ea6d36ee 100644 --- a/versions/k-/kdsoap.json +++ b/versions/k-/kdsoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d47dc1f4cfc2a401cc71c89f60a1c41ca7034198", + "version": "2.2.0", + "port-version": 1 + }, { "git-tree": "fb0537658cffb2606f6eed9d444a5d8f88cdf2a4", "version": "2.2.0", diff --git a/versions/k-/kdstatemachineeditor.json b/versions/k-/kdstatemachineeditor.json new file mode 100644 index 00000000000000..2419bde32bebf6 --- /dev/null +++ b/versions/k-/kdstatemachineeditor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "698e2dfa9c5950117cc66ad7a800d692d8c9a99e", + "version": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/k-/kealib.json b/versions/k-/kealib.json index ee8f18206e5606..47281ec2a8b9af 100644 --- a/versions/k-/kealib.json +++ b/versions/k-/kealib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b536c20c065f4d208e57b76da99c746a5b476e76", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "bf17704ffca285dddb6aef4c846fd62861134681", "version": "1.6.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 1d49856a9e53bc..f934d7e60fc095 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d39d137ecaf46182303bb5845c61fc33c485d571", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "a242d0a106748fced7dacaf9e6c635bdafa9c289", "version": "5.98.0", diff --git a/versions/k-/kf5texteditor.json b/versions/k-/kf5texteditor.json index b6ebcddef1a16b..b9ead60a30daf4 100644 --- a/versions/k-/kf5texteditor.json +++ b/versions/k-/kf5texteditor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6eaa991090763dab7139de8114bc2c715659ef35", + "version": "5.98.0", + "port-version": 2 + }, { "git-tree": "184ee77705278a5194c32d6f6d38ea3bc19b4fd2", "version": "5.98.0", diff --git a/versions/k-/krb5.json b/versions/k-/krb5.json index 7845f469a4c77a..0512bc1da578fa 100644 --- a/versions/k-/krb5.json +++ b/versions/k-/krb5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c78cbc89d3f5b368745e022b8d284f551c57d70", + "version": "1.21.3", + "port-version": 2 + }, { "git-tree": "def378059ffb932bf5f4ff18235b2d136893090e", "version": "1.21.3", diff --git a/versions/k-/kubazip.json b/versions/k-/kubazip.json index 4b72a03b592eab..5af539856d1fac 100644 --- a/versions/k-/kubazip.json +++ b/versions/k-/kubazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f180298b3a29f98aee261face05569afcf1313e5", + "version": "0.3.3", + "port-version": 0 + }, { "git-tree": "a53b15054c06a67cd7ba9f19e54476893cddad72", "version": "0.2.6", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index 7f048bf1b6ca39..2f21bfbb5a258e 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06712962f8bd3f195f1ece8fc02582de1643da0b", + "version": "1.85.0", + "port-version": 0 + }, { "git-tree": "99f96a421ac16fea60363be5488c10b19d6018d4", "version": "1.84.1", diff --git a/versions/l-/level-zero.json b/versions/l-/level-zero.json index f1368e330f9791..7d623fa2d50108 100644 --- a/versions/l-/level-zero.json +++ b/versions/l-/level-zero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39366344839d08370272fdfa483e2502be36870f", + "version": "1.19.2", + "port-version": 0 + }, { "git-tree": "363f712b8a62c1c35924352077138bf3469fa796", "version": "1.17.45", diff --git a/versions/l-/libcap.json b/versions/l-/libcap.json index fcaffbf2611613..9a7361d4328a1b 100644 --- a/versions/l-/libcap.json +++ b/versions/l-/libcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "958892a0b06a8065844bcf29104e85f46b0cd743", + "version": "2.73", + "port-version": 0 + }, { "git-tree": "624965e04fa91928fc26f8a061527d30ed58bf98", "version": "2.71", diff --git a/versions/l-/libdeflate.json b/versions/l-/libdeflate.json index 9d7adf5bc1d126..5b9bcc8e39a4a7 100644 --- a/versions/l-/libdeflate.json +++ b/versions/l-/libdeflate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7431592dabd39fe637bebeda40110a591b125c21", + "version": "1.23", + "port-version": 0 + }, { "git-tree": "db7abc03a06bc3b794ee65f4859a58bc6a441502", "version": "1.22", diff --git a/versions/l-/libdshowcapture.json b/versions/l-/libdshowcapture.json index 7cb7815ef05413..da1649b62e166e 100644 --- a/versions/l-/libdshowcapture.json +++ b/versions/l-/libdshowcapture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df899babb69eb01159e5777fc4d4ef07a1570724", + "version": "0.6.0", + "port-version": 4 + }, { "git-tree": "fc1b7753ef4b7e6fc6d6390bc86fe5186ca45a92", "version": "0.6.0", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index e49bc861667fc0..b1276d7ada15e1 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "241874200d1c1a5f852359a972a6d00c17275669", + "version": "1.51", + "port-version": 0 + }, { "git-tree": "4375cd3cc867a96a2d8b5e99a425b9b3efb4f863", "version": "1.47", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 38c1d1188bdbab..847deb29f869ea 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecd6b2d082b2b4c294587aaabb0c53b7e1d87f5c", + "version": "1.19.5", + "port-version": 2 + }, { "git-tree": "b714664a4550bae5edc9fbe655f0ce057ac9e67e", "version": "1.19.5", diff --git a/versions/l-/libical.json b/versions/l-/libical.json index 2b72d281cbda91..f7ded74d69ba15 100644 --- a/versions/l-/libical.json +++ b/versions/l-/libical.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d8962c7ef4bbfbdb942c83ec6af0a283b086110", + "version": "3.0.19", + "port-version": 0 + }, { "git-tree": "4ccfb365a99b0784a89dedeedc3d78d876606afe", "version": "3.0.18", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index fa676786b80cf2..ba60e6cd821cea 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "328e0431111dc594862afb21b8a160f982794e9b", + "version": "2.3.7", + "port-version": 2 + }, { "git-tree": "a890ad8c5cfa0e4400e7227e85e7ee4e514f7e2b", "version": "2.3.7", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 9a3e12a960fd96..82004b65f6904a 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8286a6351f59be7eed5e924d32c3a419d0612ee9", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "fbedc8ef954f9951c7d169c9bac3f9534b4b2c77", "version": "3.0.4", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index 83db3e469ae414..981027da166ead 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "380e305405e20a74576fcee51673a98a5a49fe18", + "version": "5.46", + "port-version": 0 + }, { "git-tree": "167ff0a6360284c7c139765c23367ace49ce68b6", "version": "5.45", diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index c9c4a0158c39d1..1459a2bdbbb7e3 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a01bcb32d2a7e297b961a492bc2aec19aa55cbc8", + "version": "24.12", + "port-version": 0 + }, { "git-tree": "294f2cfc21bf3881eeb3ce4c968998aa6db6adfb", "version": "24.11", diff --git a/versions/l-/libnick.json b/versions/l-/libnick.json index 854fb586a18c0b..6b89415c43fd78 100644 --- a/versions/l-/libnick.json +++ b/versions/l-/libnick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13b0cfacaadc1afe9318178ed40bf01ac604ccb2", + "version": "2024.12.0", + "port-version": 0 + }, { "git-tree": "3dbc747eca6fbd3ae4b8864a82366c151d569df4", "version": "2024.11.1", diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json index a6b0fc25ae3a5a..b105fc600dbda1 100644 --- a/versions/l-/libsecret.json +++ b/versions/l-/libsecret.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf507b0397b2917c2c12e615f94e577a3f35564d", + "version": "0.21.4", + "port-version": 1 + }, { "git-tree": "fe57a1ceea0f28f2945dab68cca4e29358ca5e71", "version": "0.21.4", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index a2385e25f38450..3a1b3878fd5081 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0a4d67bf0f603494ff7ce3e51587513a1df295fe", + "version": "2.1.2", + "port-version": 9 + }, + { + "git-tree": "d6c80d406232a0bfd3360a40132a69d9f70b972c", + "version": "2.1.2", + "port-version": 8 + }, { "git-tree": "e738e2da09a82affc4bf4090d8c672579364231b", "version": "2.1.2", diff --git a/versions/l-/libxdf.json b/versions/l-/libxdf.json index dbfffcfc3482b6..cc8f9e3ce47c54 100644 --- a/versions/l-/libxdf.json +++ b/versions/l-/libxdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecd47f3dfc1bb7dc0b85374b6e5634c5b47be4a2", + "version": "0.99.9", + "port-version": 0 + }, { "git-tree": "c1a0ecbb62eb5c0d6411498644c94fe08120f3b5", "version": "0.99.8", diff --git a/versions/l-/libxfont.json b/versions/l-/libxfont.json index 850cbd8ffd7476..26e78b0d1403b1 100644 --- a/versions/l-/libxfont.json +++ b/versions/l-/libxfont.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68da445b35a06c8bdc939e363098874e80da5b14", + "version": "2.0.5", + "port-version": 1 + }, { "git-tree": "f78821d4b3573bc0b927dc76f10660665f0b2893", "version": "2.0.5", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 00c9166a2d286d..96cfbf8d8cea4b 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42ed1437607b934471807d0a2830d23d43f22bb1", + "version": "2.13.5", + "port-version": 1 + }, { "git-tree": "f61ea0a7f998b892dc7eb51f6366867bef1d5353", "version": "2.13.5", diff --git a/versions/l-/lief.json b/versions/l-/lief.json new file mode 100644 index 00000000000000..de2348ab528ef2 --- /dev/null +++ b/versions/l-/lief.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c93d7992ef9c457a2e320a5f10df9e1dfae1407d", + "version-semver": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "fafe51c4db1abe4b79e44013592db1c89945740d", + "version-semver": "0.16.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/lilv.json b/versions/l-/lilv.json index cf8c7c3b88ce5a..da299dc63f790f 100644 --- a/versions/l-/lilv.json +++ b/versions/l-/lilv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d111881ad652319d2d57242779612581dff3b2e", + "version": "0.24.24", + "port-version": 1 + }, { "git-tree": "350900cd2f7b77c0b2cfc8d033fe98dc4f092ee7", "version": "0.24.24", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index ec7ccee18bb4dc..f3d3e8b5a731fd 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "699df3eeb8f994155f24dd335626fc938f7dc412", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "fb973202e7b0a9c6060e23b92fee4b33df52204a", "version": "1.3.0", diff --git a/versions/l-/ls-qpack.json b/versions/l-/ls-qpack.json index 2dbc37057696a3..068c57264ccc20 100644 --- a/versions/l-/ls-qpack.json +++ b/versions/l-/ls-qpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a175da89c13971ab88cd103a62804aa15934ab83", + "version": "2.6.0", + "port-version": 0 + }, { "git-tree": "73e7312699ae28db63ff0171b70283b694c46bd7", "version": "2.5.5", diff --git a/versions/m-/mchehab-zbar.json b/versions/m-/mchehab-zbar.json index a09be3be3278f6..217dbea17e17a4 100644 --- a/versions/m-/mchehab-zbar.json +++ b/versions/m-/mchehab-zbar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41ada8728385b27a6c57dca0817c78e967f3cb3d", + "version": "0.23.93", + "port-version": 0 + }, { "git-tree": "368a491e8bad201ee1b88e88314b77c540dcea2b", "version": "0.23.90", diff --git a/versions/m-/meekrosoft-fff.json b/versions/m-/meekrosoft-fff.json new file mode 100644 index 00000000000000..68c299e818a592 --- /dev/null +++ b/versions/m-/meekrosoft-fff.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "88a408fad99dd895f057f15cca5557613274cd34", + "version": "1.1", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mimicpp.json b/versions/m-/mimicpp.json index 2fa6c3f7acf3b8..e1c46b6cf3a3ef 100644 --- a/versions/m-/mimicpp.json +++ b/versions/m-/mimicpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d95758234f92448a39a0a2e666e7601f95ae7e91", + "version": "5", + "port-version": 0 + }, { "git-tree": "5f1b8b175bd484148b8c96e9b21b817381a8b964", "version": "4", diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index 3a52c976c37d2a..5f40fbd8bd7149 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "159e1840b52507ad8dc7349370e853f68225414d", + "version": "4.5.1", + "port-version": 0 + }, { "git-tree": "8467e71cd0c010cc0e0831c2111cef62124e592a", "version": "4.5.0", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index c14263117a93ef..998011d482b793 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9943a1e42f7e9c6e4abdde3ae62a31bbee43c1f", + "version": "1.29.1", + "port-version": 1 + }, { "git-tree": "57c165af3c3c82c0f1f05f0f9e9e90af1fb68b50", "version": "1.29.1", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 759ad36b651e4c..3c496ddffec4e7 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6189b50c8af944ed1231b6e30672b49a1a988c85", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "7fb58e0dc8d80bb5e013c724129133d335d9ea8a", "version": "3.11.0", diff --git a/versions/m-/msh3.json b/versions/m-/msh3.json index 0516d453196926..77377bd19405ac 100644 --- a/versions/m-/msh3.json +++ b/versions/m-/msh3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32112fdb5245ab8574dd65f981fa79ee6e6ed5d7", + "version": "0.7.0", + "port-version": 0 + }, { "git-tree": "6c26630aa357e123fe98a2dd4359b52681333a81", "version": "0.6.0", diff --git a/versions/m-/msquic.json b/versions/m-/msquic.json index ef95549f4c9594..156adec3298703 100644 --- a/versions/m-/msquic.json +++ b/versions/m-/msquic.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5e727b0b7e3bf5761f161c5f7ca8f24272a3f7f2", + "version": "2.4.7", + "port-version": 1 + }, + { + "git-tree": "04855f9144f78f05b623916dc4d7310fdf8b5d29", + "version": "2.4.7", + "port-version": 0 + }, { "git-tree": "7e20d48f6fdc1052f7339eeff9ea9ab1074a726c", "version": "2.4.5", diff --git a/versions/m-/muparser.json b/versions/m-/muparser.json index 8a36ed516eb502..e3cfe5a7f4245c 100644 --- a/versions/m-/muparser.json +++ b/versions/m-/muparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbb068f60126bf3db24e867abb1b6daad94fdb0f", + "version": "2.3.5", + "port-version": 0 + }, { "git-tree": "7a10458552dd11fbd4d72ff5e978f5f55a82e2f3", "version": "2.3.4", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 4e18dd32e97313..08447203761b1b 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f64f371e5f070b5a372836a9051ee7e8c0dfaa62", + "version-string": "2024.12.23.00", + "port-version": 0 + }, + { + "git-tree": "dd8f9b28f989e770ed3d4e881d5662983b4ea8a6", + "version-string": "2024.12.16.00", + "port-version": 0 + }, { "git-tree": "64e6a1f6b951bc001334d586487d5aa23fdf0168", "version-string": "2024.12.09.00", diff --git a/versions/n-/nanojsonc.json b/versions/n-/nanojsonc.json index 3a8ad2e97a6420..14d61a44e063ea 100644 --- a/versions/n-/nanojsonc.json +++ b/versions/n-/nanojsonc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "102c65ad71dc556dd82d4af6d83efd96ee316311", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "7680709fd527db1cc26d47f8897c0669cacbfb0f", "version": "1.0.0", diff --git a/versions/n-/nanoprintf.json b/versions/n-/nanoprintf.json index c9ac5b4f71f011..bd145554099624 100644 --- a/versions/n-/nanoprintf.json +++ b/versions/n-/nanoprintf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7428d888aabcb615d9a06f699611d0cb9227fc6", + "version": "0.5.3", + "port-version": 0 + }, { "git-tree": "88e688e729a34f99b0ec4185786fb67fb9fda107", "version": "0.3.4", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 898091dc5f910f..26001053f0a4c5 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdbb00d4ae8ee7decff5ef8fffb7865d7c5c843a", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "0a9f36eb052356da25b2705b310fa13e4da7c121", "version": "1.6.0", diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index a78404712d7fef..362ed2d07f6d67 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fecc32f457f40922f55d7fe4b0dbeb9c848ec90", + "version": "1.10.0", + "port-version": 0 + }, { "git-tree": "963e4c47fa03f36483347f322dc64fdcfbe40272", "version": "1.9.1", diff --git a/versions/n-/nyan-lang.json b/versions/n-/nyan-lang.json index d686edb3f1c10c..c0648f15ac421f 100644 --- a/versions/n-/nyan-lang.json +++ b/versions/n-/nyan-lang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1499a33e6af729d2ca75c7cd1de40b5c39dec7aa", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "63356577d6522c8d99dd8bb9214d9808f7f115b6", "version": "0.3", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index d6516a8280fa26..8535411cf221e1 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c493a7ea4c35003983be050429d12e2a51ee8fed", + "version": "4.10.0", + "port-version": 2 + }, { "git-tree": "6ba67264448ce7a60b8e109db62270331e657e38", "version": "4.10.0", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index 802f5a24c50ca9..ab74ff56e5a3b8 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bee11b35b2b321d14438f97ecbe027099ab3c236", + "version": "3.3.2", + "port-version": 0 + }, { "git-tree": "9ab34082f7f52c635b1b003367190f0e3c58966f", "version": "3.3.1", diff --git a/versions/o-/openfbx.json b/versions/o-/openfbx.json index 14e817bfdcefbf..47eba811c07133 100644 --- a/versions/o-/openfbx.json +++ b/versions/o-/openfbx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91f58df63150443bd8e644f319361162031b88c7", + "version-date": "2024-05-08", + "port-version": 1 + }, { "git-tree": "a8cefcba9bae878776bff95c9f078ffa58d5f15a", "version-date": "2024-05-08", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index a2a3d178481095..9942a25fc2802b 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "004bc9d5fa217b3e1f94c62f850107d47ff7427b", + "version": "2.1", + "port-version": 1 + }, { "git-tree": "897ab1ecaccba02608f2a36ebc8072548aa6c395", "version": "2.1", diff --git a/versions/o-/orange-math.json b/versions/o-/orange-math.json new file mode 100644 index 00000000000000..782ecb56275e6c --- /dev/null +++ b/versions/o-/orange-math.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a0015767dd3fca5dcd70397302311194c88af7e4", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/p-/pdal-dimbuilder.json b/versions/p-/pdal-dimbuilder.json index 712a9e5b4dcebb..ba6c69b3a64f8f 100644 --- a/versions/p-/pdal-dimbuilder.json +++ b/versions/p-/pdal-dimbuilder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dd659017978894ea856d827c3b691c92630b870", + "version": "2.8.3", + "port-version": 0 + }, { "git-tree": "585539caac69de6a9c8b9e13c69f614126bac008", "version": "2.8.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 289afa30ee8c00..066b8705bc6f60 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41927ca2826308f48a692ded77249ab2b50941e5", + "version": "2.8.3", + "port-version": 0 + }, { "git-tree": "d05e42385481a0708b329e583cc70f8ee102305f", "version": "2.8.1", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index 7760ad05787b4f..dfc87e7c7faf64 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cca89d3e561931b8547cf5a86de47dae14e8da30", + "version": "3.9", + "port-version": 7 + }, { "git-tree": "61d47c082b38bc7c50c5b81d730c698dd4cea04f", "version": "3.9", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index ef29a8f6945e7f..60b6f2172ee788 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2b50dbfa444d9f6dc81dfe858c7841891cde9b80", + "version": "5.5.0", + "port-version": 0 + }, + { + "git-tree": "12d1fb56ea7b2f016019fdf621b1246456f0411a", + "version": "5.3.0", + "port-version": 1 + }, { "git-tree": "890453e6b337c77f35dbb33620ac0ab32113f22f", "version": "5.3.0", @@ -86,4 +96,4 @@ "port-version": 0 } ] -} \ No newline at end of file +} diff --git a/versions/p-/poco.json b/versions/p-/poco.json index aed097aeedb1f6..1208585e7cf7e9 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a430ad2f694fb8af957b599850f63786485f98a2", + "version": "1.14.0", + "port-version": 0 + }, { "git-tree": "431894de75b90a806a64bcb289b6ad81d5c98a4c", "version": "1.13.3", diff --git a/versions/p-/prometheus-cpp.json b/versions/p-/prometheus-cpp.json index 9d2820a96260bd..c7d12dbbae59a1 100644 --- a/versions/p-/prometheus-cpp.json +++ b/versions/p-/prometheus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f784dd713938f07787ffefffef73cbb933096046", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "7e9110fe6fedb8304d064ed962e5274b0593f3e4", "version-semver": "1.2.4", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 00f987932664be..92fa51dfa977b4 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "535d364fff81dd78a71c6bcfd94a6e7b40006f82", + "version-string": "2024.12.23.00", + "port-version": 0 + }, + { + "git-tree": "1c0f5317def119968396c78818327c421a4f28ab", + "version-string": "2024.12.16.00", + "port-version": 0 + }, { "git-tree": "b17d6fc86da2bf733bface61e79174febbeb2217", "version-string": "2024.12.09.00", diff --git a/versions/p-/ptex.json b/versions/p-/ptex.json index a880fe8611ef47..a879fc17608d52 100644 --- a/versions/p-/ptex.json +++ b/versions/p-/ptex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e63d512185d2991ba49e4a3eb7c1472b8fbf02e", + "version": "2.4.3", + "port-version": 1 + }, { "git-tree": "8a98c639f2e68c4638eee485c6398a81ab52e3f1", "version": "2.4.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 5797f47d67e3e6..5311fbb39c8564 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aca356b06f62fc44f51769ef5418230a385e3c7f", + "version": "6.8.1", + "port-version": 1 + }, { "git-tree": "15eabae75af5ff861ffa692ff8072aca9af30fad", "version": "6.8.1", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 0580d73880a23d..538430cbf9f7e1 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16b54def1f75d71eb6b30ecc5b33cdcda10ea9e6", + "version": "2.56.2", + "port-version": 2 + }, { "git-tree": "3f099d34f5d5bf7b0354e667018c0caae7966229", "version": "2.56.2", diff --git a/versions/r-/recycle.json b/versions/r-/recycle.json index 719ab3649e32ee..ac829217645806 100644 --- a/versions/r-/recycle.json +++ b/versions/r-/recycle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "342b8bf7460c684c89e390b02194bcad6ef7eb64", + "version": "7.0.0", + "port-version": 0 + }, { "git-tree": "0fe3fb2e4ec2870ca2a01029cc4e40c3992572cb", "version": "6.0.0", diff --git a/versions/r-/ruapu.json b/versions/r-/ruapu.json new file mode 100644 index 00000000000000..a0a6797ed7d396 --- /dev/null +++ b/versions/r-/ruapu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7a70de92d2e605300b4cb147b32a11db159d6db7", + "version": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/r-/ryu.json b/versions/r-/ryu.json index d4e4ddb62f558d..8310c42ecd79fb 100644 --- a/versions/r-/ryu.json +++ b/versions/r-/ryu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99d308c910d365935a5bb9511eb60cb2829d2479", + "version": "2.0", + "port-version": 10 + }, { "git-tree": "c19f7f75e6695396873fa98b4d39512899a34fb5", "version": "2.0", diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index bcc291f0e0b7c0..19faeed4627eaa 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c97aa61e43c57233ca6d62a3e364d85651f9c0ac", + "version": "1.5.9", + "port-version": 0 + }, { "git-tree": "eb07be3d0d2f927badd5e4add1727a7104811c9b", "version": "1.5.5", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 96a62b70305bb8..17dd66126d5e45 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c5a6fefa8e806d07acee57b8c25b6a72ce22822", + "version": "0.7.17", + "port-version": 0 + }, { "git-tree": "3033a490102b82bd53aa21db938ca482589d4001", "version": "0.7.16", diff --git a/versions/s-/sese.json b/versions/s-/sese.json index 81ad9e9850f3a3..4ed7ac60dd3360 100644 --- a/versions/s-/sese.json +++ b/versions/s-/sese.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1540a579381f42109ef5872163f17135bd0cf09c", + "version": "2.3.0", + "port-version": 3 + }, { "git-tree": "c900b599e710379fa35b84583c0d278cedd1f247", "version": "2.3.0", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index b404bed22d9910..1c5429c3655392 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcb27d5e3d26cfdbbd2d27bf9d71b0f3b7a0578a", + "version": "3.7", + "port-version": 0 + }, { "git-tree": "12afaa5146f51bf2912339befaafd1776e10442a", "version": "3.5.1", diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index aebb83f4b249c9..1b33482ed3d270 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11732bd26171c4420ce06505e0ab52dfb841714e", + "version": "4.6.1", + "port-version": 1 + }, { "git-tree": "50e124ac105168dff2cbe199adf15e1d13f5562f", "version": "4.6.1", diff --git a/versions/s-/sse2neon.json b/versions/s-/sse2neon.json index ee08099a277bf8..db41a827939c01 100644 --- a/versions/s-/sse2neon.json +++ b/versions/s-/sse2neon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82b5440f68fea409decd979e68c27409f59ccf74", + "version": "1.8.0", + "port-version": 0 + }, { "git-tree": "52385b21c6b4937686fda2d29616b1e000e3d19c", "version": "1.7.0", diff --git a/versions/s-/stringzilla.json b/versions/s-/stringzilla.json index d7ab6771d7239c..0b8dfef788545c 100644 --- a/versions/s-/stringzilla.json +++ b/versions/s-/stringzilla.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1058dafd0cae592c5ced52f35fc9bbef045b7f9d", + "version": "3.11.3", + "port-version": 0 + }, + { + "git-tree": "80deb7c3d14c69c599962518556c3932f636183e", + "version": "3.11.2", + "port-version": 0 + }, { "git-tree": "19c1fcc087b436864ea6093cd182a5df96dcd408", "version": "3.10.5", diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json index 6d543a04c64b03..a4f3ef6d6b8aa6 100644 --- a/versions/s-/stxxl.json +++ b/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f24aba85347c3466740c7b964ac1d5fd8f03cb77", + "version-date": "2018-11-15", + "port-version": 9 + }, { "git-tree": "1317b4d308dbd0739714615e46ffab600d2fc462", "version-date": "2018-11-15", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 237b8224d2ebf1..a78a2f0be38bdb 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e00ac8989e0d8ecc37cc52d00f075a8244eec44e", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "30f4f32ed1370c9c6f8249c1f3d40573c9c20c33", "version": "2.0", diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index 04af9440d42e20..6fd6a1faa8d7b0 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a228fc0e38252f9fc749e1962462f703c43b348e", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "7f9e5c089cb674e9ea51e4ee9a572e924d93d7dd", "version": "1.6.1", diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index c829e0d80ea297..cfca4ab4da7d2a 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "666b61a993b2709d807638e6661385d523f09ba4", + "version": "0.15.6", + "port-version": 0 + }, { "git-tree": "4060d235a88ccf783ec649cd2f1303d0ee5240c0", "version": "0.15.3", diff --git a/versions/t-/tinyexr.json b/versions/t-/tinyexr.json index 60f9580905d3ce..94396e15753f60 100644 --- a/versions/t-/tinyexr.json +++ b/versions/t-/tinyexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2b22b1785f27ed281bc1d3da4e3853e0c4846f5", + "version": "1.0.9", + "port-version": 0 + }, { "git-tree": "8912e0ebb371923d28ba6a2cc8ab5ecd47957e51", "version": "1.0.8", diff --git a/versions/t-/tomsolver.json b/versions/t-/tomsolver.json index 9a912c63a192f5..6794ec33f7f9e6 100644 --- a/versions/t-/tomsolver.json +++ b/versions/t-/tomsolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c09eb0b6940aab4fc613778fe49ac639a428194", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "ca6ebeda0ee3996867907f8948cb722480696a04", "version": "1.0.0", diff --git a/versions/u-/ucoro.json b/versions/u-/ucoro.json new file mode 100644 index 00000000000000..e30e979379c8bc --- /dev/null +++ b/versions/u-/ucoro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "29380e4860b67d864c58e5c7b26c763dd90b634b", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/versions/u-/unicorn.json b/versions/u-/unicorn.json index a3fd4f274336fd..cca0f40ec173a7 100644 --- a/versions/u-/unicorn.json +++ b/versions/u-/unicorn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fcc1642b22d697846278397e4993b115a0514b6", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "d1d99593115946401db9ccd090cd53dc8ae303ba", "version": "2.0.1", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 257030cff1a1a7..3ebde6ce832b61 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a96dae4b6c9e6d254b6601fb1be2c0088881a0b4", + "version": "24.11", + "port-version": 0 + }, + { + "git-tree": "5d916134edd638a11c6a73e8553896d837d26f2b", + "version": "24.8", + "port-version": 1 + }, { "git-tree": "ead0e855944ba468f8f3e4cc4f1875ae14e2bbc1", "version": "24.8", diff --git a/versions/u-/utf8-range.json b/versions/u-/utf8-range.json index b5bead92bb6b1b..0fef9a1f5fb852 100644 --- a/versions/u-/utf8-range.json +++ b/versions/u-/utf8-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09bb6fc16a60acee3536d8e7febd6fcca82a67ac", + "version": "5.29.1", + "port-version": 0 + }, { "git-tree": "3fca368158ad02ea861065c11c195ca58d94206f", "version": "5.28.3", diff --git a/versions/u-/utfcpp.json b/versions/u-/utfcpp.json index abc7777801091c..d83b1678765c96 100644 --- a/versions/u-/utfcpp.json +++ b/versions/u-/utfcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f73420a80f760312a45c40fce2b350009991c674", + "version": "4.0.6", + "port-version": 0 + }, { "git-tree": "4aa82d07c18c1a5b1ec311a0a23fddc81b162b5a", "version": "4.0.5", diff --git a/versions/v-/v-hacd.json b/versions/v-/v-hacd.json index 01d673b6010953..1ced8a26cb78f7 100644 --- a/versions/v-/v-hacd.json +++ b/versions/v-/v-hacd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd12e9f385d6694b78b54e73328dc0afde6ed0f5", + "version": "4.1.0", + "port-version": 0 + }, { "git-tree": "a4b4d85577f6e6e7cbcfa0257cdc5f51775e3e47", "version": "3.2.0", diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json new file mode 100644 index 00000000000000..960c6a0c986d65 --- /dev/null +++ b/versions/v-/vcpkg-make.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ac1381c26cff8ab8365670f4fb00395e86c58dfa", + "version-date": "2024-12-27", + "port-version": 0 + }, + { + "git-tree": "50a2b6aaf3c272b1eff8ce757e14091c374d9855", + "version-date": "2023-05-15", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index b1514f4511e545..4845412c850288 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc948c67d7f1359319f801078422e996b0a89fd0", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "ba86563d438bbe6692c2b13df4235755ba135cbc", "version": "1.6.0", diff --git a/versions/v-/vincentlaucsb-csv-parser.json b/versions/v-/vincentlaucsb-csv-parser.json index 5c714689b5d26f..bea00757b18f5d 100644 --- a/versions/v-/vincentlaucsb-csv-parser.json +++ b/versions/v-/vincentlaucsb-csv-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61a85adb966f97ad0334f1229309a731589cb189", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "4c82b4467c59f180e2508928b5512aa1c357cf80", "version": "2.2.3", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index dab71dbeb271f5..7c30f9c2d62ac2 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6d808b3e292bafa8160961814c12a854621d36e0", + "version-string": "2024.12.23.00", + "port-version": 0 + }, + { + "git-tree": "9e21115c15ffc784518488aa7f04800a53222792", + "version-string": "2024.12.16.00", + "port-version": 0 + }, { "git-tree": "08478f0611e853873d1ae22603e240977111a5cc", "version-string": "2024.12.09.00", diff --git a/versions/w-/winsparkle.json b/versions/w-/winsparkle.json index 748c844670fd4d..361db54d9b91b7 100644 --- a/versions/w-/winsparkle.json +++ b/versions/w-/winsparkle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1defb75e4741ef2b57c225fe729abca3974a0b5", + "version": "0.8.3", + "port-version": 0 + }, { "git-tree": "033cf81cd03bc5533ddb7e57d65f704db078ba44", "version": "0.8.1", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 862e7076e207ff..6b430320b036c1 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b3254a0abf3a2a2748b7353594b401893f74da9", + "version": "0.164.3108", + "port-version": 1 + }, { "git-tree": "1e1d8374cc8a7fe139d82433d27e64e972365517", "version": "0.164.3108", diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 30d31b2fc59f30..04c2a7f3c81f32 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b77ed3d8e13fc87bade45e85ad04027ef852a00", + "version": "13.1.0", + "port-version": 0 + }, { "git-tree": "f32923512f532dd165f1379bdb3c810b9d31d7d3", "version": "13.0.0", diff --git a/versions/y-/yalantinglibs.json b/versions/y-/yalantinglibs.json index 708d24fd77011e..8068e3183256d9 100644 --- a/versions/y-/yalantinglibs.json +++ b/versions/y-/yalantinglibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9dbecb6f8b92cd9607477e11c27bee39628d4eb", + "version": "0.3.11", + "port-version": 0 + }, { "git-tree": "22ec24c2352d0a80e197145e0e6409540f2a26ce", "version": "0.3.10", diff --git a/versions/y-/yoga.json b/versions/y-/yoga.json index 007402d3354be7..39496e3f1e8639 100644 --- a/versions/y-/yoga.json +++ b/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06a93e4f1d51849c61d13ded7660ff6fe48c6f9a", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "5f4a1466ab3c27e5dd7ade997a96e98e3d46b3ad", "version": "3.1.0", diff --git a/versions/z-/zfp.json b/versions/z-/zfp.json index 02e009479f8b8c..fb76a74d1d7208 100644 --- a/versions/z-/zfp.json +++ b/versions/z-/zfp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25e02beed507eb4dab6ed9efc9acfbfbe2dc9f6f", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "560a885ed95ebb2e7477dfe4e68d5abe7f122fca", "version": "1.0.0", diff --git a/versions/z-/zix.json b/versions/z-/zix.json index b12bd1689fe96d..e2c0dc579e2463 100644 --- a/versions/z-/zix.json +++ b/versions/z-/zix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7224ec80cfaf4b20a79ae9d4907cfb51f47ccfa", + "version": "0.4.2", + "port-version": 1 + }, { "git-tree": "500baf4d01fd4dc9143addf9d23ac2a9536f2b5a", "version": "0.4.2",