Page MenuHome
Differential D11796

macOS/ ffmpeg: Fix linker warning
ClosedPublic
Actions

Authored by Ankit Meel (ankitm) on Jul 3 2021, 10:40 PM.

Details

Reviewers
Brecht Van Lommel (brecht)
Sybren A. Stüvel (sybren)
Ray Molenkamp (LazyDodo)
Group Reviewers
Platform: macOS
Commits
rB1af722b81912: Deps builder: macOS/ ffmpeg: Fix linker warning
Summary

ld: warning: could not create compact unwind for _ff_rl_init_vlc: stack subq instruction is too different from dwarf stack size

Similar to rB2de5de57c58521862e0fecc95fc474ea347b7468

Alternative is adding -Wl,-no_compact_unwind linker flag but I don't know the side effects of that.
https://gankra.github.io/blah/compact-unwinding/
Though It will allow reverting rB2de5de57c58521862e0fecc95fc474ea347b7468 and not adding any new
code to ffmpeg.diff.

Diff Detail

Repository
rB Blender
Branch
arcpatch-D11796 (branched from master)
Build Status
Buildable 15599
Build 15599: arc lint + arc unit

Event Timeline

Ankit Meel (ankitm) requested review of this revision.Jul 3 2021, 10:40 PM
Ankit Meel (ankitm) created this revision.
Ankit Meel (ankitm) edited the summary of this revision. (Show Details)
Ankit Meel (ankitm) added a reviewer: Platform: macOS.Jul 3 2021, 10:46 PM

Just a mindless duplication of rB2de5de57c58521862e0fecc95fc474ea347b7468 ..
Solves the warning though

Ankit Meel (ankitm) edited the summary of this revision. (Show Details)Jul 5 2021, 8:20 AM
Brecht Van Lommel (brecht) requested changes to this revision.Jul 5 2021, 10:27 AM
Brecht Van Lommel (brecht) added a subscriber: Brecht Van Lommel (brecht).

Use a single allocation, and avoid the macros:

VLC_TYPE (*table)[2] = av_calloc(sizeof(VLC_TYPE), 1500 * 2);
This revision now requires changes to proceed.Jul 5 2021, 10:27 AM
Ankit Meel (ankitm) updated this revision to Diff 39117.Jul 5 2021, 10:44 AM
  • single call
Harbormaster completed remote builds in B15598: Diff 39117.Jul 5 2021, 10:44 AM
Ankit Meel (ankitm) added reviewers: Sybren A. Stüvel (sybren), Ray Molenkamp (LazyDodo).Jul 5 2021, 10:44 AM
Ankit Meel (ankitm) updated this revision to Diff 39118.Jul 5 2021, 10:48 AM
  • clean paths
Harbormaster completed remote builds in B15599: Diff 39118.Jul 5 2021, 10:48 AM
Brecht Van Lommel (brecht) accepted this revision.Jul 5 2021, 11:02 AM
This revision is now accepted and ready to land.Jul 5 2021, 11:02 AM
Sybren A. Stüvel (sybren) accepted this revision.Jul 6 2021, 11:06 AM

LGTM.

Ray Molenkamp (LazyDodo) accepted this revision.Jul 6 2021, 2:48 PM

It bothers me a little that upstream is seemingly somehow not requiring any of these patches, but beyond that it looks good to me

Closed by commit rB1af722b81912: Deps builder: macOS/ ffmpeg: Fix linker warning (authored by Ankit Meel (ankitm)). · Explain WhyJul 6 2021, 5:44 PM
This revision was automatically updated to reflect the committed changes.
Ankit Meel (ankitm) added a commit: rB1af722b81912: Deps builder: macOS/ ffmpeg: Fix linker warning.
Ray Molenkamp (LazyDodo) mentioned this in D16269: Deps builder: Initial pass as deps update for 3.4.Oct 17 2022, 7:52 PM
Brecht Van Lommel (brecht) mentioned this in rB21deba56aaec: Build: update various libraries for 3.4, fixing bugs and security issues.Oct 20 2022, 1:59 PM
Brecht Van Lommel (brecht) mentioned this in rB2fb06407403a: Build: update various libraries for 3.4, fixing bugs and security issues.Nov 3 2022, 3:05 PM

Revision Contents
Changeset List

PathSize
build_files/
build_environment/
patches/
29 lines

Diff 39118

View Options

build_files/build_environment/patches/ffmpeg.diff

Loading...