[packages/xorg-driver-video-fglrx] - updated to 13.11 latest beta - removed obsolete patches - amd broke direct wget downloads
baggins
baggins at pld-linux.org
Sat Nov 23 14:30:09 CET 2013
commit bb25c48e9ea4de42be76addb62547d2e7f3b3be2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Nov 23 14:29:18 2013 +0100
- updated to 13.11 latest beta
- removed obsolete patches
- amd broke direct wget downloads
linux-3.10.patch | 226 -------------------------------------------
linux-3.7.patch | 132 -------------------------
xorg-driver-video-fglrx.spec | 25 +++--
3 files changed, 11 insertions(+), 372 deletions(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 36ffca5..55fdd1b 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -48,20 +48,22 @@ exit 1
%endif
%define intver 12.104
+%define betaver 9.4
-%define rel 21
+%define rel 1
%define pname xorg-driver-video-fglrx
Summary: Linux Drivers for AMD/ATI graphics accelerators
Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych AMD/ATI
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 13.4
-Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
+Version: 13.11
+Release: 0.beta.%{betaver}.%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
Epoch: 1
License: AMD Binary (parts are GPL)
Group: X11
# http://support.amd.com/ click through "download drivers", desktop -> radeon hd -> 7xxx -> linux
-Source0: http://www2.ati.com/drivers/linux/amd-catalyst-%{version}-linux-x86.x86_64.zip
-# Source0-md5: 558bd1b31173b06b25da647a7112e734
+#Source0: http://www2.ati.com/drivers/linux/amd-catalyst-%{version}-linux-x86.x86_64.zip
+Source0: amd-catalyst-%{version}-beta-v%{betaver}-linux-x86.x86_64.run.zip
+# Source0-md5: 60d3cfa20fe53875f9eb3c98ddc18b07
Source1: atieventsd.init
Source2: atieventsd.sysconfig
Source3: gl.pc.in
@@ -74,15 +76,13 @@ Patch3: %{pname}-desktop.patch
Patch4: %{pname}-nofinger.patch
Patch5: %{pname}-GPL-only.patch
Patch7: %{pname}-kernel-fpu.patch
-Patch8: linux-3.7.patch
-Patch9: linux-3.10.patch
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
%{?with_dist_kernel:%{expand:%kbrs}}
BuildRequires: rpmbuild(macros) >= 1.678
BuildRequires: sed >= 4.0
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
-Requires: xorg-xserver-server(videodrv-abi) <= 13.1
+Requires: xorg-xserver-server(videodrv-abi) <= 14.1
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Suggests: kernel-video-firegl
Provides: xorg-driver-video
@@ -232,7 +232,8 @@ cp -pf common/lib/modules/fglrx/build_mod/2.6.x/Makefile common/lib/modules/fglr
%setup -q -c
#sh %{SOURCE0} --extract .
-sh amd-catalyst-%{version}-linux-x86.x86_64.run --extract .
+#sh amd-catalyst-%{version}-linux-x86.x86_64.run --extract .
+sh "amd-catalyst-%{version}-beta V%{betaver}-linux-x86.x86_64.run" --extract .
cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/
cat >>common/lib/modules/fglrx/build_mod/2.6.x/Makefile <<EOF
@@ -249,8 +250,6 @@ EOF
%patch4 -p1
%patch5 -p1
%patch7 -p0
-%patch8 -p1
-%patch9 -p1
install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
@@ -325,7 +324,7 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/{,fglrx}/libglx.so
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/fglrx
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/fglrx/libGL.so
-ln -sf libfglrx_dm.so.*.* $RPM_BUILD_ROOT%{_libdir}/fglrx/libfglrx_dm.so
+(cd $RPM_BUILD_ROOT%{_libdir}/fglrx ; ln -sf libfglrx_dm.so.*.* libfglrx_dm.so)
cp -p common%{_includedir}/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
echo "LIBGL_DRIVERS_PATH=%{_libdir}/xorg/modules/dri" > $RPM_BUILD_ROOT%{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
@@ -388,8 +387,6 @@ fi
%attr(755,root,root) %{_libdir}/fglrx/libAMDXvBA.so.*.*
%attr(755,root,root) %ghost %{_libdir}/fglrx/libAMDXvBA.so.1
%attr(755,root,root) %{_libdir}/fglrx/libOpenCL.so.1
-%attr(755,root,root) %{_libdir}/fglrx/libSlotMaximizerAg.so
-%attr(755,root,root) %{_libdir}/fglrx/libSlotMaximizerBe.so
%attr(755,root,root) %{_libdir}/fglrx/libXvBAW.so.*.*
%attr(755,root,root) %ghost %{_libdir}/fglrx/libXvBAW.so.1
%{_libdir}/fglrx/libAMDXvBA.cap
diff --git a/linux-3.10.patch b/linux-3.10.patch
deleted file mode 100644
index 155b483..0000000
--- a/linux-3.10.patch
+++ /dev/null
@@ -1,226 +0,0 @@
---- 13.4/common/lib/modules/fglrx/build_mod/drm_proc.h
-+++ 13.4/common/lib/modules/fglrx/build_mod/drm_proc.h
-@@ -94,23 +95,34 @@ struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
- struct proc_dir_entry *ent;
- int i, j;
- char name[64];
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
-+#else
-+ if (!minor) root = proc_mkdir("dri", NULL);
-+#endif
- if (!root) {
- DRM_ERROR("Cannot create /proc/ati\n");
- return NULL;
- }
-
- sprintf(name, "%d", minor);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- *dev_root = create_proc_entry(name, S_IFDIR, root);
-+#else
-+ *dev_root = proc_mkdir(name, root);
-+#endif
- if (!*dev_root) {
- DRM_ERROR("Cannot create /proc/ati/%s\n", name);
- return NULL;
- }
--
- for (i = 0; i < DRM_PROC_ENTRIES; i++) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent = create_proc_entry(DRM(proc_list)[i].name,
- S_IFREG|S_IRUGO, *dev_root);
-+#else
-+ ent = proc_create_data(DRM(proc_list)[i].name,
-+ S_IFREG|S_IRUGO, *dev_root, &firegl_fops, dev);
-+#endif
- if (!ent) {
- DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
- name, DRM(proc_list)[i].name);
-@@ -121,10 +133,11 @@ struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
- if (!minor) remove_proc_entry("dri", NULL);
- return NULL;
- }
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent->read_proc = DRM(proc_list)[i].f;
- ent->data = dev;
-+#endif
- }
--
- return root;
- }
-
---- 13.4/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ 13.4/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -520,12 +520,23 @@ READ_PROC_WRAP(firegl_lock_info)
- #ifdef DEBUG
- READ_PROC_WRAP(drm_bq_info)
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- READ_PROC_WRAP(firegl_debug_proc_read)
-+#endif
- READ_PROC_WRAP(firegl_bios_version)
- READ_PROC_WRAP(firegl_interrupt_info)
- READ_PROC_WRAP(firegl_ptm_info)
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static int firegl_debug_proc_write_wrap(void* file, const char *buffer, unsigned long count, void *data)
-+#else
-+static int firegl_debug_proc_read_wrap(struct seq_file *m, void* data)
-+{
-+ return firegl_debug_proc_read(m->buf, m->from, m->index, m->size, m->size - m->count, data);
-+}
-+
-+static ssize_t firegl_debug_proc_write_wrap(struct file *file, const char *buffer, size_t count, void *data)
-+#endif
- {
- return firegl_debug_proc_write(file, buffer, count, data);
- }
-@@ -543,9 +554,15 @@ static int firegl_debug_proc_write_wrap(void* file, const char *buffer, unsigned
- *
- * \return number of bytes written
- */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static int firegl_major_proc_read(char *buf, char **start, kcl_off_t offset,
- int request, int* eof, void* data)
-+#else
-+static int firegl_major_proc_read(struct seq_file *m, void* data)
-+#endif
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int len = 0; // For ProcFS: fill buf from the beginning
-
- KCL_DEBUG1(FN_FIREGL_PROC, "offset %d\n", (int)offset);
-@@ -561,8 +578,10 @@ static int firegl_major_proc_read(char *buf, char **start, kcl_off_t offset,
-
- len = snprintf(buf, request, "%d\n", major);
-
-+#else
-+ int len = seq_printf(m, "%d\n", major);
-+#endif
- KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
--
- return len;
- }
-
-@@ -583,6 +602,29 @@ kcl_proc_list_t KCL_PROC_FileList[] =
- { "NULL", NULL, NULL} // Terminate List!!!
- };
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+static int firegl_major_proc_open(struct inode *inode, struct file *file){
-+ return single_open(file, firegl_major_proc_read, NULL);
-+}
-+
-+static const struct file_operations firegl_major_fops = {
-+ .open = firegl_major_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+};
-+
-+static int firegl_debug_proc_open(struct inode *inode, struct file *file){
-+ return single_open(file, firegl_debug_proc_read_wrap, NULL);
-+}
-+
-+static const struct file_operations firegl_debug_fops = {
-+ .open = firegl_debug_proc_open,
-+ .write = firegl_debug_proc_write_wrap,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+};
-+#endif
-+
- static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- int minor,
- struct proc_dir_entry *root,
-@@ -595,7 +637,11 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
- if (!minor)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- root = create_proc_entry("ati", S_IFDIR, NULL);
-+#else
-+ root = proc_mkdir("ati", NULL);
-+#endif
- }
-
- if (!root)
-@@ -607,18 +653,28 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- if (minor == 0)
- {
- // Global major debice number entry
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent = create_proc_entry("major", S_IFREG|S_IRUGO, root);
-+#else
-+ ent = proc_create("major", S_IFREG|S_IRUGO, root, &firegl_major_fops);
-+#endif
- if (!ent)
- {
- remove_proc_entry("ati", NULL);
- KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
- return NULL;
- }
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent->read_proc = (read_proc_t*)firegl_major_proc_read;
-+#endif
- }
-
- sprintf(name, "%d", minor);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- *dev_root = create_proc_entry(name, S_IFDIR, root);
-+#else
-+ *dev_root = proc_mkdir(name, root);
-+#endif
- if (!*dev_root) {
- remove_proc_entry("major", root);
- remove_proc_entry("ati", NULL);
-@@ -628,7 +684,12 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-
- while (list->f || list->fops)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent = create_proc_entry(list->name, S_IFREG|S_IRUGO, *dev_root);
-+#else
-+ ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, &firegl_fops,
-+ (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev));
-+#endif
- if (!ent)
- {
- KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name);
-@@ -646,6 +707,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- return NULL;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if (list->f)
- {
- ent->read_proc = (read_proc_t*)list->f;
-@@ -659,19 +721,25 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- {
- ent->data = (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev);
- }
--
-+#endif
- list++;
- }
-
- if (minor == 0)
- {
- // Global debug entry, only create it once
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent = create_proc_entry("debug", S_IFREG|S_IRUGO, root);
-- if (ent)
-+#else
-+ ent = proc_create_data("debug", S_IFREG|S_IRUGO, root, &firegl_debug_fops, dev);
-+#endif
-+ if (ent)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- ent->read_proc = (read_proc_t*)firegl_debug_proc_read_wrap;
- ent->write_proc = (write_proc_t*)firegl_debug_proc_write_wrap;
- ent->data = dev;
-+#endif
- }
- }
-
diff --git a/linux-3.7.patch b/linux-3.7.patch
deleted file mode 100644
index 47cd425..0000000
--- a/linux-3.7.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-09-26 15:04:28.000000000 +0200
-+++ 12.9/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:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/bb25c48e9ea4de42be76addb62547d2e7f3b3be2
More information about the pld-cvs-commit
mailing list