projects / fglrx-packaging.git / commitdiff
Build Results
 
Summary

Description: Unnamed repository; edit this file 'description' to name the repository.
Last Change: Thu 9/11/14 5:59

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Thu 9/11/14 5:59
Alberto Milone  
Ubuntu: drop link to... 
Fri 9/5/14 9:45
Alberto Milone  
Ubuntu: make sure it's... 
Mon 9/1/14 8:07
Alberto Milone  
Ubuntu: create a symlink... 
Mon 8/25/14 9:09
Alberto Milone  
Ubuntu: do not generate... 
Thu 8/21/14 3:56
Alberto Milone  
Ubuntu:... 
Wed 8/20/14 7:30
Alberto Milone  
Ubuntu: don't complain... 
 
> --git a/Mandriva/fglrx-add-compatibility-with-2.6.36-kernels.patch b/Mandriva/fglrx-add-compatibility-with-2.6.36-kernels.patch
deleted file mode 100644
index acb3dea
..0000000
--- a/Mandriva/fglrx-add-compatibility-with-2.6.36-kernels.patch
+++ /dev/null
@@ -1,38 +0,@@
-
From db944ac1f8dfefbc6d9e42e12aa578ff6121cbc6 Mon Sep 17 00:00:00 2001
-FromAlberto Milone <alberto.milone@canonical.com>
-
DateFri24 Sep 2010 14:54:35 +0200
-Subject: [PATCH 1/2Add compatibility with 2.6.36 kernels
-
-
-
Signed-off-byAlberto Milone <alberto.milone@canonical.com>
-
-[
Adapted for Mandriva buildmake build conditional tmb]
-
Signed-off-byThomas Backlund <tmb@mandriva.org>
-
----
---- 
fglrx-8.771.orig/common/lib/modules/fglrx/build_mod/firegl_public.c    2010-09-01 17:05:31.000000000 +0300
-+++ fglrx-8.771/common/lib/modules/fglrx/build_mod/firegl_public.c    2010-10-02 20:18:27.905570816 +0300
-@@ -320,+320,11 @@ int ip_firegl_release(struct inodeinod
-     return firegl_release((KCL_IO_FILE_Handle)filp);
- }
-
-+
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35)
-+long ip_firegl_ioctl(struct filefilpunsigned int cmdunsigned long arg)
-+
#else
int ip_firegl_ioctl(struct inodeinodestruct filefilpunsigned int cmdunsigned long arg)
-+
#endif
- {
-     return 
firegl_ioctl((KCL_IO_FILE_Handle)filpcmdarg);
- }
-@@ -
407,+411,11 @@ static struct file_operations firegl_fop
#endif
-     open:    ip_firegl_open,
-     
releaseip_firegl_release,
-+
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35)
-+    unlocked_ioctlip_firegl_ioctl,
-+
#else
-     ioctl:   ip_firegl_ioctl,
-+
#endif
-     mmap:    ip_firegl_mmap,
-
-     
write:   ip_firegl_write,
diff --git a/Mandriva/fglrx-use-cflags_module-together-with-modflags.patch b/Mandriva/fglrx-use-cflags_module-together-with-modflags.patch
deleted file mode 100644
index 1b1e978
..0000000
--- a/Mandriva/fglrx-use-cflags_module-together-with-modflags.patch
+++ /dev/null
@@ -1,35 +0,@@
-
From b9f7a8dc0769bddfb2dff47a0903b51471ebf4ef Mon Sep 17 00:00:00 2001
-FromAlberto Milone <alberto.milone@canonical.com>
-
DateFri24 Sep 2010 18:02:42 +0200
-Subject: [PATCH 2/2] Use CFLAGS_MODULE together with MODFLAGS in make.sh
-
-
CFLAGS_MODULE was introduced in 2.6.36 kernels while MODFLAGS was
-dropped (commit 6588169d516560f68672e2928680b71c647b7806therefore
-by trying to use both modules we preserve compatibility with older
-kernels and fix build issues with new kernels.
-
-
Signed-off-byAlberto Milone <alberto.milone@canonical.com>
-
-[
Adapted for Mandriva build tmb]
-
Signed-off-byThomas Backlund <tmb@mandriva.org>
-[
anssi@mandriva.orgadapted for upstream changes]
-
Signed-off-byAnssi Hannula <anssi@mandriva.org>
-
----
-
---- 
fglrx-8.771.orig/common/lib/modules/fglrx/build_mod/make.sh    2010-10-02 20:10:04.000000000 +0300
-+++ fglrx-8.771/common/lib/modules/fglrx/build_mod/make.sh    2010-10-02 20:20:07.462928823 +0300
-@@ -473,+473,12 @@ make clean
-
- echo 
'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
-
-+    
MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions"
-+
make CC=${CC} \
-     
LIBIP_PREFIX=$(echo "$LIBIP_PREFIXsed -'s|^\([^/]\)|../\1|') \
--    
MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions\
-+    
MODFLAGS="$MODFLAGS\
-+    
CFLAGS_MODULE="$MODFLAGS\
-     
KVER=${uname_r} \
-     
KDIR=${kernel_dir} \
-     
PAGE_ATTR_FIX=$PAGE_ATTR_FIX \
diff --git a/Mandriva/fglrx.spec b/Mandriva/fglrx.spec
index ba5351a
..b607441 100644
--- a/Mandriva/fglrx.spec
+++ b/Mandriva/fglrx.spec
@@ -190,+190,@@ Patch9:        fglrx-make_sh-custom-kernel-dir.patch
 
# do not probe /proc for kernel info as we may be building for a
 # different kernel
 
Patch10:    fglrx-make_sh-no-proc-probe.patch
-# 2.6.36+ fixes:
-Patch11:    fglrx-add-compatibility-with-2.6.36-kernels.patch
-Patch12:    fglrx-use-cflags_module-together-with-modflags.patch
 License
:    Freeware
 URL
:        http://ati.amd.com/support/driver.html
 
Group:        System/Kernel and hardware
@@ -348,+345,@@ cmp common/usr/X11R6/include/X11/extensions/fglrx_gamma.h fglrx_tools/lib/fglrx_
 
%patch3 -p1
 
%patch9 -p1
 
%patch10 -p1
-%patch11 -p1
-%patch12 -p1

 cat 
README.install.urpmi <<EOF
 This driver is 
for ATI Radeon HD 2000 and newer cards.
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media