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

Revert the libjpeg-turbo update and roll back to 2.1.5.1 #115

Merged
merged 2 commits into from
Jan 10, 2024

Conversation

mattleibow
Copy link

@mattleibow mattleibow commented Jan 9, 2024

Description of Change

This PR reverts the updte to libjpeg-turbo external dependency because of several encoding issues.

Reverts: #105

SkiaSharp Issue

Related to mono/SkiaSharp#2643

API Changes

None.

Behavioral Changes

None.

Required SkiaSharp PR

Requires mono/SkiaSharp#2699

PR Checklist

  • Rebased on top of skiasharp at time of PR
  • Changes adhere to coding standard
  • Updated documentation

@mattleibow mattleibow added the backport/release/2.x Backport this PR to release/2.x label Jan 9, 2024
@mattleibow mattleibow merged commit 9124c2d into skiasharp Jan 10, 2024
2 checks passed
@mattleibow mattleibow deleted the dev/revert-libjpeg-turbo-main branch January 10, 2024 09:26
Copy link

The backport to release/2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/2.x release/2.x
# Navigate to the new working tree
cd .worktrees/backport-release/2.x
# Create a new branch
git switch --create backport/pr-115-to-release/2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9124c2d7d21cd608b55b99b2a73732152ac6c284
# Push it to GitHub
git push --set-upstream origin backport/pr-115-to-release/2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/2.x

Then, create a pull request where the base branch is release/2.x and the compare/head branch is backport/pr-115-to-release/2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/release/2.x Backport this PR to release/2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant