Page MenuHomeFreeBSD

multimedia/mpv: Update to 0.26.0
ClosedPublic

Authored by cpm on Jul 19 2017, 12:55 PM.

Details

Summary

multimedia/mpc-qt:

  • Add patch to fix mpcwidget crash on mpv-0.26.0

multimedia/mpv:

  • Update mpv to 0.26.0
  • Update waf to 1.9.8 using the same waf version as bootstrap.py
  • Update ffmpeg version required to 3.3
  • Drop unnecessary CONFIGURE_ARGS options
  • Fix option helpers
  • Update WWW in pkg-descr

Changelog: https://github.com/mpv-player/mpv/releases/tag/v0.26.0

Test Plan
  • portlint -ac looks fine.
  • poudriere testport build fine on 10.3/amd64, 10.3/i386, 11.0/amd64, 11.0/i386, 12.0/amd64 and 12.0/i386.

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

cpm created this revision.Jul 19 2017, 12:55 PM
cpm added a comment.Jul 19 2017, 1:02 PM

These messages do not harm and can safely be ignored

* Node /wrkdirs/usr/ports/multimedia/mpv/work/mpv-0.26.0/build/mpv.def is created more than once (full message on 'waf -v -v'). The task generators are:
  1. 'mpv' in /wrkdirs/usr/ports/multimedia/mpv/work/mpv-0.26.0
  2. 'mpv' in /wrkdirs/usr/ports/multimedia/mpv/work/mpv-0.26.0
If you think that this is an error, set no_errcheck_out on the task instance
* Node /wrkdirs/usr/ports/multimedia/mpv/work/stage/usr/local/lib/libmpv.so is created more than once (full message on 'waf -v -v'). The task generators are:
  1. 'mpv' in /wrkdirs/usr/ports/multimedia/mpv/work/mpv-0.26.0
  2. 'mpv' in /wrkdirs/usr/ports/multimedia/mpv/work/mpv-0.26.0
If you think that this is an error, set no_errcheck_out on the task instance
cpm edited the test plan for this revision. (Show Details)Jul 19 2017, 6:25 PM
jbeich edited edge metadata.Jul 19 2017, 7:49 PM

multimedia/mpc-qt crashes after mpv@e4bc563. Can you add a downstream fix atomically during update?

# Add to multimedia/mpc-qt/Makefile then run "make makesum"
PORTREVISION=	1
...
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES=	b1644dfe782b.patch:-p1
multimedia/mpv/Makefile
42 ↗(On Diff #30949)

Maybe drop --disable-videotoolbox-* (OS X) and --disable-d3d-* (Windows). Those APIs are platform-specific, so they're always automatically disabled on Linux and BSDs.

cpm updated this revision to Diff 30974.Jul 19 2017, 8:07 PM
cpm edited the summary of this revision. (Show Details)
  • Drop unnecessary CONFIGURE_ARGS options
cpm marked an inline comment as done.Jul 19 2017, 8:07 PM

multimedia/mpc-qt crashes after mpv@e4bc563. Can you add a downstream fix atomically during update?

# Add to multimedia/mpc-qt/Makefile then run "make makesum"
PORTREVISION=	1
...
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES=	b1644dfe782b.patch:-p1

Sure! I'll push it after the Mpv update.

Thanks Jan

jbeich added a comment.EditedJul 19 2017, 8:15 PM
In D11655#241557, @cpm wrote:

Sure! I'll push it after the Mpv update.

I wanted to avoid a window, even if small, when mpc-qt is broken, so mpv update is easier to backport to 2017Q3 if desired. Otherwise, fixing mpc-qt later is just a matter of updating it to another snapshot.

cpm updated this revision to Diff 30976.Jul 19 2017, 8:25 PM
  • Fix mpvwidget crash on mpv 0.26.0
cpm added a comment.Jul 19 2017, 8:27 PM
In D11655#241557, @cpm wrote:

Sure! I'll push it after the Mpv update.

I wanted to avoid a window, even if small, when mpc-qt is broken, so mpv update is easier to backport to 2017Q3 if desired. Otherwise, fixing mpc-qt later is just a matter of updating it to another snapshot.

I have updated the svn diff including mpc-qt fix.

cpm edited the summary of this revision. (Show Details)Jul 19 2017, 8:29 PM
jbeich accepted this revision.Jul 19 2017, 8:32 PM

Thanks.

This revision is now accepted and ready to land.Jul 19 2017, 8:32 PM
cpm edited the summary of this revision. (Show Details)Jul 19 2017, 8:33 PM

Thanks.

No, thanks to you :)

Hmm, V4L option no longer has any effect after mpv@7b84a3b04e01:

Checking for TV interface                                            : disabled 
Checking for videoio.h                                               : tv not found 
Checking for videodev2.h                                             : tv not found 
Checking for Video4Linux2 TV interface                               : not found any of sys_videoio_h, videodev 
Checking for libv4l2 support                                         : tv-v4l2 not found

Can you adjust BUILD_DEPENDS to require ffmpeg>=3.3 after mpv@f59371de2170?

SMB no longer has an effect after mpv@f38bd0f25ad9. Like V4L it's due to rP395543.

cpm added a comment.Jul 19 2017, 8:57 PM

SMB no longer has an effect after mpv@f38bd0f25ad9. Like V4L it's due to rP395543.

It should work after enable SMB manually

SMB_CONFIGURE_ON=               --enable-libsmbclient
cpm updated this revision to Diff 30983.Jul 19 2017, 9:12 PM
cpm edited edge metadata.
cpm edited the summary of this revision. (Show Details)
  • Update ffmpeg version required to 3.3
  • Fix SMB and V4L options
This revision now requires review to proceed.Jul 19 2017, 9:12 PM
jbeich added inline comments.Jul 19 2017, 9:23 PM
multimedia/mpv/Makefile
16 ↗(On Diff #30983)

Don't lose PORTEPOCH added by rP239377 i.e., >=3.3,1, not >=3.3. Use pkg version -t if in doubt.

cpm updated this revision to Diff 30984.Jul 19 2017, 9:26 PM
  • Re-add PORTEPOCH
cpm marked an inline comment as done.Jul 19 2017, 9:28 PM

I removed it by mistake.

Thanks

jbeich accepted this revision.Jul 19 2017, 9:38 PM
This revision is now accepted and ready to land.Jul 19 2017, 9:38 PM
cpm updated this revision to Diff 30987.Jul 19 2017, 10:25 PM
cpm edited edge metadata.
cpm edited the summary of this revision. (Show Details)
  • Fix option helpers
This revision now requires review to proceed.Jul 19 2017, 10:25 PM
This revision was automatically updated to reflect the committed changes.