hd_brummy 15/01/15 18:52:25 Modified: vdr-xineliboutput-9999.ebuild ChangeLog vdr-xineliboutput-1.1.0.ebuild Log: fixed compile with >=vdr-2.1.2; depend fixed (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)
Revision Changes Path 1.18 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.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild?r1=1.17&r2=1.18 Index: vdr-xineliboutput-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vdr-xineliboutput-9999.ebuild 6 Jul 2014 16:40:25 -0000 1.17 +++ vdr-xineliboutput-9999.ebuild 15 Jan 2015 18:52:25 -0000 1.18 @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.17 2014/07/06 16:40:25 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.18 2015/01/15 18:52:25 hd_brummy Exp $ EAPI=5 GENTOO_VDR_CONDITIONAL=yes -inherit vdr-plugin-2 cvs toolchain-funcs eutils +inherit vdr-plugin-2 cvs toolchain-funcs DESCRIPTION="Video Disk Recorder Xinelib PlugIn" HOMEPAGE="http://sourceforge.net/projects/xineliboutput/" @@ -26,7 +26,8 @@ ) xine? ( - || ( <media-libs/xine-lib-1.2 ( >=media-libs/xine-lib-1.2 virtual/ffmpeg ) ) + ( >=media-libs/xine-lib-1.2 + virtual/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg ) ) X? ( x11-libs/libX11 1.79 media-plugins/vdr-xineliboutput/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?rev=1.79&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?rev=1.79&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?r1=1.78&r2=1.79 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- ChangeLog 6 Jul 2014 16:40:25 -0000 1.78 +++ ChangeLog 15 Jan 2015 18:52:25 -0000 1.79 @@ -1,6 +1,10 @@ # 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.78 2014/07/06 16:40:25 hd_brummy Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.79 2015/01/15 18:52:25 hd_brummy Exp $ + + 15 Jan 2015; Joerg Bornkessel <hd_bru...@gentoo.org> + vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-9999.ebuild: + fixed compile with >=vdr-2.1.2; depend fixed 06 Jul 2014; Joerg Bornkessel <hd_bru...@gentoo.org> vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-9999.ebuild: 1.6 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.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild?r1=1.5&r2=1.6 Index: vdr-xineliboutput-1.1.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vdr-xineliboutput-1.1.0.ebuild 6 Jul 2014 16:40:25 -0000 1.5 +++ vdr-xineliboutput-1.1.0.ebuild 15 Jan 2015 18:52:25 -0000 1.6 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.5 2014/07/06 16:40:25 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild,v 1.6 2015/01/15 18:52:25 hd_brummy Exp $ EAPI=5 @@ -25,7 +25,8 @@ ) xine? ( - || ( <media-libs/xine-lib-1.2 ( >=media-libs/xine-lib-1.2 virtual/ffmpeg ) ) + ( >=media-libs/xine-lib-1.2 + virtual/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg ) ) X? ( x11-libs/libX11 @@ -65,6 +66,15 @@ fi } +src_prepare() { + vdr-plugin-2_src_prepare + + if has_version ">=media-video/vdr-2.1.2"; then + sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \ + -i config.c menu.c tools/udp_pes_scheduler.c + fi +} + src_configure() { local myconf