diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2011-02-09 22:25:09 +0000 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2011-02-09 22:25:09 +0000 |
| commit | 7c10012d046a288e342c4306ab435647a623f040 (patch) | |
| tree | 6c553c09d1d51d146bc8eb9ac745a2b5770d5c56 /media-libs/mesa | |
| parent | fix keywords again (diff) | |
| download | gentoo-2-7c10012d046a288e342c4306ab435647a623f040.tar.gz gentoo-2-7c10012d046a288e342c4306ab435647a623f040.tar.bz2 gentoo-2-7c10012d046a288e342c4306ab435647a623f040.zip | |
fix bug 240956
(Portage version: 2.1.9.39/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/mesa')
| -rw-r--r-- | media-libs/mesa/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/mesa/files/glx_ro_text_segm.patch | 28 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-7.10-r1.ebuild (renamed from media-libs/mesa/mesa-7.10.ebuild) | 11 |
3 files changed, 44 insertions, 3 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 445cc37d91e9..287e41f64b42 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.308 2011/01/27 16:44:03 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.309 2011/02/09 22:25:09 zorry Exp $ + +*mesa-7.10-r1 (09 Feb 2011) + + 09 Feb 2011; Magnus Granberg <zorry@gentoo.org> -mesa-7.10.ebuild, + +mesa-7.10-r1.ebuild, +files/glx_ro_text_segm.patch: + Fix bug 240956 readonly text segment on x86 27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> mesa-7.10.ebuild: Push Gentoo Prefix changes from x11 overlay, as approved diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch new file mode 100644 index 000000000000..495b7dc4ac56 --- /dev/null +++ b/media-libs/mesa/files/glx_ro_text_segm.patch @@ -0,0 +1,28 @@ +2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org + + #240956 + * configure.ac add support to enable readonly test segment on x86 + +--- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 ++++ configure.ac 2008-11-17 23:20:17.000000000 +0100 +@@ -499,6 +499,20 @@ + enable_xcb=no + fi + ++ ++dnl readonly text segment on x86 hardened platforms ++AC_ARG_ENABLE([glx_rts], ++ [AS_HELP_STRING([--enable-glx-rts], ++ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], ++ [enable_glx_rts="$enableval"], ++ [enable_glx_rts=no]) ++if test "x$enable_glx_rts" = xyes; then ++ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" ++else ++ enable_glx_rts=no ++fi ++ ++ + dnl + dnl libGL configuration per driver + dnl diff --git a/media-libs/mesa/mesa-7.10.ebuild b/media-libs/mesa/mesa-7.10-r1.ebuild index e4f80870b202..6e3c0b72ae24 100644 --- a/media-libs/mesa/mesa-7.10.ebuild +++ b/media-libs/mesa/mesa-7.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v 1.2 2011/01/27 16:44:03 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10-r1.ebuild,v 1.1 2011/02/09 22:25:09 zorry Exp $ EAPI=3 @@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - +classic debug +gallium gles llvm motif +nptl pic selinux kernel_FreeBSD" + +classic debug +gallium gles llvm motif +nptl pic selinux kernel_FreeBSD hardened" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.23" # keep correct libdrm and dri2proto dep @@ -134,6 +134,10 @@ src_prepare() { EPATCH_SUFFIX="patch" \ epatch fi + + # bug 240956 + [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch + # FreeBSD 6.* doesn't have posix_memalign(). if [[ ${CHOST} == *-freebsd6.* ]]; then sed -i \ @@ -218,6 +222,9 @@ src_configure() { fi fi + # bug 240956 + use x86 && myconf="${myconf} $(use_enable hardened glx-rts)" + # --with-driver=dri|xlib|osmesa || do we need osmesa? econf \ --disable-option-checking \ |