diff options
| author | pi <pi@FreeBSD.org> | 2015-05-20 13:06:16 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2015-05-20 13:06:16 +0800 |
| commit | 02bf4ed6460e5116c2d7fefe76bda6c7d0eb2298 (patch) | |
| tree | d747e1f4ef938a61607a7acc58b94361ac774d88 /multimedia/mpv/Makefile | |
| parent | 937c652bbca4aeefb815f42c252d58700441a811 (diff) | |
| download | freebsd-ports-gnome-02bf4ed6460e5116c2d7fefe76bda6c7d0eb2298.tar.gz freebsd-ports-gnome-02bf4ed6460e5116c2d7fefe76bda6c7d0eb2298.tar.zst freebsd-ports-gnome-02bf4ed6460e5116c2d7fefe76bda6c7d0eb2298.zip | |
multimedia/mpv: fix conflict between ffmpeg and ffmpeg26
PR: 198758
Submitted by: Carlos J Puga Medina <cpm@fbsd.es> (maintainer)
Diffstat (limited to 'multimedia/mpv/Makefile')
| -rw-r--r-- | multimedia/mpv/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index e5f7ebb494a0..c6d63ce1f553 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -4,7 +4,7 @@ PORTNAME= mpv PORTVERSION= 0.9.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= http://ftp.waf.io/pub/release/:1 \ @@ -33,7 +33,7 @@ USE_XORG= x11 xv xxf86vm USE_LDCONFIG= yes INSTALLS_ICONS= yes -CPPFLAGS+= -I.. -I${LOCALBASE}/include +CPPFLAGS+= -I.. -I${LOCALBASE}/include/ffmpeg26 -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -45,8 +45,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-alsa \ --disable-pdf -CONFLICTS_BUILD= ffmpeg - OPTIONS_DEFINE= BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LUAJIT ZSH OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO LIBBLURAY V4L YTDL SMB |