| 1 |
commit: 4ad28e37ede07e2dd3fa48dcae60684940e9f002 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 1 21:14:28 2015 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 00:34:06 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad28e37 |
| 7 |
|
| 8 |
media-libs/mesa: Use upstream --enable-glx-read-only-text. |
| 9 |
|
| 10 |
We can now avoid eautoreconf! |
| 11 |
|
| 12 |
media-libs/mesa/mesa-11.0.2.ebuild | 24 ++++++++++-------------- |
| 13 |
1 file changed, 10 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/mesa/mesa-11.0.2.ebuild b/media-libs/mesa/mesa-11.0.2.ebuild |
| 16 |
index af7553f..38d52d0 100644 |
| 17 |
--- a/media-libs/mesa/mesa-11.0.2.ebuild |
| 18 |
+++ b/media-libs/mesa/mesa-11.0.2.ebuild |
| 19 |
@@ -6,7 +6,7 @@ EAPI=5 |
| 20 |
|
| 21 |
EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" |
| 22 |
|
| 23 |
-if [[ ${PV} = 9999* ]]; then |
| 24 |
+if [[ ${PV} = 9999 ]]; then |
| 25 |
GIT_ECLASS="git-r3" |
| 26 |
EXPERIMENTAL="true" |
| 27 |
fi |
| 28 |
@@ -23,15 +23,16 @@ FOLDER="${PV/_rc*/}" |
| 29 |
DESCRIPTION="OpenGL-like graphic library for Linux" |
| 30 |
HOMEPAGE="http://mesa3d.sourceforge.net/" |
| 31 |
|
| 32 |
-if [[ $PV == 9999* ]]; then |
| 33 |
+if [[ $PV == 9999 ]]; then |
| 34 |
SRC_URI="" |
| 35 |
+ KEYWORDS="" |
| 36 |
else |
| 37 |
SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz" |
| 38 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 39 |
fi |
| 40 |
|
| 41 |
LICENSE="MIT" |
| 42 |
SLOT="0" |
| 43 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 44 |
RESTRICT="!bindist? ( bindist )" |
| 45 |
|
| 46 |
INTEL_CARDS="i915 i965 ilo intel" |
| 47 |
@@ -110,7 +111,7 @@ RDEPEND=" |
| 48 |
opencl? ( |
| 49 |
app-eselect/eselect-opencl |
| 50 |
dev-libs/libclc |
| 51 |
- !kernel_FreeBSD? ( || ( |
| 52 |
+ !kernel_FreeBSD? ( || ( |
| 53 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 54 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 55 |
) ) |
| 56 |
@@ -158,7 +159,7 @@ DEPEND="${RDEPEND} |
| 57 |
>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] |
| 58 |
>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] |
| 59 |
" |
| 60 |
-[[ ${PV} == "9999" ]] && DEPEND+=" |
| 61 |
+[[ ${PV} == 9999 ]] && DEPEND+=" |
| 62 |
sys-devel/bison |
| 63 |
sys-devel/flex |
| 64 |
${PYTHON_DEPS} |
| 65 |
@@ -190,10 +191,7 @@ pkg_setup() { |
| 66 |
} |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
- # fix for hardened pax_kernel, bug 240956 |
| 70 |
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch |
| 71 |
- |
| 72 |
- eautoreconf |
| 73 |
+ [[ ${PV} == 9999 ]] && eautoreconf |
| 74 |
} |
| 75 |
|
| 76 |
multilib_src_configure() { |
| 77 |
@@ -267,11 +265,9 @@ multilib_src_configure() { |
| 78 |
fi |
| 79 |
fi |
| 80 |
|
| 81 |
- # x86 hardened pax_kernel needs glx-rts, bug 240956 |
| 82 |
- if use pax_kernel; then |
| 83 |
- myconf+=" |
| 84 |
- $(use_enable x86 glx-rts) |
| 85 |
- " |
| 86 |
+ # x86 hardened pax_kernel needs glx-read-only-text, bug 240956 |
| 87 |
+ if [[ ${ABI} == x86 ]]; then |
| 88 |
+ myconf+="$(use_enable pax_kernel glx-read-only-text)" |
| 89 |
fi |
| 90 |
|
| 91 |
# on abi_x86_32 hardened we need to have asm disable |
Archives