commit: ca5d3965cec439a39407403f47a1e26258ad51fc Author: Emil Karlson <jekarlson <AT> gmail <DOT> com> AuthorDate: Mon Oct 13 01:26:49 2014 +0000 Commit: Emil Karlson <jekarlson <AT> gmail <DOT> com> CommitDate: Mon Oct 13 01:26:49 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ca5d3965
x11-drivers/ati-drivers fix linux-3.17 no_hotplug build failure Fixes 524658 Thanks to Dominique Michel for providing the patch --- x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild | 3 +++ x11-drivers/ati-drivers/ati-drivers-14.9.ebuild | 3 +++ .../files/fix-the-linux-3.17-no_hotplug-error.patch | 18 ++++++++++++++++++ 3 files changed, 24 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 fbaff2e..2ebb926 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild @@ -312,6 +312,9 @@ src_prepare() { # Fix #483400 epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" + # Fix #524658 + epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch" + # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild index 70857a8..fae8fb3 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild @@ -312,6 +312,9 @@ src_prepare() { # Fix #483400 epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" + # Fix #524658 + epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch" + # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" diff --git a/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch b/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch new file mode 100644 index 0000000..a8b5462 --- /dev/null +++ b/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch @@ -0,0 +1,18 @@ +--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig 2014-07-11 11:46:19.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-10-08 15:12:55.535638391 +0200 +@@ -829,6 +829,7 @@ + + static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) + struct acpi_device *tdev; + struct pci_dev *pdev = (struct pci_dev *)data; +@@ -844,6 +845,7 @@ + } + } + #endif ++#endif + return 0; + } +