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

[Enrico Tagliavini]

commit:     c859ae87b336c0bfa8fee8b035919a3b4b973b92
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 20:27:24 2011 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 20:27:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c859ae87

[ati-drivers] version bump and PowerXpress support added

Finally the PowerXpress support should be there.
Be aware i don't have the hardware to test on
so this work should be tested.
The switch can be done with amdcccle or aticonfig
tools. Needless to say only root can do that.
All the libs symlinks are removed since they
should not be needed with the custom switchlib{GL,glx}
scripts, instead eselect is used.

Many many thanks to gdbalbuzard [0] and chickpea [1]
for the help!

A null src_test was added since the package provides no test
functions.

[0] https://forums.gentoo.org/viewtopic-p-6748306.html?sid=789ed92ff252599668e53fbbcaf8b936#6748306
[1] https://bugs.sabayon.org/show_bug.cgi?id=2210

---
 ...drivers-11.8.ebuild => ati-drivers-11.9.ebuild} |   29 +++-------
 .../ati-drivers-fix_compilation-bug-297322.patch   |   25 ---------
 x11-drivers/ati-drivers/files/switchlibGL          |   58 ++++++++++++++++++++
 3 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-11.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
similarity index 95%
rename from x11-drivers/ati-drivers/ati-drivers-11.8.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
index dfb3317..ec6093e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
@@ -25,8 +25,6 @@ SLOT="1"
 
 RDEPEND="
 	<=x11-base/xorg-server-1.10.99
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.7
 	sys-power/acpid
 	x11-apps/xauth
@@ -86,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/fglrx-libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
 	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
 	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
 	usr/lib\(32\|64\)\?/libaticaldd.so
@@ -346,7 +344,7 @@ src_compile() {
 	# These extra libs/utils either have an Imakefile that does not
 	# work very well without tweaking or a Makefile ignoring CFLAGS
 	# and the like. We bypass those.
-
+src_test() { :; } # no tests present
 	# The -DUSE_GLU is needed to compile using nvidia headers
 	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
 	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
@@ -355,6 +353,8 @@ src_compile() {
 	eend $?
 }
 
+src_test() { :; } # no tests presentsrc_test() { :; } # no tests present
+
 src_install() {
 	use modules && linux-mod_src_install
 
@@ -473,14 +473,10 @@ src_install() {
 	newconfd "${T}"/atieventsd.conf atieventsd
 
 	# PowerXpress stuff
-	local alllibdir="$(get_libdir)"
-	use multilib && alllibdir="lib64 lib32"
-	for libdir in ${alllibdir}
-	do
-		dosym /usr/${libdir}/opengl/xorg-x11/lib/libGL.so.1.2 \
-			/usr/${libdir}/fglrx/libGL.so.1.2
-		dosym ./libGL.so.1.2 /usr/${libdir}/fglrx/fglrx-libGL.so.1.2
-	done
+	exeinto /usr/$(get_libdir)/fglrx
+	doexe "${FILESDIR}"/switchlibGL || die "newexe switchlibGL failed"
+	dosym ./switchlibGL /usr/$(get_libdir)/fglrx/switchlibglx || die \
+	"dosym switchlibglx failed"
 }
 
 src_install-libs() {
@@ -507,17 +503,10 @@ src_install-libs() {
 		libGL.so.${libver}
 	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
 	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2 \
-		${ATI_ROOT}/lib/FGL.renamed.libGL.so.1.2
-	dosym ./libGL.so.1.2 ${ATI_ROOT}/lib/fglrx-libGL.so.1.2
 
 	exeinto ${ATI_ROOT}/extensions
 	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/extensions/libglx.so \
-		${ATI_ROOT}/extensions/FGL.renamed.libglx.so
-	dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
+	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
 
 	# other libs
 	exeinto /usr/$(get_libdir)

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch b/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
deleted file mode 100644
index e2af915..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1441,7 +1441,9 @@
- todo !!!
- #endif
- 
--unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
-+void __cmpxchg_wrong_size(void) {}
-+
-+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
---- common/lib/modules/fglrx/build_mod/firegl_public.h
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h
-@@ -441,7 +441,8 @@
- extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
- extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
- 
--extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
-+extern void __cmpxchg_wrong_size(void);
-+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
-                       unsigned long new, int size);
- 
- #define __ke_cmpxchg(ptr,o,n)                        \

diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-drivers/files/switchlibGL
new file mode 100644
index 0000000..e8fac1e
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/switchlibGL
@@ -0,0 +1,58 @@
+#!/bin/bash
+#  switchlibGL
+#
+#  Copyright (c) 2011 Advanced Micro Devices, Inc.
+#
+#  Purpose:
+#    For switch between AMD and Intel graphic driver library.
+#
+#  Usage:
+#  switchlibGL   amd|intel|query
+#    amd:   switches to the AMD version of libGL.
+#    intel: switches to the open-source version of libGL .
+#    query: checks, which version is currently active and prints either "amd"
+#    or "intel" or "unknown" on the standard output.
+#    must be root to execute this script
+
+ARCH=`uname -m`
+E_ERR=1
+
+# Check if root
+if [ "`whoami`" != "root" ]; then
+  echo "Must be root to run this script." 1>&2
+  exit $E_ERR
+fi
+
+# One parameter
+if [ $# -ne 1 ]; then
+  echo "Usage: `basename $0` amd|intel|query " 1>&2
+  echo "Please choose one parameter " 1>&2
+  exit $E_ERR
+fi
+
+
+# Switch to right mode
+case "$1" in
+  "amd" )
+        eselect opengl set ati
+  ;;
+  "intel" )
+        eselect opengl set xorg-x11
+  ;;
+  "query" )
+        current=`eselect opengl show`
+        case "$current" in
+          "ati" )
+             echo "amd"
+          ;;
+          "xorg-x11" )
+             echo "intel"
+          ;;
+        esac
+  ;;
+  * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
+  # other than amd|intel|query parameter report an error
+esac
+
+#  A zero return value from the script upon exit indicates success.
+exit 0