diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-11-04 23:54:49 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-11-04 23:54:49 +0000 |
| commit | 4467cf8110c437a95bf2daaaf6f096f0d72f9b18 (patch) | |
| tree | 709da00c716d92e6779bdaae1419ed8ffa33a095 /x11-base | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4467cf8110c437a95bf2daaaf6f096f0d72f9b18.tar.gz gentoo-2-4467cf8110c437a95bf2daaaf6f096f0d72f9b18.tar.bz2 gentoo-2-4467cf8110c437a95bf2daaaf6f096f0d72f9b18.zip | |
SDL is also currently broken in 1.2.99.0 according to Daniel Stone.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.2.99.0.ebuild | 18 |
2 files changed, 16 insertions, 8 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 95c4ac8633c1..aca282cff9fe 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.193 2006/11/04 23:43:13 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.194 2006/11/04 23:54:49 joshuabaergen Exp $ + + 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + SDL is also currently broken in 1.2.99.0 according to Daniel Stone. 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> xorg-server-1.2.99.0.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild index 141d0b9c12e9..3d29e05ab89a 100644 --- a/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.2.99.0.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/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild,v 1.7 2006/11/04 23:43:13 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild,v 1.8 2006/11/04 23:54:49 joshuabaergen Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -107,13 +107,15 @@ IUSE_VIDEO_CARDS=" IUSE_SERVERS="kdrive xorg" # xprint is broken too # xprint +# so is sdl... +# sdl IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} ${IUSE_SERVERS} 3dfx aiglx dbus - dri ipv6 minimal nptl sdl" + dri ipv6 minimal nptl" RDEPEND="x11-libs/libXfont x11-libs/xtrans x11-libs/libXau @@ -144,10 +146,11 @@ RDEPEND="x11-libs/libXfont x11-libs/libXres ) >=x11-libs/libxkbui-1.0.2 x11-libs/liblbxutil - kdrive? ( sdl? ( media-libs/libsdl ) ) dbus? ( sys-apps/dbus )" # dmx is currently broken # dmx? ( x11-libs/libdmx ) + # and so is sdl + # kdrive? ( sdl? ( media-libs/libsdl ) ) # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent @@ -286,11 +289,12 @@ pkg_setup() { PATCHES="${FILESDIR}/${PV}-fix-sysconfdir-references.patch" # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts="${conf_opts} --enable-xsdl" - else + # SDL broken! +# if use kdrive && use sdl; then +# conf_opts="${conf_opts} --enable-xsdl" +# else conf_opts="${conf_opts} --disable-xsdl" - fi +# fi # Only Xorg and Xgl support this, and we won't build Xgl # until it merges to trunk |