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.

Sign up for GitHub

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

Jump to bottom

deps.ffmpeg: Fix fixup step error on windows #225

Merged
merged 4 commits into from
Jan 24, 2024
Merged

deps.ffmpeg: Fix fixup step error on windows #225

merged 4 commits into from
Jan 24, 2024

Conversation

Chensiyy
Copy link
Contributor

@Chensiyy Chensiyy commented Dec 6, 2023

Description

Fixed fixup step file path.

Motivation and Context

The scripts failed when I execute them.

How Has This Been Tested?

Successfully built with WSL on my computer.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@RytoEX
Copy link
Member

RytoEX commented Jan 11, 2024

The bin/bin here seems like an obvious mistake and probably should be corrected (despite that we no longer cross-compile for Windows). I'm not sure about the other changes. @PatTheMav ?

PatTheMav
PatTheMav approved these changes Jan 11, 2024
View reviewed changes
Copy link
Member

@PatTheMav PatTheMav left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me - we'll hopefully not use these for Windows any longer, but as long as we keep cross-compilation as an emergency fallback, it's good to have this fixed.

RytoEX
RytoEX requested changes Jan 11, 2024
View reviewed changes
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a space between each commit prefix and the rest of the commit message subject.

deps.ffmpeg: Fix

@Chensiyy
deps.ffmpeg: Fix libpng fixup step error on windows
76c7544 
Invalid file path, the dir of strip_files is "bin/" rather than "bin/bin/"
@Chensiyy
deps.ffmpeg: Fix libopus fixup step error on windows
35956b9 
Invalid file path, the dir of strip_files is "bin/" rather than "bin/bin/"
@Chensiyy
deps.ffmpeg: Fix libvorbis fixup step error on windows
f3d9984 
Invalid file path, the dir of strip_files is "bin/" rather than "bin/bin/"
@Chensiyy
deps.ffmpeg: Fix aom fixup step error on windows
c06e6f0 
Invalid file path, the dir of strip_files is "bin/" rather than "bin/bin/"
@Chensiyy Chensiyy force-pushed the fix_depsffmpeg_fixup branch 2 times, most recently from 0ccb0b4 to c06e6f0 Compare January 14, 2024 03:30
@Chensiyy
Copy link
Contributor Author

Please add a space between each commit prefix and the rest of the commit message subject.

deps.ffmpeg: Fix

I've fixed it.

@RytoEX RytoEX changed the title deps.ffmpeg:Fix fixup step error on windows deps.ffmpeg: Fix fixup step error on windows Jan 15, 2024
RytoEX
RytoEX approved these changes Jan 17, 2024
View reviewed changes
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@RytoEX RytoEX merged commit 473122f into obsproject:master Jan 24, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PatTheMav PatTheMav PatTheMav approved these changes

@RytoEX RytoEX RytoEX approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Chensiyy @RytoEX @PatTheMav