From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QuLxw-0007Qp-O3 for garchives@archives.gentoo.org; Fri, 19 Aug 2011 10:06:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A615121C026; Fri, 19 Aug 2011 10:06:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5ABFF21C026 for ; Fri, 19 Aug 2011 10:06:08 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79C2B1B4078 for ; Fri, 19 Aug 2011 10:06:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B778D80040 for ; Fri, 19 Aug 2011 10:06:06 +0000 (UTC) From: "Enrico Tagliavini" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Enrico Tagliavini" Message-ID: <37f1f1531a72a88e623a0c44c43538c60c56737a.Enrico@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-11.7.ebuild x11-drivers/ati-drivers/ati-drivers-11.8.ebuild x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch X-VCS-Directories: x11-drivers/ati-drivers/ x11-drivers/ati-drivers/files/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: 37f1f1531a72a88e623a0c44c43538c60c56737a Date: Fri, 19 Aug 2011 10:06:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 442737d40b6bacdf7e0fe101ef6dc171 commit: 37f1f1531a72a88e623a0c44c43538c60c56737a Author: Enrico Tagliavini gmail com> AuthorDate: Fri Aug 19 10:05:41 2011 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Fri Aug 19 10:05:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D37f1f153 [ati-drivers] version bump. remove old --- ...drivers-11.7.ebuild =3D> ati-drivers-11.8.ebuild} | 0 .../ati-drivers/files/ati-drivers-2.6.39.patch | 96 --------------= ------ 2 files changed, 0 insertions(+), 96 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-11.7.ebuild b/x11-driver= s/ati-drivers/ati-drivers-11.8.ebuild similarity index 100% rename from x11-drivers/ati-drivers/ati-drivers-11.7.ebuild rename to x11-drivers/ati-drivers/ati-drivers-11.8.ebuild diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch b/x11= -drivers/ati-drivers/files/ati-drivers-2.6.39.patch deleted file mode 100644 index 6f3940c..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch +++ /dev/null @@ -1,96 +0,0 @@ -Description: add support for missing kernel lock -Author: Pascal Giard - -diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/fir= egl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_= public.c ---- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_pub= lic.c 2011-04-27 21:30:08.000000000 +0200 -+++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c= 2011-04-27 21:29:27.000000000 +0200 -@@ -1902,13 +1902,17 @@ - /** \brief Grab global kernel lock */ - void ATI_API_CALL KCL_GlobalKernelLock(void) - { -+#ifdef CONFIG_KERNEL_LOCK - lock_kernel(); -+#endif - } -=20 - /** \brief Release global kernel lock */ - void ATI_API_CALL KCL_GlobalKernelUnlock(void) - { -+#ifdef CONFIG_KERNEL_LOCK - unlock_kernel(); -+#endif - } -=20 - /**********************************************************************= *******/ -# Do not include smp_lock.h if the Kernel is built without BKL. -# Closes: #619952 - -diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drm= P.h fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h ---- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h 201= 1-03-24 17:00:28.000000000 +0100 -+++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h 2011-03-= 29 20:39:05.000000000 +0200 -@@ -57,7 +57,11 @@ - #include - #include - #include -+/* with no Big Kernel Lock and linux 2.6.38 -+ and higher smp_lock.h is removed */ -+#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38= ) - #include /* For (un)lock_kernel */ -+#endif - #include - #include - #if defined(__alpha__) || defined(__powerpc__) -diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/fir= egl_public.c fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_= public.c ---- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_pub= lic.c 2011-03-29 20:37:04.000000000 +0200 -+++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c= 2011-03-29 20:39:05.000000000 +0200 -@@ -116,7 +116,16 @@ - #include - #include - #include --#include -+ -+/* with no Big Kernel Lock and linux 2.6.38 -+ and higher is smp_lock.h removed. -+ instead of smp_lock.h is sched.h required */ -+#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38= ) -+#include /* For (un)lock_kernel */ -+#else -+#include -+#endif -+ - // newer SuSE kernels need this - #include -=20 -Description: Add Linux 2.6.39 support - had the following comment until 2.6.38: - . - /* - * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence - * deprecated. - * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as - * appropriate. - */ - #define SPIN_LOCK_UNLOCKED __SPIN_LOCK_UNLOCKED(old_style_spin_init= ) - . - This definition got removed in 2.6.39. Restore it locally until it gets= fixed - upstream. -Author: Miguel Colon -Forwarded: no -Last-Update: 2011-03-30 - -diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/fir= egl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_= public.c ---- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_pub= lic.c 2011-04-27 21:48:43.000000000 +0200 -+++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c= 2011-04-27 21:49:36.000000000 +0200 -@@ -1060,7 +1060,12 @@ - dev->pubdev.signature =3D FGL_DEVICE_SIGNATURE; -=20 - for (i =3D 0; i < __KE_MAX_SPINLOCKS; i++) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) - dev->spinlock[i] =3D SPIN_LOCK_UNLOCKED; -+#else -+ dev->spinlock[i] =3D __SPIN_LOCK_UNLOCKED(old_style_spin_init); -+#endif -+ -=20 - for (i=3D0; i < __KE_MAX_SEMAPHORES; i++) - sema_init(&dev->struct_sem[i], 1);