svn commit: r386837 - head/multimedia/mpv

[Kurt Jaeger]

Author: pi
Date: Wed May 20 05:06:16 2015
New Revision: 386837
URL: https://svnweb.freebsd.org/changeset/ports/386837

Log:
  multimedia/mpv: fix conflict between ffmpeg and ffmpeg26
  
  PR:		198758
  Submitted by:	Carlos J Puga Medina <cpm at fbsd.es> (maintainer)

Modified:
  head/multimedia/mpv/Makefile

Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile	Wed May 20 03:57:44 2015	(r386836)
+++ head/multimedia/mpv/Makefile	Wed May 20 05:06:16 2015	(r386837)
@@ -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