rpmfusion-commits
October 2008
rpmfusion-commits@lists.rpmfusion.org
- 18 participants
- 749 discussions
rpms/rt2870-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsDh5494/rpms/rt2870-kmod/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module rt2870-kmod
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: rt2870-kmod
# $Id: Makefile,v 1.1 2008/10/05 13:28:56 thl Exp $
NAME := rt2870-kmod
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
16 years, 1 month
- 1
- 0
rpms/rt2870-kmod Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870-kmod
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsDh5494/rpms/rt2870-kmod
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module rt2870-kmod
--- NEW FILE Makefile ---
# Top level Makefile for module rt2870-kmod
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
16 years, 1 month
- 1
- 0
rpms/rt2870-kmod/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsDh5494/rpms/rt2870-kmod/devel
Log Message:
Directory /cvs/free/rpms/rt2870-kmod/devel added to the repository
16 years, 1 month
- 1
- 0
rpms/rt2870-kmod - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870-kmod
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsDh5494/rpms/rt2870-kmod
Log Message:
Directory /cvs/free/rpms/rt2870-kmod added to the repository
16 years, 1 month
- 1
- 0
rpms/rt2870/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsfb5319/rpms/rt2870/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module rt2870
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: rt2870
# $Id: Makefile,v 1.1 2008/10/05 13:28:25 thl Exp $
NAME := rt2870
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
16 years, 1 month
- 1
- 0
rpms/rt2870 Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsfb5319/rpms/rt2870
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module rt2870
--- NEW FILE Makefile ---
# Top level Makefile for module rt2870
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
16 years, 1 month
- 1
- 0
rpms/rt2870/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsfb5319/rpms/rt2870/devel
Log Message:
Directory /cvs/free/rpms/rt2870/devel added to the repository
16 years, 1 month
- 1
- 0
rpms/rt2870 - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsfb5319/rpms/rt2870
Log Message:
Directory /cvs/free/rpms/rt2870 added to the repository
16 years, 1 month
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-8 amdcccle.desktop, NONE, 1.1 fglrx-README.Fedora, NONE, 1.1 fglrx-a-ac-aticonfig, NONE, 1.1 fglrx-a-lid-aticonfig, NONE, 1.1 fglrx-ati-powermode.sh, NONE, 1.1 fglrx-atieventsd.init, NONE, 1.1 fglrx-config-display, NONE, 1.1 fglrx-init, NONE, 1.1 fglrx.csh, NONE, 1.1 fglrx.sh, NONE, 1.1 xorg-x11-drv-fglrx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4835
Modified Files:
.cvsignore sources
Added Files:
amdcccle.desktop fglrx-README.Fedora fglrx-a-ac-aticonfig
fglrx-a-lid-aticonfig fglrx-ati-powermode.sh
fglrx-atieventsd.init fglrx-config-display fglrx-init
fglrx.csh fglrx.sh xorg-x11-drv-fglrx.spec
Log Message:
import from livna
--- 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.xpm
Exec=amdcccle
Type=Application
Terminal=false
Encoding=UTF-8
Categories=Qt;System;
--- NEW FILE fglrx-README.Fedora ---
README for AMD's Linux fglrx drivers, as packaged by livna.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 fglrx driver should now be loaded if there is
a proper kernel-module installed. You can also run:
/etc/init.d/fglrx 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 -):
fglrx-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, run:
fglrx-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-fglrx-$(uname -r)-(ati-version)-(livna-release-tag).(arch).rpm
(e.g. kmod-fglrx-8.34.8-1.2.6.20_1.2933.fc6.i686.rpm)
at rpm.livna.org. If you use another kernel grab the proper SRPM
(e.g fglrx-kmod-8.34.8-4.2.6.20_1.2962.fc7.src.rpm)
from rpm.livna.org and rebuild the kernel module with the following command:
rpmbuild --rebuild /path/to/fglrxRPM.src.rpm
--- NEW FILE fglrx-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 fglrx-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 fglrx-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 fglrx-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 fglrx-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, 2007 Stewart Adam
import string
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 fglrxConfigDisplay(GlxConfig):
def __init__(self):
GlxConfig.__init__(self)
self.vendor = 'fglrx'
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()
# finally, run arg checks.
self.run()
def enable(self, isAutoConfigure=True):
# Backup the file before make any change.
currentDriver = self.getDriver()
# Already enabled?
if currentDriver == self.majorVendor:
print _('Driver already enabled.')
return
# fglrx modules
self.addModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# 'remembering' magic's in here.
self.config.setOldDriver(currentDriver)
#currentDriver = self.config.getOldDriver()
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 os.uname()[4] == "x86_64" :
x86_64Content = "/usr/lib/fglrx\n/usr/lib64/fglrx\n"
Utils.writeFile(self.ldconf, x86_64Content)
else:
Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
# Haven't heard of this in a while either.
#if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
# print WARNING_DRI_NOT_AVAILABLE
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# 20071023: AIGLX now supported by fglrx 8.42.3!
## Disable AIGLX by default, it's not compatible
#self.setComposite(False)
#self.setAiglxFlag(False)
self.restoreconf()
def disable(self, isAutoConfigure=True):
self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# Check if it's already disabled
if self.getDriver() != self.majorVendor:
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):
print _("Usage: %s-config-display enable | disable ") % self.vendor
def run(self):
# Check number of arguments
# arg = action
if len(sys.argv) == 2:
arg = sys.argv[1]
else:
print _('Wrong number of arguments')
self.printUsage()
sys.exit(1)
# Check value of argument
if arg.lower() != "enable" and arg.lower() != "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:
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)
app = fglrxConfigDisplay()
--- NEW FILE fglrx-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='fglrx'
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/fglrx/${modname}";then
module="${modpath}/extra/fglrx/${modname}"
elif test -e "${modpath}/kernel/drivers/video/fglrx/${modname}";then
module="${modpath}/kernel/drivers/video/fglrx/${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 fglrx.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 fglrx.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-fglrx.spec ---
%define atilibdir %{_libdir}/fglrx
%define ativersion 8.09
# 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-fglrx
Version: 8.532
Release: 3.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
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: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
Source5: amdcccle.desktop
Source6: fglrx-atieventsd.init
Source7: fglrx-ati-powermode.sh
Source8: fglrx-a-ac-aticonfig
Source9: fglrx-a-lid-aticonfig
Source10: fglrx.sh
Source11: fglrx.csh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: x86_64 i386
# pulls compat-libstdc++-33
Requires: libstdc++.so.5
Requires: libstdc++.so.5(CXXABI_1.2)
Requires: libstdc++.so.5(GLIBCPP_3.2)
Requires: fglrx-kmod >= %{version}
Requires(post): fglrx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
Requires: livna-config-display >= 0.0.18
Requires: %{name}-libs = %{version}-%{release}
Requires: %{atilibdir}/libGL.so.1.2
Requires(post): livna-config-display
Requires(preun): livna-config-display
Requires(post): chkconfig
Requires(post): ldconfig
Requires(preun): chkconfig
Provides: fglrx-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-96xx
Obsoletes: fglrx-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 9500 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} = %{version}-%{release}
Requires: %{_includedir}/X11/extensions, %{_includedir}/GL
%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}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
%endif
%description libs
This package provides the shared libraries for %{name}.
%prep
%setup -q -c -T
sh %{SOURCE0} --extract fglrx
tar -cjf fglrx-kmod-data-%{version}.tar.bz2 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/x710/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# fix doc perms
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
%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/fglrx/${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}/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
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/lib/}" = "/${file}" ]]
#then
# atilibdir32bit doesn't exist anymore; we do multiarch builds instead (ie "make i386" catches these files)
# #install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir32bit}/${file##./usr/X11R6/lib/}
# continue
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/ati/}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/ati/${file##./etc/ati/}
elif [[ ! "/${file##./usr/include/}" = "/${file}" ]] || [[ ! "/${file##./etc/}" = "/${file}" ]] || [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file}
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/fglrx.sh
install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/fglrx.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}/fglrx
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 livna \
--add-category X-Livna \
--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
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig ||:
if [ "${1}" -eq 1 ]; then
# Enable fglrx driver when installing
%{_sbindir}/fglrx-config-display enable &>/dev/null ||:
# Add init script(s) and start it
/sbin/chkconfig --add fglrx ||:
/sbin/chkconfig --add atieventsd ||:
/etc/init.d/fglrx start &>/dev/null ||:
fi ||:
%post libs -p /sbin/ldconfig
%preun
if [ "${1}" -eq 0 ]; then
# Disable driver on final removal
test -f %{_sbindir}/fglrx-config-display && %{_sbindir}/fglrx-config-display disable &>/dev/null ||:
/etc/init.d/fglrx stop &>/dev/null ||:
/sbin/chkconfig --del fglrx ||:
/sbin/chkconfig --del atieventsd ||:
fi ||:
%postun -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc fglrxpkg/usr/share/doc/fglrx/*
%dir %{_sysconfdir}/ati/
%{_sysconfdir}/ati/authatieventsd.sh
%{_sysconfdir}/ati/signature
%{_sysconfdir}/acpi/actions/ati-powermode.sh
%config %{_sysconfdir}/ati/atiogl.xml
%config %{_sysconfdir}/ati/logo.xbm.example
%config %{_sysconfdir}/ati/logo_mask.xbm.example
%config %{_sysconfdir}/ati/control
%config %{_sysconfdir}/ati/amdpcsdb.default
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
%config(noreplace)%{_sysconfdir}/profile.d/fglrx.*
%{_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.*
%files libs
%defattr(-,root,root,-)
%dir %{atilibdir}
%{atilibdir}/*.so*
# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
%{_libdir}/dri/
%{_libdir}/xorg/modules/*.so
%{_libdir}/xorg/modules/extensions/fglrx/
%files devel
%defattr(-,root,root,-)
%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
%{atilibdir}/*.a
%{_libdir}/xorg/modules/*.a
%{_includedir}/GL/
%{_includedir}/X11/extensions/*.h
%changelog
* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 8.532-3.8.09
- rebuild for rpm fusion
* Wed Oct 1 2008 Stewart Adam <s.adam at diffingo.com> - 8.532-2.8.09
- Move libdri to the extensions/fglrx directory to prevent conflicts
* 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
- Fix %%fedora comparison
* 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
* Wed Mar 5 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.471-1.8.03
- Update to 8.03
* Sat Feb 16 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
* Sun Dec 23 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.443.1-2.7.12
- Don't provide libGL.so.1
- libs-32bit requires /usr/lib/libGL.so.1.2
* Sat Dec 22 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
* 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-fglrx/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:03:10 -0000 1.1
+++ .cvsignore 5 Oct 2008 13:24:45 -0000 1.2
@@ -0,0 +1 @@
+ati-driver-installer-8-9-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:03:10 -0000 1.1
+++ sources 5 Oct 2008 13:24:45 -0000 1.2
@@ -0,0 +1 @@
+9e1bb93afaf194907e6b141b2e3c524b ati-driver-installer-8-9-x86.x86_64.run
16 years, 1 month
- 1
- 0
rpms/xorg-x11-drv-nvidia-legacy/F-8 60-nvidia.nodes, NONE, 1.1 filter-requires.sh, NONE, 1.1 nvidia-legacy-README.Fedora, NONE, 1.1 nvidia-legacy-config-display, NONE, 1.1 nvidia-legacy-init, NONE, 1.1 nvidia-legacy.csh, NONE, 1.1 nvidia-legacy.opts, NONE, 1.1 nvidia-legacy.sh, NONE, 1.1 nvidia-settings.desktop, NONE, 1.1 xorg-x11-drv-nvidia-legacy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-legacy/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4712
Modified Files:
.cvsignore sources
Added Files:
60-nvidia.nodes filter-requires.sh nvidia-legacy-README.Fedora
nvidia-legacy-config-display nvidia-legacy-init
nvidia-legacy.csh nvidia-legacy.opts nvidia-legacy.sh
nvidia-settings.desktop xorg-x11-drv-nvidia-legacy.spec
Log Message:
import from livna
--- NEW FILE 60-nvidia.nodes ---
nvidia0
nvidia1
nvidia2
nvidia3
nvidiactl
--- NEW FILE filter-requires.sh ---
#!/bin/sh
if [ -x /usr/lib/rpm/redhat/find-provides ]; then
FINDREQ=/usr/lib/rpm/redhat/find-requires
else
FINDREQ=/usr/lib/rpm/find-requires
fi
$FINDREQ $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d'
--- NEW FILE nvidia-legacy-README.Fedora ---
README for Nvidia Linux Drivers, as packaged by livna.org.
1. After Installation
---------------------
You only have to restart X to start using the Nvidia drivers after
installation. Either choose "Log Out" from the GNOME/KDE menu, and then
press Ctrl-Alt-Backspace at the login prompt, or press Ctrl-Alt-Backspace
directly. You should see a white screen with a big Nvidia logo in the middle
for about one second.
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: NVIDIA Corporation
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 Nvidia drivers again. If you want to temporarily
disable the Nvidia drivers without uninstalling, you can issue the
following two commands as root (remember su -):
nvidia-legacy-config-display disable
To re-enable the Nvidia drivers, run:
nvidia-legacy-config-display enable
3. Additional configuration
---------------------------
It's possible to configure image quality and performance by setting various
environment variables. Take a look at /etc/profile.d/nvidia-legacy.sh
(or .csh if you use csh) and read the README file in the same directory
as this file.
There are a number of settings in the X configuration file as well.
The most interesting are acceleration of the XRENDER extension and AGP
configuration. In the Driver section of /etc/X11/xorg.conf, you may add
the following line:
Option "RenderAccel" "true"
to enable XRENDER acceleration. A value of "false" disables it.
Note: this has shown to make some systems unstable, making the display freeze.
If you experience this, set to "false" or comment out the line.
To control AGP behaviour, add the following line to the Driver section:
Option "NvAGP" "X"
where X is 0, 1, 2 or 3. The different values are as follows (from Nvidia
README):
0 : disable agp
1 : use NVIDIA's internal AGP support, if possible
2 : use AGPGART, if possible
3 : use any agp support (try AGPGART, then NVIDIA's AGP)
Default is 3. AGPGART is the Linux kernel AGP driver. See Nvidia README,
appendix D for more information. AGP speed is controlled by giving a parameter
to the Nvidia kernel module, but should be autodetected in most cases.
See output of "modinfo nvidia".
For more configuration options (TwinView, TV-out etc) see the Nvidia README.
4. An Initscript to enable/disable nvidia driver
------------------------------------------------
To make gdm work at system start this package contains an initscript that
will be run during start up. This script will detect if the nvidia module
for the running kernel is present. If the module is present, then the
initscript will run.
"nvidia-legacy-config-display enable"
so that the X server will use the nvidia driver, otherwise it will run
"nvidia-legacy-config-display disable"
and X will use the nv driver. You can disable this check by running, as
root (with root $PATH) :
chkconfig nvidia-legacy off
This script will also be invoked when switching to runlevels 6
(reboot) and 0 (halt). When rebooting (or shutting down) the system,
the script will _disable_ nvidia driver (and switch back to "nv"
driver), so that, whatever the kernel you boot, Red Hat Graphical Boot
will work.
We suggest you read the chkconfig(8) man page for complete
informations about how to handle rc scripts.
--- NEW FILE nvidia-legacy-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 Van Assche Alphonse
# Copyright 2006, 2007 Stewart Adam
import string
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 nvidiaConfigDisplay(GlxConfig):
def __init__(self):
GlxConfig.__init__(self)
self.vendor = 'nvidia-legacy'
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()
# finally, run arg checks.
self.run()
def enable(self, isAutoConfigure = True):
# Backup the file before make any change.
currentDriver = self.getDriver()
# Already enabled?
if currentDriver == self.majorVendor:
print _('Driver already enabled.')
return
# nVidia modules
self.addModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
# 'remembering' magic's in here.
self.config.setOldDriver(currentDriver)
#currentDriver = self.config.getOldDriver()
self.toggleDriver(currentDriver, self.majorVendor)
# Disable dri and GLcore modules - these are no
self.removeModule("dri")
self.removeModule("GLcore")
# Add glx/dbe/extmod modules when modules section exists
if self.xconfig.modules:
for module in ["glx", "dbe", "extmod"]:
if self.onlyHasModule(module):
self.removeModule(module)
break
else:
self.addModule(module)
# Problems with Compiz without these.
self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
#self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# We have to read saved status file to restore the Xorg configuration.
self.restoreconf()
def disable(self, isAutoConfigure = True):
self.removeModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
# Check if it's already disabled
if self.getDriver() != self.majorVendor:
print _('Driver already disabled.')
return
# Backup the file before make any change.
prevDriver = self.config.getOldDriver()
if prevDriver == self.majorVendor:
print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
print _('Using the \'nv\' driver instead.')
prevDriver = "nv"
self.config.setOldDriver("nv")
self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
#self.removeOption(self.majorVendor,"DisableGLXRootClipping")
self.toggleDriver(self.majorVendor, prevDriver)
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# We have to save the status file so it can be restored later
self.storeconf()
# Disable AIGLX by default, it's not compatible
self.setComposite(False)
self.setAiglxFlag(False)
def printUsage(self):
print _("Usage: ") + self.vendor + _("-config-display [ enable|disable ]")
def run(self):
# Check number of arguments
# arg = action
if len(sys.argv) == 2:
arg = sys.argv[1]
else:
print _('Wrong number of arguments')
self.printUsage()
sys.exit(1)
# Check value of argument
if arg.lower() != "enable" and arg.lower() != "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:
raise # Uncomment me to show the real error
print MSG_CONF_APPLY_ERROR
try:
self.doAllRestores()
sys.exit(1)
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)
app = nvidiaConfigDisplay()
--- NEW FILE nvidia-legacy-init ---
#!/bin/sh
#
# chkconfig: 2345 8 92
# description: This script will check if a nvidia legacy 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='nvidia-legacy'
exec="/usr/sbin/$name-config-display"
prog="`basename $exec`"
lockfile="/var/lock/subsys/$name"
RETVAL=0
modname="nvidia.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/nvidia/${modname}";then
module="${modpath}/extra/nvidia/${modname}"
elif test -e "${modpath}/kernel/drivers/video/nvidia/${modname}";then
module="${modpath}/kernel/drivers/video/nvidia/${modname}"
elif test -e "${modpath}/extra/nvidia-legacy/${modname}";then
module="${modpath}/extra/nvidia-legacy/${modname}"
elif test -e "${modpath}/kernel/drivers/video/nvidia-legacy/${modname}";then
module="${modpath}/kernel/drivers/video/nvidia-legacy/${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 $"The $name driver will not be enabled until one is found." && echo_warning;echo -en '\n'
$exec disable
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() {
#action $"Disabling the $name driver:" $exec disable
#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 $"The $name driver cannot be enabled until one is found."
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 nvidia-legacy.csh ---
# These variables are used to control image quality and performance.
# Uncomment these and set an appropriate value if needed
# See /usr/share/doc/xorg-x11-drv-nvidia-legacy-<version>/README.txt for more information.
# Setting this to 1 might prevent certain OpenGL apps from crashing.
#setenv __GL_SINGLE_THREADED 0
# This setting controls full scene antialiasing.
# Depending on your chipset, different values give different types of FSAA.
#setenv __GL_FSAA_MODE 0
# Anisotropic filtering. This setting is also chip dependent, see above.
#setenv __GL_DEFAULT_LOG_ANISO 0
# Sync buffer swap with monitor refresh. A value > 0 enables.
#setenv __GL_SYNC_TO_VBLANK 0
# If you have more than one monitor, this setting determines which display
# should be synced.
#setenv __GL_SYNC_DISPLAY_DEVICE
--- NEW FILE nvidia-legacy.opts ---
alias char-major-195* nvidia
options nvidia NVreg_ModifyDeviceFiles=0
--- NEW FILE nvidia-legacy.sh ---
# These variables are used to control image quality and performance.
# Uncomment these and set an appropriate value if needed
# See /usr/share/doc/xorg-x11-drv-nvidia-legacy-<version>/README.txt for more information.
# Setting this to 1 might prevent certain OpenGL apps from crashing.
#export __GL_SINGLE_THREADED=0
# This setting controls full scene antialiasing.
# Depending on your chipset, different values give different types of FSAA.
#export __GL_FSAA_MODE=0
# Anisotropic filtering. This setting is also chip dependent, see above.
#export __GL_DEFAULT_LOG_ANISO=0
# Sync buffer swap with monitor refresh. A value > 0 enables.
#export __GL_SYNC_TO_VBLANK=0
# If you have more than one monitor, this setting determines which display
# should be synced.
#export __GL_SYNC_DISPLAY_DEVICE=
--- NEW FILE nvidia-settings.desktop ---
[Desktop Entry]
Name=nVidia Display Settings
Comment=Configure the nVidia driver
Exec=nvidia-settings
Terminal=false
Icon=nvidia-settings
Type=Application
Categories=System;
--- NEW FILE xorg-x11-drv-nvidia-legacy.spec ---
%define nvidialibdir %{_libdir}/nvidia
# Tweak to have debuginfo - part 1/2
%if "%fedora" > "7"
%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
%{nil}
%endif
Name: xorg-x11-drv-nvidia-legacy
Version: 71.86.06
Release: 2%{?dist}
Summary: NVIDIA's legacy proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
Source2: nvidia-legacy.sh
Source3: nvidia-legacy.csh
Source4: nvidia-settings.desktop
Source5: nvidia-legacy-init
Source6: 60-nvidia.nodes
Source10: nvidia-legacy-config-display
Source11: nvidia-legacy-README.Fedora
Source12: nvidia-legacy.opts
# So we don't pull other nvidia variants
Source91: filter-requires.sh
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE91}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i386 x86_64
Requires: nvidia-legacy-kmod >= %{version}
Requires(post): nvidia-legacy-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
Requires: which
Requires: livna-config-display
Requires: %{name}-libs = %{version}-%{release}
# to prevent i386 package being pulled first and x86_64 package being excluded
# on x86_64 systems
%ifarch x86_64
Requires: %{nvidialibdir}/libGL.so.%{version}
%endif
Requires(post): livna-config-display
Requires(preun): livna-config-display
Requires(post): chkconfig
Requires(post): ldconfig
Requires(preun): chkconfig
Provides: nvidia-legacy-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-fglrx
Obsoletes: nvidia-legacy-kmod < %{version}
%description
This package provides the most recent NVIDIA legacy display driver which allows
for hardware accelerated rendering with NVIDIA chipsets NV5 (Riva TNT) to NV40
(GeForce 6800). NV41 and newer (such as GeForce 7xxx) are NOT
supported by this release.
For the full product support list, please consult the release notes
for driver version %{version}.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{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}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
%endif
%description libs
This package provides the shared libraries for %{name}.
%prep
%setup -q -c -T
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
tar -cjf nvidia-glx-legacy-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
# Tweak to have debuginfo - part 2/2
%if "%fedora" > "7"
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
%ifarch %{ix86}
ln -s nvidiapkg-x86 nvidiapkg
%else
ln -s nvidiapkg-x64 nvidiapkg
%endif
mv nvidiapkg/LICENSE nvidiapkg/usr/share/doc/
# More docs
cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
%build
# Nothing to build
echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT
set +x
for file in $(cd nvidiapkg &> /dev/null; find . -type f | grep -v -e 'makeself.sh$' -e 'mkprecompiled$' -e 'tls_test$' -e 'tls_test_dso.so$' -e 'nvidia-settings.desktop$' -e '^./Makefile' -e '^./nvidia-installer' -e '^./pkg-history.txt' -e '^./.manifest' -e '/usr/share/doc/' -e 'libGL.la$' -e 'drivers/nvidia_drv.o$' -e 'nvidia-installer.1.gz$' -e '^./usr/src/')
do
if [[ ! "/${file##./usr/lib/}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/}
elif [[ ! "/${file##./usr/X11R6/lib/modules/extensions}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/nvidia/${file##./usr/X11R6/lib/modules/extensions}
elif [[ ! "/${file##./usr/X11R6/lib/modules}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/lib/modules}
elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/X11R6/lib/}
elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
then
install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_includedir}/nvidia/${file##./usr/include/}
elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
then
if [[ ! "/${file##./usr/bin/nvidia-xconfig}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/sbin/${file##./usr/bin/}
elif [[ ! "/${file##./usr/bin/nvidia-bug-report.sh}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/bin/${file##./usr/bin/}
else
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/${file}
fi
elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
then
install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
gunzip $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
elif [[ ! "/${file##./usr/share/pixmaps/}" = "/${file}" ]]
then
install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/${file##./usr/share/pixmaps/}
else
echo ${file} found -- don\'t know how to handle
exit 1
fi
done
set -x
# Fixme: should we do this directly in above for-loop? Yes, we should! No, please don't!
ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so
ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so.1
ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so.1
ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-tls.so.1
ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/libnvidia-tls.so.1
ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
# profile.d files
install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/nvidia-legacy.sh
install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/nvidia-legacy.csh
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-legacy-config-display
# Desktop entry for nvidia-settings
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
%{SOURCE4}
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-legacy
# udev node file
install -D -p -m 0664 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/60-nvidia.nodes
# modprobe.d file
install -D -p -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/nvidia-legacy
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%ifarch %{ix86}
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-x86.conf
%endif
%ifarch x86_64
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-x86_64.conf
%endif
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
%clean
rm -rf $RPM_BUILD_ROOT
%post
# Removes old legacy layout, fixed SELinux copy errors
if [ -e /etc/udev/devices/nvidia* ];then rm -f /etc/udev/devices/nvidia*;fi ||:
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
%{_sbindir}/nvidia-legacy-config-display enable &>/dev/null ||:
# Add init script and start it
/sbin/chkconfig --add nvidia-legacy ||:
/etc/init.d/nvidia-legacy start &>/dev/null ||:
fi
%post libs -p /sbin/ldconfig
%preun
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
test -f %{_sbindir}/nvidia-legacy-config-display && %{_sbindir}/nvidia-legacy-config-display disable &>/dev/null ||:
%{_initrddir}/nvidia-legacy stop &>/dev/null
/sbin/chkconfig --del nvidia-legacy ||:
fi ||:
# Remove all entries of nvidia/NV driver from modprobe.conf
# Start using modprobe.d as of FC5
# This can be removed eventually
# Make a backup of the backup
if [ -f %{_sysconfdir}/modprobe.conf.backup-nvidia-glx ]; then
mv %{_sysconfdir}/modprobe.conf.backup-nvidia-glx %{_sysconfdir}/modprobe.conf.backup-nvidia-legacy || :
fi
if [ -f %{_sysconfdir}/modprobe.conf.backup-nvidia-legacy ]; then
mv %{_sysconfdir}/modprobe.conf.backup-nvidia-legacy %{_sysconfdir}/modprobe.conf.backup-nvidia-legacy-old || :
fi
if [ -f %{_sysconfdir}/modprobe.conf ]; then
mv %{_sysconfdir}/modprobe.conf %{_sysconfdir}/modprobe.conf.backup-nvidia-legacy || :
grep -v -E -e "^alias +[^ ]+ +(nvidia|NVdriver)" -e "options nvidia " %{_sysconfdir}/modprobe.conf.backup-nvidia-legacy > %{_sysconfdir}/modprobe.conf ||:
fi
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/profile.d/nvidia*
%config %{_sysconfdir}/modprobe.d/nvidia-legacy
%{_sysconfdir}/udev/makedev.d/60-nvidia.nodes
%{_initrddir}/nvidia-legacy
%{_bindir}/*
%{_sbindir}/*
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
# No manpages for legacy
#%{_mandir}/man[1-9]/nvidia*.*
%verify (not user) %attr(0600,root,root) %dev(c,195,0) /dev/nvidia0
%verify (not user) %attr(0600,root,root) %dev(c,195,1) /dev/nvidia1
%verify (not user) %attr(0600,root,root) %dev(c,195,2) /dev/nvidia2
%verify (not user) %attr(0600,root,root) %dev(c,195,3) /dev/nvidia3
%verify (not user) %attr(0600,root,root) %dev(c,195,255) /dev/nvidiactl
%files libs
%defattr(-,root,root,-)
%dir %{nvidialibdir}
%dir %{nvidialibdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia*
%{nvidialibdir}/*.so*
%{nvidialibdir}/tls/*.so.*
%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/nvidia
%dir %{_includedir}/nvidia/GL
%{_includedir}/nvidia/GL/*.h
%{nvidialibdir}/libXvMCNVIDIA.a
%changelog
* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 71.86.06-2
- rebuild for rpm fusion
* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 71.86.06-1
- Update to 71.86.06
* Wed May 28 2008 Stewart Adam <s.adam at diffingo.com> - 71.86.04-6
- Only modify modprobe.conf if it exists
* Fri Feb 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.04-5
- Use nvidia-legacy-config-display, not nvidia-config-display in post scriptlet
* Fri Feb 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.04-4
- Fix typo in filter requires script
* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 71.86.04-3
- Fix debuginfo package creation.
- Add libGLcore.so to the filter list.
- Only requires versioned libGL on x86_64 (no problem on x86).
* Thu Feb 7 2008 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.04-2
- Filter requires on main package so we don't pull in xorg-x11-drv-nvidia*-libs
* Mon Feb 4 2008 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.04-1.1
- Fix copy/paste error (wfb)
* Mon Feb 4 2008 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.04-1
- Backport many changes from nvidia to nvidia-legacy
- Remove some old Obsoletes/Provides
- Add Requires versioned libGL.so from the right path
- Uses pkg0 instead of pkg2 for x86_64 (and remove the lib32 from our loop).
- Update to 71.86.04
- Make .desktop file to pass desktop-file-validate
- Remove libs-32bit and make a proper multiarch -libs package
- Add empty %%build section
- Remove shebang for files that are sourced
* Tue Nov 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.01-4.1
- Fix typo in initscript (bz#1707)
* Thu Nov 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.01-4
- Initscript improvements
- Minor bugfixes with scriptlets (don't echo "already disabled" type messages)
* Mon Oct 30 2007 kwizart < kwizart at gmail.com > - 71.86.01-3
- Fix back 60-nvidia.nodes for legacy
* Mon Oct 30 2007 kwizart < kwizart at gmail.com > - 71.86.01-2
- Add no replace for profile.d
- Strip binaries and libs even if no debuginfo is made
* Mon Oct 8 2007 Stewart Adam < s.adam AT diffingo DOT com > - 71.86.01-1
- Update to 71.86.01
* Fri Jun 15 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.7185-4
- F7 SELinux fixes (continued)
- Add a new post scriptlet to remove those legacy-layout udev files
* Sun Jun 10 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.7185-3
- F7 SELinux fixes
* Sat Apr 28 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.7185-2
- Fixes in the config-display (vendor > majorVendor)
* Mon Apr 23 2007 kwizart < kwizart at gmail.com > - 1.0.7185-1
- Update to 1.0.7185
* Fri Mar 9 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.7184-6
- 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 > - 1.0.7184-5
- Bump for new tag
- fi to end if!
* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.7184-4
- Standardize all summaries and descriptions with other nvidia and fglrx
packages
- Standardize initscript and *config-display with other nvidia and fglrx
packages
- Conflicts the 96xx packages
- Start merge with livna-config-display
* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.7184-3
- Rebuild for Fedora Core 7 test1
* Sat Aug 26 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.7184-2
- fixed the init script so it actually finds the kernel module (extra/nvidia-legacy
rather than /extra/nvidia)
* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.7184-1
- update to release 1.0.7184
* Wed Aug 09 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.7182-2
- oops, don't include the installer man page
- tweaked the for loop slightly. man page and bug report tool weren't picked up
- added changes/updates from non-legacy spec from Apr 02 2006 to now
* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.7182-1
- use /etc/modprobe.d like nvidia-glx
- remove the GNOME category from the desktop file
- add libGL.so
- minor changes to spacing, removal of random tabs, re-arrangements
- Update to 7182 (official legacy driver release)
* Sun Apr 02 2006 Niko Mirthes <nmirthes AT gmail DOT com> - 1.0.7174-1
- adapted 'legacy' package (7174) for Fedora Core 5 release
- changed spacing a bit and removed trailing spaces and random tabs
* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.2
- Integrate nvidia-glx-NVIDIA_kernel-1.0-7174-1296092.diff-1.txt to fix x86_64
and 2.6.14
- Require nvidia-glx-legacy in pre and not nvidia-config-display
- Don't echo NVreg_ModifyDeviceFiles=0 to /etc/modprobe.conf
- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
-- avoid changing time stamps on libs where possible
-- only add /etc/modprobe.conf entries if they aren't already there
-- add /etc/modprobe.conf entries one at a time
-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
-- avoid removing any modprobe.conf entries other than our own
-- match Xorg's install defaults where it makes sense (0444)
-- a few other minor tweaks to the files lists
* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.1
- Rename to nvidia-glx-legacy
- Conflicts with nvidia-glx
* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
- Conflicts with nvidia-glx-legacy
- Integrate some minor correction suggested by Niko Mirthes
<nmirthes AT gmail DOT com> in #475
* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
- Rename src5: nvidia.init to nvidia-glx-init
- Fix correct servicename in nvidia-glx-init
- Run nvidia-glx-init before gdm-early-login; del and readd the script
during post
* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
- Update to 7676
- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
- Drop support for FC2
- Nearly proper Udev-Support with workarounds around FC-Bug 151527
* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
- Slight change of modprobe.conf rexexp
* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
- Adjust kenrnel-module-stuff for FC4
- Ship both x86 and x64 in the SRPM
* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
- Only create 16 devices
- Put libXvMCNVIDIA.a in -devel
- Don't remove nvidia options in /etc/modprobe.conf
- Make ld.so.conf file config(noreplace)
- Use same directory permissions as the kernel
* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
- New upstream release, 7174
* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
- Added x86_64 support patch from Thorsten Leemhuis
* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
- Fix kernel module permissions again (644)
- Only create 16 /dev/nvidia* devices, 256 is unnecessary
* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
- Fixed kernel-module permissions
* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
- Removed provides on kernel-module and kernel-modules
* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
- New upstream release 1.0.7167
- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
- Removed old patch against 2.6.9
* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
- Fixed permissions of nvidia/nvidia.ko
* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
- Fix incorrect MAKDEV behaviour and dependency
* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
- Fixed creation of /dev/nvidia* on FC2
* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
- Dont try to print kvariant in description when it's not defined.
* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
- Use rpmbuildtags driverp and kernelp
* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
- New upstream version, 1.0-6629
- Build without kernel-module-devel by default
* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
- Make n-c-display handle misc problems in a better way
- Fixed wrong icon file name in .desktop file
- Re-added the mysteriously vanished sleep line in the init script
when kernel module wasn't present
* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
- Allow rpm to strip the kernel module. Does not safe that much space ATM but
might be a good idea
- Allow to build driver and kernel-module packages independent of each other
- Some minor spec-file changes
* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
- udev fixes
- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
- Remove FC1/kernel 2.4 compability
- Rename srpm to nvidia-glx
- Build with kernel-module-devel
* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
- Restore ldsoconfd macro
- Disable autoamtic removal of scripted installation for now; needs testing
* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
- Upstream release 6111
- Fixed init script (again)
* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
- ld.so.conf.d directory detected by spec file
- Using nvidialibdir in nvidia-glx-devel files section
- Got rid of yarrow and tettnang macros
- libGL.so.1 symlink in tls directory always present
* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
- Fixed script bug that would empty prelink.conf
- Added symlink to non-tls libGL.so.1 on FC1
* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
- Updated init script to reflect name change -xfree86 -> -display
* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
- Fixed backup file naming
* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
- Restore working macros
- Always package the gui tool
* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
- Renamed nvidia-config-xfree86 to nvidia-config-display
- Fixed symlinks
- Use ld.so.conf.d on FC2
- Remove script installation in pre
- Use system-config-display icon for nvidia-settings
- 2 second delay in init script when kernel module not found
- Make nvidia-config-display fail more gracefully
- Add blacklist entry to prelink.conf on FC1
* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
- New upstream release
- First attempt to support FC2
- Dropped dependency on XFree86
* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
- Use pkg0
* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
- New Makefile variable SYSSRC to point to kernel sources.
- kmodhelper fixes.
* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
- New upstream release
- Removed (now obsolete) kernel-2.6 patch
- Install target changed upstream, from "nvidia.o" to "module"
- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
- Updated nvidia-config-display
- Now requiring pyxf86config
* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
- Added nvidiasettings macro to enable/disable gui packaging
* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
- Updated minion.de patches
- Added some explicit requires
- Test nvidia-config-xfree86 presence in kernel-module package
scriptlets
* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
- Updated Readme.fedora
- nvidia-glx-devel package
* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
- Hopefully fixed kernel variant thingy
* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
- Support for other kernel variants (bigmem, etc..)
- Changed URL in Source0
* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
- Dropped nvidia pkgX information in release tag.
* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
- Using fedora.us kmodhelper for kernel macro
- Using nvidia pkg0 archive
* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
- kernel-module-nvidia package provides kernel-module
- We wont own devices anymore. And we wont re-create them if they are
already present
* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
- Yet another initscript update. Really.
- Scriptlets updated too
* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
- Fixed alias in modprobe.conf for 2.6
* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
- Another initscript update
* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
- kernel module requires kernel same kversion
- initscript updated again
- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
make libGL from nvidia first found. Hope Mike Harris will appreciate.
* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
- kernel-module-nvidia requires kernel same version-release
* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
- Updated initscript
* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
- lvn repository tag
* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
- Added initscript to toggle nvidia driver according to running kernel
and installed kernel-module-nvidia packages
- Updated scriptlets
* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
- Arch detection
- Url in patch0
* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
- Desktop entry for nvidia-settings
- s/kernel-module-{name}/kernel-module-nvidia
- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
- Using modprobe.conf for 2.6 kernel
- Hopefully fixed symlinks
* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
- Building kernel module for defined kernel
- kernel module for 2.6 is nvidia.ko
- Patch not to install kernel module on make install
- Updated patch for 2.6
- depmod in scriptlet for defined kernel
- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
symlink now
- Dont override libGL.so symlink because it belongs to XFree86-devel
- Added nvidia 'pkgfoo' info to packages release
- Spec file cleanup
* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
- Fixed repairing of a link in post-uninstall
- Obsolete Mesa instead of Conflict with it, enables automatic removal.
* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
- Added support for 2.6 kernels
- Cleaned up build section, removed the need for patching Makefiles.
- Added missing BuildReq gcc32
- Don't package libs twice, only in /usr/lib/tls/nvidia
- Made config cript executable and put it into /usr/sbin
- Moved kernel module to kernel/drivers/video/nvidia/
- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
- New beta 4620 driver
- New GUI control panel
- Some minor fixes
* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
- Finally fixed SMP builds.
* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
- Don't make nvidia-glx depend on kernel-smp
* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
- Some build fixes
* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
- Added CC=gcc32
- Fixed upgrading issue
- Added driver switching capabilities to config script.
* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
- Added conflict with XFree86-Mesa-libGL.
- Disabled showing of the README.Fedora after installation.
* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
- Added NVidia configuration script written in Python.
- Some cleanup of files section
- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
Panu Matilainen )
- Fixed name problem
* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
- Initial RPM release, still some ugly stuff in there but should work...
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-legacy/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:03:34 -0000 1.1
+++ .cvsignore 5 Oct 2008 13:24:23 -0000 1.2
@@ -0,0 +1,2 @@
+NVIDIA-Linux-x86_64-71.86.06-pkg0.run
+NVIDIA-Linux-x86-71.86.06-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-legacy/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:03:34 -0000 1.1
+++ sources 5 Oct 2008 13:24:23 -0000 1.2
@@ -0,0 +1,2 @@
+205599549ddd6fadecfbc1adb090dfe2 NVIDIA-Linux-x86_64-71.86.06-pkg0.run
+61e4511d1bbb2962ca139091210b61ea NVIDIA-Linux-x86-71.86.06-pkg0.run
16 years, 1 month
- 1
- 0