Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6210/devel Modified Files: .cvsignore sources Added Files: amdcccle.desktop blacklist-radeon.conf catalyst-README.Fedora catalyst-a-ac-aticonfig catalyst-a-lid-aticonfig catalyst-ati-powermode.sh catalyst-atieventsd.init catalyst-config-display catalyst-init catalyst.csh catalyst.sh xorg-x11-drv-catalyst.spec Log Message: Initial import of xorg-x11-drv-catalyst --- NEW FILE amdcccle.desktop --- [Desktop Entry] Name=ATI Catalyst Control Center Name[de]=ATI Catalyst Control Center Name[es]=ATI Catalyst Control Center Name[fr]=ATI Catalyst Control Center Name[it]=ATI Catalyst Control Center GenericName=ATI Catalyst Control Center GenericName[de]=ATI Catalyst Control Center GenericName[es]=ATI Catalyst Control Center GenericName[fr]=ATI Catalyst Control Center GenericName[it]=ATI Catalyst Control Center Comment=ATI graphics adapter configuration Comment[de]=ATI Graphik-Adapterkonfiguration Comment[es]=Configuración del adaptador de los gráficos de ATI Comment[fr]=Configuration d'adapteur de graphiques d'ATI Comment[it]=Configurazione dell'adattatore dei grafici di ATI Icon=ccc_large Exec=amdcccle Type=Application Terminal=false Categories=Qt;System; --- NEW FILE blacklist-radeon.conf --- #blacklist required for proprietary fglrx driver blacklist radeon blacklist radeonfb blacklist drm --- NEW FILE catalyst-README.Fedora --- README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org. 1. After Installation ----------------------------- The easiest way to start using the fglrx drivers after installation is to restart your system. The hard way depends on your hardware and your configuration: 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: /sbin/rmmod radeon and end your X session once again. To check that hardware acceleration is working, issue the following command in a terminal: glxinfo | grep "OpenGL vendor" That should print out OpenGL vendor string: ATI Technologies Inc. Also, the command glxinfo | grep direct should print out direct rendering: Yes If it does, you're all set. 2. Basic Configuration ----------------------------- 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 3. Additional configuration ---------------------------------- For configuration options (TwinView, TV-out etc) see /usr/share/doc/fglrx-*/index.html 4. Kernel Module ----------------------------- The fglrx kernel module is required for DRI. For Fedora kernels you will find RPMs with the name: kmod-catalyst-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm (e.g. kmod-catalyst-2.6.27.19-170.2.35.fc10.x86_64-9.4-1.fc10.x86_64) at rpmfusion.org. If you use another kernel, grab the proper SRPM: (e.g catalyst-kmod-9.4.fc10.src.rpm) from rpmfusion.org and rebuild the kernel module with the following command: rpmbuild --rebuild /path/to/catalyst-srpm.src.rpm 5. Release-specific notes ----------------------------- Recent releases (Catalyst 8.12+) are incompatible with the plymouth boot system implemented in Fedora 10, as the 'radeon' and 'drm' kernel modules are loaded from the kernel ramdisk image (initrd) before fglrx can be. Because of this, these modules have been blacklisted. The open-source radeon driver as well as the plymouth graphical boot system will not function while the this driver is installed. If you would like to use them, please uninstall this driver first. The initrd image for the current kernel will need to be regenerated* before 3D rendering will function correctly. To do this, execute these commands as root: mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.rfbak mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r` A final reboot will be required before things function as expected. To restore plymouth functionality and use the open source drivers, first uninstall the xorg-x11-drv-catalyst package from your system and then run: mv /boot/initrd-`uname -r`.img.rfbak /boot/initrd-`uname -r`.img Once again, a reboot will be required before the open source drivers being working properly. * Please note that in some cases, the initrd image may need to be regenerated twice (once for getting fglrx to load, the other for putting the udev config file into the initrd image). If your machine still does not have working DRI or 3D rendering after regenerating the image once and rebooting, regenerate the image again: mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r` Reboot and DRI should be enabled correctly now. --- NEW FILE catalyst-a-ac-aticonfig --- # /etc/acpi/actions/ati-powermode.sh # Called when the user connects ac power to us # event=ac_adapter action=/etc/acpi/actions/ati-powermode.sh --- NEW FILE catalyst-a-lid-aticonfig --- # /etc/acpi/actions/ati-powermode.sh # Called when the user opens/closes the laptop lid # event=button[ /]lid action=/etc/acpi/actions/ati-powermode.sh --- NEW FILE catalyst-ati-powermode.sh --- #!/bin/bash # # Control script for ACPI lid state and AC adapter state # # Copyright (c) 2006, ATI Technologies Inc. All rights reserved. # # Fedora Modifications By Michael Larabel <Michael AT Phoronix.com> on July 5, 2006 getXuser() { user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` if [ x"$user" = x"" ]; then user=`finger| grep -m1 ":$displaynum" | awk '{print $1}'` fi if [ x"$user" != x"" ]; then userhome=`getent passwd $user | cut -d: -f6` export XAUTHORITY=$userhome/.Xauthority else export XAUTHORITY="" fi } grep -q closed /proc/acpi/button/lid/*/state if [ $? = 0 ]; then lid_closed=1 echo "Lid Closed" else lid_closed=0 echo "Lid Open" fi grep -q off-line /proc/acpi/ac_adapter/*/state if [ $? = 0 ]; then echo "On DC" on_dc=1 else echo "On AC" on_dc=0 fi if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then echo "Low power" for x in /tmp/.X11-unix/*; do displaynum=`echo $x | sed s#/tmp/.X11-unix/X##` getXuser; if [ x"$XAUTHORITY" != x"" ]; then export DISPLAY=":$displaynum" su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" fi done else echo "High power" for x in /tmp/.X11-unix/*; do displaynum=`echo $x | sed s#/tmp/.X11-unix/X##` getXuser; if [ x"$XAUTHORITY" != x"" ]; then export DISPLAY=":$displaynum" su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" fi done fi --- NEW FILE catalyst-atieventsd.init --- #!/bin/sh # Startup script for the ATI External Events Daemon (atieventsd) # # chkconfig: 5 97 07 # description: Grant or revoke access to X for the ATI External Events Daemon # Source function library. . /etc/rc.d/init.d/functions [ -f /usr/sbin/atieventsd ] || exit 0 prog=atieventsd opts="" PATH=/sbin:/usr/sbin:$PATH RETVAL=0 start() { echo -n $"Starting ATI External Events Daemon: " XAUTHORITY=/var/run/$prog.Xauthority $prog $opts RETVAL=$? pid=`pidof $prog` if [ -n "$pid" ] ; then success $"atieventsd" touch /var/lock/subsys/$prog echo $pid > /var/run/$prog.pid RETVAL=0 else failure $"atieventsd" RETVAL=1 fi echo } stop() { echo -n $"Stopping ATI External Events Daemon: " killproc $prog RETVAL=$? if [ $RETVAL -eq 0 ]; then rm -f /var/run/$prog.pid rm -f /var/lock/subsys/$prog fi echo } case "$1" in start) start ;; stop) stop ;; status) status $prog ;; restart|reload) stop start ;; condrestart) if [ -f /var/lock/subsys/$prog ]; then stop start fi ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" ;; esac exit $RETVAL --- NEW FILE catalyst-config-display --- #!/usr/bin/python -tt # -*- coding: UTF-8 -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 only # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2003, 2004 Peter Backlund # Copyright 2004 Thorsten Leemhuis # Copyright 2006, 2007 Van Assche Alphonse # Copyright 2006-2009 Stewart Adam # internal revision: 2.0 import os import sys from livnaConfigDisplay.const import * from livnaConfigDisplay.const import _ import livnaConfigDisplay.ConfigDisplay from livnaConfigDisplay.GlxConfig import * from livnaConfigDisplay import Utils from livnaConfigDisplay.ConfigFile import ConfigFile class catalystConfigDisplay(GlxConfig): """Autoconfiguration class for fglrx""" def __init__(self): """Initializes the internal variables & objects""" GlxConfig.__init__(self) self.vendor = 'catalyst' self.majorVendor = Utils.getMajorVendor() if self.vendor != Utils.getVendor(): print _('The initscript and installed driver vendors do not match!') sys.exit(1) self.ldconf = LD_CONF_FILE % (self.vendor) try: self.doAllBackups() except livnaConfigDisplayError, (bkupErrMsg): print bkupErrMsg sys.exit(1) self.xconfig, self.xconfigpath = self.loadXconfig() self.config = ConfigFile(STATUS_FILE) self.TOP_MOD_DIR = self.getModTopDir() def enable(self): """Enable the driver""" # Backup the file before make any change. currentDriver = self.getDriver() # Annoying bit because newer catalyst drivers require a Screen section if len(self.xconfig.layout) == 0: # no layouts layout = xf86config.XF86ConfLayout() self.xconfig.layout.insert(layout) layout.identifier = "Default Layout" else: layout = self.xconfig.layout[0] if len(layout.adjacencies) == 0: # no layout adjacencies layout.adjacencies.insert(xf86config.XF86ConfAdjacency()) layout.adjacencies[0].screen = "Screen0" if len(self.xconfig.screen) == 0: # no screens screen = xf86config.XF86ConfScreen() self.xconfig.screen.insert(screen) else: screen = self.xconfig.screen[0] screen.device = "Videocard0" screen.defaultdepth = 24 screen.identifier = "Screen0" self.xconfig.device[0].identifier = 'Videocard0' # fglrx modules self.addModulePath("/extensions/catalyst", self.TOP_MOD_DIR) # 'remembering' magic's in here. Do not allow setting old driver to fglrx. if currentDriver != self.majorVendor: self.config.setOldDriver(currentDriver) self.toggleDriver(currentDriver, self.majorVendor) self.addOption(self.majorVendor,"OpenGLOverlay" ,"off") self.addOption(self.majorVendor,"VideoOverlay" ,"on") if self.xconfig.modules: for module in ["glx", "dri", "extmod"]: if self.onlyHasModule(module): self.removeModule(module) break else: self.addModule(module) # if not already enabled if not os.path.exists(self.ldconf): if os.uname()[4] == "x86_64" : x86_64Content = "/usr/lib/catalyst\n/usr/lib64/catalyst\n" Utils.writeFile(self.ldconf, x86_64Content) else: Utils.writeFile(self.ldconf,"/usr/lib/catalyst\n") print _('Running ldconfig, this could take some time...') Utils.runLdconfig() Utils.writeXorgConf(self.xconfig, self.xconfigpath) self.restoreconf() def disable(self): """Disables the driver""" self.removeModulePath("/extensions/catalyst", self.TOP_MOD_DIR) # remove legacy path self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR) # Check if it's already disabled if not os.path.exists(self.ldconf): print _('Driver already disabled.') return # We have to save the status file so it can be restored later self.storeconf() # Backup the file before make any change. prevDriver = self.config.getOldDriver() if prevDriver == self.vendor: print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor) print _('Using the \'radeon\' driver instead.') prevDriver = "radeon" self.config.setOldDriver("radeon") self.removeOption(self.majorVendor,"OpenGLOverlay") self.removeOption(self.majorVendor,"VideoOverlay") self.toggleDriver(self.majorVendor, prevDriver) # Let's give control back to the naitive DRI Utils.removeFile(self.ldconf) print _('Running ldconfig, this could take some time...') Utils.runLdconfig() Utils.writeXorgConf(self.xconfig, self.xconfigpath) # And return to the Fedora default. self.enableAiglx() def printUsage(self): """Displays usage information""" print _("Usage: %s-config-display enable | disable ") % self.vendor def run(self): """Runs the appropriate autoconfiguation function""" # Check number of arguments # arg = action if len(sys.argv) > 2: print _('Wrong number of arguments') self.printUsage() sys.exit(1) # Check value of argument arg = sys.argv[1] if not arg.lower() in ['enable', 'disable']: print _('Invalid command: %s') % arg.lower() self.printUsage() sys.exit(1) try: if arg == "enable": if self.getActive(): self.enable() else: print _('livna-config-display\'s `active\' state is False - Exiting') elif arg == "disable": if self.getActive(): self.disable() except error, errMsg: #raise # Uncomment me to show the real error print MSG_CONF_APPLY_ERROR try: self.doAllRestores() except livnaConfigDisplayError, (bkupErrMsg): #raise # Uncomment me to show the real error print MSG_CONF_RESTORE_ERROR + '\n' + MSG_TRACEBACK % (str(errMsg)) + '\n\n' + str(bkupErrMsg) sys.exit(1) if __name__ == '__main__': app = catalystConfigDisplay() app.run() --- NEW FILE catalyst-init --- #!/bin/sh # # chkconfig: 2345 8 92 # description: This script will check if a fglrx kernel module is\ # present for the running kernel and modify the xorg.conf to \ # the appropriate configuration. # Source function library. . /etc/rc.d/init.d/functions name='catalyst' exec="/usr/sbin/$name-config-display" prog="`basename $exec`" lockfile="/var/lock/subsys/$name" RETVAL=0 modname="fglrx.ko" modpath="/lib/modules/$(uname -r)" # Default to no module module="noneWithSomeCrazyNameSoItsNeverFound" # If one exists, then use it. if test -e "${modpath}/extra/${modname}";then module="${modpath}/extra/${modname}" elif test -e "${modpath}/extra/catalyst/${modname}";then module="${modpath}/extra/catalyst/${modname}" elif test -e "${modpath}/kernel/drivers/video/catalyst/${modname}";then module="${modpath}/kernel/drivers/video/catalyst/${modname}" fi # Try to modify the below the least possible. If you need to change something, try # using the variables above first, as most of the program control is based on # the variables above. If something really needs to be changed, try to make # the change in all the drivers for the sake of consistency. # We shouldn't use lock files anymore because the lock file # doesn't mean a driver is disabled or enabled. For example, we start() # at boot and enable the driver. start() makes a lock file. We stop() on # shutdown, which removes the lock file. But what if the user ran *config-display # manually? Or if we don't `*config-display disable` in stop()? start() { if action $"Checking for module $modname:" test -f $module;then action $"Enabling the $name driver:" $exec enable RETVAL=$? else echo -en $"$modname for kernel $(uname -r) was not found." && echo_warning;echo -en '\n' echo -en $"$name DRI will not be enabled until one is found." && echo_warning;echo -en '\n' RETVAL=1 fi if [ "$RETVAL" -eq "0" ];then #touch $lockfile # this is a nothing assignment so that bash doesn't complain. RETVAL=0 else # Let them read the errors or warnings sleep 3 fi return } stop() { #RETVAL=$? RETVAL=0 #if [ "$RETVAL" -eq 0 ];then # rm -f $lockfile #fi return } restart() { stop start } reload() { restart } status() { #if [ -e $lockfile ];then if [ -f $module ] && lsmod | grep ^${modname%%.ko} &>/dev/null ;then echo $"$modname for kernel $(uname -r) was found." echo $"The driver is enabled." else echo $"$modname for kernel $(uname -r) was not found." echo -en $"$name DRI cannot be enabled until one is found." && echo_warning;echo -en '\n' fi #else # echo $"The $name driver has not been enabled." #fi RETVAL=0 } fdrstatus() { status $prog } case "$1" in start|stop|restart|reload) $1 ;; status) fdrstatus ;; condrestart) restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" exit 1 ;; esac exit $RETVAL --- NEW FILE catalyst.csh --- 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 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 endif --- NEW FILE catalyst.sh --- 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";; esac --- NEW FILE xorg-x11-drv-catalyst.spec --- %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 Name: xorg-x11-drv-catalyst Version: 9.4 Release: 4%{?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 Source13: blacklist-radeon.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} >= 11 ExclusiveArch: i586 x86_64 %else ExclusiveArch: i386 x86_64 %endif Requires: catalyst-kmod >= %{version} # Needed in all nvidia or fglrx driver packages BuildRequires: desktop-file-utils Requires: livna-config-display >= 0.0.23 Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} Requires(post): livna-config-display Requires(preun): livna-config-display Requires(post): chkconfig Requires(preun): chkconfig Provides: catalyst-kmod-common = %{version} Conflicts: xorg-x11-drv-nvidia Conflicts: xorg-x11-drv-nvidia-legacy Conflicts: xorg-x11-drv-nvidia-71xx Conflicts: xorg-x11-drv-nvidia-96xx Conflicts: xorg-x11-drv-nvidia-173xx Conflicts: xorg-x11-drv-nvidia-beta Conflicts: xorg-x11-drv-nvidia-newest Conflicts: xorg-x11-drv-nvidia-custom Conflicts: xorg-x11-drv-fglrx Obsoletes: catalyst-kmod < %{version} # ATI auto-generated RPMs Conflicts: ATI-fglrx Conflicts: ATI-fglrx-control-panel Conflicts: ATI-fglrx-devel Conflicts: kernel-module-ATI-fglrx Conflicts: ATI-fglrx-IA32-libs %description This package provides the most recent proprietary AMD display driver which allows for hardware accelerated rendering with ATI Mobility, FireGL and Desktop GPUs. Some of the Desktop and Mobility GPUs supported are the Radeon HD 2000 series to the Radeon HD 4800 series. For the full product support list, please consult the release notes for release %{version}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} %description devel This package provides the development files of the %{name} package, such as OpenGL headers. %package libs Summary: Libraries for %{name} Group: User Interface/X Hardware Support Requires: %{name} = %{version}-%{release} Requires(post): ldconfig Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release} %description libs This package provides the shared libraries for %{name}. %prep %setup -q -c -T sh %{SOURCE0} --extract fglrx tar -cjf catalyst-kmod-data-%{version}.tar.bz2 fglrx/common/usr/share/doc/fglrx/ATI_LICENSE.TXT \ 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/x740/* fglrx/arch/x86/* fglrxpkg/ %endif %ifarch x86_64 cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/ %endif # fix doc perms & copy README.Fedora find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \; install -pm 0644 %{SOURCE1} ./README.Fedora %build %install rm -rf $RPM_BUILD_ROOT ./__doc set +x for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e 'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$' -e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e 'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e 'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e '^./lib/modules/fglrx' -e '/usr/share/icons/ccc_') do if [[ ! "/${file##}" = "/${file}" ]] then install -D -p -m 0644 fglrxpkg/${file} ./__doc/${file##./usr/share/doc/fglrx/} elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/drivers}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/drivers/${file##./usr/X11R6/%{_lib}/modules/drivers} 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}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions} elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/%{_lib}/modules} %ifarch %{ix86} 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} %endif 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}}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/} elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/} elif [[ ! "/${file##./usr/X11R6/bin/}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_bindir}/${file##./usr/X11R6/bin/} elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sbindir}/${file##./usr/bin/} elif [[ ! "/${file##./usr/sbin/}" = "/${file}" ]] then install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sbindir}/${file##./usr/sbin/} elif [[ ! "/${file##./etc/}" = "/${file}" ]] then install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/${file##./etc/} elif [[ ! "/${file##./usr/include/}" = "/${file}" ]] then install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/${file##./usr/include/} elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]] then install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/} elif [[ ! "/${file##./usr/share/ati/amdcccle}" = "/${file}" ]] then install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file} else echo ${file} found -- don\'t know how to handle exit 1 fi 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 '{}' \; # 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 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 libfglrx_pp.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_pp.so.1 ln -s libfglrx_tvout.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_tvout.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_small.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_small.xpm 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 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 # Fix odd perms find fglrxpkg -type f -perm 0555 -exec chmod 0755 '{}' \; find fglrxpkg -type f -perm 0744 -exec chmod 0755 '{}' \; chmod 644 fglrxpkg/usr/src/ati/fglrx_sample_source.tgz find $RPM_BUILD_ROOT -type f -name '*.a' -exec chmod 0644 '{}' \; chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh # blacklist to prevent radeon autoloading mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-radeon.conf %clean rm -rf $RPM_BUILD_ROOT %post 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 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/chkconfig --del atieventsd fi ||: %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora %dir %{_sysconfdir}/ati/ %{_sysconfdir}/ati/atiogl.xml %{_sysconfdir}/ati/logo.xbm.example %{_sysconfdir}/ati/logo_mask.xbm.example %{_sysconfdir}/ati/amdpcsdb.default # These next two files control "supported hardware" verification %{_sysconfdir}/ati/signature %{_sysconfdir}/ati/control %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.* %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-radeon.conf %{_initrddir}/* %{_sbindir}/* %{_bindir}/* # Xorg libs that do not need to be multilib %{_libdir}/xorg/modules/drivers/fglrx_drv.so %{_libdir}/xorg/modules/linux/libfglrxdrm.so #/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}/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/GL/ %{_includedir}/fglrx/X11/extensions/*.h %changelog * Sun May 3 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-4 - Make the ExclusiveArch dynamic - Fix requirement on libs subpackage - Move ldconfig requirement to libs subpackage * Mon Apr 27 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-3 - Append '.conf' to the blacklist filename - No longer provide libs-32bit - Use ||: correctly in scriptlets * Thu Apr 23 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-2 - Remove udev configuration file - Install header files to our own directory - Do not provide/obsolete ati-x11-drv* - Remove redundant Require statements - Conflicts: xorg-x11-drv-nvidia custom and 71xx * Sat Apr 18 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-1 - Update to 9.4 - Fork as xorg-x11-drv-catalyst * Sat Apr 4 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-0.3.beta - Only disable ldconfig when driver is already enabled, always configure xorg.conf even if driver is already enabled * Sat Apr 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.4-0.2.beta - s/i386/i586/ in ExclusiveArch for F11 * Sat Mar 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-0.1.beta - Update to Catalyst 9.4 (beta) * Sat Mar 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.3-1 - Update to Catalyst 9.3 * Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 9.2-2 - Make devel subpackage depend on lib subpackage of the same arch * Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 9.2-1 - Update to Catalyst 9.2 * Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 9.1-1 - Use Catalyst version for Version tag instead of internal driver version - Update README.Fedora (add note concerning double initrd regeneration) * Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1 - Update to Catalst 9.1 - Sync with changes made for F-10 - Include README.Fedora in %%doc - Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs - Update License tag * Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12 - Update to 8.12 - Add Conflicts: for new nvidia packages * Mon Nov 17 2008 Stewart Adam <s.adam at diffingo.com> - 8.552-1.8.11 - Update to 8.11 * Mon Nov 3 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.6.8.11beta - Revert the libs dep change - Fix upgrade path for FreshRPMs users * Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.5.8.11beta - Remove the libs subpackage's dependency on main package * Thu Oct 23 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.4.8.11beta - Don't place Xorg modules in -libs - Let RPM detect dependency on libstdc * Mon Oct 20 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.3.8.11beta - Move libdri to the extensions/fglrx directory to prevent conflicts - Require livna-config-display >= 0.0.21 * Sat Oct 18 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.2.8.11beta - Change dependency of main package to libs subpackage in devel subpackage to fix multiarch repo push * Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.1.8.11beta - Update to 8.11 beta (8.54.3) * Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10 - Update to 8.10 * Sat Sep 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.532-1.8.09 - Update to 8.09 * Wed Sep 3 2008 Stewart Adam <s.adam at diffingo.com> - 8.522-2.8.08 - Fix x86 %%files * Thu Aug 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.522-1.8.08 - Update to 8.08 - Update description - Update the install grep loop and remove duplicate 'fglrx_sample_source.tgz$' * Thu Jul 24 2008 Stewart Adam <s.adam at diffingo.com> - 8.512-1.8.07 - Update to 8.07 * Wed Jun 18 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.501-1.8.06 - Update to 8.06 - Don't remove python-devel BR (I think this was a glitch in RPM pre-F9 rawhide) * Thu May 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.493-1.8.05 - Update to 8.05 - Update debuginfo fix * Fri Apr 18 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.476-1.8.04 - Update to 8.04 - Call ldconfig in post, postun for libs and main package * Wed Mar 5 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.471-1.8.03 - Update to 8.03 * Wed Feb 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.455.2-1.8.02 - Update to 8.02 * Sat Feb 2 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.452.1-3.8.01 - Port kwizart's changes to nvidia in devel: - Remove ldconfig call on the main package - Remove some old Obsoletes/Provides - Move the xorg modules to the main package (not needed for multilib) - Add Requires libGL.so from the right path * Sun Jan 27 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.452.1-2.8.01 - Main package requires %%{name}-libs - Fix -libs description * Sat Jan 19 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.452.1-1.8.01 - Update to Catalyst 8.01 - %%config(noreplace) the acpi configuration files - No shebangs in files that are to be sourced - Provides ati-fglrx since we obsolete it * Wed Dec 26 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.443.1-2.7.12 - Split up libraries - Remove libs-32bit package - Don't use %%dir and file listing, just use directoryname/ to grab the dir and all files in it - Add empty build section - Fix License tag - Provide proper libraries * Thu Dec 20 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.443.1-1.7.12 - Update to Catalyst 7.12 - Don't overwrite LD_LIBRARY_PATH for now * Wed Nov 21 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.43-1.7.11 - Update to Catalyst 7.11 * Mon Nov 5 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.42.3-7.1 - Fix typo in initscript * Thu Nov 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.42.3-7 - Initscript improvements - Minor bugfixes with scriptlets (don't echo "already disabled" type messages) - config(noreplace) the profile.d scripts * Sat Oct 27 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.42.3-6 - Modify profile.d scripts so that we find fglrx's libGL.so.1 * Thu Oct 25 2007 kwizart < kwizart at gmail.com > 8.42.3-5 - Strip binaries and libs even if no debuginfo is made - Fix some doc perms. * Thu Oct 25 2007 kwizart < kwizart at gmail.com > 8.42.3-4 - Fix Deletion of static libs until we support them on x86_64 - Fix post ldconfig on libs-32bit - Create symlinks for linker. * Wed Oct 24 2007 kwizart < kwizart at gmail.com > 8.42.3-3 - Fix x86_64 build (Remove 32bit static lib and use fglrx/arch/x86/* in fglrxpkg/ - Add postun script for 32bit package * Wed Oct 24 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.42.3-2 - BR: python-devel to fix "python: command not found" errors during build * Tue Oct 23 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.42.3-1 - Update to 8.42.3 - Change fglrx-config-display to leave AIGLX on by default now that it is supported by the drivers * Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> 8.40.4-3 - Disable debuginfo generation to avoid "no build id" errors * Sun Aug 19 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.40.4-2 - Add /etc/ati/signature * Tue Aug 16 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.40.4-1 - Update to 8.40.4 * Sun Jul 23 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.39.4-2 - Update ATI's fixed 8.39.4 * Thu Jul 19 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.39.4-1 - Update to 8.39.4 * Thu Jul 05 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.7-3 - make fglrx-config-display add/remove the OpenGLOverlay X option. This is aticonfig's default behavior * Sun Jul 1 2007 Stewart Adam <s.adam AT diffingo DOT com> 8.38.7-2 - Bump * Sat Jun 30 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.7-1 - Update to 8.38.7 - Whitespace alignment - Install the .desktop file more 'correctly' * Mon Jun 25 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.6-1 - Update to 8.38.6 - fglrx remains broken on Fedora 7 - removed remaining build requirements for old control panel * Sun Jun 03 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.37.6-3 - Further 'fixed' fglrx.csh. Hope it doesn't suck too badly. It seems to work, but someone with more C shell experience should fix it up. - Tweaked .desktop file (remove empty and unneeded entries, added 3 new languages). - Minor whitespace adjustments to the .spec - Remove build requirement qt-devel. CCC is binary only. We should look at the other build requirements as well since we no longer actually compile anything. * Sun Jun 3 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.37.6-2 - forgot to mention in 8.36.7-1 that atieventsd is now added - Fix fglrx.csh * Thu May 31 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.37.6-1 - Update to 8.37.6 - Add ||: to _all_ commands in pre/post scriptlets so they don't block the scriptlet if they fail to execute - New profile.d scripts, remove old /etc/profile.d script - Package our own desktop file * Sat Apr 28 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.36.5-3 - Fixes in the config-display (vendor > majorVendor) * Sun Apr 22 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.36.5-2 - fglrx-config-display updates * Wed Apr 18 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.36.5-1 - Update to new 8.36.5 release * Fri Mar 30 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.35.5-1 - Update to 8.35.5 - Update sources - Remove uneeded patch for the control panel sources * Sun Mar 25 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.34.8-10 - Sync devel with FC-6 - Fix up initscript a little - Update README * Fri Mar 9 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.34.8-9 - Fix up scriptlets a little so that 'Driver already enabled|disabled' doesn't always appear on install or remove - Update *-config-display files for majorVendor and not plain vendor * Fri Mar 2 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-8 - New config-display - New initscript - Bump to -8 * Mon Feb 26 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-6 - Remove broken symlink atiogl_a_dri.so - It's AMD not ATI's driver now! * Sat Feb 24 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.34.8-5 - Bump for new tag * Sat Feb 24 2007 Stewart Adam < <s.adam AT diffingo DOT com> - 8.34.8-4 - Standardize all summaries and descriptions with other nvidia and fglrx packages - Standardize initscript and *config-display with other nvidia and fglrx packages - Start merge with livna-config-display - No more ghost! * Thu Feb 22 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-3 - Add the profile.d script back, it was used for something else then workaround for the RH bug * Wed Feb 21 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-2 - Seems I can't overwrite a tag.. Bump I go! - Fix changelog date for 8.34.8-1 * Wed Feb 21 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-1 - Update to 8.34.8 - Move paths and names to plain fglrx, not ati-fglrx, the driver's name's long changed! - Don't own /usr/X11R6... It's part of the standard hierarchy! - Fix funny permissions on /etc/ files - Mark config files as %%config * Sun Feb 18 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-4 - Fix %%post, make it %%postun for libs-32bit * Sat Feb 17 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-3 - Change descriptions to more informative, easy-to-understand ones - Requires pyxf86config * Fri Jan 12 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-2 - ldconfig in %%postun for 32-bit libs, too! * Fri Jan 12 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-1 - Update to 8.33.6 - ldconfig in %%post for 32-bit libs * Tue Nov 27 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.31.5-3 - re-add workaround -- seems some machines still search in /usr/X11R6 for dri files * Mon Nov 27 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.31.5-2 - add modified version of a patch from Stewart Adam to put the DRI .so files to the right spot and remove the old workaround * Fri Nov 17 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.31.5-1 - Update to 8.31.5, patch from Edgan in #livna * Sat Oct 14 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.29.6-1 - Update to 8.29.6 (needed for 2.6.18 suppport/FC6) * Fri Aug 18 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.28.8-1 - Update to 8.28.4 - refactored %%prep now that ATi's installer has merged arches * Fri Aug 18 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-4 - updated/improved atieventsd init script - removed remove excess tabs/whitespace from fglrx-config-display - make tar quiet when creating the kmod tarball * Sat Aug 05 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-3 - don't try to use '*.sh' in the for loop - tone down the rant in ati-fglrx.profile.d * Tue Aug 01 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-2 - fix perms on static libs - added powerplay acpi bits - made authatieventsd actually do something. Thorsten's for loop hurts little children - rearranged files sections somewhat - move all *.a files to devel package - make the package actually build (file libaticonfig.a dropped upstream) * Sun Jul 30 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-1 - Update to 8.27.10 - minor changes to spacing, removal of random tabs, re-arrangements * Tue Jun 27 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.26.18-1 - Update to 8.26.18 * Fri Jun 02 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.25.18-2 - Fix 32bit libs * Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.25.18-1 - Update to 8.25.18 * Fri May 19 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.24.8-3 - Change security context in %%post until #191054 is fixed - conflict with nvidia packages * Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.24.8-2 - Require fglrx-kmod instead of kmod-fglrx, obsolete incompatible kmods (#970). * Sat Apr 15 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.24.8-1 - Update to 8.24.8 * Sun Apr 02 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7-6 - Fix a "lib != %%{_lib}" * Wed Mar 29 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.23.7-5 - fix perms on the headers - tweak nvidia-settings' desktop file slightly * Sun Mar 26 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7-4 - fix another stupid oddity of fglrx with modular X * Sun Mar 26 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7-3 - fix deps in devel - separate package for 32bit libs - some cleanups from straw - always activate driver - try to unload drm and radeon in profile.d script * Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7-2 - update fglrx-config-display - packge /usr/lib/xorg/modules/dri/fglrx_dri.so for now * Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7-1 - drop 0.lvn - update to 8.23.7 - ExclusiveArch i386 and not %%{ix86} -- we don't want to build for athlon&co - package some links that ldconfig normally would create * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.1 - split into packages for userland and kmod - rename to xorg-x11-drv-fglrx; yum/rpm should use mesa-libGL{,-devel} then in the future when seaching for libGL.so{,.1} - remove kernel-module part - remove old cruft * Mon Dec 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.3 - Add patch for kernel 2.6.15 * Tue Dec 13 2005 Dams <anvil[AT]livna.org> - 8.20.8.1-0.lvn.2 - Really dropped Epoch * Sat Dec 10 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.1 - Update to 8.20.8-1 - Drop Epoch * Sun Nov 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.19.10.1-0.lvn.2 - Patch for 2.6.14 still needed on x86_64 (thx Ryo Dairiki for noticing) * Sat Nov 12 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.19.10.1-0.lvn.1 - Update to 8.19.10-1 - Remove patches for 2.6.14 - Add fresh translation to desktop-file * Wed Nov 09 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.18.6.1-0.lvn.2 - Patch kernel-module source to compile with 2.6.14 * Thu Oct 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.18.6.1-0.lvn.1 - Update to 8.18.6-1 - Conflict with nvidia-glx{,-legacy) (#627) - Fix moduleline.split in fglrx-config-display (#582) - Unload drm in fglrx-config-display, too - Only ship self compiled fireglcontrolpanel * Fri Aug 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.16.20.1-0.lvn.1 - Update to 8.16.20-1 - Update patch1, fireglcontrol.desktop - Don't strip kernel-module for now * Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.5 - Update fglrx-2.6.12-inter_module_get.patch (thx to Mike Duigou) * Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.4 - Add patches from http://ati.cchtml.com/show_bug.cgi?id=136 and some tricks to built with 2.6.12 -- fixes building for FC4 * Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.3 - Missed one thing during reword of kernel-module-build-stuff - Both x86_64 and x86 in the same package now * Sun Jun 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.2 - Fix thinko * Sun Jun 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.1 - Rework kernel-module-build-stuff for FC3 kmd and FC4 and new livna scheme - Simplify the install; Lowers risk to miss files and is easier to maintain - Remove dep on fedora-rpmdevtools - Use modules and userland rpmbuild parameter to not build kernel- or driver-package * Wed May 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.12.10.1-0.lvn.2 - Add fix for kernel 2.6.11 * Fri Apr 08 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.12.10.1-0.lvn.1 - Update to 8.12.10-1 - mod 0755 dri.so to let rpm detect require libstdc++.so.5 * Thu Mar 06 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.10.19.1-0.lvn.2 - Add patch for via agpgart (#355) * Thu Feb 17 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.10.19.1-0.lvn.1 - Update to 8.10.19-1 - Remove patch for 2.6.10 kernel - require libstdc++.so.5 * Wed Jan 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.4 - fix x86-64 in spec-file and in fglrx-config-display - Fix by Ville Skyttä: ldconfig on upgrades * Wed Jan 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.3 - Package library links * Wed Jan 19 2005 Dams <anvil[AT]livna.org> - 0:8.8.25.1-0.lvn.2 - Urlized ati rpm source * Sat Jan 15 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.1 - Update to 8.8.25 - Remove workaround from last version - Remove special drm includes - Prepare package for 64-bit version; But untested ATM - Update patches * Tue Jan 11 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.3 - add patch10 -- allows building on 2.6.10; Found: http://www.rage3d.com/board/showthread.php?t=33798874&highlight=2.6.10 - update drm-includes - temporary for kernel-module: Requires: ati-fglrx >= %%{epoch}:%%{version}-0.lvn.2 so we don't have to rebuild the driver package * Sun Nov 21 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.2 - Use kernelp and driverp rpmbuild parameter to not build kernel- or driver-package - Trim doc in header * Fri Nov 04 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.1 - Update to 3.14.6 * Fri Nov 04 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.7 - Build per default without kmoddev - Rename --without tools to --without dirverp - Update dri-headers to 2.6.9 version - update building documentation in header * Fri Oct 22 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.6 - Some small cleanups to various parts of the package as suggested by Dams * Fri Oct 22 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.5 - Enhance makefile patch so building with different uname should work correctly - Build verbose * Thu Oct 21 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.4 - Update fedora-unrpm usage to work with newer version - Update one para in README and fglrx-config-display output * Fri Oct 15 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.3 - Change the enabling/disabling methode again -- driver is changed now directly. DRI is enabled when fglrx is enabled, but try to unload/warn if radeon kernel-module is loaded. DRI will be disabled and reenabled on the when next restart when disableing fglrx driver. - Update README.fglrx.Fedora * Mon Oct 11 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.2 - Let new version of ati-flrx-config-display change default depth to 24 - Updated Spec-File bits: fedora-kmodhelper usage and building description * Thu Sep 30 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.1 - Update to 3.14.1 - In expectation of missing kernel-sourcecode package in FC3 remove the BR on it and include the neccessary header-files in the package. Will integrate more packages if there are API changes. But for now I think this is the easiest methode. - Let ati-flrx-config-display handle /etc/ld.so.conf.d/ati-fglrx.conf - Update ati-flrx-config-display; it adds a VideoOverlay Option now so xv works out of the box - Don't (de)activate driver if DRI-Kernel-Modules are loaded; Let the init script to that during restart - Update README.fglrx.Fedora * Wed Sep 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.12.0-0.lvn.2 - Allow rpm to strip the kernel module. - Fix shared library permissions. - Split Requires(post,postun) to two to work around a bug in rpm. - Fix -devel dependencies and kernel module package provisions. - Improve summary and description, remove misleading comments. * Sat Sep 11 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.12.0-0.lvn.1 - Update to 3.12.0 - Fix some fedora-kmodhelper/kernel-module related bits in spec - Clean up install part a bit more * Sun Sep 05 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.6 - Add stupid ati-fglrx.profile.d workaround for systems that had the original fglrx drivers installed before - Conflict with fglrx -- the package should be removed so it can clean up the mess it did itself. - Clean up desktop file * Tue Aug 24 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.5 - Add ifdefs so building tools and kernel-module can be separated - BuildRequire kernel-sourcecode kverrel, not kernel * Wed Aug 17 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.4 - Fixed double release in Requires of devel-package - Building against custom kernels now should work using rhkernel-macro - Updated fedora-kmodhelper to 0.9.10 - Add 'include ld.so.conf.d/*.conf' before /usr/lib/X11 in /etc/ld.so.conf if it does not exists * Wed Aug 10 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.3 - small fixes for dump issues * Thu Aug 09 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.2 - BuildRequire fedora-rpmdevtools - Use KERNEL_PATH correctly, needs updated patch1 * Sat Aug 07 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.1 - Update to 3.11.1 - Minor fixes * Fri Aug 6 2004 Dams <anvil[AT]livna.org> 0:3.9.0-0.lvn.4 - .a files are 0644 moded. tgz files too. - Added missing BuildReq: desktop-file-utils, qt-devel, fedora-rpmdevtools * Mon Jul 19 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.3 - Update Patches to a working solution - Modify start-script-- fglrx can also work without kernel-module (no DRI then) * Sun Jul 18 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.2 - intergrate Readme, init-script and fglrx-config-display (stolen from nvidia package) * Sat Jul 17 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2009 17:47:31 -0000 1.1 +++ .cvsignore 6 May 2009 20:01:21 -0000 1.2 @@ -0,0 +1 @@ +ati-driver-installer-9-4-x86.x86_64.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2009 17:47:31 -0000 1.1 +++ sources 6 May 2009 20:01:21 -0000 1.2 @@ -0,0 +1 @@ +bdedd0405021f31000cca3399d5f7336 ati-driver-installer-9-4-x86.x86_64.run