diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-11 22:45:32 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-11 22:45:32 +0000 |
| commit | 923f0f092e60198107959bca7680871c63c5da6e (patch) | |
| tree | f6d4a0c0492c48eb8493ca1c86394cf56e857535 /media-video/kaffeine | |
| parent | Fix DEPEND/RDEPEND for modular-X. (diff) | |
| download | gentoo-2-923f0f092e60198107959bca7680871c63c5da6e.tar.gz gentoo-2-923f0f092e60198107959bca7680871c63c5da6e.tar.bz2 gentoo-2-923f0f092e60198107959bca7680871c63c5da6e.zip | |
Add patch to disable xinerama support and add xinerama useflag, also add dependencies where needed.
(Portage version: 2529-svn)
Diffstat (limited to 'media-video/kaffeine')
| -rw-r--r-- | media-video/kaffeine/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch | 22 | ||||
| -rw-r--r-- | media-video/kaffeine/kaffeine-0.7.1-r1.ebuild | 14 |
3 files changed, 38 insertions, 5 deletions
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog index 9c1cc8351f0b..e5731e4961ed 100644 --- a/media-video/kaffeine/ChangeLog +++ b/media-video/kaffeine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/kaffeine # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.40 2006/01/09 19:36:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.41 2006/01/11 22:45:32 flameeyes Exp $ + + 11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kaffeine-0.7.1-xinerama.patch, kaffeine-0.7.1-r1.ebuild: + Add patch to disable xinerama support and add xinerama useflag, also add + dependencies where needed. 09 Jan 2006; Markus Rothe <corsair@gentoo.org> kaffeine-0.7.1.ebuild: Stable on ppc64 diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch b/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch new file mode 100644 index 000000000000..9fc37002f9d1 --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch @@ -0,0 +1,22 @@ +Index: kaffeine/configure.in.in +=================================================================== +--- kaffeine/configure.in.in (revision 497089) ++++ kaffeine/configure.in.in (working copy) +@@ -26,11 +26,16 @@ + dnl + dnl Checks for Xinerama extension + dnl +-AC_CHECK_LIB(Xinerama, XineramaQueryExtension, ++AC_ARG_WITH([xinerama], ++ AS_HELP_STRING([--without-xinerama], [Disable xinerama support (defaut: check)])) ++ ++if test "x$with_xinerama" != "xno"; then ++ AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + X_PRE_LIBS="$X_PRE_LIBS -lXinerama" + AC_DEFINE(HAVE_XINERAMA,,[Define this if you have libXinerama installed]) + ac_have_xinerama="yes",, + $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) ++fi + AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") + + dnl --------------------------------------------- diff --git a/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild b/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild index e36a18e53249..b4b929472a8e 100644 --- a/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild +++ b/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild,v 1.1 2006/01/03 16:27:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild,v 1.2 2006/01/11 22:45:32 flameeyes Exp $ inherit eutils kde @@ -11,26 +11,32 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="dvb gstreamer" +IUSE="dvb gstreamer xinerama" RDEPEND="|| ( x11-base/xorg-server >=x11-base/xorg-x11-6.8.0-r4 ) >=media-libs/xine-lib-1 gstreamer? ( =media-libs/gstreamer-0.8* - =media-libs/gst-plugins-0.8* )" + =media-libs/gst-plugins-0.8* ) + xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )" DEPEND="${RDEPEND} + xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) ) dvb? ( >=sys-kernel/linux-headers-2.6 ) dev-util/pkgconfig" # the dependency on xorg-x11 is meant to avoid bug #59746 -PATCHES="${FILESDIR}/${P}-systemproto.patch" +PATCHES="${FILESDIR}/${P}-systemproto.patch + ${FILESDIR}/${P}-xinerama.patch" need-kde 3.2 src_compile() { + rm ${S}/configure + myconf="${myconf} + $(use_with xinerama) $(use_with dvb) $(use_with gstreamer)" |