Page MenuHomeFreeBSD

Initial draft: unbundling ffmpeg from mplayer
ClosedPublic

Authored by riggs on Dec 28 2016, 9:15 AM.

Details

Reviewers
jbeich
mat
Commits
rP429960: Log:
Summary
  • Update mplayer to snapshot as of 20161228
  • Unbundle ffmpeg from tarball (ports ffmpeg is 3.x now)
  • Don't build and link static ffmpeg libs; link to system shared libs

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 Initial draft: unbundling ffmpeg from mplayer.
riggs updated this object.
riggs edited the test plan for this revision. (Show Details)

Since the ports tree is on ffmpeg 3.x now, I'd like to unbundle it from mplayer. A second pair of eyes would be much appreciated!

multimedia/mencoder/Makefile
93 ↗(On Diff #23315)

For shared targets Makefile.common is probably a better place. If the target is already defined try:

_OPTIONS_patch+=	310:common-pre-patch
common-pre-patch:
	<whatever>

or

post-patch:	common-pre-patch
common-pre-patch:
	<whatever>
94 ↗(On Diff #23315)

ArchLinux and Debian get by fine without such a hack. If this is about configure anomaly then stop pretending it's GNU compatible which would avoid _LATE_CONFIGURE_ARGS logic then pass --mandir manually like multimedia/ffmpeg.

Simplified patchset. It seems, mplayer does not need ffmpeg sources
in-tree anymore to compile.

Am I missing something? GNU_CONFIGURE -> HAS_CONFIGURE + CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" should be enough.

Am I missing something? GNU_CONFIGURE -> HAS_CONFIGURE + CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" should be enough.

Different topics. You were referring to the post-patch target handling the manpage while my interest with this patchset is mostly getting rid of in-tree ffmpeg. Anyway, the post-patch target could use cleanup while on it, good idea.

multimedia/mencoder/Makefile
94 ↗(On Diff #23315)

A while ago, it was necessary to have an ffmpeg copy in-tree (in the 2.x series) as mplayer used non-public interfaces to ffmpeg. Apparently, it compiles fine now without it. So, this part is removed entirely.

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

Refactor post-patch into common-post-patch, GNU_CONFIGURE -> HAS_CONFIGURE

This revision was automatically updated to reflect the committed changes.
riggs marked an inline comment as done.