Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson backports for 0.28.x #2815

Merged
merged 19 commits into from
Nov 5, 2023
Merged

meson backports for 0.28.x #2815

merged 19 commits into from
Nov 5, 2023

Conversation

neheb
Copy link
Collaborator

@neheb neheb commented Nov 4, 2023

No description provided.

@neheb neheb changed the base branch from main to 0.28.x November 4, 2023 20:33
@neheb
Copy link
Collaborator Author

neheb commented Nov 4, 2023

meson: basic cmake conf is questionable. It's incomplete and errors on missing cmake.

@ghost
Copy link

ghost commented Nov 4, 2023

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

Copy link

codecov bot commented Nov 4, 2023

Codecov Report

Merging #2815 (6b6642e) into 0.28.x (414bff1) will increase coverage by 0.05%.
Report is 63 commits behind head on 0.28.x.
The diff coverage is 51.66%.

@@            Coverage Diff             @@
##           0.28.x    #2815      +/-   ##
==========================================
+ Coverage   63.92%   63.98%   +0.05%     
==========================================
  Files         103      103              
  Lines       22306    22338      +32     
  Branches    10796    10821      +25     
==========================================
+ Hits        14259    14292      +33     
+ Misses       5827     5824       -3     
- Partials     2220     2222       +2     
Files Coverage Δ
include/exiv2/image.hpp 100.00% <ø> (ø)
include/exiv2/matroskavideo.hpp 60.00% <ø> (ø)
include/exiv2/slice.hpp 90.56% <ø> (ø)
include/exiv2/value.hpp 85.11% <100.00%> (ø)
src/canonmn_int.cpp 72.88% <100.00%> (ø)
src/convert.cpp 52.35% <100.00%> (ø)
src/futils.cpp 73.09% <ø> (ø)
src/minoltamn_int.cpp 66.52% <100.00%> (ø)
src/panasonicmn_int.cpp 52.58% <ø> (ø)
src/pentaxmn_int.cpp 71.36% <100.00%> (+0.85%) ⬆️
... and 17 more

@kevinbackhouse
Copy link
Collaborator

Do you want to include this in v0.28.1?

@neheb
Copy link
Collaborator Author

neheb commented Nov 4, 2023

yeah

@kevinbackhouse
Copy link
Collaborator

yeah

If you rebase it then hopefully the tests will all pass.

@kevinbackhouse kevinbackhouse self-requested a review November 4, 2023 22:03
neheb and others added 19 commits November 4, 2023 15:07
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 8361b92)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 8588024)
MSVCRT requires wide string APIs, which were removed. Instead of dealing
with this, just error out on it. MSVCRT is deprecated anyway.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit e61e3d5)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit cfe041e)
Moved files in normal headers for simplicity.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit db25f13)
Makes the main one smaller.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit ec561bb)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit fcc45a3)
(cherry picked from commit 3a1baf0)
Also make video support properly optional.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 6621332)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit dde0b4a)
CMake can't install properly for some reason. Nuke.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit d7e064c)
apt is having some reliability issues. Cache the packages to speed up
workflow and fix this.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 796a102)
The update to 3.11 seems to have fixed meson crashing.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 9e42c6a)
Reduces verbosity when installing packages.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 0831c81)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit e1c94a1)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit bec05da)
Bumps [mymindstorm/setup-emsdk](https://github.com/mymindstorm/setup-emsdk) from 11 to 12.
- [Release notes](https://github.com/mymindstorm/setup-emsdk/releases)
- [Commits](mymindstorm/setup-emsdk@v11...v12)

---
updated-dependencies:
- dependency-name: mymindstorm/setup-emsdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 6e3dfe5)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 4f548c6)
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 0de650d)
@neheb neheb merged commit 8fd2dfb into Exiv2:0.28.x Nov 5, 2023
103 of 104 checks passed
@neheb neheb deleted the me branch November 5, 2023 00:06
@kevinbackhouse kevinbackhouse added this to the v0.28.2 milestone Feb 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants