rpms/xorg-x11-drv-catalyst/devel 00-catalyst-modulepath.conf, 1.2, 1.3 01-catalyst-videodriver.conf, 1.2, 1.3 amdcccle.desktop, 1.2, 1.3 blacklist-radeon.conf, 1.4, 1.5 catalyst-README.Fedora, 1.4, 1.5 catalyst-a-ac-aticonfig, 1.2, 1.3 catalyst-a-lid-aticonfig, 1.2, 1.3 catalyst-ati-powermode.sh, 1.2, 1.3 catalyst-atieventsd.init, 1.2, 1.3 sources, 1.7, 1.8 xorg-x11-drv-catalyst.spec, 1.10, 1.11 .cvsignore, 1.6, 1.7 dead.package, 1.3, NONE
Leigh Scott
leigh123linux at rpmfusion.org
Sat Jul 11 16:52:39 CEST 2015
- Previous message: rpms/catalyst-kmod/devel catalyst-kmod.spec, 1.20, 1.21 catalyst-kmodtool-excludekernel-filterfile, 1.4, 1.5 compat_alloc-Makefile.patch, 1.3, 1.4 kernel_4.0-cr4-strn.patch, NONE, 1.1 sources, 1.8, 1.9 dead.package, 1.3, NONE
- Next message: rpms/xorg-x11-drv-catalyst/devel xorg-x11-drv-catalyst.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14859/devel
Modified Files:
.cvsignore
Added Files:
00-catalyst-modulepath.conf 01-catalyst-videodriver.conf
amdcccle.desktop blacklist-radeon.conf catalyst-README.Fedora
catalyst-a-ac-aticonfig catalyst-a-lid-aticonfig
catalyst-ati-powermode.sh catalyst-atieventsd.init sources
xorg-x11-drv-catalyst.spec
Removed Files:
dead.package
Log Message:
Give this zombie a new lease of life
Index: 00-catalyst-modulepath.conf
===================================================================
RCS file: 00-catalyst-modulepath.conf
diff -N 00-catalyst-modulepath.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 00-catalyst-modulepath.conf 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,5 @@
+# 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
Index: 01-catalyst-videodriver.conf
===================================================================
RCS file: 01-catalyst-videodriver.conf
diff -N 01-catalyst-videodriver.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 01-catalyst-videodriver.conf 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,6 @@
+# This file is provided by xorg-x11-drv-catalyst; do not edit.
+Section "Device"
+ Identifier "Videocard0"
+ Driver "fglrx"
+EndSection
+
Index: amdcccle.desktop
===================================================================
RCS file: amdcccle.desktop
diff -N amdcccle.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ amdcccle.desktop 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,21 @@
+[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;
Index: blacklist-radeon.conf
===================================================================
RCS file: blacklist-radeon.conf
diff -N blacklist-radeon.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blacklist-radeon.conf 11 Jul 2015 14:52:38 -0000 1.5
@@ -0,0 +1,4 @@
+# RPM Fusion blacklist for radeon driver - you need to run as root:
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# if radeon is loaded despite this file.
+blacklist radeon
Index: catalyst-README.Fedora
===================================================================
RCS file: catalyst-README.Fedora
diff -N catalyst-README.Fedora
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-README.Fedora 11 Jul 2015 14:52:38 -0000 1.5
@@ -0,0 +1,78 @@
+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:
+ 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
+then 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 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
+----------------------------------
+
+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
+-----------------------------
+
+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.
+
Index: catalyst-a-ac-aticonfig
===================================================================
RCS file: catalyst-a-ac-aticonfig
diff -N catalyst-a-ac-aticonfig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-a-ac-aticonfig 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,6 @@
+# /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
Index: catalyst-a-lid-aticonfig
===================================================================
RCS file: catalyst-a-lid-aticonfig
diff -N catalyst-a-lid-aticonfig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-a-lid-aticonfig 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,6 @@
+# /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
Index: catalyst-ati-powermode.sh
===================================================================
RCS file: catalyst-ati-powermode.sh
diff -N catalyst-ati-powermode.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-ati-powermode.sh 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,65 @@
+#!/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
Index: catalyst-atieventsd.init
===================================================================
RCS file: catalyst-atieventsd.init
diff -N catalyst-atieventsd.init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-atieventsd.init 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,72 @@
+#!/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
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 11 Jul 2015 14:52:38 -0000 1.8
@@ -0,0 +1,2 @@
+65bb3ac5ec0201ba7940ae0db151bf3d amd-driver-installer-15.20.1046-x86.x86_64.zip
+b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: xorg-x11-drv-catalyst.spec
diff -N xorg-x11-drv-catalyst.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xorg-x11-drv-catalyst.spec 11 Jul 2015 14:52:38 -0000 1.11
@@ -0,0 +1,525 @@
+%global atilibdir %{_libdir}/catalyst
+%global amdrun amd-driver-installer-15.20.1046-x86.x86_64.run
+%global debug_package %{nil}
+
+%global __strip /bin/true
+Name: xorg-x11-drv-catalyst
+Version: 15.20
+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: http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip
+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: blacklist-radeon.conf
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 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
+# 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): 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
+
+%{?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
+Desktop GPUs. Some of the Desktop and Mobility GPUs supported are the
+Radeon HD 2xxx series to the Radeon HD 6xxx 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
+%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}
+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
+# Unzip fglrx driver
+unzip %{SOURCE0}
+# Extract fglrx driver
+sh %{amdrun} --extract fglrx
+
+# Extract XvBA devel files
+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
+tar -cjf catalyst-kmod-data-%{version}.tar.bz2 fglrx/common/usr/share/doc/fglrx/LICENSE.TXT \
+ fglrx/common/*/modules/fglrx/ \
+ fglrx/arch/*/*/modules/fglrx/
+
+mkdir fglrxpkg
+%ifarch %{ix86}
+cp -r fglrx/common/* fglrx/xpic/* fglrx/arch/x86/* fglrxpkg/
+%endif
+
+%ifarch x86_64
+cp -r fglrx/common/* fglrx/xpic_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 %{SOURCE2} ./README.Fedora
+
+# 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
+
+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_' -e '^./usr/share/ati/lib')
+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/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}
+ 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}/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}/}
+ 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}
+ elif [[ ! "/${file##./usr/share/doc/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
+
+# 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
+
+# ATI says this is a 64-bit binary, but it's not.
+rm -rf $RPM_BUILD_ROOT%{atilibdir}/libSlotMaximizerBe.so
+
+
+# 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
+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 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
+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
+
+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 '{}' \;
+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
+
+# Remove rpaths (see comment on chrpath BR above)
+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
+
+#Blacklist radeon
+install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+# Update the user's version numbers in the AMD Control Center.
+if [ -f %{_sysconfdir}/amdpcsdb ];then
+ 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 rd.driver.blacklist=radeon' &>/dev/null
+ fi
+fi ||:
+
+%post libs -p /sbin/ldconfig
+
+%preun
+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 rd.driver.blacklist=radeon' &>/dev/null
+ fi
+fi ||:
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
+%dir %{_sysconfdir}/ati/
+%doc %{_docdir}/amdcccle/ccc_copyrights.txt
+%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
+%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-radeon.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
+%{_sysconfdir}/ati/atiapfxx.blb
+%{_sysconfdir}/ati/atiapfxx
+%{_sysconfdir}/ati/atiapfxx.log
+%{_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/amd*.icd
+# 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
+%{_initrddir}/*
+%{_sbindir}/*
+%{_bindir}/*
+# no_multilib
+%{_libdir}/xorg/modules/drivers/fglrx_drv.so
+%{_libdir}/xorg/modules/linux/libfglrxdrm.so
+%{_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.*
+
+%files libs
+%defattr(-,root,root,-)
+%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
+* Sun Apr 27 2014 Leigh Scott <leigh123linux at googlemail.com> - 14.4-1
+- Update to Catalyst 14.4 (internal version 14.10.1006)
+
+* Thu Oct 03 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.9-1
+- Update to Catalyst 13.9 (internal version 13.152)
+
+* Sat Aug 03 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
+* Wed May 29 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.6-0.1.beta
+- Update to Catalyst 13.6beta (internal version 13.101)
+
+* Sat May 11 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.4-1
+- Update to Catalyst 13.4 (internal version 12.104)
+
+* Sun Jan 20 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.1-1
+- Update to Catalyst 13.1 (internal version 9.012)
+
+* Wed Dec 05 2012 Leigh Scott <leigh123linux at googlemail.com> - 12.11-0.3.beta11
+- Update to Catalyst 12.11 beta11 (internal version 9.01.8)
+- add blacklist file to %%{_prefix}/lib/modprobe.d/
+
+* Mon Nov 05 2012 Leigh Scott <leigh123linux at googlemail.com> - 12.11-0.2.beta
+- update blacklist scriptlets
+
+* Sat Oct 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 12.11-0.1.beta
+- Update to Catalyst 12.11 beta (internal version 9.01)
+
+* Tue Oct 23 2012 Leigh Scott <leigh123linux at googlemail.com> - 12.10-1
+- Update to Catalyst 12.10 release (internal version 9.002)
+
+* Mon Oct 01 2012 Leigh Scott <leigh123linux at googlemail.com> - 12.9-0.1.beta
+- Update to Catalyst 12.9 beta (internal version 9.00)
+
+* Fri Aug 17 2012 Leigh Scott <leigh123linux at googlemail.com> - 12.8-1
+- Update to Catalyst 12.8 release (internal version 8.982)
+
+* Sat Jun 30 2012 leigh scott <leigh123linux at googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 release (internal version 8.98)
+
+* Sun Jun 24 2012 leigh scott <leigh123linux at googlemail.com> - 12.6-0.1
+- Update to Catalyst 12.6 beta (internal version 8.98)
+
+* Fri Apr 27 2012 leigh scott <leigh123linux at googlemail.com> - 12.4-1
+- Update to Catalyst 12.4 (internal version 8.961)
+
+* Fri Mar 30 2012 leigh scott <leigh123linux at googlemail.com> - 12.3-1
+- Update to Catalyst 12.3 (internal version 8.951)
+
+* Sun Feb 05 2012 Stewart Adam <s.adam at diffingo.com> - 12.1-1
+- Update to Catalyst 12.1 (internal version 8.93)
+
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-3
+- Bump because of rawhide tagging issue
+
+* 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)
+- Fix several packaging bugs (#1932, #1965)
+- Port changes from F-15 branch by Nicolas Chauvet in rfbz#1965
+- 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
+
+* 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
+
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 18 Sep 2013 14:41:38 -0000 1.6
+++ .cvsignore 11 Jul 2015 14:52:38 -0000 1.7
@@ -1,3 +1,2 @@
+amd-driver-installer-15.20.1046-x86.x86_64.zip
xvba-sdk-0.74-404001.tar.gz
-ati-driver-installer-11-11-x86.x86_64.run
-amd-catalyst-13.8-beta2-linux-x86.x86_64.zip
--- dead.package DELETED ---
- Previous message: rpms/catalyst-kmod/devel catalyst-kmod.spec, 1.20, 1.21 catalyst-kmodtool-excludekernel-filterfile, 1.4, 1.5 compat_alloc-Makefile.patch, 1.3, 1.4 kernel_4.0-cr4-strn.patch, NONE, 1.1 sources, 1.8, 1.9 dead.package, 1.3, NONE
- Next message: rpms/xorg-x11-drv-catalyst/devel xorg-x11-drv-catalyst.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list