* [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-xineliboutput: vdr-xineliboutput-1.0.4_p20091118.ebuild ChangeLog vdr-xineliboutput-1.0.4_p20090820.ebuild
@ 2009-11-20 9:58 Matthias Schwarzott (zzam)
0 siblings, 0 replies; only message in thread
From: Matthias Schwarzott (zzam) @ 2009-11-20 9:58 UTC (permalink / raw
To: gentoo-commits
zzam 09/11/20 09:58:27
Modified: vdr-xineliboutput-1.0.4_p20091118.ebuild ChangeLog
vdr-xineliboutput-1.0.4_p20090820.ebuild
Log:
Fix installing sub-plugins, thanks to chub for reporting.
(Portage version: 2.2_rc50/cvs/Linux i686)
Revision Changes Path
1.2 media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild?r1=1.1&r2=1.2
Index: vdr-xineliboutput-1.0.4_p20091118.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-xineliboutput-1.0.4_p20091118.ebuild 18 Nov 2009 20:59:36 -0000 1.1
+++ vdr-xineliboutput-1.0.4_p20091118.ebuild 20 Nov 2009 09:58:26 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.0.4_p20091118.ebuild,v 1.1 2009/11/18 20:59:36 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild,v 1.2 2009/11/20 09:58:26 zzam Exp $
GENTOO_VDR_CONDITIONAL=yes
@@ -11,9 +11,6 @@
MY_PV=${PV#*_p}
MY_P=${PN}-cvs-${MY_PV}
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2"
@@ -130,13 +127,17 @@
# install vdr plugin
vdr-plugin_src_install
- # There may be no sub-plugin, depending on use-flags
+ # version number that the sources contain
+ local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
+ cut -d'"' -f2)"
+ echo SO_VERSION=$SO_VERSION
insinto ${VDR_PLUGIN_DIR}
- local f
- for f in libxineliboutput*.so.${SO_VERSION}; do
- [[ -f "$f" ]] || continue
- doins "${f}" || die "could not install sub-plugin ${f}"
- done
+ if use fbcon; then
+ doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
+ fi
+ if use X; then
+ doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
+ fi
fi
if use xine; then
1.50 media-plugins/vdr-xineliboutput/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog 20 Nov 2009 08:59:55 -0000 1.49
+++ ChangeLog 20 Nov 2009 09:58:26 -0000 1.50
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-xineliboutput
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.49 2009/11/20 08:59:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.50 2009/11/20 09:58:26 zzam Exp $
+
+ 20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
+ vdr-xineliboutput-1.0.4_p20090820.ebuild,
+ vdr-xineliboutput-1.0.4_p20091118.ebuild:
+ Fix installing sub-plugins, thanks to chub for reporting.
20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
-vdr-xineliboutput-1.0.0_rc1.ebuild, -vdr-xineliboutput-1.0.0_rc2.ebuild,
1.2 media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild?r1=1.1&r2=1.2
Index: vdr-xineliboutput-1.0.4_p20090820.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-xineliboutput-1.0.4_p20090820.ebuild 26 Aug 2009 08:20:13 -0000 1.1
+++ vdr-xineliboutput-1.0.4_p20090820.ebuild 20 Nov 2009 09:58:26 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.0.4_p20090820.ebuild,v 1.1 2009/08/26 08:20:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild,v 1.2 2009/11/20 09:58:26 zzam Exp $
GENTOO_VDR_CONDITIONAL=yes
@@ -11,9 +11,6 @@
MY_PV=${PV#*_p}
MY_P=${PN}-cvs-${MY_PV}
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2"
@@ -130,13 +127,17 @@
# install vdr plugin
vdr-plugin_src_install
- # There may be no sub-plugin, depending on use-flags
+ # version number that the sources contain
+ local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
+ cut -d'"' -f2)"
+ echo SO_VERSION=$SO_VERSION
insinto ${VDR_PLUGIN_DIR}
- local f
- for f in libxineliboutput*.so.${SO_VERSION}; do
- [[ -f "$f" ]] || continue
- doins "${f}" || die "could not install sub-plugin ${f}"
- done
+ if use fbcon; then
+ doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
+ fi
+ if use X; then
+ doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
+ fi
fi
if use xine; then
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-20 9:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-20 9:58 [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-xineliboutput: vdr-xineliboutput-1.0.4_p20091118.ebuild ChangeLog vdr-xineliboutput-1.0.4_p20090820.ebuild Matthias Schwarzott (zzam)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox