diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2013-04-08 22:33:17 +0400 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2013-04-08 22:33:17 +0400 |
| commit | 1b7d3638b1aea22c9c50d9738c45227cb1cd9750 (patch) | |
| tree | 2993707b93d8a3ce43b556a674f6058fb5d26f04 | |
| parent | Add patch to use non-null platform-id (diff) | |
| parent | x11-drivers/xf86-video-ati: fix check for 3.9 kernels (diff) | |
| download | x11-1b7d3638b1aea22c9c50d9738c45227cb1cd9750.tar.gz x11-1b7d3638b1aea22c9c50d9738c45227cb1cd9750.tar.bz2 x11-1b7d3638b1aea22c9c50d9738c45227cb1cd9750.zip | |
Merge remote-tracking branch 'origin/master' into opencl
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild | 9 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild index 4783e59e..78d4eb64 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild @@ -176,6 +176,13 @@ pkg_pretend() { linux-info_pkg_setup require_configured_kernel _check_kernel_config + + if [[ "${KV_EXTRA}" != -hardened ]] && use pax_kernel; then + eerror "USE pax_kernel enabled for a non-hardened kernel." + eerror "If you know this kernel supports pax_kernel, open a bug at" + eerror "https://bugs.gentoo.org" + die "USE pax_kernel enabled for a non-hardened kernel" + fi fi } @@ -548,7 +555,7 @@ src_install-libs() { doheader xvba_sdk/include/amdxvba.h if use pax_kernel; then - pax-mark Cm "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" + pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" fi } diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild index 391195bc..76193ade 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild @@ -17,7 +17,16 @@ RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon] udev? ( virtual/udev )" DEPEND="${RDEPEND}" -CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON" +pkg_pretend() { + if use kernel_linux ; then + if kernel_is -ge 3 9; then + CONFIG_CHECK="~DRM_RADEON ~!FB_RADEON" + else + CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON" + fi + fi + check_extra_config +} src_configure() { XORG_CONFIGURE_OPTIONS=( |