summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-08-15 20:34:43 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-08-15 20:34:43 +0000
commitcf84a8d9a243cc3df56d332bcf3e87cc495bce87 (patch)
tree58464c453d4a0e6eb2538dfbe081fc0865493904 /media-plugins/vdr-xineliboutput
parentInitial commit wrt #88948, thanks to Anton Romanov for reporting. (diff)
downloadgentoo-2-cf84a8d9a243cc3df56d332bcf3e87cc495bce87.tar.gz
gentoo-2-cf84a8d9a243cc3df56d332bcf3e87cc495bce87.tar.bz2
gentoo-2-cf84a8d9a243cc3df56d332bcf3e87cc495bce87.zip
Fix ebuild to compile without xinerama support, reported by Marko_ in #gentoo-vdr.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
-rw-r--r--media-plugins/vdr-xineliboutput/ChangeLog7
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild18
2 files changed, 18 insertions, 7 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 6ca137340c2c..eed36a39dd8b 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -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.45 2009/08/10 12:12:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.46 2009/08/15 20:34:43 zzam Exp $
+
+ 15 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
+ vdr-xineliboutput-1.0.4_p20090810.ebuild:
+ Fix ebuild to compile without xinerama support, reported by Marko_ in
+ #gentoo-vdr.
*vdr-xineliboutput-1.0.4_p20090810 (10 Aug 2009)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
index cd2e93b1be5d..a9f3f688e787 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
@@ -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_p20090810.ebuild,v 1.1 2009/08/10 12:12:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild,v 1.2 2009/08/15 20:34:43 zzam Exp $
GENTOO_VDR_CONDITIONAL=yes
@@ -21,33 +21,38 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-IUSE="+vdr +xine fbcon X libextractor"
+IUSE="+vdr +xine fbcon X libextractor xinerama"
# both vdr plugin or vdr-sxfe can use X11
+# still depends need some cleanup
COMMON_DEPEND="
vdr? ( >=media-video/vdr-1.4.0 )
xine? ( >=media-libs/xine-lib-1.1.1 )
media-libs/jpeg
- libextractor? ( >=media-libs/libextractor-0.5.20 )"
+ libextractor? ( >=media-libs/libextractor-0.5.20 )
-DEPEND="${COMMON_DEPEND}
- sys-kernel/linux-headers
X? (
x11-libs/libX11
x11-libs/libXv
x11-libs/libXext
x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
)"
-RDEPEND="${COMMON_DEPEND}
+
+DEPEND="${COMMON_DEPEND}
+ sys-kernel/linux-headers
X? (
x11-proto/xextproto
x11-proto/xf86vidmodeproto
x11-proto/xproto
x11-proto/renderproto
+ xinerama? ( x11-proto/xineramaproto )
)"
+RDEPEND="${COMMON_DEPEND}"
+
S=${WORKDIR}/${MY_P#vdr-}
VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
@@ -106,6 +111,7 @@ src_prepare() {
HAVE_XRENDER = 1
HAVE_XDPMS = 1
HAVE_EXTRACTOR_H = $(use_onoff libextractor)
+ HAVE_XINERAMA = $(use_onoff xinerama)
EOF
# patching makefile to work with this