[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-xineliboutput: vdr-xineliboutput-9999.ebuild metadata.xml ChangeLog vdr-xineliboutput-1.1.0.ebuild

[Christian Ruppert (idl0r)]

idl0r       14/01/27 19:12:07

  Modified:             vdr-xineliboutput-9999.ebuild metadata.xml
                        ChangeLog
  Added:                vdr-xineliboutput-1.1.0.ebuild
  Log:
  Version bump, bug 499342
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

Revision  Changes    Path
1.15                 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild?r1=1.14&r2=1.15

Index: vdr-xineliboutput-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vdr-xineliboutput-9999.ebuild	19 Oct 2013 18:40:11 -0000	1.14
+++ vdr-xineliboutput-9999.ebuild	27 Jan 2014 19:12:06 -0000	1.15
@@ -1,15 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.14 2013/10/19 18:40:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.15 2014/01/27 19:12:06 idl0r Exp $
 
 EAPI=5
 GENTOO_VDR_CONDITIONAL=yes
 
 inherit vdr-plugin-2 cvs toolchain-funcs eutils
 
-MY_PV=${PV#*_p}
-MY_P=${PN}
-
 DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
 HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
 
@@ -19,7 +16,7 @@
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="caps dbus fbcon jpeg libextractor nls +vdr vdpau +X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
 COMMON_DEPEND="
 	vdr? (
@@ -39,8 +36,12 @@
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
 			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
 			jpeg? ( virtual/jpeg )
+			bluray? ( media-libs/libbluray )
+			opengl? ( virtual/opengl )
 		)
-	)"
+	)
+
+	cec? ( dev-libs/libcec )"
 
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -54,8 +55,7 @@
 	)"
 RDEPEND="${COMMON_DEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
+S=${WORKDIR}/${PN}
 VDR_CONFD_FILE="${FILESDIR}/confd-1.0.0_pre6"
 
 pkg_setup() {
@@ -72,16 +72,10 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-build-system.patch"
-
 	# Allow user patches to be applied without modifyfing the ebuild
 	epatch_user
 
 	vdr-plugin-2_src_prepare
-
-	sed -i -e 's:^\(LOCALEDIR\) .*:\1 = $(DESTDIR)/usr/share/vdr/locale:' \
-		-e "s:LIBDIR .*:LIBDIR = ${VDR_PLUGIN_DIR}:" \
-		Makefile || die
 }
 
 src_configure() {
@@ -94,8 +88,6 @@
 	fi
 
 	# No autotools based configure script
-	# There is no real opengl support, just the switch and some help text is
-	# left...
 	./configure \
 		--cc=$(tc-getCC) \
 		--cxx=$(tc-getCXX) \
@@ -114,8 +106,10 @@
 		$(use_enable vdpau) \
 		$(use_enable dbus dbus-glib-1) \
 		$(use_enable nls i18n) \
+		$(use_enable bluray libbluray) \
+		$(use_enable opengl) \
+		$(use_enable cec libcec) \
 		${myconf} \
-		--disable-opengl \
 		|| die
 }
 



1.8                  media-plugins/vdr-xineliboutput/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	26 Nov 2012 14:29:26 -0000	1.7
+++ metadata.xml	27 Jan 2014 19:12:06 -0000	1.8
@@ -10,6 +10,8 @@
 		Video Disk Recorder Xinelib PlugIn ( VDR )
 	</longdescription>
 	<use>
+		<flag name="cec">Enable CEC support through <pkg>dev-libs/libcec</pkg></flag>
+		<flag name="bluray">Enable BluRay metadata support through <pkg>media-libs/libbluray</pkg></flag>
 		<flag name="libextractor">Use <pkg>media-libs/libextract</pkg> to gather
 			files' metadata in media-player</flag>
 		<flag name="vdr">Compile the vdr output plugin to use local or remote xine as output</flag>



1.72                 media-plugins/vdr-xineliboutput/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?r1=1.71&r2=1.72

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	8 Jan 2014 19:42:13 -0000	1.71
+++ ChangeLog	27 Jan 2014 19:12:06 -0000	1.72
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.71 2014/01/08 19:42:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.72 2014/01/27 19:12:06 idl0r Exp $
+
+*vdr-xineliboutput-1.1.0 (27 Jan 2014)
+
+  27 Jan 2014; Christian Ruppert <idl0r@g.o>
+  +vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-9999.ebuild, metadata.xml:
+  Version bump, bug 499342
 
 *vdr-xineliboutput-1.0.5-r2 (08 Jan 2014)
 



1.1                  media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild?rev=1.1&content-type=text/plain

Index: vdr-xineliboutput-1.1.0.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild,v 1.1 2014/01/27 19:12:07 idl0r Exp $

EAPI=5
GENTOO_VDR_CONDITIONAL=yes

inherit vdr-plugin-2 toolchain-funcs eutils

DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"

SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"

COMMON_DEPEND="
	vdr? (
		>=media-video/vdr-1.6.0
		libextractor? ( >=media-libs/libextractor-0.5.20 )
		caps? ( sys-libs/libcap )
	)

	xine? (
		|| ( <media-libs/xine-lib-1.2 ( >=media-libs/xine-lib-1.2 virtual/ffmpeg ) )
		fbcon? ( jpeg? ( virtual/jpeg ) )
		X? (
			x11-libs/libX11
			x11-libs/libXext
			x11-libs/libXrender
			xinerama? ( x11-libs/libXinerama )
			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
			jpeg? ( virtual/jpeg )
			bluray? ( media-libs/libbluray )
			opengl? ( virtual/opengl )
		)
	)"

DEPEND="${COMMON_DEPEND}
	virtual/pkgconfig
	sys-kernel/linux-headers
	nls? ( sys-devel/gettext )
	xine? (
		X? (
			x11-proto/xproto
			x11-libs/libXxf86vm
		)
	)"
RDEPEND="${COMMON_DEPEND}"

VDR_CONFD_FILE="${FILESDIR}/confd-1.0.0_pre6"

pkg_setup() {
	if ! use vdr && ! use xine; then
		die "You either need at least one of these flags: vdr xine"
	fi

	vdr-plugin-2_pkg_setup

	if use xine; then
		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
	fi
}

src_prepare() {
	# Allow user patches to be applied without modifyfing the ebuild
	epatch_user

	vdr-plugin-2_src_prepare
}

src_configure() {
	local myconf

	if has_version ">=media-libs/xine-lib-1.2"; then
		myconf="${myconf} --enable-libavutil"
	else
		myconf="${myconf} --disable-libavutil"
	fi

	# No autotools based configure script
	./configure \
		--cc=$(tc-getCC) \
		--cxx=$(tc-getCXX) \
		$(use_enable X x11) \
		$(use_enable X xshm) \
		$(use_enable X xdpms) \
		$(use_enable X xshape) \
		$(use_enable X xrender) \
		$(use_enable fbcon fb) \
		$(use_enable vdr) \
		$(use_enable xine libxine) \
		$(use_enable libextractor) \
		$(use_enable caps libcap) \
		$(use_enable jpeg libjpeg) \
		$(use_enable xinerama) \
		$(use_enable vdpau) \
		$(use_enable dbus dbus-glib-1) \
		$(use_enable nls i18n) \
		$(use_enable bluray libbluray) \
		$(use_enable opengl) \
		${myconf} \
		|| die
}

src_install() {
	if use vdr; then
		vdr-plugin-2_src_install

		# bug 346989
		insinto /etc/vdr/plugins/xineliboutput/
		doins examples/allowed_hosts.conf
		fowners -R vdr:vdr /etc/vdr/

		if use nls; then
			emake DESTDIR="${D}" i18n
		fi

		if use xine; then
			insinto $XINE_PLUGIN_DIR
			doins xineplug_inp_xvdr.so

			insinto $XINE_PLUGIN_DIR/post
			doins xineplug_post_*.so

			if use fbcon; then
				dobin vdr-fbfe

				insinto $VDR_PLUGIN_DIR
				doins libxineliboutput-fbfe.so.*
			fi

			if use X; then
				dobin vdr-sxfe

				insinto $VDR_PLUGIN_DIR
				doins libxineliboutput-sxfe.so.*
			fi
		fi
	else
		emake DESTDIR="${D}" install

		dodoc HISTORY README
	fi
}