Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=57262433b84505ab3fe7e2b5800ba7df82996f0c
commit 57262433b84505ab3fe7e2b5800ba7df82996f0c Author: janny <[EMAIL PROTECTED]> Date: Wed Mar 5 10:45:26 2008 +0100 fglrx-fwlive-8.42.3-10-i686 * version bump in fwlive repo diff --git a/source/x11-extra/fglrx-fwlive/2.6.22.patch b/source/x11-extra/fglrx-fwlive/2.6.22.patch deleted file mode 100644 index 850607e..0000000 --- a/source/x11-extra/fglrx-fwlive/2.6.22.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- firegl_public.c-orig 2007-05-16 14:52:12.000000000 -0500 -+++ firegl_public.c 2007-05-16 14:52:48.000000000 -0500 -@@ -144,12 +144,14 @@ - #define EXPORT_NO_SYMBOLS - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - #ifdef __x86_64__ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - #include "linux/ioctl32.h" - #else - #include "asm/ioctl32.h" - #endif -+#endif - - #ifdef __x86_64__ - #include "asm/compat.h" diff --git a/source/x11-extra/fglrx-fwlive/FrugalBuild b/source/x11-extra/fglrx-fwlive/FrugalBuild index acdad31..1d55609 100644 --- a/source/x11-extra/fglrx-fwlive/FrugalBuild +++ b/source/x11-extra/fglrx-fwlive/FrugalBuild @@ -3,13 +3,15 @@ # Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=fglrx-fwlive -pkgver=8.38.6 -pkgrel=2 +_F_archive_name=fglrx +pkgver=8.42.3 +pkgrel=10 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/"; # libstdc++5: no hardware acceleration without it -#Finclude kernel-module -kver=2.6.22-1 +_F_kernelmod_scriptlet=fglrx_module.install +Finclude kernel-module +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` @@ -20,7 +22,7 @@ subdescs=('fglrx kernel module') subdepends=($depends) subgroups=('x11-extra') subarchs=('i686 x86_64') -subinstall=fglrx_module-fwlive.install +subinstall=fglrx_module.install depends=() rodepends=('fglrx_module-fwlive' 'xorg-server' 'libstdc++5') @@ -28,15 +30,16 @@ conflicts=('libgl') provides=('libgl') groups=('x11-extra') archs=('i686' 'x86_64') -install=$pkgname.install +install=$_F_archive_name.install up2date=$pkgver source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run \ - README.Frugalware libGL.la 2.6.22.patch) + README.Frugalware libGL.la \ + fglrx-firegl_public.c-2.6.24.patch) options=([EMAIL PROTECTED] 'nodocs') -sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67' \ +sha1sums=('b8e878e846e0971d49339ee5957acc6482329510' \ 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ - 'e862660a7af445f3d0ac07c360bd786b909f426e') + '5c88075b135bbc6700301d29736a74177b6df860') Xversion=x710 @@ -54,10 +57,7 @@ build() { cp -r $Fsrcdir/ATi/common/* $Fsrcdir/ || Fdie - if [ "$CARCH" == "x86_64" ]; then - Fcd /lib/modules/fglrx/build_mod - patch -p0 < $Fsrcdir/2.6.22.patch || Fdie - fi + patch -p0 < $Fsrcdir/fglrx-firegl_public.c-2.6.24.patch || Fdie # building kernel module Fcd /lib/modules/fglrx/build_mod @@ -66,7 +66,7 @@ build() { Ffile lib/modules/fglrx/build_mod/fglrx.ko $_F_kernelmod_dir/video/fglrx.ko # moving the intresting part to the package - mv $Fsrcdir/usr $Fdestdir || Fdie + mv $Fsrcdir/{usr,etc} $Fdestdir || Fdie # Install into correct paths for Xorg7 Fmkdir /usr/{include,lib/xorg,bin} @@ -80,9 +80,6 @@ build() { mv $Fdestdir/usr/X11R6/lib64/* $Fdestdir/usr/lib || Fdie fi mv $Fdestdir/usr/X11R6/bin/* $Fdestdir/usr/bin || Fdie - # FIXME - [ "$CARCH" == "i686" ] && Fexe ATi/x690/usr/X11R6/bin/fireglcontrolpanel /usr/bin/fireglcontrolpanel - [ "$CARCH" == "x86_64" ] && Fexe ATi/x690_64a/usr/X11R6/bin/fireglcontrolpanel /usr/bin/fireglcontrolpanel Frm /usr/X11R6 # No hardware support without it @@ -95,6 +92,8 @@ build() { Fln ../../dri /usr/lib/xorg/modules/dri # closes #2112 Fln /usr/lib/dri /usr/X11R6/lib/modules/dri + # closes #2498 + Fln lib /usr/X11R6/lib64 # Links Fln libfglrx_pp.so.1.0 /usr/lib/libfglrx_pp.1 @@ -104,9 +103,12 @@ build() { Fln libGL.so.1.2 /usr/lib/libGL.so.1 cp -ar $Fsrcdir/libGL.la $Fdestdir/usr/lib || Fdie - find $Fdestdir -type d |xargs chmod 755 + (find $Fdestdir -type d |xargs chmod 755) || Fdie + # closes #2498 + (find $Fdestdir -perm 744 |xargs chmod 755) || Fdie Fdoc README.Frugalware - Fsplit fglrx_module-fwlive /lib + Fsplit fglrx_module /lib + Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch new file mode 100644 index 0000000..740eb1f --- /dev/null +++ b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch @@ -0,0 +1,104 @@ +--- lib/modules/fglrx/build_mod/firegl_public.c.orig 2007-08-10 23:59:21.000000000 +0200 ++++ lib/modules/fglrx/build_mod/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; \ +@@ -2986,7 +2986,7 @@ + { + return request_irq(irq, + (void(*)(int, void *, struct pt_regs *))handler, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -3009,7 +3009,7 @@ + irq_handler_func = handler; + return request_irq(irq, + ke_irq_handler_wrap, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -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; + } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install b/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install deleted file mode 100644 index 7c80936..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() -{ - echo 'You have successfully installed the ATi proprietary driver!' - echo 'To configure your xserver please run aticonfig!' - echo 'Before using X please restart your computer!' -} - -post_upgrade() -{ - post_install $1 -} - -op=$1 -shift -$op $* - -# vim: ft=sh diff --git a/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install b/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install deleted file mode 100644 index 47e9670..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install +++ /dev/null @@ -1,23 +0,0 @@ -post_install() -{ - [ `grep fglrx < /etc/sysconfig/modules|wc -l` == 0 ] && \ - echo 'fglrx' >> /etc/sysconfig/modules - depmod -a -} - -post_upgrade() -{ - post_install $1 -} - -pre_remove() -{ - [ ! `/sbin/lsmod|grep fglrx|wc -l` == 0 ] && /sbin/rmmod fglrx - sed -i 's|fglrx||g' /etc/sysconfig/modules -} - -op=$1 -shift -$op $* - -# vim: ft=sh _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
