ffmpeg7: fix compilation for OS X 10.7 through 10.12

[erikbs]

Description

Add patch that adds a type alias for OS X <= 10.12 from AVMediaType to NSString* (introduced in the 10.13 SDK, but with an extra specifier). I have submitted the same patch to ffmpeg. Before 10.13 these constants were declared directly as NSString*.

Type(s)

• bugfix
• enhancement
• security fix

Tested on

macOS 10.9.5 13F1911 x86_64
Xcode 6.2 6C131e

Verification

Have you

• followed our Commit Message Guidelines?
• squashed and minimized your commits?
• checked that there aren't other open pull requests for the same change?
• referenced existing tickets on Trac with full URL in commit message?
• checked your Portfile with port lint --nitpick?
• tried existing tests with sudo port test?
• tried a full install with sudo port -vst install?
• tested basic functionality of all binary files?
• checked that the Portfile's most important variants haven't been broken?

[macportsbot]

Notifying maintainers:
@barracuda156 for port ffmpeg7.
@mascguy for port ffmpeg7.

[jmroot]

Please rebase against master in order to pick up c83c328.

[barracuda156]

Did the build fail otherwise? If yes, then no need to revbump it.

[RobK88]

Did the build fail otherwise? If yes, then no need to revbump it.

I agree with you. It looks like there is no need to revbump it.

[reneeotten]

@erikbs did you submit this patch upstream? If so, please include a link to the issue/PR; if not, please do so we can see what they say about it. Also the latest upstream version is 7.1 please verify that the issue you're trying to solve here hasn't been addressed yet.

[erikbs]

@reneeotten I did and got some feedback (before I opened this PR), but it has not been merged: https://patchwork.ffmpeg.org/project/ffmpeg/patch/[email protected]/ . As far as I can see the issue is still there on master.

[RobK88]

I recommend that this PR be merged for ffmpeg7 (release 7.01) with a note in the Portfile that the patch can be removed in the future when the patch is incorporated upstream in the source code in a future release of ffmpeg7.

There are ports that depend on ffmpeg7 such as cmus that are currently broken on older macOS systems.

[erikbs]

I recommend that this PR be merged for ffmpeg7 (release 7.01) with a note in the Portfile that the patch can be removed in the future when the patch is incorporated upstream in the source code in a future release of ffmpeg7.

There are ports that depend on ffmpeg7 such as cmus that are currently broken on older macOS systems.

Good idea, I pushed an update with a note added.

[reneeotten]

@erikbs upstream has released version 7.1 - please try the updated version and check if this issues has been resolved.

[aeiouaeiouaeiouaeiouaeiouaeiou]

@reneeotten still not fixed in upstream: https://trac.macports.org/ticket/71218

[aeiouaeiouaeiouaeiouaeiouaeiou]

So can we merge this? #26404 contains a fix for building on macOS <10.15, but it won't work because timg depends on broken ffmpeg7.

[reneeotten]

it doesn't look upstream is going to respond anytime soon. I am fine with merging this PR provided that you apply the patch conditionally to only the systems that need it.

[aeiouaeiouaeiouaeiouaeiouaeiou]

@erikbs ping

[erikbs]

Pushed a new commit:

• Rebased on master to pick up 7.1.
• Apply patch only on 10.12 and older.
• Restored underscore in macro for consistency with existing style.

Tested okay on 10.9.

[aeiouaeiouaeiouaeiouaeiouaeiou]

LGTM
@reneeotten

[mascguy]

LGTM, thank you for this contribution!

[mascguy]

While 10.7, 10.8, 10.9, 10.10, and 10.12 are all fixed, 10.11 fails with the following:

libavutil/hwcontext_videotoolbox.c:628:9: error: use of unknown builtin '__builtin_available' [-Wimplicit-function-declaration]
    if (__builtin_available(macOS 10.8, iOS 10, *)) {
        ^
libavutil/hwcontext_videotoolbox.c:628:29: error: use of undeclared identifier 'macOS'
    if (__builtin_available(macOS 10.8, iOS 10, *)) {
                            ^
2 errors generated.

https://build.macports.org/builders/ports-10.11_x86_64-builder/builds/282228/steps/install-port/logs/stdio

Still, this is a big improvement!

[aeiouaeiouaeiouaeiouaeiouaeiou]

@mascguy https://trac.macports.org/ticket/64469

patch-avutil-builtin-available.diff should be updated or just blacklist clang < 900.

[mascguy]

@mascguy https://trac.macports.org/ticket/64469

patch-avutil-builtin-available.diff should be updated or just blacklist clang < 900.

Just curious, has that been done for ffmoeg-devel?

[aeiouaeiouaeiouaeiouaeiouaeiou]

@mascguy nope, it encounter the same issue.