jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

catalyst: update to 15.201.1151.

Browse source
This commit is contained in:
Juan RP 2015-09-16 09:22:12 +02:00
parent 6813dcf592
commit 6776ff1e29
2 changed files with 6 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
srcpkgs/catalyst/files/kolasa_4.0-cr4-strn.patch
View file

@ -1,70 +0,0 @@
diff -uNr 14.12/common/lib/modules/fglrx/build_mod/firegl_public.c 14.12_2/common/lib/modules/fglrx/build_mod/firegl_public.c
--- 14.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-11-28 21:02:10.000000000 +0100
+++ 14.12_2/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-03-08 13:30:42.565275902 +0100
@@ -4468,8 +4468,13 @@
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
cr4 = read_cr4();
write_cr4(cr4 & ~X86_CR4_PGE);
+#else
+ cr4 = __read_cr4();
+ __write_cr4(cr4 & ~X86_CR4_PGE);
+#endif
}
__flush_tlb();
@@ -4482,7 +4487,11 @@
write_cr0(cr0 & 0xbfffffff);
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
write_cr4(cr4);
+#else
+ __write_cr4(cr4);
+#endif
}
local_irq_restore(flags);
@@ -4509,8 +4518,13 @@
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
cr4 = read_cr4();
write_cr4(cr4 & ~X86_CR4_PGE);
+#else
+ cr4 = __read_cr4();
+ __write_cr4(cr4 & ~X86_CR4_PGE);
+#endif
}
__flush_tlb();
@@ -4522,7 +4536,11 @@
write_cr0(cr0 & 0xbfffffff);
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
write_cr4(cr4);
+#else
+ __write_cr4(cr4);
+#endif
}
local_irq_restore(flags);
diff -uNr 14.12/common/lib/modules/fglrx/build_mod/kcl_str.c 14.12_2/common/lib/modules/fglrx/build_mod/kcl_str.c
--- 14.12/common/lib/modules/fglrx/build_mod/kcl_str.c 2014-11-28 21:02:10.000000000 +0100
+++ 14.12_2/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-03-08 13:25:11.568396701 +0100
@@ -169,7 +169,11 @@
const char* s2,
KCL_TYPE_SizeSigned count)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
return strnicmp(s1, s2, count);
+#else
+ return strncasecmp(s1, s2, count);
+#endif
}
/** \brief Locate character in string

12
srcpkgs/catalyst/template
View file

@ -1,9 +1,10 @@
# Template file for 'catalyst'
_desc="AMD catalyst driver for Linux"
_release="15.9"
pkgname=catalyst
version=15.20.1046
revision=3
version=15.201.1151
revision=1
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary AMD license"
homepage="http://www.amd.com"
@ -19,8 +20,8 @@ create_wrksrc=yes
XBPS_FETCH_CMD="wget --referer='http://support.amd.com/en-us/download/desktop?os=Linux+x86' "
distfiles="http://www2.ati.com/drivers/linux/amd-driver-installer-${version}-x86.x86_64.zip"
checksum=ffde64203f49d9288eaa25f4d744187b6f4f14a87a444bab6a001d822b327a9d
distfiles="http://www2.ati.com/drivers/linux/amd-catalyst-${_release}-linux-installer-${version}-x86.x86_64.zip"
checksum=bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91
if [ "$XBPS_MACHINE" = "i686" ]; then
_ARCHDIR="x86"
@ -31,10 +32,9 @@ elif [ "$XBPS_MACHINE" = "x86_64" ]; then
fi
do_build() {
/bin/sh ./amd-driver-installer-${version}-x86.x86_64.run --extract fglrx-${version}
/bin/sh ./*.run --extract fglrx-${version}
cd fglrx-${version}
patch -Np1 -i ${FILESDIR}/kolasa_4.0-cr4-strn.patch
patch -Np1 -i ${FILESDIR}/kolasa_4.1_remove-IRQF_DISABLED.patch
patch -Np1 -i ${FILESDIR}/fglrx_gpl_symbol.patch
}