[arch-commits] CVS update of unstable/x11/fglrx-mm (3 files)
Travis Willard
travis at archlinux.org
Thu Nov 22 04:57:08 UTC 2007
Date: Wednesday, November 21, 2007 @ 23:57:08
Author: travis
Path: /home/cvs-unstable/unstable/x11/fglrx-mm
Removed: PKGBUILD (1.7) fglrx-mm.install (1.2)
firegl_public-2-6-23.patch (1.1)
Removing fglrx-mm. Replaced by catalyst-mm.
----------------------------+
PKGBUILD | 60 ------------------------------
fglrx-mm.install | 35 -----------------
firegl_public-2-6-23.patch | 86 -------------------------------------------
3 files changed, 181 deletions(-)
Index: unstable/x11/fglrx-mm/PKGBUILD
diff -u unstable/x11/fglrx-mm/PKGBUILD:1.7 unstable/x11/fglrx-mm/PKGBUILD:removed
--- unstable/x11/fglrx-mm/PKGBUILD:1.7 Mon Aug 20 22:39:29 2007
+++ unstable/x11/fglrx-mm/PKGBUILD Wed Nov 21 23:57:08 2007
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD,v 1.7 2007/08/21 02:39:29 travis Exp $
-# Maintainer: Travis Willard <travisw at wmpub.ca>
-# Contributor: amdviaman
-
-pkgname=fglrx-mm
-pkgver=8.40.4
-_kernel_version=2.6.23
-pkgrel=1
-pkgdesc="Proprietary AMD/ATI kernel drivers for Radeon brand cards. mm kernel."
-arch=('i686' 'x86_64')
-url="http://www.ati.com"
-#license installed in /usr/share/licenses by fglrx-utils package
-license=('custom:fglrx')
-depends=("fglrx-utils>=${pkgver}" "kernel26mm>=${_kernel_version}.rc1.mm1")
-makedepends=()
-replaces=('ati-fglrx-mm')
-install=${pkgname}.install
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run firegl_public-2-6-23.patch)
-
-_kernver=${_kernel_version}-mm
-
-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/
-
- patch -Np0 -i $startdir/src/firegl_public-2-6-23.patch
-
- # Build the kernel module
- 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/$install
-
-}
-
-md5sums=('d02add61ee36a4183510317c3c42b147'
- '3bcb3038a0905942f61418d69b8b895b')
-sha1sums=('6260c8596529eac34fabe3437678afe6e2761490'
- 'c1e29b25712e0f0cbd0047ced5d9d501ea9ed0aa')
Index: unstable/x11/fglrx-mm/fglrx-mm.install
diff -u unstable/x11/fglrx-mm/fglrx-mm.install:1.2 unstable/x11/fglrx-mm/fglrx-mm.install:removed
--- unstable/x11/fglrx-mm/fglrx-mm.install:1.2 Tue Aug 14 08:50:04 2007
+++ unstable/x11/fglrx-mm/fglrx-mm.install Wed Nov 21 23:57:08 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.23-mm
- 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.23-mm
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-# arg 1: the old package version
-post_remove() {
- KERNEL_VERSION=2.6.23-mm
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
Index: unstable/x11/fglrx-mm/firegl_public-2-6-23.patch
diff -u unstable/x11/fglrx-mm/firegl_public-2-6-23.patch:1.1 unstable/x11/fglrx-mm/firegl_public-2-6-23.patch:removed
--- unstable/x11/fglrx-mm/firegl_public-2-6-23.patch:1.1 Tue Aug 14 08:50:04 2007
+++ unstable/x11/fglrx-mm/firegl_public-2-6-23.patch Wed Nov 21 23:57:08 2007
@@ -1,86 +0,0 @@
---- firegl_public.c.orig 2007-08-10 23:59:21.000000000 +0200
-+++ firegl_public.c 2007-08-13 20:00:26.000000000 +0200
-@@ -214,6 +214,56 @@
- #define preempt_enable()
- #endif
-
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
-+#if defined(__i386__)
-+#define ptep_test_and_clear_dirty(vma, addr, ptep) ({ \
-+ int __ret = 0; \
-+ if (pte_dirty(*(ptep))) \
-+ __ret = test_and_clear_bit(_PAGE_BIT_DIRTY, \
-+ &(ptep)->pte_low); \
-+ if (__ret) \
-+ pte_update((vma)->vm_mm, addr, ptep); \
-+ __ret; \
-+})
-+
-+static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_USER; }
-+static inline int pte_user(pte_t pte) { return (pte).pte_low & _PAGE_USER; }
-+#ifdef CONFIG_X86_PAE
-+/*
-+ * Is the pte executable?
-+ */
-+static inline int pte_x(pte_t pte)
-+{
-+ return !(pte_val(pte) & _PAGE_NX);
-+}
-+
-+/*
-+ * All present user-pages with !NX bit are user-executable:
-+ */
-+static inline int pte_exec(pte_t pte)
-+{
-+ return pte_user(pte) && pte_x(pte);
-+}
-+#else
-+static inline int pte_exec(pte_t pte)
-+{
-+ return pte_user(pte);
-+}
-+#endif /* PAE */
-+
-+#elif defined(__x86_64__)
-+static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma,
-+ unsigned long addr, pte_t *ptep)
-+{
-+ if (!pte_dirty(*ptep))
-+ return 0;
-+ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
-+}
-+static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
-+static inline int pte_exec(pte_t pte) { return !(pte_val(pte) & _PAGE_NX); }
-+#endif
-+#endif
-+
- // ============================================================
- /* globals */
-
-@@ -2356,7 +2406,7 @@ void ATI_API_CALL __ke_put_vm_page_table
- #ifndef ptep_clear_flush_dirty
- #define ptep_clear_flush_dirty(__vma, __address, __ptep) \
- ({ \
-- int __dirty = ptep_test_and_clear_dirty(__ptep); \
-+ int __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); \
- if (__dirty) \
- flush_tlb_page(__vma, __address); \
- __dirty; \
-@@ -5303,7 +5353,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_R
- /** \brief Type definition of the structure describing Slab Cache object */
- typedef struct tag_kasSlabCache_t
- {
-- kmem_cache_t* cache; /* OS slab cache object */
-+ struct kmem_cache *cache; /* OS slab cache object */
- spinlock_t lock; /* OS spinlock object protecting the cache */
- unsigned int routine_type; /* Type of routine the cache might be accessed from */
- char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */
-@@ -5349,7 +5399,7 @@ unsigned int ATI_API_CALL KAS_SlabCache_
- DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
-
- if ((slabcache_obj->cache =
-- kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
-+ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
- {
- ret = 1;
- }
More information about the arch-commits
mailing list