rpms/xorg-x11-drv-catalyst/F-16 xorg-x11-drv-catalyst.spec,1.5,1.6
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20754
Modified Files:
xorg-x11-drv-catalyst.spec
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-2
- Fix OpenCL vendor configuration file path
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-catalyst.spec 16 Nov 2011 22:47:06 -0000 1.5
+++ xorg-x11-drv-catalyst.spec 16 Nov 2011 23:26:43 -0000 1.6
@@ -5,7 +5,7 @@
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
Version: 11.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -345,7 +345,7 @@
# OpenCL files
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
-%config %{_sysconfdir}/OpenCL/vendors/amdocl64.icd
+%config %{_sysconfdir}/OpenCL/vendors/amd*.icd
# These next two files control "supported hardware" verification
%{_sysconfdir}/ati/signature
%{_sysconfdir}/ati/control
@@ -390,6 +390,9 @@
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-2
+- Fix OpenCL vendor configuration file path
+
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
- Port changes from F-15 branch by Nicolas Chauvet in rfbz#1965
13 years
rpms/xorg-x11-drv-catalyst/F-15 xorg-x11-drv-catalyst.spec, 1.9, 1.10
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20709
Modified Files:
xorg-x11-drv-catalyst.spec
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-2
- Fix OpenCL vendor configuration file path
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-catalyst.spec 16 Nov 2011 23:05:12 -0000 1.9
+++ xorg-x11-drv-catalyst.spec 16 Nov 2011 23:26:36 -0000 1.10
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-catalyst
Version: 11.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -361,7 +361,7 @@
# OpenCL files
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
-%config %{_sysconfdir}/OpenCL/vendors/amdocl64.icd
+%config %{_sysconfdir}/OpenCL/vendors/amd*.icd
# These next two files control "supported hardware" verification
%{_sysconfdir}/ati/signature
%{_sysconfdir}/ati/control
@@ -405,6 +405,9 @@
%{atilibdir}/libatiuki.so
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-2
+- Fix OpenCL vendor configuration file path
+
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
13 years
rpms/catalyst-kmod/F-16 catalyst-kmod.spec,1.12,1.13
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19118
Modified Files:
catalyst-kmod.spec
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1.1
- Bump because of rawhide tagging issue
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- catalyst-kmod.spec 16 Nov 2011 22:56:43 -0000 1.12
+++ catalyst-kmod.spec 16 Nov 2011 23:19:12 -0000 1.13
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 11.11
-Release: 1%{?dist}
+Release: 1%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1.1
+- Bump because of rawhide tagging issue
+
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
13 years
rpms/xorg-x11-drv-catalyst/F-15 .cvsignore, 1.8, 1.9 sources, 1.7, 1.8 xorg-x11-drv-catalyst.spec, 1.8, 1.9
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17320
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 29 Oct 2011 00:45:01 -0000 1.8
+++ .cvsignore 16 Nov 2011 23:05:11 -0000 1.9
@@ -1,2 +1,2 @@
-ati-driver-installer-11-9-x86.x86_64.run
xvba-sdk-0.74-404001.tar.gz
+ati-driver-installer-11-11-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 29 Oct 2011 00:45:01 -0000 1.7
+++ sources 16 Nov 2011 23:05:11 -0000 1.8
@@ -1,2 +1,2 @@
-2c6af8691b4d68709d0e0e04b96d0a3e ati-driver-installer-11-9-x86.x86_64.run
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
+7196077aacfbaf7234a705f5352a1111 ati-driver-installer-11-11-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-catalyst.spec 4 Nov 2011 22:09:39 -0000 1.8
+++ xorg-x11-drv-catalyst.spec 16 Nov 2011 23:05:12 -0000 1.9
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 11.9
-Release: 3%{?dist}
+Version: 11.11
+Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: catalyst-config-display
@@ -358,6 +358,10 @@
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
%{_sysconfdir}/ati/amdpcsdb.default
+# OpenCL files
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%config %{_sysconfdir}/OpenCL/vendors/amdocl64.icd
# These next two files control "supported hardware" verification
%{_sysconfdir}/ati/signature
%{_sysconfdir}/ati/control
@@ -401,6 +405,9 @@
%{atilibdir}/libatiuki.so
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+
* Fri Nov 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.9-3
- Various fixes from rfbz#1965
- Ghost catalyst libraries directory in ld.so.conf.d
13 years
rpms/catalyst-kmod/F-16 .cvsignore, 1.6, 1.7 catalyst-kmod.spec, 1.11, 1.12 sources, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15856/F-16
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 29 Oct 2011 01:49:06 -0000 1.6
+++ .cvsignore 16 Nov 2011 22:56:43 -0000 1.7
@@ -1 +1 @@
-2cff71bcf0d147b5630534001ea43ea2 catalyst-kmod-data-11.9.tar.bz2
+catalyst-kmod-data-11.11.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- catalyst-kmod.spec 16 Nov 2011 21:51:44 -0000 1.11
+++ catalyst-kmod.spec 16 Nov 2011 22:56:43 -0000 1.12
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 11.9
-Release: 1%{?dist}.2
+Version: 11.11
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+
* Wed Nov 16 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.9-1.2
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 29 Oct 2011 01:49:06 -0000 1.5
+++ sources 16 Nov 2011 22:56:43 -0000 1.6
@@ -1 +1 @@
-2cff71bcf0d147b5630534001ea43ea2 catalyst-kmod-data-11.9.tar.bz2
+19be5cd21a0ba3921676e4d00adf18eb catalyst-kmod-data-11.11.tar.bz2
13 years
rpms/catalyst-kmod/F-15 .cvsignore, 1.8, 1.9 catalyst-kmod.spec, 1.22, 1.23 sources, 1.7, 1.8
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15856/F-15
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 29 Sep 2011 00:10:11 -0000 1.8
+++ .cvsignore 16 Nov 2011 22:56:43 -0000 1.9
@@ -1 +1 @@
-2cff71bcf0d147b5630534001ea43ea2 catalyst-kmod-data-11.9.tar.bz2
+catalyst-kmod-data-11.11.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/catalyst-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- catalyst-kmod.spec 13 Nov 2011 21:27:20 -0000 1.22
+++ catalyst-kmod.spec 16 Nov 2011 22:56:43 -0000 1.23
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 11.9
-Release: 1%{?dist}.5
+Version: 11.11
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+
* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.9-1.5
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 29 Sep 2011 00:10:12 -0000 1.7
+++ sources 16 Nov 2011 22:56:43 -0000 1.8
@@ -1 +1 @@
-2cff71bcf0d147b5630534001ea43ea2 catalyst-kmod-data-11.9.tar.bz2
+19be5cd21a0ba3921676e4d00adf18eb catalyst-kmod-data-11.11.tar.bz2
13 years
rpms/catalyst-kmod/devel .cvsignore, 1.5, 1.6 catalyst-kmod.spec, 1.11, 1.12 sources, 1.4, 1.5
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15856/devel
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 2 May 2011 07:51:22 -0000 1.5
+++ .cvsignore 16 Nov 2011 22:56:44 -0000 1.6
@@ -1 +1 @@
-catalyst-kmod-data-11.4.tar.bz2
+catalyst-kmod-data-11.11.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- catalyst-kmod.spec 2 Nov 2011 22:44:37 -0000 1.11
+++ catalyst-kmod.spec 16 Nov 2011 22:56:44 -0000 1.12
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels current
+#define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 11.4
-Release: 1%{?dist}.5
+Version: 11.11
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.4-1.5
- Rebuild for F-16 kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 2 May 2011 07:51:24 -0000 1.4
+++ sources 16 Nov 2011 22:56:44 -0000 1.5
@@ -1 +1 @@
-e29af83b63f9f6793f4851ae53e97bea catalyst-kmod-data-11.4.tar.bz2
+19be5cd21a0ba3921676e4d00adf18eb catalyst-kmod-data-11.11.tar.bz2
13 years
rpms/xorg-x11-drv-catalyst/devel 00-catalyst-modulepath.conf, NONE, 1.1 01-catalyst-videodriver.conf, NONE, 1.1 catalyst-README.Fedora, 1.2, 1.3 catalyst-config-display, 1.2, NONE catalyst-init, 1.1, NONE catalyst.csh, 1.1, NONE catalyst.sh, 1.1, NONE filter-provides.sh, 1.1, NONE filter-requires.sh, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14880/devel
Modified Files:
catalyst-README.Fedora
Added Files:
00-catalyst-modulepath.conf 01-catalyst-videodriver.conf
Removed Files:
catalyst-config-display catalyst-init catalyst.csh catalyst.sh
filter-provides.sh filter-requires.sh
Log Message:
Cleanup some files and update README for devel
--- NEW FILE 00-catalyst-modulepath.conf ---
# This file is provided by xorg-x11-drv-catalyst; do not edit.
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/catalyst"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- NEW FILE 01-catalyst-videodriver.conf ---
# This file is provided by xorg-x11-drv-catalyst; do not edit.
Section "Device"
Identifier "Videocard0"
Driver "fglrx"
EndSection
Index: catalyst-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/catalyst-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalyst-README.Fedora 2 May 2011 07:46:01 -0000 1.2
+++ catalyst-README.Fedora 16 Nov 2011 22:50:16 -0000 1.3
@@ -12,14 +12,13 @@
Check if you have loaded the module "radeon". If not simply log out of your
X session to restart X -- the catalyst driver should now be loaded if there is
a proper kernel-module installed. You can also run:
- /etc/init.d/catalyst status
-to see if you need a reboot. If you read:
- Initscript is running.
- Driver is enabled.
-You don't need a reboot. If you have loaded the radeon driver log out of
-your X session, log in again, issue the command:
+ modprobe fglrx
+to force the fglrx kernel module to load.
+
+If you have loaded the radeon driver, log out of your X session, log in again
+and issue the command:
/sbin/rmmod radeon
-and end your X session once again.
+then end your X session once again.
To check that hardware acceleration is working, issue the following command
in a terminal:
@@ -39,15 +38,11 @@
The installation scripts perform the basic configuration for you.
When (if) you uninstall the drivers, the configuration is reset to
-use the X.org/XFree86 radeon driver again. If you want to temporarily disable
-the fglrx drivers without uninstalling, you can issue the following
-two commands as root (remember su -):
- catalyst-config-display disable
-Note: DRI will be disabled in this case when the fglrx kernel-module was
-loaded. It will be enabled again on the next system restart.
-To re-enable the fglrx drivers without a reboot, run:
- catalyst-config-display enable
-
+use the default autodetected driver again. If you want to temporarily disable
+the fglrx drivers without uninstalling, look inside /etc/X11/xorg.conf.d and
+backup any files with a filename matching the pattern XY-catalyst-* and then
+restart your X session. To re-enable the drivers, replace these files to their
+original state.
3. Additional configuration
@@ -73,22 +68,11 @@
5. Release-specific notes
-----------------------------
-As of Catalyst version 9.10, the fglrx kernel module is no longer incompatible
-with the open-source Radeon Xorg driver. The initrd image regeneration
-workaround is therefore no longer required.
-
-However, during testing it was found that in some cases, kernel modesetting
-may need to be disabled in order for the fglrx driver to function correctly.
-Upon a fresh installation, the Catalyst driver will automatically add
-radeon.modeset=0 to the default kernel's parameters in /etc/grub.conf. If you
-are upgrading from a previous version of the Catalyst driver, you may have to
-make this change manually by running as root:
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
-
-The Catalyst driver will automatically undo this change upon uninstallation.
-Should you want to keep kernel modesetting disabled after uninstallation, run
-the same command above after uninstalling the Catalyst drivers and then reboot.
+Please note that this release was not written to run correctly on the Xorg
+server version included with Fedora 16 and will likely fail to operate correctly
+with most, if not all, graphic cards.
+
+During testing it was found that in some cases, kernel modesetting may need to
+disabled in order for the fglrx driver to function correctly. You may want to
+edit /etc/grub2.cfg manually and add the 'nomodeset' kernel parameter.
-For legacy reasons, the driver will also remove rdblacklist=radeon from the
-kernel parameters upon uninstallation.
--- catalyst-config-display DELETED ---
--- catalyst-init DELETED ---
--- catalyst.csh DELETED ---
--- catalyst.sh DELETED ---
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---
13 years
rpms/xorg-x11-drv-catalyst/F-16 02-catalyst-ignoreabi.conf, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14880/F-16
Removed Files:
02-catalyst-ignoreabi.conf
Log Message:
Cleanup some files and update README for devel
--- 02-catalyst-ignoreabi.conf DELETED ---
13 years
rpms/xorg-x11-drv-catalyst/F-16 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 xorg-x11-drv-catalyst.spec, 1.4, 1.5
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14064
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
- Update to Catalyst 11.11 (internal version 8.91.1)
- Port changes from F-15 branch by Nicolas Chauvet in rfbz#1965
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 29 Oct 2011 01:49:51 -0000 1.5
+++ .cvsignore 16 Nov 2011 22:47:05 -0000 1.6
@@ -1,2 +1,2 @@
-ati-driver-installer-11-9-x86.x86_64.run
xvba-sdk-0.74-404001.tar.gz
+ati-driver-installer-11-11-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 29 Oct 2011 01:49:51 -0000 1.4
+++ sources 16 Nov 2011 22:47:05 -0000 1.5
@@ -1,2 +1,2 @@
-2c6af8691b4d68709d0e0e04b96d0a3e ati-driver-installer-11-9-x86.x86_64.run
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
+7196077aacfbaf7234a705f5352a1111 ati-driver-installer-11-11-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-catalyst.spec 29 Oct 2011 01:49:51 -0000 1.4
+++ xorg-x11-drv-catalyst.spec 16 Nov 2011 22:47:06 -0000 1.5
@@ -1,19 +1,16 @@
%define atilibdir %{_libdir}/catalyst
-# Tweak to have debuginfo - part 1/2
-%if 0%{?fedora} > 7
-%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-%{nil}
-%endif
+%global debug_package %{nil}
+%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 11.9
-Release: 2%{?dist}
+Version: 11.11
+Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -23,7 +20,6 @@
Source7: catalyst-a-lid-aticonfig
Source8: 00-catalyst-modulepath.conf
Source9: 01-catalyst-videodriver.conf
-Source10: 02-catalyst-ignoreabi.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +44,7 @@
%endif
Requires(post): chkconfig
+
Requires(preun): chkconfig
Provides: catalyst-kmod-common = %{version}
@@ -119,6 +116,9 @@
mkdir amdxvba
pushd amdxvba
tar xfz %{SOURCE1}
+# rename docs
+mv -f LICENSE AMD_XvBA_LICENSE
+mv -f README AMD_XvBA_README
popd
# Create tarball of kmod data for use later
@@ -126,12 +126,6 @@
fglrx/common/*/modules/fglrx/ \
fglrx/arch/*/*/modules/fglrx/
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} > 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
-
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/xpic/* fglrx/arch/x86/* fglrxpkg/
@@ -241,17 +235,23 @@
# Move XvBA data file to correct location
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
mv $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.cap $RPM_BUILD_ROOT%{_prefix}/lib
+chmod 0644 $RPM_BUILD_ROOT%{_prefix}/lib/libAMDXvBA.cap
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
# If we want versioned libs, then we need to change this and the loop above
# to install the libs as soname.so.%{version}
-ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1
-ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1
-ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1
-ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libXvBAW.so.1
-ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libatiuki.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so.1
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so.1
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so.1
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so.1
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so
install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm
install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/atieventsd
@@ -259,22 +259,18 @@
install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-ac-aticonfig.conf
install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
-# Install static driver dependant configuration files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-modulepath.conf
-
-# Install ld.so.conf.d file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
-echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
-
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE3}
+# Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-modulepath.conf
+touch -r %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-modulepath.conf
+install -pm 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+
# Fix odd perms
find fglrxpkg -type f -perm 0555 -exec chmod 0755 '{}' \;
find fglrxpkg -type f -perm 0744 -exec chmod 0755 '{}' \;
@@ -287,22 +283,37 @@
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle
chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
-# Update the user's version numbers in the AMD Control Center. Replacement
-# values can be obtained by executing:
-# cat fglrxpkg/etc/ati/amdpcsdb.default | grep -i version
+# Update the user's version numbers in the AMD Control Center.
if [ -f %{_sysconfdir}/amdpcsdb ];then
- sed -i -e 's|ReleaseVersion=.*|S8.892-110914m-125703C-ATI|' %{_sysconfdir}/amdpcsdb
- sed -i -e 's|Catalyst_Version=.*|S11.9|' %{_sysconfdir}/amdpcsdb
+ ReleaseVersion=$(sed '/ReleaseVersion=S/!d; s/ReleaseVersion=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${ReleaseVersion}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1
+ fi
+ Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${Catalyst_Version}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1
+ fi
fi ||:
if [ "${1}" -eq 1 ]; then
# Add init script(s) and start it
/sbin/chkconfig --add atieventsd
+ /sbin/service atieventsd start >/dev/null 2>&1
+ if [ -x /sbin/grubby ] ; then
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
+ fi
fi ||:
%post libs -p /sbin/ldconfig
@@ -311,6 +322,11 @@
if [ "${1}" -eq 0 ]; then
/sbin/service atieventsd stop >/dev/null 2>&1
/sbin/chkconfig --del atieventsd
+ if [ -x /sbin/grubby ] ; then
+ # remove rdblacklist from boot params in case they installed with v10.7, which blacklisted radeon upon installation
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon' &>/dev/null
+ fi
fi ||:
%postun libs -p /sbin/ldconfig
@@ -321,11 +337,15 @@
%dir %{_sysconfdir}/ati/
%doc %{_docdir}/amdcccle/ccc_copyrights.txt
%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
-%config %{_sysconfdir}/X11/xorg.conf.d/*.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
%{_sysconfdir}/ati/atiogl.xml
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
%{_sysconfdir}/ati/amdpcsdb.default
+# OpenCL files
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%config %{_sysconfdir}/OpenCL/vendors/amdocl64.icd
# These next two files control "supported hardware" verification
%{_sysconfdir}/ati/signature
%{_sysconfdir}/ati/control
@@ -349,18 +369,31 @@
%files libs
%defattr(-,root,root,-)
-%dir %{atilibdir}
%config %{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
+%dir %{atilibdir}
%{atilibdir}/*.so*
%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
+%doc amdxvba/doc/AMD_XvBA_Spec_v0_74_01_AES_2.pdf
+%doc amdxvba/AMD_XvBA_LICENSE amdxvba/AMD_XvBA_README
%{atilibdir}/*.a
%{_includedir}/fglrx/
+# enumerate development symlinks
+%{atilibdir}/libGL.so
+%{atilibdir}/libfglrx_dm.so
+%{atilibdir}/libAMDXvBA.so
+%{atilibdir}/libXvBAW.so
+%{atilibdir}/libatiuki.so
+
%changelog
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+- Port changes from F-15 branch by Nicolas Chauvet in rfbz#1965
+
* Fri Oct 28 2011 Stewart Adam <s.adam at diffingo.com> 11.9-2
- Port over changes from F-15 branch, including:
* Update to 11.9
13 years