Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv20896 Modified Files: .cvsignore catalyst.csh catalyst.sh sources xorg-x11-drv-catalyst.spec Log Message: * Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1 * Update to Catalyst 11.6 (internal version 8.86.1) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 May 2011 07:45:27 -0000 1.6 +++ .cvsignore 18 Jun 2011 21:30:42 -0000 1.7 @@ -1 +1 @@ -ati-driver-installer-11-4-x86.x86_64.run +ati-driver-installer-11-6-x86.x86_64.run Index: catalyst.csh =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/catalyst.csh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- catalyst.csh 6 May 2009 20:01:21 -0000 1.1 +++ catalyst.csh 18 Jun 2011 21:30:42 -0000 1.2 @@ -1,9 +1,9 @@ set arch = `uname -m` if ($arch == x86_64) then - setenv LIBGL_DRIVERS_PATH /usr/lib64/dri:/usr/lib/dri - #setenv LD_LIBRARY_PATH /usr/lib64/fglrx:/usr/lib/fglrx:$LD_LIBRARY_PATH + setenv LIBGL_DRIVERS_PATH /usr/lib64/dri:/usr/lib/dri:$LIBGL_DRIVERS_PATH + setenv LD_LIBRARY_PATH /usr/lib64/catalyst:/usr/lib/catalyst:$LD_LIBRARY_PATH else if ($arch =~ i[3-6]86) then - setenv LIBGL_DRIVERS_PATH /usr/lib/dri - #setenv LD_LIBRARY_PATH /usr/lib/fglrx:$LD_LIBRARY_PATH + setenv LIBGL_DRIVERS_PATH /usr/lib/dri:$LIBGL_DRIVERS_PATH + setenv LD_LIBRARY_PATH /usr/lib/catalyst:$LD_LIBRARY_PATH endif Index: catalyst.sh =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/catalyst.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- catalyst.sh 6 May 2009 20:01:21 -0000 1.1 +++ catalyst.sh 18 Jun 2011 21:30:42 -0000 1.2 @@ -1,8 +1,9 @@ ARCH="$(uname -m)" case "$ARCH" in - x86_64) export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib/dri";; - #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64/fglrx:/usr/lib/fglrx";; - i[3-6\d]86) export LIBGL_DRIVERS_PATH="/usr/lib/dri";; - #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/fglrx";; + x86_64) export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib/dri:$LIBGL_DRIVERS_PATH"; + export LD_LIBRARY_PATH="/usr/lib64/fglrx:/usr/lib/catalyst:$LD_LIBRARY_PATH";; + i[3-6\d]86) export LIBGL_DRIVERS_PATH="/usr/lib/dri:$LIBGL_DRIVERS_PATH"; + export LD_LIBRARY_PATH="/usr/lib/catalyst:$LD_LIBRARY_PATH";; esac + Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 May 2011 07:45:27 -0000 1.5 +++ sources 18 Jun 2011 21:30:42 -0000 1.6 @@ -1 +1 @@ -b50dc05ef3428a9ee632b09eebeb4586 ati-driver-installer-11-4-x86.x86_64.run +ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/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 2 May 2011 07:50:42 -0000 1.6 +++ xorg-x11-drv-catalyst.spec 18 Jun 2011 21:30:42 -0000 1.7 @@ -7,13 +7,13 @@ %endif Name: xorg-x11-drv-catalyst -Version: 11.4 +Version: 11.6 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: catalyst-README.Fedora Source3: catalyst-config-display Source4: catalyst-init @@ -154,6 +154,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 +171,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}/} @@ -208,9 +217,13 @@ # 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 '{}' \; +# 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 + # 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 libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/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 @@ -320,7 +333,8 @@ %defattr(-,root,root,-) %dir %{atilibdir} %{atilibdir}/*.so* -%{atilibdir}/fglrx/*libGL*.so* +%{atilibdir}/switchlibGL +%{atilibdir}/switchlibglx %{atilibdir}/libAMDXvBA.cap %{_libdir}/dri/ @@ -332,6 +346,9 @@ %{_includedir}/fglrx/ %changelog +* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1 +* Update to Catalyst 11.6 (internal version 8.86.1) + * Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1 - Update to Catalyst 11.4 (internal version 8.84.1)