Updates fork with latest changes from master#12
Merged
Conversation
* Update llhttp to version 9.3.0 for compatibility with libnode 22.17.1 (LTS). * Use min cmake 3.20, remove pc files from package method instead of patching * Fix CMake version range. The upper limit is a guess, as it is unknown when CMake 3.25 support will be dropped. * Update recipes/llhttp/all/conanfile.py --------- Co-authored-by: Abril Rincón Blanco <5364255+AbrilRBS@users.noreply.github.com> Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
* boost: fix arm cross compilation * Forward compilerflags to user bjam Signed-off-by: Uilian Ries <uilianr@jfrog.com> * Fix compiler flags string format Signed-off-by: Uilian Ries <uilianr@jfrog.com> --------- Signed-off-by: Uilian Ries <uilianr@jfrog.com> Co-authored-by: Uilian Ries <uilianr@jfrog.com>
* arrow: add version 21.0.0 * Add patch * parquet requires rapidjson and fixed patch * Add libarrow_compute * Add libarrow_compute as dep on acero * Update recipes/arrow/all/conanfile.py --------- Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
* b2, cmake: test built reference in test package * ninja * cmake: modify the right files
* ninja and m4: fix test package when cross building * fix * remove redundant code
* libpq 15.x - support WIndows arm64 * win arm64 shared lib
The amalgamation build is useful to integrate Botan as a single header/cpp file into downstream projects. When using the library through Conan it does not pose a relevant advantage. On the contrary, we saw miscompilations when using GCC 13 with the amalgamation. Hence, it does not seem to be a good default. See also: randombit/botan#5011
* Add version released this year * Cleanup very old versions
* avcpp: simplify, modernise, maintain a single version * Update recipes/avcpp/all/conanfile.py * No patches --------- Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
…io#27969) --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
conan-io#28030) * libheif: add new version, stop publishing revisions for older versions, use version ranges * libheif: fixes * fix and patches
* OpenEXR: Add version 3.3.5 Fixes (including a memory leak). * openexr: only keep latest 3.3.x --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
* Add observable_unique_ptr * Cleanup * Let us check for cppstd --------- Co-authored-by: Abril Rincón Blanco <5364255+AbrilRBS@users.noreply.github.com>
* upa-url: new recipe version 2.0.0 Add Upa URL library from https://github.com/upa-url/upa * Fix attributes * Cleanup, make static for now until next release * Update recipes/upa-url/all/conanfile.py Co-authored-by: Rimas Misevičius <rmisev3@gmail.com> * Add 2.2.0 --------- Co-authored-by: Abril Rincón Blanco <5364255+AbrilRBS@users.noreply.github.com> Co-authored-by: Abril Rincón Blanco <abrilrb@jfrog.com>
…anges in several recipes, maintain fewer versions (conan-io#28031) * cimg: openexr use version range * wavelet_buffer update * opencascade: opencv version * ffmpeg update * libtiff: keep two versions * openimageio: versions * openjph versions * opencolorio: keep single version * openimageio: version range for opencolorio * minizip-ng versions * opencolorio range for minizip-ng * xlsxio version range for minizip-ng * libtiff: dont enable everything by default * xlsxio versions * dont touch ffmpeg * libheif: fix usage cppstd * fix * remove no-op conditional * remove unused patches * minizip-ng updates * openjph fixes * libtiff fixes * cimg fixes * fixes * wavelet_buffer fixes * fixes * openimageio: make compatible with libheif 1.20 * opencolorio: use cmake build rpath * minizip-ng and opencolorio: fix issues on macos * openimageio: fix rpath build on linux
…o#28032) * libdwarf: Bump to 2.1.0 * Updated patch * Stop publishing useless versions. Added -DLIBDWARF_STATIC=1 * missing config.yml changes --------- Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
…o#28038) * Added version 0.7.4. Minor recipe changes * Fixes and linter
…#27902) ### dav1d * Add version 1.5.0 (and only keep this one) * Use `gas-preprocessor` to support building on Windows arm64 ### fffmpeg * Only keep versions 4.4.4 and 7.1.1 - all other recipes already require a version range * require version ranges for some dependencies - in particular in those cases where a media codec supports windows arm64 in a newer version * use gas-preprocessor to support windows arm64 ### gas-preprocessor * add new recipe (a single perl file) ### libavif * require verion ranges for some dependencies (in particular `dav1d` so that it uses the version being added in this PR) * remove conan1 logic * keep only the most recent version and 1.0.4 which is still referenced by other recipes ### libheif * fix version range for `dav1d` ### libvpx * keep the most recent version, which is the one compatible with windows arm64 (and move ffmpeg to use the version range) ### libx265 * fixes to support windows arm64 (assembly does not work when enabled on/for windows arm64) * keep most recent version ### openh264 * use gas preprocessor to support windows arm64 * keep most recent version
* Add opencv/4.12.0 * Optional: Define cmake components, cleanup recipe * Add backported patch * opencv: webp from conan targets --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
* Add new version for cpr 1.12.0 * Add patch previously overlooked
…28057) * wip * wip * itk * cctag * stella-cv-fbow * imutils-cpp * pcl * opencv * itk * opencv * stella-cv-fbow * fix
* sqlite3: add 3.49.2 and 3.50.3 * sqlite3 versions * use sha2-256 checksum instead of published sha3-256 --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
* replace x64 with ARM64 in sln and vcxproj * opusfile versions --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
* Mainly triggering me was cisco/openh264#3809
* kubernetes_client_c package added * fix some linter issues * requirementes version and options updated * remove lib/cmake * wip * wip * wip * reference rename to kubernetes * test package updated * use languages = "C" and auto_shared_fpic * Update recipes/kubernetes/all/conanfile.py * Update recipes/kubernetes/all/conanfile.py * Update recipes/kubernetes/all/conanfile.py * Make linter happy --------- Co-authored-by: Ernesto de Gracia Herranz <ernestodgh@jfrog.com> Co-authored-by: Abril Rincón Blanco <5364255+AbrilRBS@users.noreply.github.com>
* libarchive: fix cmake 4 support * Removed upper cmake bound on version range --------- Co-authored-by: PerseoGI <perseog@jfrog.com>
* poco wip * remove patch * poco redundant code * Support poco versions 1.14.0, 1.14.1, 1.14.2 - see issues conan-io#26090, conan-io#26639, conan-io#27598 * update * poco fix target names * poco * f * poco fix zlib --------- Co-authored-by: Alexander Winkler <alexander.winkler@mindbreeze.com>
* capstone: add 5.0.6 * capstone * capstone * fix --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
Bronek
approved these changes
Aug 4, 2025
Collaborator
Bronek
left a comment
Bronek
left a comment
There was a problem hiding this comment.
Hope we can automate such merges in the future.
Author
Yes. For some reason pressing the "Sync fork" button didn't do anything. I can probably add a CI workflow to do this for us daily or weekly. |
Author
|
An alternative approach via the UI seems to be:
|
Author
|
As GitHub still showed that our fork was behind, I followed the alternative approach: #13. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For posterity, I used the following commands.
git remote add upstream git@github.com:conan-io/conan-center-index.git.And then just make sure you change the base branch to the
XRPLF/conan-center-indexin the GitHub UI before creating the pull request.