From 2b0e7ef13c754e8da3e4f88e8d7f383c53b4af7c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 18 Apr 2013 17:11:05 +0200 Subject: [PATCH] catalyst: update to 13.3beta3. --- srcpkgs/catalyst/files/arch-fglrx-3.7.patch | 132 ------------------ srcpkgs/catalyst/files/kernel-3.8-fixes.patch | 13 -- .../files/uapi_linux_version_make.patch | 21 --- srcpkgs/catalyst/template | 16 +-- 4 files changed, 8 insertions(+), 174 deletions(-) delete mode 100644 srcpkgs/catalyst/files/arch-fglrx-3.7.patch delete mode 100644 srcpkgs/catalyst/files/kernel-3.8-fixes.patch delete mode 100644 srcpkgs/catalyst/files/uapi_linux_version_make.patch diff --git a/srcpkgs/catalyst/files/arch-fglrx-3.7.patch b/srcpkgs/catalyst/files/arch-fglrx-3.7.patch deleted file mode 100644 index c204dc8ff51..00000000000 --- a/srcpkgs/catalyst/files/arch-fglrx-3.7.patch +++ /dev/null @@ -1,132 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2012-09-26 15:04:28.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2012-10-16 20:30:42.146523753 +0200 -@@ -3892,7 +3892,11 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - break; - -@@ -3922,14 +3926,22 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - } - break; - #endif - - case __KE_SHM: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_shm_ops; - break; - -@@ -3937,7 +3949,11 @@ - - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - - //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ - //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ -@@ -3946,14 +3962,22 @@ - - case __KE_CTX: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_ctx_ops; - break; - - case __KE_PCI_BQS: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_pci_bq_ops; - break; -@@ -3984,9 +4008,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_ops; - } -@@ -4015,9 +4047,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_agp_bq_ops; - } -@@ -4025,7 +4065,11 @@ - #endif /* __AGP__BUILTIN__ */ - - case __KE_KMAP: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_kmap_ops; - if (readonly && (vma->vm_flags & VM_WRITE)) - { -@@ -4046,7 +4090,11 @@ - #endif - // fall through - case __KE_GART_CACHEABLE: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_gart_ops; - break; - default: diff --git a/srcpkgs/catalyst/files/kernel-3.8-fixes.patch b/srcpkgs/catalyst/files/kernel-3.8-fixes.patch deleted file mode 100644 index a93a7cddc7c..00000000000 --- a/srcpkgs/catalyst/files/kernel-3.8-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-10-23 22:44:52.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-12-22 22:11:30.289750331 +0100 -@@ -775,7 +775,9 @@ - unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo) - { - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) -- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) -+ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle; -+ #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) - pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; - #else - pInfo->video_handle = pInfo->pcidev->dev.firmware_data; diff --git a/srcpkgs/catalyst/files/uapi_linux_version_make.patch b/srcpkgs/catalyst/files/uapi_linux_version_make.patch deleted file mode 100644 index 48212f3830b..00000000000 --- a/srcpkgs/catalyst/files/uapi_linux_version_make.patch +++ /dev/null @@ -1,21 +0,0 @@ -Use uapi/linux/version.h if linux/version.h not found. - ---- common/lib/modules/fglrx/build_mod/make.sh.orig 2013-02-07 19:17:27.405645903 +0100 -+++ common/lib/modules/fglrx/build_mod/make.sh 2013-02-07 19:19:05.549150417 +0100 -@@ -203,11 +203,16 @@ cd $current_wd - # sample: #define UTS_RELEASE "2.4.0-test7" - - src_file=$linuxincludes/linux/version.h -+src_file_new=$linuxincludes/generated/uapi/linux/version.h - - if [ ! -e $src_file ]; then -+ if [ ! -e $src_file_new ]; then - echo "kernel includes at $linuxincludes not found or incomplete" | tee -a $logfile - echo "file: $src_file" | tee -a $logfile - exit 1 -+ else -+ src_file=$src_file_new -+ fi - fi - - OsRelease=${uname_r} diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index a99285bf47b..cb930d65bc1 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -1,7 +1,9 @@ # Template file for 'catalyst' pkgname=catalyst -version=13.1 -revision=4 +_distver=13.3 +_patchver=beta3 +version=${_distver}${_patchver} +revision=1 short_desc="AMD catalyst driver for Linux -- libraries and utilities" maintainer="Juan RP " license="Propietary AMD license" @@ -10,8 +12,8 @@ homepage="http://www.amd.com" create_wrksrc=yes makedepends="unzip" -distfiles=http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${version}-linux-x86.x86_64.zip -checksum=67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad +distfiles=http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-${_distver}-${_patchver}-linux-x86.x86_64.zip +checksum=42fac898329a75cb094d29c08c20e33be227aa85f7b4ea1b13038466c65ff7c0 if [ "${XBPS_MACHINE}" = "i686" ]; then _ARCHDIR="x86" @@ -28,8 +30,6 @@ do_build() { do_install() { cd ${wrksrc}/fglrx - patch -Np0 -i ${FILESDIR}/arch-fglrx-3.7.patch - patch -Np0 -i ${FILESDIR}/kernel-3.8-fixes.patch install -dm755 ${DESTDIR}/usr/{bin,sbin} install -dm755 ${DESTDIR}/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system} @@ -113,7 +113,6 @@ catalyst-dkms_package() { vmkdir usr/src/${_fglrx} cd ${wrksrc}/fglrx - patch -Np0 -i ${FILESDIR}/uapi_linux_version_make.patch cp -r common/lib/modules/fglrx/build_mod/* ${PKGDESTDIR}/usr/src/${_fglrx} vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 644 usr/src/${_fglrx} @@ -132,6 +131,7 @@ catalyst-opencl_package() { short_desc="AMD catalyst driver for Linux -- OpenCL implementation" provides="libOpenCL-${version}" replaces="libOpenCL>=0" + noverifyrdeps=yes pkg_install() { cd ${wrksrc}/fglrx/arch/${_ARCHDIR} @@ -153,6 +153,6 @@ catalyst_package() { depends="${pkgname}-dkms-${version}_${revision}" conflicts="nvidia>=0" pkg_install() { - vmove usr + vmove all } }