diff options
Diffstat (limited to 'community-testing/catalyst')
-rw-r--r-- | community-testing/catalyst/3.5-do_mmap.patch | 50 | ||||
-rw-r--r-- | community-testing/catalyst/PKGBUILD | 63 | ||||
-rw-r--r-- | community-testing/catalyst/catalyst.install | 16 |
3 files changed, 0 insertions, 129 deletions
diff --git a/community-testing/catalyst/3.5-do_mmap.patch b/community-testing/catalyst/3.5-do_mmap.patch deleted file mode 100644 index 04248eb7b..000000000 --- a/community-testing/catalyst/3.5-do_mmap.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/community-testing/catalyst/PKGBUILD b/community-testing/catalyst/PKGBUILD deleted file mode 100644 index 80652f726..000000000 --- a/community-testing/catalyst/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 76561 2012-09-23 08:26:49Z lcarlier $ -# Maintainer: idontknow -# Contributor: to fill with a lot of people - -pkgname=catalyst -pkgver=12.8 -pkgrel=0.1 -_extramodules=extramodules-3.5-ARCH -pkgdesc="AMD proprietary gpu drivers" -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -depends=('linux>=3.5' 'linux<3.6') -makedepends=('linux-headers>=3.5' 'linux-headers<3.6') -#conflicts=('nvidia' 'xf86-video-ati' 'ati-dri') -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - 3.5-do_mmap.patch) -md5sums=('41c5478322b13be6909eeb46412a3aa0' - 'a450e2e3db61994b09e9d99d95bee837') -install=catalyst.install - -build() { - cd ${srcdir} - - if [ "${CARCH}" = "x86_64" ]; then - BUILDARCH=x86_64 - _archdir=x86_64 - else - BUILDARCH=i386 - _archdir=x86 - fi - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - sh ./amd-driver-installer*.run --extract fglrx-install - - cd fglrx-install - patch -Np1 -i ../3.5-do_mmap.patch - - cd common/lib/modules/fglrx/build_mod - ln -s "${srcdir}/fglrx-install/arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a - ln -s 2.6.x/Makefile - - CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=0 -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -D__SMP__ -DMODVERSIONS" - - make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \ - MODFLAGS="$CFLAGS_MODULE" CFLAGS_MODULE="$CFLAGS_MODULE" \ - KVER=${_kernver} PAGE_ATTR_FIX=0 modules -} - -package() { - depends=(${depends[@]} "catalyst-utils=${pkgver}") - - cd ${srcdir}/fglrx-install/common/lib/modules/fglrx/build_mod - - install -Dm644 fglrx.ko "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" - install -dm755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/catalyst.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" - - # license - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community-testing/catalyst/catalyst.install b/community-testing/catalyst/catalyst.install deleted file mode 100644 index 22b72ea84..000000000 --- a/community-testing/catalyst/catalyst.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the catalyst module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - |