latest for testing

svn path=/; revision=241

18 files changed, 384 insertions, 0 deletions

diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati
new file mode 100644
index 0000000..27180e0
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/09ati
@@ -0,0 +1,3 @@
+PATH=/opt/ati/bin
+ROOTPATH=/opt/ati/bin:/opt/ati/sbin
+MANPATH=/opt/ati/man
diff --git a/x11-drivers/ati-drivers/files/8.532/CVS/Entries b/x11-drivers/ati-drivers/files/8.532/CVS/Entries
new file mode 100644
index 0000000..79dd080
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.532/CVS/Entries
@@ -0,0 +1,2 @@
+/ati-powermode-opt-path-2.patch/1.1/Sat Apr 26 10:50:46 2008//
+D
diff --git a/x11-drivers/ati-drivers/files/8.532/CVS/Repository b/x11-drivers/ati-drivers/files/8.532/CVS/Repository
new file mode 100644
index 0000000..2360779
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.532/CVS/Repository
@@ -0,0 +1 @@
+gentoo-x86/x11-drivers/ati-drivers/files/8.476
diff --git a/x11-drivers/ati-drivers/files/8.532/CVS/Root b/x11-drivers/ati-drivers/files/8.532/CVS/Root
new file mode 100644
index 0000000..8e31e07
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.532/CVS/Root
@@ -0,0 +1 @@
+je_fro@cvs.gentoo.org:/var/cvsroot
diff --git a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch
new file mode 100644
index 0000000..f5a35a3
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch
@@ -0,0 +1,42 @@
+diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
+--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
+@@ -4,6 +4,8 @@
+ # Control script for ACPI lid state and AC adapter state
+ #
+ 
++aticonfig='/opt/bin/aticonfig'
++
+ getXuser() {
+         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
+         if [ x"$user" = x"" ]; then
+@@ -47,7 +49,7 @@
+ done
+ 
+ #If PPLIB is enabled
+-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
+ if [ $? = 0 ]; then
+    echo "Has PPLIB"
+    has_pplib=1
+@@ -61,15 +63,15 @@
+ if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
+     echo "Low power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
++        su $user -c "$aticonfig --set-powerstate=1"
+     fi
+ else
+     echo "high power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
++	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
+     fi
+ fi
+
diff --git a/x11-drivers/ati-drivers/files/CVS/Entries b/x11-drivers/ati-drivers/files/CVS/Entries
new file mode 100644
index 0000000..a6d5a28
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/CVS/Entries
@@ -0,0 +1,11 @@
+/09ati/1.2/Thu Jul  6 13:04:05 2006//
+/ati-drivers-2.6.19.patch/1.1/Sun Dec  3 15:51:37 2006//
+/ati-drivers-2.6.20.patch/1.1/Mon Feb  5 10:01:57 2007//
+/ati-drivers-8.35.5-2.6.19.patch/1.1/Fri Mar 30 15:46:11 2007//
+/ati-drivers-8.35.5-2.6.20.patch/1.2/Fri Mar 30 15:46:11 2007//
+/ati-powermode-opt-path.patch/1.1/Sat Feb 10 00:01:13 2007//
+/ati-powermode.sh.patch/1.1/Fri Aug  4 12:20:19 2006//
+/atieventsd.init/1.3/Fri May 18 23:58:01 2007//
+/atieventsd.rc6/1.2/Fri Aug  4 12:20:19 2006//
+/libGL.la.in/1.1/Tue Jun  5 18:49:04 2007//
+D
diff --git a/x11-drivers/ati-drivers/files/CVS/Entries.Log b/x11-drivers/ati-drivers/files/CVS/Entries.Log
new file mode 100644
index 0000000..fa2699a
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/CVS/Entries.Log
@@ -0,0 +1,10 @@
+A D/8.37.6////
+A D/8.40.4////
+A D/8.42.3////
+A D/8.433////
+A D/8.443.1////
+A D/8.452////
+A D/8.455.2////
+A D/8.471.3////
+A D/8.476////
+R D/8.42.3////
diff --git a/x11-drivers/ati-drivers/files/CVS/Repository b/x11-drivers/ati-drivers/files/CVS/Repository
new file mode 100644
index 0000000..12184ee
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/CVS/Repository
@@ -0,0 +1 @@
+gentoo-x86/x11-drivers/ati-drivers/files
diff --git a/x11-drivers/ati-drivers/files/CVS/Root b/x11-drivers/ati-drivers/files/CVS/Root
new file mode 100644
index 0000000..8e31e07
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/CVS/Root
@@ -0,0 +1 @@
+je_fro@cvs.gentoo.org:/var/cvsroot
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
new file mode 100644
index 0000000..160565a
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
@@ -0,0 +1,67 @@
+diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c
+--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c	2006-09-19 19:30:42.000000000 -0500
++++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c	2006-10-27 09:44:23.902749464 -0500
+@@ -61,7 +61,6 @@
+ #include <linux/modversions.h>
+ #endif
+ #endif
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/init.h>
+diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c
+--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-09-19 19:30:42.000000000 -0500
++++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-10-27 09:44:34.265174136 -0500
+@@ -99,9 +99,6 @@
+ #endif
+ #endif
+ 
+-#include <linux/config.h>
+-
+-
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h
+--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h	2006-09-19 19:30:42.000000000 -0500
++++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h	2006-10-27 09:44:52.502401656 -0500
+@@ -38,7 +38,6 @@
+ #define _DRM_H_
+ 
+ #if defined(__linux__)
+-#include <linux/config.h>
+ #include <asm/ioctl.h>		/* For _IO* macros */
+ #define DRM_IOCTL_NR(n)		_IOC_NR(n)
+ #define DRM_IOC_VOID		_IOC_NONE
+diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h
+--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h	2006-09-19 19:30:42.000000000 -0500
++++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h	2006-10-27 09:45:03.912667032 -0500
+@@ -42,7 +42,6 @@
+  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
+ #include <asm/current.h>
+ #endif /* __alpha__ */
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/miscdevice.h>
+diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-09-19 19:30:42.000000000 -0500
++++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-10-27 09:45:47.463046368 -0500
+@@ -67,9 +67,6 @@
+  * for example for CPU hot-plugging. I wonder why a desktop
+  * distribution would even include such a kernel patch. */
+ #ifdef CONFIG_MEM_MIRROR
+-/* Prevent linux/config.h from being included again in subsequent
+- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */
+-#include <linux/config.h>
+ #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules."
+ #warning "This will break page tracking when the fglrx kernel module is used."
+ #undef CONFIG_MEM_MIRROR
+@@ -86,7 +83,6 @@
+ #include <asm/unistd.h> /* for installing the patch wrapper */
+ #include <linux/module.h>
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/fs.h>
+ #include <linux/proc_fs.h>
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
new file mode 100644
index 0000000..aeaba71
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
@@ -0,0 +1,73 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-18 10:58:15.000000000 -0500
++++ common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-18 11:14:04.000000000 -0500
+@@ -181,6 +181,70 @@
+ int errno;
+ #endif // __ia64__
+ 
++#if defined(__i386__)
++#define __syscall_return(type, res) \
++do { \
++        if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \
++                errno = -(res); \
++                res = -1; \
++        } \
++        return (type) (res); \
++} while (0)
++#define _syscall2(type,name,type1,arg1,type2,arg2) \
++type name(type1 arg1,type2 arg2) \
++{ \
++long __res; \
++__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
++        : "=a" (__res) \
++        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
++        : "memory"); \
++__syscall_return(type,__res); \
++}
++
++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
++type name(type1 arg1,type2 arg2,type3 arg3) \
++{ \
++long __res; \
++__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
++        : "=a" (__res) \
++        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
++                  "d" ((long)(arg3)) : "memory"); \
++__syscall_return(type,__res); \
++}
++#elif defined(__x86_64__)
++#define __syscall_clobber "r11","rcx","memory" 
++#define __syscall "syscall"
++
++#define __syscall_return(type, res) \
++do { \
++        if ((unsigned long)(res) >= (unsigned long)(-127)) { \
++                errno = -(res); \
++                res = -1; \
++        } \
++        return (type) (res); \
++} while (0)
++#define _syscall2(type,name,type1,arg1,type2,arg2) \
++type name(type1 arg1,type2 arg2) \
++{ \
++long __res; \
++__asm__ volatile (__syscall \
++        : "=a" (__res) \
++        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \
++__syscall_return(type,__res); \
++}
++
++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
++type name(type1 arg1,type2 arg2,type3 arg3) \
++{ \
++long __res; \
++__asm__ volatile (__syscall \
++        : "=a" (__res) \
++        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
++                  "d" ((long)(arg3)) : __syscall_clobber); \
++__syscall_return(type,__res); \
++}
++#endif
++
+ // int mlock(const void *addr, size_t len);
+ _syscall2(int, mlock, const void *, addr, size_t, len )
+ // int munlock(const void *addr, size_t len);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
new file mode 100644
index 0000000..665d8d6
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
@@ -0,0 +1,33 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-29 23:48:46.000000000 +0200
++++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-30 00:15:21.000000000 +0200
+@@ -5055,7 +5057,6 @@
+  */
+ unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache)
+ {
+-    unsigned int ret = 0;
+     kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache;
+ 
+     DBG_ENTER("0x%08X", hSlabCache);
+@@ -5069,18 +5070,11 @@
+ 
+     DBG_TRACE("destroying slab object '%s'", slabcache_obj->name);
+ 
+-    if (kmem_cache_destroy(slabcache_obj->cache) == 0)
+-    {
+-        ret = 1;
+-        slabcache_obj->cache = NULL;
+-    }
+-    else
+-    {
+-        DBG_ERROR("destroying failed");
+-    }
++    kmem_cache_destroy(slabcache_obj->cache);
++    slabcache_obj->cache = NULL;
+ 
+-    DBG_LEAVE("%d", ret);
+-    return ret;
++    DBG_LEAVE("1");
++    return 1;
+ }
+ 
+ /** \brief Allocate an entry in a Slab Cache
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
new file mode 100644
index 0000000..c830d38
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
@@ -0,0 +1,11 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-29 23:48:46.000000000 +0200
++++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-30 00:15:21.000000000 +0200
+@@ -171,6 +171,8 @@
+ #endif
+ #endif
+ 
++#include <linux/freezer.h>
++
+ #include <linux/kmod.h>
+ 
+ // To enable DBG_* macros set this variable to nonzero
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
new file mode 100644
index 0000000..fb6119e
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
@@ -0,0 +1,22 @@
+=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh'
+--- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-02-09 12:25:40 +0000
++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-02-09 12:28:54 +0000
+@@ -46,7 +46,7 @@
+ 	getXuser;
+ 	if [ x"$XAUTHORITY" != x"" ]; then
+ 	    export DISPLAY=":$displaynum"	    
+-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
++	    su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now"
+ 	fi
+     done
+ else
+@@ -56,7 +56,7 @@
+ 	getXuser;
+ 	if [ x"$XAUTHORITY" != x"" ]; then
+ 	    export DISPLAY=":$displaynum"
+-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
++	    su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now"
+ 	fi
+     done
+ fi
+
diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
new file mode 100644
index 0000000..cd776e0
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
@@ -0,0 +1,32 @@
+diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
+--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
+@@ -17,6 +17,10 @@
+         fi
+ }
+ 
++aticonfig='/opt/ati/bin/aticonfig'
++
++# default high power state
++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
+ 
+ grep -q closed /proc/acpi/button/lid/*/state
+ if [ $? = 0 ]; then
+@@ -46,7 +50,7 @@
+ 	getXuser;
+ 	if [ x"$XAUTHORITY" != x"" ]; then
+ 	    export DISPLAY=":$displaynum"	    
+-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
++	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
+ 	fi
+     done
+ else
+@@ -56,7 +60,7 @@
+ 	getXuser;
+ 	if [ x"$XAUTHORITY" != x"" ]; then
+ 	    export DISPLAY=":$displaynum"
+-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
++	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
+ 	fi
+     done
+ fi
diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init
new file mode 100644
index 0000000..73139ce
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/atieventsd.init
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
+
+depend() {
+    need acpid
+}
+
+start() {
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
+    eend $?
+}
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6
new file mode 100644
index 0000000..2180e0e
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/atieventsd.rc6
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $
+
+depend() {
+    need acpid
+}
+
+start() {
+    start-stop-daemon --start --pidfile /var/run/atieventsd.pid \
+      --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS}
+    local pid=`pidof atieventsd`
+    echo $pid > /var/run/atieventsd.pid
+    eend $?
+}
+
+stop() {
+    start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid
+    eend $?
+}
+
diff --git a/x11-drivers/ati-drivers/files/libGL.la.in b/x11-drivers/ati-drivers/files/libGL.la.in
new file mode 100644
index 0000000..7fdc409
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/libGL.la.in
@@ -0,0 +1,32 @@
+# libGL.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libGL.so.1'
+
+# Names of this library.
+library_names='libGL.so.${libmajor}.${libminor} libGL.so.${libmajor} libGL.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs='-L/usr/${libdir} -lX11 -lXext -ldl'
+
+# Version information for libGL.
+current=1
+age=0
+revision=${revision}
+
+# Is this an already installed library?
+installed=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/${libdir}'