svn commit: r369213 - head/multimedia/mpv

[Grzegorz Blach]

Author: gblach
Date: Wed Sep 24 23:02:45 2014
New Revision: 369213
URL: http://svnweb.freebsd.org/changeset/ports/369213
QAT: https://qat.redports.org/buildarchive/r369213/

Log:
  - Update to 0.5.4
  - Add option to use LuaJIT instead of Lua [1]
  
  PR:		193822 [1]
  Submitted by:	Jan Beich (jbeich <at> vfemail <dot> net) [1]

Modified:
  head/multimedia/mpv/Makefile
  head/multimedia/mpv/distinfo
  head/multimedia/mpv/pkg-plist

Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile	Wed Sep 24 22:39:03 2014	(r369212)
+++ head/multimedia/mpv/Makefile	Wed Sep 24 23:02:45 2014	(r369213)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	GH:0 GHC:0 http://ftp.waf.io/pub/release/:1 \
@@ -24,11 +24,11 @@ BUILD_DEPENDS=	rst2man:${PORTSDIR}/textp
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	5b6a67b
+GH_COMMIT=	 40cd886
 
 WAF_VERSION=	1.7.16
 
-USES=		compiler:c11 desktop-file-utils iconv lua pkgconfig python:build
+USES=		compiler:c11 desktop-file-utils iconv pkgconfig python:build
 USE_XORG=	x11 xv xxf86vm
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
@@ -38,7 +38,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--mandir=${MANPREFIX}/man \
-		--lua=${LUA_VER_STR}fbsd \
 		--disable-debug-build \
 		--enable-libmpv-shared \
 		--disable-mpg123 \
@@ -46,7 +45,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-portaudio \
 		--disable-pdf
 
-OPTIONS_DEFINE=		BS2B ENCA LADSPA LCMS2 LIBGUESS LIRC ZSH
+OPTIONS_DEFINE=		BS2B ENCA LADSPA LCMS2 LIBGUESS LIRC LUAJIT ZSH
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO LIBBLURAY V4L QUVI SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU XINERAMA
@@ -56,7 +55,8 @@ OPTIONS_SUB=		yes
 BS2B_DESC=	Enable Bauer Stereophonic-to-Binaural DSP support
 ENCA_DESC=	Enable encoding detection support
 LIBGUESS_DESC=	Enable high-speed character set detection support
-QUVI_DESC=	Enable flash media stream support
+LUAJIT_DESC=	Use LuaJIT instead of Lua (Don't use with QUVI)
+QUVI_DESC=	Enable flash media stream support (Don't use with LUAJIT)
 IN_DESC=	Input
 VO_DESC=	Video Output
 AO_DESC=	Audio Output
@@ -79,6 +79,11 @@ LIBGUESS_CONFIGURE_ENABLE=	libguess
 LIRC_LIB_DEPENDS=		liblirc_client.so:${PORTSDIR}/comms/lirc
 LIRC_CONFIGURE_ENABLE=		lirc
 
+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_USES_OFF=		lua
+LUAJIT_CONFIGURE_ON=		--lua=luajit
+LUAJIT_CONFIGURE_OFF=		--lua=${LUA_VER_STR}fbsd
+
 ZSH_USES=			perl5
 ZSH_USE=			PERL5=build
 ZSH_CONFIGURE_ENABLE=		zsh-comp

Modified: head/multimedia/mpv/distinfo
==============================================================================
--- head/multimedia/mpv/distinfo	Wed Sep 24 22:39:03 2014	(r369212)
+++ head/multimedia/mpv/distinfo	Wed Sep 24 23:02:45 2014	(r369213)
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.5.3.tar.gz) = a50754426c3e98a966137190658324f1e9386bbf5bd4328730dc6aa20efd8465
-SIZE (mpv-0.5.3.tar.gz) = 2579934
+SHA256 (mpv-0.5.4.tar.gz) = 226e423e1dde7bf7d6760189c7b0677e3ffc566f5ecd8e04b9b79049499c885b
+SIZE (mpv-0.5.4.tar.gz) = 2580028
 SHA256 (waf-1.7.16) = b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61
 SIZE (waf-1.7.16) = 91846

Modified: head/multimedia/mpv/pkg-plist
==============================================================================
--- head/multimedia/mpv/pkg-plist	Wed Sep 24 22:39:03 2014	(r369212)
+++ head/multimedia/mpv/pkg-plist	Wed Sep 24 23:02:45 2014	(r369213)
@@ -13,7 +13,3 @@ share/icons/hicolor/16x16/apps/mpv.png
 share/icons/hicolor/32x32/apps/mpv.png
 share/icons/hicolor/64x64/apps/mpv.png
 %%ZSH%%share/zsh/site-functions/_mpv
-%%ZSH%%@dirrmtry share/zsh/site-functions
-%%ZSH%%@dirrmtry share/zsh
- at dirrm include/mpv
- at dirrmtry etc/mpv