[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/

["Emil Karlson" <jekarlson@gmail.com>]

commit:     b5725eca10bdba826d5362e81fab4ef57c0b2c55
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Fri Feb 15 18:47:48 2013 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Fri Feb 15 18:47:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b5725eca

ati-drivers: add compile patch for hardened kernel

Add IUSE=pax_kernel to apply the incompatible kernel patch conditionally.

---
 .../ati-drivers/ati-drivers-13.2_beta3-r200.ebuild |    5 +++-
 .../ati-drivers/files/const-notifier-block.patch   |   25 ++++++++++++++++++++
 x11-drivers/ati-drivers/metadata.xml               |    3 ++
 3 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-13.2_beta3-r200.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.2_beta3-r200.ebuild
index cf18684..0f65f61 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.2_beta3-r200.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.2_beta3-r200.ebuild
@@ -20,7 +20,7 @@ fi
 XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
 SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
 FOLDER_PREFIX="common/"
-IUSE="debug +modules multilib qt4 static-libs disable-watermark"
+IUSE="debug +modules multilib qt4 static-libs disable-watermark pax_kernel"
 
 LICENSE="AMD GPL-2 QPL-1.0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -287,6 +287,9 @@ src_prepare() {
 	# see https://bugs.gentoo.org/show_bug.cgi?id=448216
 	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
 
+	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
+	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
+
 	cd "${MODULE_DIR}"
 
 	# bugged fglrx build system, this file should be copied by hand

diff --git a/x11-drivers/ati-drivers/files/const-notifier-block.patch b/x11-drivers/ati-drivers/files/const-notifier-block.patch
new file mode 100644
index 0000000..ba1fdb2
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/const-notifier-block.patch
@@ -0,0 +1,25 @@
+diff -Nur common/lib/modules/fglrx/build_mod/kcl_acpi.c common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-29 17:03:51.000000000 +0200
++++ common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-02-15 20:33:10.611838616 +0200
+@@ -15,6 +15,9 @@
+  ****************************************************************************/
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++#include <linux/notifier.h>
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+ #include <generated/autoconf.h>
+ #else
+@@ -145,7 +148,11 @@
+     return NOTIFY_OK;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++static notifier_block_no_const firegl_acpi_lid_notifier = {
++#else
+ static struct notifier_block firegl_acpi_lid_notifier = {
++#endif
+         .notifier_call = firegl_acpi_lid_event,
+ };
+ #endif

diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index 7f03c15..872d247 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -16,4 +16,7 @@
 	<use>
 		<flag name='disable-watermark'>Do a potentially dangerous binary search and replace to disable watermark</flag>
 	</use>
+	<use>
+		<flag name='pax_kernel'>Enable pax kernel specific patches</flag>
+	</use>
 </pkgmetadata>