Bug 202401 - multimedia/mpv: drop ffmpeg26 cruft
Summary: multimedia/mpv: drop ffmpeg26 cruft
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Jan Beich
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-08-17 23:47 UTC by Jan Beich
Modified: 2015-08-18 00:53 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (cjpm)

Attachments
v1 (2.23 KB, patch)
2015-08-17 23:47 UTC, Jan Beich 		no flags Details | Diff
v2 (453 bytes, patch)
2015-08-18 00:09 UTC, Jan Beich 		jbeich: maintainer-approval? (cjpm)
 Details | Diff
mpv.diff (1.86 KB, patch)
2015-08-18 00:14 UTC, Carlos J Puga Medina 		no flags Details | Diff
mpv.diff (1.67 KB, patch)
2015-08-18 00:25 UTC, Carlos J Puga Medina 		no flags Details | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jan Beich freebsd_committer freebsd_triage 2015-08-17 23:47:00 UTC 
Created attachment 159964 [details]
v1

ports 386837 introduced ffmpeg26 include but ports r391260 didn't clean it up properly. multimedia/ffmpeg doesn't use special prefix, so no subdirectories under PREFIX/include before /libav*.

Let's remove now nop include.
Comment 1 Carlos J Puga Medina 2015-08-17 23:55:38 UTC 
(In reply to Jan Beich from comment #0)

Perfect!

Thanks jbeich@
Comment 2 Carlos J Puga Medina 2015-08-18 00:05:22 UTC 
Just one thing, pkg-plist doesn't need to change:

--- multimedia/mpv/pkg-plist	(revision 394417)
+++ multimedia/mpv/pkg-plist	(working copy)
@@ -5,7 +5,7 @@ include/mpv/opengl_cb.h
 include/mpv/qthelper.hpp
 lib/libmpv.so
 lib/libmpv.so.1
-lib/libmpv.so.1.16.0
+lib/libmpv.so.1.19.0
 libdata/pkgconfig/mpv.pc
 man/man1/mpv.1.gz
 share/applications/mpv.desktop
Comment 3 Jan Beich freebsd_committer freebsd_triage 2015-08-18 00:06:55 UTC 
Comment on attachment 159964 [details]
v1

Oops, local hacks crept in.
Comment 4 Jan Beich freebsd_committer freebsd_triage 2015-08-18 00:09:23 UTC 
Created attachment 159965 [details]
v2
Comment 5 Carlos J Puga Medina 2015-08-18 00:11:13 UTC 
mpv needs a PORTREVISION bump.
Comment 6 Carlos J Puga Medina 2015-08-18 00:14:19 UTC 
Created attachment 159966 [details]
mpv.diff
Comment 7 Jan Beich freebsd_committer freebsd_triage 2015-08-18 00:17:16 UTC 
(In reply to Carlos J Puga Medina from comment #5)
> mpv needs a PORTREVISION bump.

Why? Nothing installs under PREFIX/include/ffmpeg and mpv.pc doesn't record it as well.

On /branches/2015Q3 multimedia/mpv continues to use the include as multimedia/ffmpeg26 exists there.
Comment 8 Carlos J Puga Medina 2015-08-18 00:23:03 UTC 
(In reply to Jan Beich from comment #7)

Understood, then it stays like this.
Comment 9 Carlos J Puga Medina 2015-08-18 00:25:09 UTC 
Created attachment 159967 [details]
mpv.diff
Comment 10 Carlos J Puga Medina 2015-08-18 00:31:29 UTC 
Thanks for your review, jbeich@
Comment 11 Carlos J Puga Medina 2015-08-18 00:49:06 UTC 
- Re-add YTDL option (Install youtube_dl)
- Fix CPPFLAGS
- Remove LIB_DEPENDS leftovers.
Comment 12 Jan Beich freebsd_committer freebsd_triage 2015-08-18 00:51:02 UTC 
Comment on attachment 159967 [details]
mpv.diff

I take it the change in attachment 159965 [details] is approved given you've kept it in your versions. But let's not mix different issues here.

> LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
>-		libass.so:${PORTSDIR}/multimedia/libass \
>-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
>-		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
>+		libass.so:${PORTSDIR}/multimedia/libass

These may need to go into options and, indeed, would require PORTREVISION bump then.

>+YTDL_RUN_DEPENDS=		${LOCALBASE}/bin/youtube-dl:${PORTSDIR}/www/youtube_dl
>+

This belongs to bug 202337. Submit it there or open a new bug. Also requires PORTREVISION bump.
Comment 13 commit-hook freebsd_committer freebsd_triage 2015-08-18 00:51:07 UTC 
A commit references this bug:

Author: jbeich
Date: Tue Aug 18 00:50:12 UTC 2015
New revision: 394537
URL: https://svnweb.freebsd.org/changeset/ports/394537

Log:
  multimedia/mpv: drop nop include after r391260

  multimedia/ffmpeg doesn't use non-default prefix for include
  directories unlike multimedia/ffmpeg0 or multimedia/libav.

  PR:		202401
  Approved by:	Carlos J Puga Medina <cpm@fbsd.es> (maintainer)

Changes:
  head/multimedia/mpv/Makefile