[gentoo-commits] gentoo-x86 commit in media-video/mpv: metadata.xml mpv-9999.ebuild ChangeLog

[Alexander Vershilov (qnikst)]

qnikst      13/10/05 07:51:40

  Modified:             metadata.xml mpv-9999.ebuild ChangeLog
  Log:
  add lua flag (request and patches by Nikoli)
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)

Revision  Changes    Path
1.9                  media-video/mpv/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?r1=1.8&r2=1.9

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml	21 Sep 2013 13:19:47 -0000	1.8
+++ metadata.xml	5 Oct 2013 07:51:39 -0000	1.9
@@ -13,6 +13,7 @@
 	<flag name='doc-pdf'>Build documentation in pdf format</flag>
 	<flag name="enca">Enables support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
 	<flag name="libguess">Enables support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
+	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 	<flag name="mng">MNG input support</flag>
 	<flag name="mp3">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support.</flag>
 	<flag name="postproc">Enable image post-processing via libpostproc</flag>



1.20                 media-video/mpv/mpv-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?r1=1.19&r2=1.20

Index: mpv-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mpv-9999.ebuild	30 Sep 2013 17:48:24 -0000	1.19
+++ mpv-9999.ebuild	5 Oct 2013 07:51:39 -0000	1.20
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.19 2013/09/30 17:48:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.20 2013/10/05 07:51:39 qnikst Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
 
-inherit toolchain-funcs flag-o-matic multilib base
+inherit toolchain-funcs flag-o-matic multilib base pax-utils
 [[ ${PV} == *9999* ]] && inherit git-2
 
 DESCRIPTION="Video player based on MPlayer/mplayer2"
@@ -19,7 +19,7 @@
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b +cdio doc-pdf dvb +dvd +enca encode +iconv jack joystick
-jpeg ladspa lcms +libass libcaca libguess lirc mng +mp3 -openal +opengl oss
+jpeg ladspa lcms +libass libcaca libguess lirc lua luajit mng +mp3 -openal +opengl oss
 portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vaapi
 vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
 
@@ -27,6 +27,7 @@
 	enca? ( iconv )
 	lcms? ( opengl )
 	libguess? ( iconv )
+	luajit? ( lua )
 	opengl? ( || ( wayland X ) )
 	portaudio? ( threads )
 	pvr? ( v4l )
@@ -81,6 +82,10 @@
 	libcaca? ( media-libs/libcaca )
 	libguess? ( >=app-i18n/libguess-1.0 )
 	lirc? ( app-misc/lirc )
+	lua? (
+		!luajit? ( >=dev-lang/lua-5.1 )
+		luajit? ( dev-lang/luajit:2 )
+	)
 	mng? ( media-libs/libmng )
 	mp3? ( media-sound/mpg123 )
 	openal? ( >=media-libs/openal-1.13 )
@@ -180,6 +185,8 @@
 	use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9"
 	use samba || myconf+=" --disable-smb"
 	use lirc || myconf+=" --disable-lirc --disable-lircc"
+	use lua || myconf+=" --disable-lua"
+	use lua && myconf+=" --lua=luajit"
 	use doc-pdf || myconf+=" --disable-pdf"
 
 	########
@@ -297,6 +304,10 @@
 src_install() {
 	base_src_install
 
+	if use luajit; then
+		pax-mark -m "${ED}"usr/bin/mpv
+	fi
+
 	if use vf-dlopen; then
 		exeinto /usr/$(get_libdir)/${PN}
 		doexe TOOLS/vf_dlopen/*.so



1.29                 media-video/mpv/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	30 Sep 2013 17:48:24 -0000	1.28
+++ ChangeLog	5 Oct 2013 07:51:39 -0000	1.29
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.28 2013/09/30 17:48:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.29 2013/10/05 07:51:39 qnikst Exp $
+
+  05 Oct 2013; Alexander Vershilov <qnikst@g.o> metadata.xml,
+  mpv-9999.ebuild:
+  add lua flag (request and patches by Nikoli)
 
   30 Sep 2013; Tomáš Chvátal <scarabeus@g.o> mpv-9999.ebuild:
   Drop AUTHORS file, no longer distributed.