[libraw] Re-fix non-thread-safe library installation, always export pkgconfig files, add usage #19593
Conversation
…kgconfig files, add usage
JackBoosY
added
category:port-bug
|
cc @ras0219-msft for review this PR since you modified this part. |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
All manifest files must be formatted
./vcpkg format-manifest ports/*/vcpkg.json
Diff
diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json
index 23df524..6439478 100644
--- a/ports/libraw/vcpkg.json
+++ b/ports/libraw/vcpkg.json
@@ -5,8 +5,8 @@
"description": "raw image decoder library",
"homepage": "https://www.libraw.org",
"dependencies": [
- "lcms",
"jasper",
+ "lcms",
{
"name": "vcpkg-cmake",
"host": trueAfter committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6bc4362fb49e53f1fff7f51e4e27e1946755ecc6 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 94f34ac..ff4bc42 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3557,8 +3557,8 @@
"port-version": 2
},
"libraw": {
- "baseline": "201903-3",
- "port-version": 0
+ "baseline": "201903",
+ "port-version": 4
},
"librdkafka": {
"baseline": "1.7.0",
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 7dc015c..d0e889f 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "b1609e8b8544fe3a79145dff86289e34d0be109b",
+ "version-string": "201903",
+ "port-version": 4
+ },
{
"git-tree": "659d20658809488ab3cfccf30d85870ce06615e0",
"version-string": "201903-3",
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6bc4362fb49e53f1fff7f51e4e27e1946755ecc6 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 9734a5d..d0e889f 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "29570f7c291c82fff29831f09cba7d3080250fc5",
+ "git-tree": "b1609e8b8544fe3a79145dff86289e34d0be109b",
"version-string": "201903",
"port-version": 4
},
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6bc4362fb49e53f1fff7f51e4e27e1946755ecc6 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 9734a5d..c6d3b94 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "29570f7c291c82fff29831f09cba7d3080250fc5",
+ "git-tree": "e92bbae52fde973c40d11645968b17ae4ca56846",
"version-string": "201903",
"port-version": 4
},
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6bc4362fb49e53f1fff7f51e4e27e1946755ecc6 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 9734a5d..c6d3b94 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "29570f7c291c82fff29831f09cba7d3080250fc5",
+ "git-tree": "e92bbae52fde973c40d11645968b17ae4ca56846",
"version-string": "201903",
"port-version": 4
},
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6bc4362fb49e53f1fff7f51e4e27e1946755ecc6 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 9734a5d..ee84e7e 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "29570f7c291c82fff29831f09cba7d3080250fc5",
+ "git-tree": "b429ecc70be47299a5df72c53d7e02ea415bf3fc",
"version-string": "201903",
"port-version": 4
},
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Depends on #19628. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 21935b744dc411e0fb1926618fdfb18c67d4b188 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 9734a5d..ee84e7e 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "29570f7c291c82fff29831f09cba7d3080250fc5",
+ "git-tree": "b429ecc70be47299a5df72c53d7e02ea415bf3fc",
"version-string": "201903",
"port-version": 4
},
| # Rename cmake module into a config in order to allow more flexible lookup rules | ||
| file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/FindLibRaw.cmake ${CURRENT_PACKAGES_DIR}/share/libraw/libraw-config.cmake) |
There was a problem hiding this comment.
@ras0219-msft, I noticed you added it before, could you help confirm?
|
I had a look at libraw:x64-osx.
|
|
@dg0yt We need to use wrapper to guide the search of MODULE mode. |
Makes sense - but then the find modules should be installed with it original name, not as a fake config file. This would unbreak |
JackBoosY
added
info:reviewed
|
Ping @dg0yt for review this PR. |
vicroms
removed
the
requires:vcpkg-team-review
|
@JackBoosY Sorry. I have got the latest vcpkg Pull Request code on my PC and generate a new "vcpkg.exe". However, after I typed "vcpkg install openimageio[libraw,ffmpeg,freetype,opencv,gif,openjpeg,webp] --triplet x64-windows", it still shows the same error. Even just "vcpkg install openimageio:x64-windows" can lead to the error. How can I solve it? I have been puzzled about it for two months since I began to use vcpkg, and I hurried to complete it now. |
|
@minhaolee Please provide D:\vcpkg\buildtrees\openimageio\config-x64-windows-out.log. |
|
@JackBoosY Sorry, I was collecting image data recently. Sure, the content of log are below. [1/2] "D:/vcpkg/downloads/tools/cmake-3.21.1-windows/cmake-3.21.1-windows-i386/bin/cmake.exe" -S "D:/vcpkg/buildtrees/openimageio/src/a25d056cb0-36fa00c6d2.clean" -B .. "-DUSE_LIBRAW=ON" "-DUSE_OPENCOLORIO=OFF" "-DUSE_FFMPEG=ON" "-DUSE_FIELD3D=OFF" "-DUSE_FREETYPE=ON" "-DUSE_GIF=ON" "-DUSE_OPENCV=ON" "-DUSE_OPENJPEG=ON" "-DUSE_WEBP=ON" "-DUSE_PYTHON=OFF" "-DOIIO_BUILD_TOOLS=OFF" "-DOIIO_BUILD_TESTS=OFF" "-DUSE_DCMTK=OFF" "-DUSE_NUKE=OFF" "-DUSE_QT=OFF" "-DUSE_PTEX=OFF" "-DLINKSTATIC=0" "-DBUILD_MISSING_FMT=OFF" "-DBUILD_MISSING_ROBINMAP=OFF" "-DBUILD_MISSING_DEPS=OFF" "-DSTOP_ON_WARNING=OFF" "-DVERBOSE=ON" "-DCMAKE_MAKE_PROGRAM=D:/vcpkg/downloads/tools/ninja/1.10.2-windows/ninja.exe" "-DBUILD_SHARED_LIBS=ON" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=D:/vcpkg/scripts/toolchains/windows.cmake" "-DVCPKG_TARGET_TRIPLET=x64-windows" "-DVCPKG_SET_CHARSET_FLAG=ON" "-DVCPKG_PLATFORM_TOOLSET=v142" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DVCPKG_APPLOCAL_DEPS=OFF" "-DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" "-DVCPKG_CXX_FLAGS=" "-DVCPKG_CXX_FLAGS_RELEASE=" "-DVCPKG_CXX_FLAGS_DEBUG=" "-DVCPKG_C_FLAGS=" "-DVCPKG_C_FLAGS_RELEASE=" "-DVCPKG_C_FLAGS_DEBUG=" "-DVCPKG_CRT_LINKAGE=dynamic" "-DVCPKG_LINKER_FLAGS=" "-DVCPKG_LINKER_FLAGS_RELEASE=" "-DVCPKG_LINKER_FLAGS_DEBUG=" "-DVCPKG_TARGET_ARCHITECTURE=x64" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=D:/vcpkg" "-D_VCPKG_INSTALLED_DIR=D:/vcpkg/installed" "-DVCPKG_MANIFEST_INSTALL=OFF" "-DCMAKE_DISABLE_SOURCE_CHANGES=ON" -G "Ninja" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=D:/vcpkg/packages/openimageio_x64-windows" -- Looking for pthread.h -- Found JPEG: optimized;D:/vcpkg/installed/x64-windows/lib/jpeg.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/jpeg.lib -- Found PNG: optimized;D:/vcpkg/installed/x64-windows/lib/libpng16.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/libpng16d.lib (found version "1.6.37") The following configuration files were considered but not accepted: Call Stack (most recent call first): -- OpenCV library not found -- Found FFMPEG: optimized;D:/vcpkg/installed/x64-windows/lib/avdevice.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avdevice.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avfilter.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avfilter.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avformat.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avformat.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avcodec.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avcodec.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avresample.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avresample.lib;optimized;D:/vcpkg/installed/x64-windows/lib/swresample.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/swresample.lib;optimized;D:/vcpkg/installed/x64-windows/lib/swscale.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/swscale.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avutil.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avutil.lib Could not find a package configuration file provided by Add the installation prefix of "unofficial-libsquish" to CMAKE_PREFIX_PATH -- unofficial-libsquish library not found -- FFmpeg not found: ffmpeg plugin will not be built CMake Warning at src/jpeg2000.imageio/CMakeLists.txt:11 (message): -- Create imagio_pvt.h from imageio_pvt.h.in -- Generating done 'D:/vcpkg/downloads/tools/ninja/1.10.2-windows/ninja.exe' '-C' 'D:/vcpkg/buildtrees/openimageio/x64-windows-rel' '-t' 'recompact' failed with: ninja: error: loading 'build.ninja': ϵͳ�Ҳ���ָ�����ļ��� CMake Warning: CMake Generate step failed. Build files cannot be regenerated correctly. -- * Checking for dependencies... -- Looking for pthread.h -- Found JPEG: optimized;D:/vcpkg/installed/x64-windows/lib/jpeg.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/jpeg.lib -- Found PNG: optimized;D:/vcpkg/installed/x64-windows/lib/libpng16.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/libpng16d.lib (found version "1.6.37") The following configuration files were considered but not accepted: Call Stack (most recent call first): -- OpenCV library not found -- Found FFMPEG: optimized;D:/vcpkg/installed/x64-windows/lib/avdevice.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avdevice.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avfilter.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avfilter.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avformat.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avformat.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avcodec.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avcodec.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avresample.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avresample.lib;optimized;D:/vcpkg/installed/x64-windows/lib/swresample.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/swresample.lib;optimized;D:/vcpkg/installed/x64-windows/lib/swscale.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/swscale.lib;optimized;D:/vcpkg/installed/x64-windows/lib/avutil.lib;debug;D:/vcpkg/installed/x64-windows/debug/lib/avutil.lib Could not find a package configuration file provided by Add the installation prefix of "unofficial-libsquish" to CMAKE_PREFIX_PATH -- unofficial-libsquish library not found -- FFmpeg not found: ffmpeg plugin will not be built CMake Warning at src/jpeg2000.imageio/CMakeLists.txt:11 (message): -- Create imagio_pvt.h from imageio_pvt.h.in -- Generating done 'D:/vcpkg/downloads/tools/ninja/1.10.2-windows/ninja.exe' '-C' 'D:/vcpkg/buildtrees/openimageio/x64-windows-dbg' '-t' 'recompact' failed with: ninja: error: loading 'build.ninja': ϵͳ�Ҳ���ָ�����ļ��� CMake Warning: CMake Generate step failed. Build files cannot be regenerated correctly. |
|
@JackBoosY By the way, what is "unofficial-libsquish"? It shows unofficial-libsquish missing... Is this the exactly right reason? |
Since libsquish doesn't have cmake targets in the upstream build, the ones that we patch in for it are prefixed with "unofficial-" so that if upstream ever decides to add real cmake configs we don't conflict with them. When that happens we have to patch downstream consumers of that lib to consume those unofficial- targets. That's usually not a problem since most downstream consumers in that situation use a "find" module or a vendored copy we would have to patch around anyway. |
Please re-install libsquish first. |
|
@JackBoosY @BillyONeal Thanks a lot! I have successfully installed OpenImageIO. I did not realize that re-install libsquish can tackle this problem because everytime I type "vcpkg install linsquish:x64-windows" it shows "already installed", neither "vcpkg upgrade" can help. |
When building
openimageio[libraw]:That's because oiio needs to find the thread-safe and non-thread-safe versions of libraw.
So, in this PR:
FindLibraw.cmakeneed them.FindLibraw.cmake.Fixes #19580.