Page MenuHomeFreeBSD

Update to upstream version 0.10.5, turning FDK_AAC into an OPTION
ClosedPublic

Authored by riggs on Apr 23 2016, 4:04 PM.

Details

Summary

Update to upstream version 0.10.5

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

riggs retitled this revision from to Update to upstream version 0.10.5, turning FDK_AAC into an OPTION.
riggs updated this object.
riggs edited the test plan for this revision. (Show Details)
riggs added a reviewer: jbeich.
jbeich requested changes to this revision.Apr 23 2016, 6:01 PM
jbeich edited edge metadata.

r- is mainly due to typo in configure option. If you have time try to convert X11 to option helpers as well.

FWIW, according to ffmpeg wiki its own AAC encoder may have better quality than the old version in libav-10.1 if not even fdk-aac.

multimedia/handbrake/Makefile
29 ↗(On Diff #15535)

Defining LICENSE_FILE isn't required if there's a copy under /usr/ports/Templates/Licenses/

68 ↗(On Diff #15535)

Maybe define as USES=localbase

75 ↗(On Diff #15535)

non-free is a poor description, better copy LICENSE* section from audio/fdk-aac and convert to LICENSE_COMB=multi e.g.,

FDK_AAC_DESC=	Enable Fraunhofer FDK AAC Codec

FDK_AAC_VARS=		LICENSE+=FDK_AAC LICENSE_COMB=multi
LICENSE_NAME_FDK_AAC=	Software License for The Fraunhofer FDK AAC Codec Library for Android
LICENSE_FILE_FDK_AAC=	${BUILD_WRKSRC}/contrib/fdkaac/${DISTFILES:Mfdk*:R:R}/NOTICE
LICENSE_PERMS_FDK_AAC=	dist-mirror pkg-mirror auto-accept
78 ↗(On Diff #15535)

According to make/configure.py the option is named --enable-fdk-aac. You can also use _CONFIGURE_ENABLE helper here i.e.,

FDK_AAC_CONFIGURE_ENABLE=	fdk-aac
109 ↗(On Diff #15535)

Do you still need it after USES=localbase ?

114 ↗(On Diff #15535)

To move above .include <bsd.port.options.mk> this can be converted to

# Enforce linking to the system c++ standard lib
USES+=          compiler:features
LDFLAGS+=       -l${COMPILER_FEATURES:Mlib*c++:S/lib//}
153 ↗(On Diff #15535)

Maybe define as post-extract-FDK_AAC-on: if you're already using option helpers. See 20150701 entry in /usr/ports/CHANGES

197 ↗(On Diff #15535)

Ditto, maybe use post-patch-FDK_AAC-on:

This revision now requires changes to proceed.Apr 23 2016, 6:01 PM
multimedia/handbrake/Makefile
29 ↗(On Diff #15535)

Yes it is.

Most points addressed with upcoming patch.

multimedia/handbrake/Makefile
109 ↗(On Diff #15535)

Seems to work in initial tests. Good catch, thanks!

riggs edited edge metadata.
riggs marked an inline comment as done.

Addressed the review comments from jbeich and mat.
X11 OPTION is still handled via .if{} at some places.

jbeich edited edge metadata.
This revision is now accepted and ready to land.Apr 24 2016, 1:45 PM
This revision was automatically updated to reflect the committed changes.