| 1 |
commit: cc7c79df20b5a7f8ecc6e24a5e5ef668a2403284 |
| 2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 1 13:14:31 2015 +0000 |
| 4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 13:14:31 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7c79df |
| 7 |
|
| 8 |
media-libs/mesa: Version bump. Drop unnecessary libelf dependency on *-fbsd |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
media-libs/mesa/Manifest | 1 + |
| 13 |
.../mesa/{mesa-9999.ebuild => mesa-11.0.2.ebuild} | 23 ++++++++++++---------- |
| 14 |
media-libs/mesa/mesa-9999.ebuild | 8 ++++---- |
| 15 |
3 files changed, 18 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
| 18 |
index c74fdb7..1d16822 100644 |
| 19 |
--- a/media-libs/mesa/Manifest |
| 20 |
+++ b/media-libs/mesa/Manifest |
| 21 |
@@ -6,4 +6,5 @@ DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c3 |
| 22 |
DIST mesa-10.6.6.tar.xz 7040744 SHA256 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 SHA512 a251dc258ccf2fbeccbff3447a23c0f417722244322c8887fe4a50b0013d3da3705ffbfe412b61717d2c3370cb6a88bec51b91e1b77a5b987d6fbf0fdbfe4a5e WHIRLPOOL 6f441a5b19b496d14b659b1ba3b70d2ead685ab1eb7d77b77c24d69127bd69ce6453feed1e042840bdb6cf47f68caa61c73c07ec2259a697acc3393e42111be6 |
| 23 |
DIST mesa-10.6.8.tar.xz 7042260 SHA256 e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd SHA512 ebb2daff1afcc5f6808c5c9948814014c0570b18fb91481c9d09b2c28776ce6e4fd8bba650e559ac5d87d30fe06b38032c78828c13b95d5f9a0338d44b75f61e WHIRLPOOL e94395c0954875c9b1eaa6692385593a24242c3915012dcf8fcfa7b0d16cff33fc80421234dccdfafa4ecb9b82a176f177cf7ec622f6b80eac6de4cfcb5c7552 |
| 24 |
DIST mesa-11.0.0.tar.xz 7257112 SHA256 e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32 SHA512 9938010f3d5e72bb8dea371e3502622e2ff6eae14e0265011df8fc81ec915d632abda9be7e772828adb8f0c7c12c830d89dce42e196ca18489fb1386a766220f WHIRLPOOL 454466396fac029450b619c842fa1e34906e5c529a67a575e9096f9e9b1584ad5b00f9ada2656e0469d5cf6d94e966709d4e0253484eb03d32f93e3e7d521f78 |
| 25 |
+DIST mesa-11.0.2.tar.xz 7263112 SHA256 fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4 SHA512 5b388c7464a97259b43f0c95114ddb6ea8d748a53a495202a01aa757baf5784c66c57e1f462a909bb9b3bf1239aa4fcbefbfc9fad2376a8288493304a2988ec4 WHIRLPOOL b4dd696c6135dd5f9711727ab57d042941a8b949010192544138f184086d90f1e9da1408ea937c95e831788c0797317d938e40948ae25226928ea14f77503859 |
| 26 |
DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97 |
| 27 |
|
| 28 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-11.0.2.ebuild |
| 29 |
similarity index 95% |
| 30 |
copy from media-libs/mesa/mesa-9999.ebuild |
| 31 |
copy to media-libs/mesa/mesa-11.0.2.ebuild |
| 32 |
index e7cf9a9..af7553f 100644 |
| 33 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 34 |
+++ b/media-libs/mesa/mesa-11.0.2.ebuild |
| 35 |
@@ -25,14 +25,13 @@ HOMEPAGE="http://mesa3d.sourceforge.net/" |
| 36 |
|
| 37 |
if [[ $PV == 9999* ]]; then |
| 38 |
SRC_URI="" |
| 39 |
- KEYWORDS="" |
| 40 |
else |
| 41 |
SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz" |
| 42 |
- 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" |
| 43 |
fi |
| 44 |
|
| 45 |
LICENSE="MIT" |
| 46 |
SLOT="0" |
| 47 |
+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" |
| 48 |
RESTRICT="!bindist? ( bindist )" |
| 49 |
|
| 50 |
INTEL_CARDS="i915 i965 ilo intel" |
| 51 |
@@ -95,7 +94,7 @@ RDEPEND=" |
| 52 |
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] |
| 53 |
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] |
| 54 |
x11-libs/libXfixes:=[${MULTILIB_USEDEP}] |
| 55 |
- llvm? ( |
| 56 |
+ llvm? ( !kernel_FreeBSD? ( |
| 57 |
video_cards_radeonsi? ( || ( |
| 58 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 59 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 60 |
@@ -105,16 +104,16 @@ RDEPEND=" |
| 61 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 62 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 63 |
) ) |
| 64 |
- ) |
| 65 |
+ ) ) |
| 66 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 67 |
) |
| 68 |
opencl? ( |
| 69 |
app-eselect/eselect-opencl |
| 70 |
dev-libs/libclc |
| 71 |
- || ( |
| 72 |
+ !kernel_FreeBSD? ( || ( |
| 73 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 74 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 75 |
- ) |
| 76 |
+ ) ) |
| 77 |
) |
| 78 |
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) |
| 79 |
vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] ) |
| 80 |
@@ -191,7 +190,10 @@ pkg_setup() { |
| 81 |
} |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
- [[ ${PV} == 9999 ]] && eautoreconf |
| 85 |
+ # fix for hardened pax_kernel, bug 240956 |
| 86 |
+ [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch |
| 87 |
+ |
| 88 |
+ eautoreconf |
| 89 |
} |
| 90 |
|
| 91 |
multilib_src_configure() { |
| 92 |
@@ -265,9 +267,11 @@ multilib_src_configure() { |
| 93 |
fi |
| 94 |
fi |
| 95 |
|
| 96 |
- # x86 hardened pax_kernel needs glx-read-only-text, bug 240956 |
| 97 |
+ # x86 hardened pax_kernel needs glx-rts, bug 240956 |
| 98 |
if use pax_kernel; then |
| 99 |
- myconf+="$(use_enable x86 glx-read-only-text)" |
| 100 |
+ myconf+=" |
| 101 |
+ $(use_enable x86 glx-rts) |
| 102 |
+ " |
| 103 |
fi |
| 104 |
|
| 105 |
# on abi_x86_32 hardened we need to have asm disable |
| 106 |
@@ -283,7 +287,6 @@ multilib_src_configure() { |
| 107 |
--enable-dri \ |
| 108 |
--enable-glx \ |
| 109 |
--enable-shared-glapi \ |
| 110 |
- --disable-shader-cache \ |
| 111 |
$(use_enable !bindist texture-float) \ |
| 112 |
$(use_enable d3d9 nine) \ |
| 113 |
$(use_enable debug) \ |
| 114 |
|
| 115 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 116 |
index e7cf9a9..1ac917f 100644 |
| 117 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 118 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 119 |
@@ -95,7 +95,7 @@ RDEPEND=" |
| 120 |
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] |
| 121 |
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] |
| 122 |
x11-libs/libXfixes:=[${MULTILIB_USEDEP}] |
| 123 |
- llvm? ( |
| 124 |
+ llvm? ( !kernel_FreeBSD? ( |
| 125 |
video_cards_radeonsi? ( || ( |
| 126 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 127 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 128 |
@@ -105,16 +105,16 @@ RDEPEND=" |
| 129 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 130 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 131 |
) ) |
| 132 |
- ) |
| 133 |
+ ) ) |
| 134 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 135 |
) |
| 136 |
opencl? ( |
| 137 |
app-eselect/eselect-opencl |
| 138 |
dev-libs/libclc |
| 139 |
- || ( |
| 140 |
+ !kernel_FreeBSD? ( || ( |
| 141 |
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] |
| 142 |
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] |
| 143 |
- ) |
| 144 |
+ ) ) |
| 145 |
) |
| 146 |
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) |
| 147 |
vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] ) |
Archives