[fglrx-8.23.7-2-x86_64 voroskoi <[EMAIL PROTECTED]>**20060402054131 added x86_64 to archs updated README.Frugalware patches taken from gentoo, thx :) ] { hunk ./extra/source/x11/fglrx/FrugalBuild 1 -# Last modified: Thu, 23 Mar 2006 13:58:17 +0100 +# Last modified: Sun, 02 Apr 2006 07:30:58 +0200 hunk ./extra/source/x11/fglrx/FrugalBuild 18 -archs=('i686') +archs=('i686' 'x86_64') hunk ./extra/source/x11/fglrx/FrugalBuild 21 -source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-i386.run README.Frugalware) +[ "$CARCH" == "i686" ] && source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-i386.run) +[ "$CARCH" == "x86_64" ] && source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/64bit/ati-driver-installer-8.23.7-x86_64.run ati-drivers-8.22.5-intermodule.patch ati-drivers-8.23.7-noiommu.patch) +source=([EMAIL PROTECTED] README.Frugalware) hunk ./extra/source/x11/fglrx/FrugalBuild 25 -sha1sums=('331f03f017b2f5187376c41905e27f41a8e01650' \ - 'eb880355272671124a9f9c71a243804d6be4ce7e') +[ "$CARCH" == "i686" ] && sha1sums=('331f03f017b2f5187376c41905e27f41a8e01650') +[ "$CARCH" == "x86_64" ] && sha1sums=('a1754ec13a8312d0eedaafde9c7bbaeb4007c283' \ + 'a4e90a325aff2c2e17d441fda3697d5956a2ce21' \ + '5b043683a457417d0d55cee12aff8fc0f040114f') +sha1sums=([EMAIL PROTECTED] 'ff1bf5549896234bb7a17abbad8caa6578b19c4a') hunk ./extra/source/x11/fglrx/FrugalBuild 35 -subarchs=('i686') +subarchs=('i686' 'x86_64') hunk ./extra/source/x11/fglrx/FrugalBuild 40 - chmod a+x ati-driver-installer-$pkgver-i386.run - ./ati-driver-installer-$pkgver-i386.run --extract ATi + if [ "$CARCH" == "i686" ]; then + chmod a+x ati-driver-installer-$pkgver-i386.run + ./ati-driver-installer-$pkgver-i386.run --extract ATi + cp -r $Fsrcdir/ATi/arch/x86/* $Fsrcdir/ || Fdie + cp -r $Fsrcdir/ATi/x690/* $Fsrcdir/ || Fdie + fi + if [ "$CARCH" == "x86_64" ]; then + chmod a+x ati-driver-installer-$pkgver-x86_64.run + ./ati-driver-installer-$pkgver-x86_64.run --extract ATi + cp -r $Fsrcdir/ATi/arch/x86_64/* $Fsrcdir/ || Fdie + cp -r $Fsrcdir/ATi/x690_64a/* $Fsrcdir/ || Fdie + fi hunk ./extra/source/x11/fglrx/FrugalBuild 53 - cp -r $Fsrcdir/ATi/arch/x86/* $Fsrcdir/ || Fdie hunk ./extra/source/x11/fglrx/FrugalBuild 54 - cp -r $Fsrcdir/ATi/x690/* $Fsrcdir/ || Fdie + + if [ "$CARCH" == "x86_64" ]; then + Fcd /lib/modules/fglrx/build_mod + patch -p0 < $Fsrcdir/ati-drivers-8.22.5-intermodule.patch || Fdie + patch -p0 < $Fsrcdir/ati-drivers-8.23.7-noiommu.patch || Fdie + fi hunk ./extra/source/x11/fglrx/FrugalBuild 73 - mv $Fdestdir/usr/X11R6/lib/* $Fdestdir/usr/lib || Fdie + if [ "$CARCH" == "i686" ]; then + Fmessage "Using i686 libs" + mv $Fdestdir/usr/X11R6/lib/* $Fdestdir/usr/lib || Fdie + fi + if [ "$CARCH" == "x86_64" ]; then + Fmessage "Using x86_64 libs" + mv $Fdestdir/usr/X11R6/lib64/* $Fdestdir/usr/lib || Fdie + fi hunk ./extra/source/x11/fglrx/README.Frugalware 1 +########################################################### + +Make sure you have something similar in /etc/fstab: +tmpfs /dev/shm tmpfs defaults 0 0 + +############################################################ + hunk ./extra/source/x11/fglrx/README.Frugalware 13 +############################################################ + +On the following page you can find some useful solutions for +different fglrx problems: +http://www.thinkwiki.org/wiki/Problems_with_fglrx + +############################################################ + addfile ./extra/source/x11/fglrx/ati-drivers-8.22.5-intermodule.patch hunk ./extra/source/x11/fglrx/ati-drivers-8.22.5-intermodule.patch 1 +--- firegl_public.c-orig 2006-02-23 14:54:16.386740016 -0600 ++++ firegl_public.c 2006-02-23 14:56:38.054203288 -0600 +@@ -361,13 +361,15 @@ + } firegl_drm_stub_info_t; + static firegl_drm_stub_info_t firegl_stub_info; + +-#if LINUX_VERSION_CODE < 0x020400 ++#if LINUX_VERSION_CODE > 0x02060F + struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL; + #define inter_module_put(x) + #define inter_module_unregister(x) + #define inter_module_get_request(x,y) firegl_stub_pointer + #define inter_module_register(x,y,z) do { firegl_stub_pointer = z; } while (0) ++#endif + /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */ ++#if LINUX_VERSION_CODE < 0x020400 + #define fops_put(fops) MOD_DEC_USE_COUNT + #define fops_get(fops) (fops); MOD_INC_USE_COUNT + #endif // LINUX_VERSION_CODE < 0x020400 addfile ./extra/source/x11/fglrx/ati-drivers-8.23.7-noiommu.patch hunk ./extra/source/x11/fglrx/ati-drivers-8.23.7-noiommu.patch 1 +--- firegl_public.c.orig 2006-03-21 15:32:05.000000000 +0100 ++++ firegl_public.c 2006-03-21 15:38:06.000000000 +0100 +@@ -2353,7 +2353,7 @@ + + int ATI_API_CALL __ke_no_iommu(void) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) + #ifdef CONFIG_GART_IOMMU + return no_iommu; + #else /* !CONFIG_GART_IOMMU */ } _______________________________________________ Frugalware-darcs mailing list Frugalware-darcs@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-darcs