| 1 |
commit: 001a76ca3e584ad150d06a5c9c1a1075c7c4ec9d |
| 2 |
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Dec 30 20:17:24 2011 +0000 |
| 4 |
Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Dec 30 20:17:24 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=001a76ca |
| 7 |
|
| 8 |
x11-drivers/ati-drivers: added pax_kernel USE |
| 9 |
|
| 10 |
Adding pax_kernel USE flag and reverting back to -r1 since there |
| 11 |
is no more need to rebuild for non hardened users. |
| 12 |
|
| 13 |
--- |
| 14 |
...11.12-r2.ebuild => ati-drivers-11.12-r1.ebuild} | 9 +++------ |
| 15 |
x11-drivers/ati-drivers/metadata.xml | 5 +++++ |
| 16 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild |
| 21 |
rename to x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 22 |
index 73b44b5..986756c 100644 |
| 23 |
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild |
| 24 |
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 25 |
@@ -17,7 +17,7 @@ else |
| 26 |
SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" |
| 27 |
FOLDER_PREFIX="" |
| 28 |
fi |
| 29 |
-IUSE="debug +modules multilib opencl qt4" |
| 30 |
+IUSE="debug +modules multilib opencl pax_kernel qt4" |
| 31 |
|
| 32 |
LICENSE="AMD GPL-2 QPL-1.0 as-is" |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
@@ -320,12 +320,10 @@ src_prepare() { |
| 35 |
|| die "Replacing 'finger' with 'who' failed." |
| 36 |
# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and |
| 37 |
# add function to detect default state. |
| 38 |
- epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die \ |
| 39 |
- "Failed to epatch powermode-opt-path-2.patch" |
| 40 |
+ epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch |
| 41 |
|
| 42 |
# fix needed for at least hardened-sources, see bug #392753 |
| 43 |
- epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch || die \ |
| 44 |
- "Failed to epatch ati-drivers-redefine-WARN.patch" |
| 45 |
+ use pax_kernel && epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch |
| 46 |
|
| 47 |
cd "${MODULE_DIR}" |
| 48 |
|
| 49 |
@@ -357,7 +355,6 @@ src_compile() { |
| 50 |
# These extra libs/utils either have an Imakefile that does not |
| 51 |
# work very well without tweaking or a Makefile ignoring CFLAGS |
| 52 |
# and the like. We bypass those. |
| 53 |
-src_test() { :; } # no tests present |
| 54 |
# The -DUSE_GLU is needed to compile using nvidia headers |
| 55 |
# according to a comment in ati-drivers-extra-8.33.6.ebuild. |
| 56 |
"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ |
| 57 |
|
| 58 |
diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml |
| 59 |
index 1f3ffe4..ba2339f 100644 |
| 60 |
--- a/x11-drivers/ati-drivers/metadata.xml |
| 61 |
+++ b/x11-drivers/ati-drivers/metadata.xml |
| 62 |
@@ -23,4 +23,9 @@ |
| 63 |
Install OpenCL runtime libraries |
| 64 |
</flag> |
| 65 |
</use> |
| 66 |
+ <use> |
| 67 |
+ <flag name='pax_kernel'> |
| 68 |
+ Enable if the user plans to run the package under a pax enabled hardened kernel |
| 69 |
+ </flag> |
| 70 |
+ </use> |
| 71 |
</pkgmetadata> |
Archives