svn commit: r340445 - in head/multimedia/mpv: . files

[Grzegorz Blach]

Author: gblach
Date: Mon Jan 20 18:38:14 2014
New Revision: 340445
URL: http://svnweb.freebsd.org/changeset/ports/340445
QAT: https://qat.redports.org/buildarchive/r340445/

Log:
  - Update to 0.3.3
  - Fix build when devel/talloc is installed

Added:
  head/multimedia/mpv/files/patch-wscript   (contents, props changed)
Deleted:
  head/multimedia/mpv/files/patch-waftools-checks-custom.py
Modified:
  head/multimedia/mpv/Makefile
  head/multimedia/mpv/distinfo

Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile	Mon Jan 20 18:37:12 2014	(r340444)
+++ head/multimedia/mpv/Makefile	Mon Jan 20 18:38:14 2014	(r340445)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	GH:0 GHC:0 https://waf.googlecode.com/files/:1
@@ -22,9 +22,9 @@ BUILD_DEPENDS=	rst2man:${PORTSDIR}/textp
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	6b20c24
+GH_COMMIT=	d276f75
 
-WAF_VERSION=	1.7.14
+WAF_VERSION=	1.7.15
 
 USES=		compiler:c11 desktop-file-utils gmake iconv pkgconfig
 USE_PYTHON_BUILD=	yes
@@ -43,9 +43,10 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 
 OPTIONS_DEFINE=		BS2B ENCA LADSPA LCMS2 LIRC
 OPTIONS_GROUP=		IN VO AO
-OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L QUVI
+OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L QUVI SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU XINERAMA
 OPTIONS_GROUP_AO=	JACK PULSEAUDIO
+OPTIONS_DEFAULT=	SMB
 
 BS2B_DESC=	Enable Bauer Stereophonic-to-Binaural DSP support
 DVDNAV_DESC=	Enable DVD navigation menus support
@@ -119,11 +120,11 @@ LIB_DEPENDS+=		libquvi.so:${PORTSDIR}/mu
 CONFIGURE_ARGS+=	--disable-libquvi
 .endif
 
-#.if ${PORT_OPTIONS:MSMB}
-#LIB_DEPENDS+=		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-#.else
+.if ${PORT_OPTIONS:MSMB}
+LIB_DEPENDS+=		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+.else
 CONFIGURE_ARGS+=	--disable-libsmbclient
-#.endif
+.endif
 
 .if ${PORT_OPTIONS:MCACA}
 LIB_DEPENDS+=		libcaca.so:${PORTSDIR}/graphics/libcaca

Modified: head/multimedia/mpv/distinfo
==============================================================================
--- head/multimedia/mpv/distinfo	Mon Jan 20 18:37:12 2014	(r340444)
+++ head/multimedia/mpv/distinfo	Mon Jan 20 18:38:14 2014	(r340445)
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.3.2.tar.gz) = 3d91142ade5020e6da8174d0fffc7faeead1b5a8e56003e6c059a5ae4c6cc9f2
-SIZE (mpv-0.3.2.tar.gz) = 2514802
-SHA256 (waf-1.7.14) = 93b2783e8a9027d5a6f6f11aed784e506765707bdcbd7c39eaeb7f000b171fe7
-SIZE (waf-1.7.14) = 90755
+SHA256 (mpv-0.3.3.tar.gz) = 73d0ee4c1d73e97c3b1911b5c4513f08072b20f4d81b76ae923ba82dc4a5b1da
+SIZE (mpv-0.3.3.tar.gz) = 2514903
+SHA256 (waf-1.7.15) = e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6
+SIZE (waf-1.7.15) = 90909

Added: head/multimedia/mpv/files/patch-wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mpv/files/patch-wscript	Mon Jan 20 18:38:14 2014	(r340445)
@@ -0,0 +1,11 @@
+--- wscript.orig	2014-01-20 18:59:38.000000000 +0100
++++ wscript	2014-01-20 19:00:04.000000000 +0100
+@@ -806,7 +806,7 @@
+     ctx.load('detections.devices')
+ 
+     if ctx.env.DEST_OS in ('freebsd', 'openbsd'):
+-        ctx.env.CFLAGS += ['-I/usr/local/include']
++        ctx.env.CFLAGS += ['-I..', '-I/usr/local/include']
+         ctx.env.LINKFLAGS += ['-L/usr/local/lib']
+ 
+     if ctx.env.DEST_OS == 'netbsd':