summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-08-21 07:25:00 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-08-21 07:25:00 +0000
commit806ad258bb3a3f43066529e4d0e24b47341372ba (patch)
treef875821eb995705d0cc0c354023d9057a9d0f338 /x11-base/kdrive
parentStable on x86 per security bug #102002 (diff)
downloadgentoo-2-806ad258bb3a3f43066529e4d0e24b47341372ba.tar.gz
gentoo-2-806ad258bb3a3f43066529e4d0e24b47341372ba.tar.bz2
gentoo-2-806ad258bb3a3f43066529e4d0e24b47341372ba.zip
Add minimal USE flag, which disables xv, composite, xrecord and xres. Make static USE flag actually build static servers -- this still works for neither Xati, Xephyr, Xepson, Xfake or Xi810 among kdrive servers nor Xglx.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-base/kdrive')
-rw-r--r--x11-base/kdrive/ChangeLog8
-rw-r--r--x11-base/kdrive/files/make-xv-configable.patch30
-rw-r--r--x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild21
3 files changed, 55 insertions, 4 deletions
diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog
index 42ad5fe75ed7..d164f0b67deb 100644
--- a/x11-base/kdrive/ChangeLog
+++ b/x11-base/kdrive/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-base/kdrive
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.30 2005/08/21 05:36:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.31 2005/08/21 07:24:59 spyderous Exp $
+
+ 21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ +files/make-xv-configable.patch, kdrive-6.6.1_pre20050820.ebuild:
+ Add minimal USE flag, which disables xv, composite, xrecord and xres. Make
+ static USE flag actually build static servers -- this still works for
+ neither Xati, Xephyr, Xepson, Xfake or Xi810 among kdrive servers nor Xglx.
21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/startxkd:
Fix up startxkd so it works better for me.
diff --git a/x11-base/kdrive/files/make-xv-configable.patch b/x11-base/kdrive/files/make-xv-configable.patch
new file mode 100644
index 000000000000..0f29c6fd02a9
--- /dev/null
+++ b/x11-base/kdrive/files/make-xv-configable.patch
@@ -0,0 +1,30 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=4166
+
+diff -urN xserver.orig/hw/kdrive/i810/Makefile.am xserver/hw/kdrive/i810/Makefile.am
+--- xserver.orig/hw/kdrive/i810/Makefile.am 2005-08-14 20:19:34.000000000 -0700
++++ xserver/hw/kdrive/i810/Makefile.am 2005-08-20 20:52:47.000000000 -0700
+@@ -6,18 +6,22 @@
+
+ noinst_LIBRARIES = libi810.a
+
++if XV
++XV_SOURCES = i810_video.c
++endif
++
+ if TSLIB
+ TSLIB_FLAG = -lts
+ endif
+
+ libi810_a_SOURCES = \
+ i810_cursor.c \
+- i810_video.c \
+ i810draw.c \
+ i810draw.h \
+ i810_reg.h \
+ i810.c \
+- i810.h
++ i810.h \
++ $(XV_SOURCES)
+
+ Xi810_SOURCES = \
+ i810stub.c
diff --git a/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild b/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
index 77da00ea3c5d..82d3f36644f6 100644
--- a/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
+++ b/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
@@ -1,18 +1,20 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild,v 1.2 2005/08/21 06:08:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild,v 1.3 2005/08/21 07:25:00 spyderous Exp $
SNAPSHOT="yes"
inherit flag-o-matic x-modular
+PATCHES="${FILESDIR}/make-xv-configable.patch"
+
MY_PN="xserver"
MY_P="${MY_PN}-${PV##*pre}"
SRC_URI="http://dev.gentoo.org/~spyderous/overlay/distfiles/${MY_P}.tar.bz2"
HOMEPAGE="http://xserver.freedesktop.org/wiki/Software/Xserver"
DESCRIPTION="Experimental X11 implementations"
KEYWORDS="~x86"
-IUSE="ipv6 static"
+IUSE="ipv6 static minimal"
RDEPEND="x11-libs/libXdmcp
x11-libs/libX11
x11-libs/libXext
@@ -38,6 +40,10 @@ S="${WORKDIR}/${MY_P%%-[0-9]*}"
pkg_setup() {
CONFIGURE_OPTIONS="$(use_enable ipv6)
+ $(use_enable !minimal xv)
+ $(use_enable !minimal composite)
+ $(use_enable !minimal xrecord)
+ $(use_enable !minimal xres)
--enable-xglserver
--enable-xglxserver
--disable-xeglserver
@@ -46,9 +52,18 @@ pkg_setup() {
# --enable-xeglserver
append-ldflags -Wl,-z,now
+}
+
+src_compile() {
+ x-modular_src_configure
+
+ # Has to be after configure, or configure dies
if use static; then
- append-ldflags -static
+ append-ldflags -all-static
fi
+
+ # Yes, we do need the LDFLAGS here in addition to the above append.
+ emake LDFLAGS="${LDFLAGS}"
}
src_install() {