1:49 a.m.
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19691
Modified Files:
.cvsignore catalyst-README.Fedora sources
xorg-x11-drv-catalyst.spec
Removed Files:
catalyst-config-display catalyst-init catalyst.csh catalyst.sh
filter-provides.sh filter-requires.sh
Log Message:
* 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
* Fix several packaging bugs (#1932, #1965)
- Skipped release 1 to keep F-14/15 & F-16 upgrade path in check
- No longer use livna-config-display
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 May 2011 07:46:01 -0000 1.4
+++ .cvsignore 29 Oct 2011 01:49:51 -0000 1.5
@@ -1 +1,2 @@
-ati-driver-installer-11-4-x86.x86_64.run
+ati-driver-installer-11-9-x86.x86_64.run
+xvba-sdk-0.74-404001.tar.gz
Index: catalyst-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/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 29 Oct 2011 01:49:51 -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.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 May 2011 07:46:01 -0000 1.3
+++ sources 29 Oct 2011 01:49:51 -0000 1.4
@@ -1 +1,2 @@
-b50dc05ef3428a9ee632b09eebeb4586 ati-driver-installer-11-4-x86.x86_64.run
+2c6af8691b4d68709d0e0e04b96d0a3e ati-driver-installer-11-9-x86.x86_64.run
+b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-catalyst.spec 2 May 2011 07:50:41 -0000 1.3
+++ xorg-x11-drv-catalyst.spec 29 Oct 2011 01:49:51 -0000 1.4
@@ -7,29 +7,23 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 11.4
-Release: 1%{?dist}
+Version: 11.9
+Release: 2%{?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...
-Source1: catalyst-README.Fedora
-Source3: catalyst-config-display
-Source4: catalyst-init
-Source5: amdcccle.desktop
-Source6: catalyst-atieventsd.init
-Source7: catalyst-ati-powermode.sh
-Source8: catalyst-a-ac-aticonfig
-Source9: catalyst-a-lid-aticonfig
-Source10: catalyst.sh
-Source11: catalyst.csh
-# So we don't mess with mesa provides.
-Source91: filter-requires.sh
-Source92: filter-provides.sh
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
-%define __find_provides %{SOURCE92}
+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
+Source4: catalyst-atieventsd.init
+Source5: catalyst-ati-powermode.sh
+Source6: catalyst-a-ac-aticonfig
+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)
@@ -43,21 +37,17 @@
Requires: catalyst-kmod >= %{version}
-# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12
-BuildRequires: chrpath
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
-Requires: livna-config-display >= 0.0.23
+# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12
+BuildRequires: chrpath
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
Requires(post): chkconfig
-
Requires(preun): chkconfig
Provides: catalyst-kmod-common = %{version}
@@ -79,6 +69,12 @@
Conflicts: kernel-module-ATI-fglrx
Conflicts: ATI-fglrx-IA32-libs
+%{?filter_setup:
+%filter_from_provides /^libGL\.so/d;
+%filter_from_requires /^libGL\.so/d;
+%filter_setup
+}
+
%description
This package provides the most recent proprietary AMD display driver which
allows for hardware accelerated rendering with ATI Mobility, FireGL and
@@ -92,7 +88,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name}
@@ -112,8 +112,17 @@
%prep
%setup -q -c -T
+# Extract fglrx driver
sh %{SOURCE0} --extract fglrx
-tar -cjf catalyst-kmod-data-%{version}.tar.bz2
fglrx/common/usr/share/doc/fglrx/ATI_LICENSE.TXT \
+
+# Extract XvBA devel files
+mkdir amdxvba
+pushd amdxvba
+tar xfz %{SOURCE1}
+popd
+
+# Create tarball of kmod data for use later
+tar -cjf catalyst-kmod-data-%{version}.tar.bz2
fglrx/common/usr/share/doc/fglrx/LICENSE.TXT \
fglrx/common/*/modules/fglrx/ \
fglrx/arch/*/*/modules/fglrx/
@@ -134,10 +143,14 @@
# fix doc perms & copy README.Fedora
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
-install -pm 0644 %{SOURCE1} ./README.Fedora
+install -pm 0644 %{SOURCE2} ./README.Fedora
-%build
+# Set the correct path for gdm's Xauth file before we install it in the loop below
+sed -i -e
's|GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth|GDM_AUTH_FILE=/var/gdm/$1.Xauth|'
fglrxpkg/etc/ati/authatieventsd.sh
+%build
+# Nothing to build
+echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT ./__doc
@@ -154,6 +167,9 @@
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/dri}" = "/${file}"
]]
then
install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{_prefix}/%{_lib}/dri/${file##./usr/X11R6/%{_lib}/modules/dri}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}" =
"/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions}" =
"/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions}
@@ -168,9 +184,15 @@
elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" =
"/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{_includedir}/fglrx/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+ elif [[ ! "/${file##./usr/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file}
$RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
@@ -205,37 +227,53 @@
done
set -x
+# Install XvBA headers
+install -D -p -m 0644 amdxvba/include/amdxvba.h $RPM_BUILD_ROOT%{_includedir}/fglrx
+
+# Remove switching scripts
+rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibGL
+rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibglx
+
+# Remove some 'fglrx-' prefixes
+mv $RPM_BUILD_ROOT%{atilibdir}/{fglrx-,}libGL.so.1.2
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
+
+# 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
+
# 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
'{}' \;
+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
+# 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_gamma.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_gamma.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
-# profile.d files
-install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.sh
-install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.csh
-
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 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/%(basename %{SOURCE3})
-install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/catalyst
-install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_initrddir}/atieventsd
-install -D -p -m 0755 %{SOURCE7}
$RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/ati-powermode.sh
-install -D -p -m 0644 %{SOURCE8}
$RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-ac-aticonfig.conf
-install -D -p -m 0644 %{SOURCE9}
$RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
+install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/atieventsd
+install -D -p -m 0755 %{SOURCE5}
$RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/ati-powermode.sh
+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 \
- %{SOURCE5}
-
-# Set the correct path for gdm's Xauth file
-sed -i 's|GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth|GDM_AUTH_FILE=/var/gdm/$1.Xauth|'
fglrxpkg/etc/ati/authatieventsd.sh
+ %{SOURCE3}
# Fix odd perms
find fglrxpkg -type f -perm 0555 -exec chmod 0755 '{}' \;
@@ -254,33 +292,25 @@
%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
+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
+fi ||:
+
if [ "${1}" -eq 1 ]; then
- # Enable catalyst driver when installing
- %{_sbindir}/catalyst-config-display enable &>/dev/null
# Add init script(s) and start it
- /sbin/chkconfig --add catalyst
/sbin/chkconfig --add atieventsd
- /etc/init.d/catalyst start &>/dev/null
- 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
%preun
if [ "${1}" -eq 0 ]; then
- # Disable driver on final removal
- test -f %{_sbindir}/catalyst-config-display &&
%{_sbindir}/catalyst-config-display disable &>/dev/null
- /etc/init.d/catalyst stop &>/dev/null
- /sbin/chkconfig --del catalyst
+ /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
@@ -291,6 +321,7 @@
%dir %{_sysconfdir}/ati/
%doc %{_docdir}/amdcccle/ccc_copyrights.txt
%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
+%config %{_sysconfdir}/X11/xorg.conf.d/*.conf
%{_sysconfdir}/ati/atiogl.xml
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
@@ -301,38 +332,42 @@
%config %{_sysconfdir}/ati/authatieventsd.sh
%config %{_sysconfdir}/acpi/actions/ati-powermode.sh
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
-%config(noreplace) %{_sysconfdir}/profile.d/catalyst.*
%{_initrddir}/*
%{_sbindir}/*
%{_bindir}/*
-# Xorg libs that do not need to be multilib
+# no_multilib
%{_libdir}/xorg/modules/drivers/fglrx_drv.so
%{_libdir}/xorg/modules/linux/libfglrxdrm.so
-#/no_multilib
+%{_libdir}/xorg/modules/extensions/catalyst/
+%{_libdir}/xorg/modules/*.so
+%{_prefix}/lib/libAMDXvBA.cap
+# /no_multilib
%{_datadir}/applications/*amdcccle.desktop
%{_datadir}/ati/amdcccle/*
%{_datadir}/icons/*
%{_mandir}/man[1-9]/atieventsd.*
-%{_libdir}/xorg/modules/extensions/catalyst/
-%{_libdir}/xorg/modules/*.so
%files libs
%defattr(-,root,root,-)
%dir %{atilibdir}
+%config %{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
%{atilibdir}/*.so*
-%{atilibdir}/fglrx/*libGL*.so*
-%{atilibdir}/libAMDXvBA.cap
%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
%{atilibdir}/*.a
-#%{_libdir}/xorg/modules/*.a
%{_includedir}/fglrx/
-
%changelog
+* 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
+ * Fix several packaging bugs (#1932, #1965)
+- Skipped release 1 to keep F-14/15 & F-16 upgrade path in check
+- No longer use livna-config-display
+
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
- Update to Catalyst 11.4 (internal version 8.84.1)
- Port changes from F-14 branch
--- catalyst-config-display DELETED ---
--- catalyst-init DELETED ---
--- catalyst.csh DELETED ---
--- catalyst.sh DELETED ---
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---