[arch-commits] CVS update of extra/modules/ati-fglrx (3 files)
Travis Willard
travis at archlinux.org
Mon Apr 23 03:57:04 UTC 2007
Date: Sunday, April 22, 2007 @ 23:57:04
Author: travis
Path: /home/cvs-extra/extra/modules/ati-fglrx
Removed: PKGBUILD (1.34) ati-fglrx.install (1.10) firegl_public.patch (1.1)
Renamed to fglrx due to AMD's dropping of ATI branding
---------------------+
PKGBUILD | 58 ----------------------------
ati-fglrx.install | 35 -----------------
firegl_public.patch | 101 --------------------------------------------------
3 files changed, 194 deletions(-)
Index: extra/modules/ati-fglrx/PKGBUILD
diff -u extra/modules/ati-fglrx/PKGBUILD:1.34 extra/modules/ati-fglrx/PKGBUILD:removed
--- extra/modules/ati-fglrx/PKGBUILD:1.34 Wed Mar 28 22:16:47 2007
+++ extra/modules/ati-fglrx/PKGBUILD Sun Apr 22 23:57:04 2007
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD,v 1.34 2007/03/29 02:16:47 travis Exp $
-# Maintainer: James Rayner <iphitus at gmail.com>
-# Maintainer: Travis Willard <travisw at wmpub.ca>
-# Contributor: amdviaman
-
-pkgname=ati-fglrx
-pkgver=8.35.5
-pkgrel=1
-pkgdesc="ATI proprietary binary drivers for >= r300 chipsets. Drivers for the Linux kernel."
-arch=('i686' 'x86_64')
-url="http://www.ati.com"
-license=('custom:"ATI"') #license provided by ati-fglrx-utils package
-depends=('ati-fglrx-utils' 'kernel26')
-makedepends=()
-conflicts=('ati-drivers-module' 'ati-drivers-arch' 'nvidia')
-options=('!strip')
-install=ati-fglrx.install
-_kernver=2.6.20-ARCH
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run firegl_public.patch)
-
-build() {
- cd $startdir/src
-
- [ "$CARCH" = "i686" ] && _arch="x86"
- [ "$CARCH" = "x86_64" ] && _arch="x86_64"
-
- chmod a+x ati-driver-installer-$pkgver-x86.x86_64.run
- ./ati-driver-installer-$pkgver-x86.x86_64.run --extract archive_files
-
-
- cp $startdir/src/archive_files/arch/${_arch}/* $startdir/src/ -r
- cp $startdir/src/archive_files/common/* $startdir/src/ -r
-
- if [ "$CARCH" == "x86_64" ]; then
- cp $startdir/src/archive_files/x710_64a/* $startdir/src/ -r
- else
- cp $startdir/src/archive_files/x710/* $startdir/src/ -r
- fi
- cd $startdir/src
- cd $startdir/src/lib/modules/fglrx/build_mod/
-
- # Build the kernel module
- patch -Np0 -i $startdir/src/firegl_public.patch || return 1
- cp 2.6.x/Makefile .
- make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" modules || return 1
-
- # Install the kernel module
- install -m 644 -D $startdir/src/lib/modules/fglrx/build_mod/fglrx.ko \
- $startdir/pkg/lib/modules/${_kernver}/video/fglrx.ko
-
- sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/ati-fglrx.install
-
-}
-
-md5sums=('c580c83cbf99007a4256fd40368cb2d9'
- 'a55c9aefa45f190628b5e32aaa4594f6')
-sha1sums=('07d02058a958a20c9b80a1802ff64524ad9a8b95'
- 'e776766e9c79c4af0a2ee55e73404fcded93190d')
Index: extra/modules/ati-fglrx/ati-fglrx.install
diff -u extra/modules/ati-fglrx/ati-fglrx.install:1.10 extra/modules/ati-fglrx/ati-fglrx.install:removed
--- extra/modules/ati-fglrx/ati-fglrx.install:1.10 Tue Feb 6 07:43:00 2007
+++ extra/modules/ati-fglrx/ati-fglrx.install Sun Apr 22 23:57:04 2007
@@ -1,35 +0,0 @@
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
-# arg 1: the new package version
-pre_install() {
- /bin/true
-}
-
-# arg 1: the new package version
-post_install() {
- echo "PLEASE NOTE:"
- echo "--------------------------------------------------------------"
- echo "You can use the tool 'aticonfig' to generate an xorg.conf file."
- echo "Remember to add fglrx to the MODULES list in /etc/rc.conf."
- echo "--------------------------------------------------------------"
- KERNEL_VERSION=2.6.20-ARCH
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- KERNEL_VERSION=2.6.20-ARCH
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-# arg 1: the old package version
-post_remove() {
- KERNEL_VERSION=2.6.20-ARCH
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
Index: extra/modules/ati-fglrx/firegl_public.patch
diff -u extra/modules/ati-fglrx/firegl_public.patch:1.1 extra/modules/ati-fglrx/firegl_public.patch:removed
--- extra/modules/ati-fglrx/firegl_public.patch:1.1 Wed Mar 28 22:16:47 2007
+++ extra/modules/ati-fglrx/firegl_public.patch Sun Apr 22 23:57:04 2007
@@ -1,101 +0,0 @@
---- firegl_public.c.old 2007-03-28 21:39:58.000000000 -0400
-+++ firegl_public.c 2007-03-28 21:39:46.000000000 -0400
-@@ -23,6 +23,8 @@
-
- // ============================================================
- #include <linux/version.h>
-+#include <linux/sched.h>
-+#include <linux/freezer.h>
- #ifdef MODVERSIONS
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71)
- #include <linux/modversions.h>
-@@ -204,6 +204,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);
-@@ -5005,15 +5069,9 @@
-
- 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);
-+ ret = 1;
-+ slabcache_obj->cache = NULL;
-
- DBG_LEAVE("%d", ret);
- return ret;
More information about the arch-commits
mailing list