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

["Enrico Tagliavini" <enrico.tagliavini@gmail.com>]

commit:     7081be5f3d61574c1f48bba681dd981d7437a49a
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Fri Jun 17 11:13:50 2011 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Fri Jun 17 11:13:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7081be5f

[ati-drivers] 11.6 bump & close #371851 #368005

---
 x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild |    2 +-
 ...drivers-11.5.ebuild => ati-drivers-11.6.ebuild} |   30 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild
index b279410..7ca6011 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild
@@ -127,7 +127,7 @@ QA_DT_HASH="
 _check_kernel_config() {
 	local failed=0
 	local error=""
-	if kernel_is -lt 2 6; then
+	if ! kernel_is ge 2 6; then
 		eerror "You need a 2.6 linux kernel to compile against!"
 		die "No 2.6 Kernel found"
 	fi

diff --git a/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
similarity index 97%
rename from x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
index c10061c..41a2fc1 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
@@ -84,7 +84,7 @@ QA_WX_LOAD="
 QA_PRESTRIPPED="
 	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
 	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
 	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
 	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
 	usr/lib\(32\|64\)\?/libaticaldd.so
@@ -127,7 +127,7 @@ QA_DT_HASH="
 _check_kernel_config() {
 	local failed=0
 	local error=""
-	if ! kernel_is 2 6; then
+	if ! kernel_is ge 2 6; then
 		eerror "You need a 2.6 linux kernel to compile against!"
 		die "No 2.6 Kernel found"
 	fi
@@ -200,7 +200,7 @@ _check_kernel_config() {
 		failed=1
 	fi
 
-	kernel_is ge 2 6 37 && if ! linux_chkconfig_present BKL ; then
+	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
 		eerror "${P} requires BKL."
 		eerror "Please enable the Big Kernel Lock:"
 		eerror "Kernel hacking  --->"
@@ -290,8 +290,10 @@ src_prepare() {
 		fi
 	fi
 
-	# Fix a known compilation error
-	epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
+	# Experimental 2.6.39 support
+	if kernel_is -ge 2 6 39 ; then
+		epatch "${FILESDIR}"/ati-drivers-2.6.39.patch || die "epatch failed"
+	fi
 
 	# These are the userspace utilities that we also have source for.
 	# We rebuild these later.
@@ -423,15 +425,6 @@ src_install() {
 	# We cleaned out the compilable stuff in src_unpack
 	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
 
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
 	# Common files.
 	# etc.
 	insinto /etc/ati
@@ -529,6 +522,15 @@ src_install-libs() {
 		${ATI_ROOT}/extensions/FGL.renamed.libglx.so
 	dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
 
+	# other libs
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed some row above
+	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
 	# DRI modules, installed into the path used by recent versions of mesa.
 	exeinto /usr/$(get_libdir)/dri
 	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so