From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A7430138A60 for ; Fri, 15 Feb 2013 18:49:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ECBEE0504; Fri, 15 Feb 2013 18:49:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95220E0504 for ; Fri, 15 Feb 2013 18:49:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F04833D3D7 for ; Fri, 15 Feb 2013 18:49:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E39D0E4073 for ; Fri, 15 Feb 2013 18:49:32 +0000 (UTC) From: "Emil Karlson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Emil Karlson" Message-ID: <1360954068.b5725eca10bdba826d5362e81fab4ef57c0b2c55.emil_karlson@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-13.2_beta3-r200.ebuild x11-drivers/ati-drivers/files/const-notifier-block.patch x11-drivers/ati-drivers/metadata.xml X-VCS-Directories: x11-drivers/ati-drivers/ x11-drivers/ati-drivers/files/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: b5725eca10bdba826d5362e81fab4ef57c0b2c55 X-VCS-Branch: master Date: Fri, 15 Feb 2013 18:49:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7763a5f9-4f60-4add-a32a-61560af6d289 X-Archives-Hash: e2a5801595b338ac4d915571039597b0 commit: b5725eca10bdba826d5362e81fab4ef57c0b2c55 Author: Emil Karlson gmail com> AuthorDate: Fri Feb 15 18:47:48 2013 +0000 Commit: Emil Karlson gmail 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 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#include ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) + #include + #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 @@ Do a potentially dangerous binary search and replace to disable watermark + + Enable pax kernel specific patches +