maintainer-approval requested: [Bug 217051] [PATCH] multimedia/vlc: Build in C++11 mode by default : [Attachment 179920] Proposed patch

[bugzilla-noreply at freebsd.org]

Raphael Kubo da Costa <rakuco at FreeBSD.org> has asked multimedia at FreeBSD.org for
maintainer-approval:
Bug 217051: [PATCH] multimedia/vlc: Build in C++11 mode by default
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=217051

Attachment 179920: Proposed patch
https://bugs.freebsd.org/bugzilla/attachment.cgi?id=179920&action=edit



--- Description ---
This is in preparation for the Qt 5.6.2 -> 5.7.1 update (bug 216797): Qt 5.7
requires C++11 support.

VLC 2.2.4 has issues building in C++11 mode, so incorporate a few upstream
commits to make things work, and adjust the atomics-related patches landed in
ports r416225, as including <atomic> only with libc++ >= 3.8.0 leaves out
FreeBSD 10.3. include/vlc_atomic.h is now closer to its git (post-2.2.4)
version, in that we now have 3 possible conditions:
1. The header is included in C11 mode, in which case <stdatomic.h> is included.
2. The header is included by C code but we're not building in C11 mode, in
which case some shims are defined.
3. The header is included by C++ code, so we can assume C++11 and just include
<atomic>.

It will likely be possible to drop the changes once a new VLC version is
released, as upstream has since started requiring C+11 and passes the
appropriate flags to the compiler.