- Update to 0.3.3

- Fix build when devel/talloc is installed

4 files changed, 24 insertions, 27 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 20c31b481e5c..9b1c8a8ef9e1 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -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}/textproc/py-docutils
 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}/multimedia/libquvi
 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
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index ae91792e285c..b2b4688e9a28 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -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
diff --git a/multimedia/mpv/files/patch-waftools-checks-custom.py b/multimedia/mpv/files/patch-waftools-checks-custom.py
deleted file mode 100644
index ae88c15e08ec..000000000000
--- a/multimedia/mpv/files/patch-waftools-checks-custom.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- waftools/checks/custom.py.orig
-+++ waftools/checks/custom.py
-@@ -52,10 +52,12 @@ def check_lua(ctx, dependency_identifier):
-     lua_versions = [
-         ( '51',     'lua >= 5.1.0 lua < 5.2.0'),
-         ( '51deb',  'lua5.1 >= 5.1.0'), # debian
-+        ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD
-         ( 'luajit', 'luajit >= 2.0.0' ),
-         # assume all our dependencies (libquvi in particular) link with 5.1
-         ( '52',     'lua >= 5.2.0' ),
-         ( '52deb',  'lua5.2 >= 5.2.0'), # debian
-+        ( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD
-     ]
- 
-     if ctx.options.LUA_VER:
diff --git a/multimedia/mpv/files/patch-wscript b/multimedia/mpv/files/patch-wscript
new file mode 100644
index 000000000000..24899f896b7a
--- /dev/null
+++ b/multimedia/mpv/files/patch-wscript
@@ -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':