12:45 a.m.
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11923
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Removed Files:
filter-provides.sh filter-requires.sh
Log Message:
* Fri Oct 28 2011 Stewart Adam <s.adam at diffingo.com> 11.9-2
- Fix several packaging bugs (#1932, #1965)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 29 Sep 2011 00:10:36 -0000 1.7
+++ .cvsignore 29 Oct 2011 00:45:01 -0000 1.8
@@ -1 +1,2 @@
ati-driver-installer-11-9-x86.x86_64.run
+xvba-sdk-0.74-404001.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 29 Sep 2011 00:10:36 -0000 1.6
+++ sources 29 Oct 2011 00:45:01 -0000 1.7
@@ -1 +1,2 @@
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-15/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-catalyst.spec 29 Sep 2011 00:10:36 -0000 1.6
+++ xorg-x11-drv-catalyst.spec 29 Oct 2011 00:45:01 -0000 1.7
@@ -8,13 +8,14 @@
Name: xorg-x11-drv-catalyst
Version: 11.9
-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
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
+Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
+Source2: catalyst-README.Fedora
Source3: catalyst-config-display
Source4: catalyst-init
Source5: amdcccle.desktop
@@ -22,12 +23,6 @@
Source7: catalyst-ati-powermode.sh
Source8: catalyst-a-ac-aticonfig
Source9: catalyst-a-lid-aticonfig
-# 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}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,21 +36,22 @@
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: livna-config-display >= 0.0.23
+
Requires(post): livna-config-display
-Requires(preun): livna-config-display
Requires(post): chkconfig
+Requires(preun): livna-config-display
Requires(preun): chkconfig
Provides: catalyst-kmod-common = %{version}
@@ -77,6 +73,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
@@ -90,7 +92,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}
@@ -110,7 +116,16 @@
%prep
%setup -q -c -T
+# Extract fglrx driver
sh %{SOURCE0} --extract fglrx
+
+# 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/
@@ -132,10 +147,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
@@ -212,23 +231,34 @@
done
set -x
-# 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
'{}' \;
+# Install XvBA headers
+install -D -p -m 0644 amdxvba/include/amdxvba.h $RPM_BUILD_ROOT%{_includedir}/fglrx
-# Remove the fglrx prefix on some of the new library filenames
-mv $RPM_BUILD_ROOT/%{atilibdir}/{fglrx-,}libGL.so.1.2
-mv $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
+# 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
-# if we want versioned libs, then we need to change this and the loop above
+# 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 libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/libGL.so.1
+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
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 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/catalyst-config-display
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
@@ -240,9 +270,6 @@
--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
-
# Fix odd perms
find fglrxpkg -type f -perm 0555 -exec chmod 0755 '{}' \;
find fglrxpkg -type f -perm 0744 -exec chmod 0755 '{}' \;
@@ -260,6 +287,14 @@
%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
@@ -279,8 +314,9 @@
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/service catalyst stop >/dev/null 2>&1
/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
@@ -310,34 +346,34 @@
%{_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}
%{atilibdir}/*.so*
-%{atilibdir}/switchlibGL
-%{atilibdir}/switchlibglx
-%{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
+- Fix several packaging bugs (#1932, #1965)
+
* Wed Sep 28 2011 Stewart Adam <s.adam at diffingo.com> 11.9-1
- Update to Catalyst 11.9 (internal version 8.89.2)
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---