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 D5B62138825 for ; Mon, 10 Nov 2014 20:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9B30E081E; Mon, 10 Nov 2014 20:07:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 333D5E081E for ; Mon, 10 Nov 2014 20:07:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCB0D34016B for ; Mon, 10 Nov 2014 20:07:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 632159D9A for ; Mon, 10 Nov 2014 20:07:41 +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: <1415649993.9589ab069aa08fe9787e02107860128a40940d48.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-14.9-r1.ebuild x11-drivers/ati-drivers/ati-drivers-14.9.ebuild x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch X-VCS-Directories: x11-drivers/ati-drivers/files/ x11-drivers/ati-drivers/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: 9589ab069aa08fe9787e02107860128a40940d48 X-VCS-Branch: master Date: Mon, 10 Nov 2014 20:07:41 +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: 18e26ef9-c94c-4e3c-9412-703bd1c4b90e X-Archives-Hash: 9b7178909c712307b8658318b31ba862 commit: 9589ab069aa08fe9787e02107860128a40940d48 Author: Emil Karlson gmail com> AuthorDate: Mon Nov 10 20:06:33 2014 +0000 Commit: Emil Karlson gmail com> CommitDate: Mon Nov 10 20:06:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9589ab06 x11-drivers/ati-drivers: fix x86-32 build failure on linux-3.17 fixes #526602 --- x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild | 3 +++ x11-drivers/ati-drivers/ati-drivers-14.9.ebuild | 3 +++ x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild index 2ebb926..267b375 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild @@ -318,6 +318,9 @@ src_prepare() { # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" + # Compile fix, #526602 + epatch "${FILESDIR}/use-kernel_fpu_begin.patch" + cd "${MODULE_DIR}" # bugged fglrx build system, this file should be copied by hand diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild index fae8fb3..378153e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild @@ -318,6 +318,9 @@ src_prepare() { # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" + # Compile fix, #526602 + epatch "${FILESDIR}/use-kernel_fpu_begin.patch" + cd "${MODULE_DIR}" # bugged fglrx build system, this file should be copied by hand diff --git a/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch new file mode 100644 index 0000000..f0ba278 --- /dev/null +++ b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch @@ -0,0 +1,12 @@ +diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:30:58.630304842 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:32:57.300306011 +0200 +@@ -6389,7 +6389,7 @@ + */ + void ATI_API_CALL KCL_fpu_begin(void) + { +-#ifdef CONFIG_X86_64 ++#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) + kernel_fpu_begin(); + #else + #ifdef TS_USEDFPU