October 2009 - rpmfusion-commits

rpms/xorg-x11-drv-nvidia/devel blacklist-nouveau.conf, 1.2, 1.3 filter-provides.sh, NONE, 1.1 filter-requires.sh, 1.2, 1.3 nvidia-README.Fedora, 1.2, 1.3 nvidia-config-display, 1.2, 1.3 nvidia-init, 1.2, 1.3 nvidia-settings.desktop, 1.2, 1.3 xorg-x11-drv-nvidia.spec, 1.26, 1.27 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23035/devel Modified Files: .cvsignore sources Added Files: blacklist-nouveau.conf filter-provides.sh filter-requires.sh nvidia-README.Fedora nvidia-config-display nvidia-init nvidia-settings.desktop xorg-x11-drv-nvidia.spec Log Message: Update to 190.42 Index: blacklist-nouveau.conf =================================================================== RCS file: blacklist-nouveau.conf diff -N blacklist-nouveau.conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ blacklist-nouveau.conf 31 Oct 2009 12:07:18 -0000 1.3 @@ -0,0 +1,4 @@ +# RPM Fusion blacklist for nouveau driver - you need to run as root: +# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r) +# if nouveau is loaded despite this file. +blacklist nouveau --- NEW FILE filter-provides.sh --- #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then FINDPROV=/usr/lib/rpm/redhat/find-provides else FINDPROV=/usr/lib/rpm/find-provides fi $FINDPROV $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d' Index: filter-requires.sh =================================================================== RCS file: filter-requires.sh diff -N filter-requires.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ filter-requires.sh 31 Oct 2009 12:07:18 -0000 1.3 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -x /usr/lib/rpm/redhat/find-requires ]; 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' | sed -e '/libGL.so/d' + Index: nvidia-README.Fedora =================================================================== RCS file: nvidia-README.Fedora diff -N nvidia-README.Fedora --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nvidia-README.Fedora 31 Oct 2009 12:07:18 -0000 1.3 @@ -0,0 +1,113 @@ +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-config-display disable + +To re-enable the Nvidia drivers, run: + + nvidia-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.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-config-display enable" + +so that the X server will use the nvidia driver, otherwise it will run + + "nvidia-config-display disable" + +and X will use the nv driver. You can disable this check by running, as +root (with root $PATH) : + + chkconfig nvidia 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. + Index: nvidia-config-display =================================================================== RCS file: nvidia-config-display diff -N nvidia-config-display --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nvidia-config-display 31 Oct 2009 12:07:18 -0000 1.3 @@ -0,0 +1,146 @@ +#!/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' + 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() + # And return to the Fedora default. + self.enableAiglx() + + 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() Index: nvidia-init =================================================================== RCS file: nvidia-init diff -N nvidia-init --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nvidia-init 31 Oct 2009 12:07:18 -0000 1.3 @@ -0,0 +1,117 @@ +#!/bin/sh +# +# chkconfig: 2345 8 92 +# description: This script will check if a nvidia 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' +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}" +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 Index: nvidia-settings.desktop =================================================================== RCS file: nvidia-settings.desktop diff -N nvidia-settings.desktop --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nvidia-settings.desktop 31 Oct 2009 12:07:18 -0000 1.3 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=nVidia Display Settings +Comment=Configure the nVidia driver +Exec=nvidia-settings +Terminal=false +Icon=nvidia-settings +Type=Application +Categories=System; Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: xorg-x11-drv-nvidia.spec diff -N xorg-x11-drv-nvidia.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xorg-x11-drv-nvidia.spec 31 Oct 2009 12:07:18 -0000 1.27 @@ -0,0 +1,1020 @@ +%define nvidialibdir %{_libdir}/nvidia + +# 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-nvidia +Version: 190.42 +Release: 1%{?dist} +Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards + +Group: User Interface/X Hardware Support +License: Redistributable, no modification permitted +URL: http://www.nvidia.com/ +Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%... +Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8... +Source4: nvidia-settings.desktop +Source5: nvidia-init +Source6: blacklist-nouveau.conf +Source10: nvidia-config-display +Source11: nvidia-README.Fedora +# So we don't pull other nvidia variants +Source91: filter-requires.sh +# So we don't mess with mesa provides. +Source92: filter-provides.sh +%define _use_internal_dependency_generator 0 +%define __find_requires %{SOURCE91} +%define __find_provides %{SOURCE92} + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?fedora} > 11 || 0%{?rhel} > 5 +ExclusiveArch: i686 x86_64 +%else 0%{?fedora} == 11 +ExclusiveArch: i586 x86_64 +%else +ExclusiveArch: i386 x86_64 +%endif + +Requires: nvidia-kmod >= %{version} +Requires(post): nvidia-kmod >= %{version} + +# Needed in all nvidia or fglrx driver packages +BuildRequires: desktop-file-utils +Requires: which +Requires: livna-config-display >= 0.0.21 +Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} + +Requires(post): livna-config-display +Requires(preun): livna-config-display +Requires(post): chkconfig +Requires(post): ldconfig +Requires(preun): chkconfig + + +Provides: nvidia-kmod-common = %{version} +Conflicts: xorg-x11-drv-nvidia-beta +Conflicts: xorg-x11-drv-nvidia-legacy +Conflicts: xorg-x11-drv-nvidia-71xx +Conflicts: xorg-x11-drv-nvidia-96xx +Conflicts: xorg-x11-drv-nvidia-173xx +Conflicts: xorg-x11-drv-fglrx +Conflicts: xorg-x11-drv-catalyst +Obsoletes: nvidia-kmod < %{version} + +#Introduced in F10 for freshrpms compatibility +Obsoletes: nvidia-x11-drv < %{version}-%{release} +Provides: nvidia-x11-drv = %{version}-%{release} +#Introduced in F10 when 173xx has forked to legacy serie +Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100 +Provides: xorg-x11-drv-nvidia-newest = %{version}-101 + + +%description +This package provides the most recent NVIDIA display driver which allows for +hardware accelerated rendering with NVIDIA chipsets GeForce6 series and newer. +GeForce5 and below 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}-libs-%{_target_cpu} = %{version}-%{release} +#Introduced in F10 when 173xx has forked to legacy serie +Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100 +Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101 + +%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} +Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-libs-32bit = %{version}-%{release} +Obsoletes: %{name}-libs-32bit <= %{version}-%{release} +Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release} +Provides: nvidia-x11-drv-32bit = %{version}-%{release} +%endif +#Introduced in F10 when 173xx has forked to legacy serie +Obsoletes: xorg-x11-drv-nvidia-newest-libs < %{version}-100 +Provides: xorg-x11-drv-nvidia-newest-libs = %{version}-101 + +%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-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/ + +# 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 + +%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 + +# Move the libnvidia-wfb.so lib to the Nvidia xorg extension directory. +mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.%{version} + +# 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 libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-cfg.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 + + +# This is 97xx specific. libnvidia-wfb.so is a replacement of libwfb.so +# It is used by card > NV30 but required by G80 and newer. +%if 0%{?fedora} >= 9 +rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.%{version} +%else +ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1 +ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libwfb.so +%endif + +# This is 169.04 adds - cuda libs and headers +ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1 +ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so + +# This is 180.xx adds - vdpau libs and headers +ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau_nvidia.so + +# X configuration script +install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-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 + +# ld.so.conf.d file +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf + +#Blacklist nouveau by F-11 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ +install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ + +# 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 [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||: +if [ "$1" -eq "1" ]; then + # Enable nvidia driver when installing + %{_sbindir}/nvidia-config-display enable &>/dev/null ||: + # Add init script and start it + /sbin/chkconfig --add nvidia ||: + /etc/init.d/nvidia start &>/dev/null ||: +fi + +%post libs -p /sbin/ldconfig + +%preun +if [ "$1" -eq "0" ]; then + # Disable driver on final removal + test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null ||: + %{_initrddir}/nvidia stop &> /dev/null ||: + /sbin/chkconfig --del nvidia ||: +fi ||: + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc nvidiapkg/usr/share/doc/* +%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf +%{_initrddir}/nvidia +%{_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 +%{_mandir}/man[1-9]/nvidia*.* + +%files libs +%defattr(-,root,root,-) +%dir %{nvidialibdir} +%dir %{nvidialibdir}/tls +%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf +%{nvidialibdir}/*.so.* +%{nvidialibdir}/libcuda.so +%{nvidialibdir}/libGLcore.so +%{nvidialibdir}/libvdpau_nvidia.so +%exclude %{nvidialibdir}/libvdpau_trace.so* +%exclude %{nvidialibdir}/libvdpau.* +%{nvidialibdir}/tls/*.so.* + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/nvidia +%dir %{_includedir}/nvidia/GL +%dir %{_includedir}/nvidia/cuda +%exclude %dir %{_includedir}/nvidia/vdpau +%{_includedir}/nvidia/GL/*.h +%{_includedir}/nvidia/cuda/*.h +%exclude %{_includedir}/nvidia/vdpau/*.h +%exclude %{nvidialibdir}/libXvMCNVIDIA.a +%exclude %{nvidialibdir}/libcuda.so +%{nvidialibdir}/libGL.so +%{nvidialibdir}/libXvMCNVIDIA.so + + +%changelog +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedorproject.org> - 190.42-1 +- Update to 190.42 + +* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 185.18.36-3 +- Exclude libvdpau as it is now a separate package. +- Avoid Requires/Provides of the libGL.so.1 . rfbz#859 + +* Sat Aug 29 2009 kwizart < kwizart at gmail.com > - 185.18.36-1 +- Update to 185.18.36 (final) + +* Mon Aug 3 2009 kwizart < kwizart at gmail.com > - 185.18.31-1 +- Update to 185.18.31 (final) + +* Thu Jul 30 2009 kwizart < kwizart at gmail.com > - 185.18.29-1 +- Update to 185.18.29 (final) + +* Wed Jul 1 2009 kwizart < kwizart at gmail.com > - 185.18.14-3 +- Fix libcuda.so runtime usage - BZ 670#c4 + Workaround for cudart.so wrong behaviour + +* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 185.18.14-2 +- blacklist nouveau by default. + +* Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 185.18.14-1 +- Update to 185.18.14 (final) + +* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1 +- Update to 180.51 (stable) +- Add 71xx/beta/catalyst Conflicts +- Don't Obsoletes the beta serie anymore (only the newest) + +* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 180.37-3 +- Fix x86 Arch for fedora >= 11 + +* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.37-2 +- rebuild for new F11 features + +* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 180.37-1 +- Update to 180.37 (prerelease) + +* Thu Feb 26 2009 kwizart < kwizart at gmail.com > - 180.35-2 +- Fix Conflicts/Provides with beta +- Obsoltes/Provides for devel + +* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 180.35-1 +- Update to 180.35 (prerelease) +- Obsoletes opengl 3.0 beta nserie. + +* Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 180.29-2 +- Make devel subpackage depend on lib subpackage of the same arch + +* Tue Feb 10 2009 kwizart < kwizart at gmail.com > - 180.29-1 +- Update to 180.29 (stable) + +* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 180.27-1 +- Update to 180.27 (beta) + +* Tue Jan 27 2009 kwizart < kwizart at gmail.com > - 180.25-1 +- Update to 180.25 (beta) + +* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1 +- Update to 180.22 (stable) + +* Sat Dec 28 2008 kwizart < kwizart at gmail.com > - 180.18-1 +- Update to 180.18 (beta) + +* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 180.16-1 +- Update to 180.16 (beta) +- Exclude libXvMCNVIDIA.a +- More accurate -devel subpackage. + +* Tue Dec 2 2008 Stewart Adam <s.adam at diffingo.com> - 177.82-2 +- Fix upgrade path for nvidia-newest (bz#191) + +* Thu Nov 13 2008 kwizart < kwizart at gmail.com > - 177.82-1 +- Update to 177.82 + +* Wed Nov 12 2008 kwizart < kwizart at gmail.com > - 177.80-6 +- Obsoletes/Provides xorg-x11-drv-nvidia-newest +- Cleaning +- Improve description + +* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-5 +- Fix upgrade path for FreshRPMs users + +* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-4 +- Revert the libs dep change + +* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-3 +- Remove the libs subpackage's dependency on main package +- Update dependency on livna-config-display + +* Sat Oct 18 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-2 +- Change dependency of main package to libs subpackage in devel subpackage to + fix multiarch repo push + +* Mon Oct 13 2008 kwizart < kwizart at gmail.com > - 177.80-1 +- Update to 177.80 +- Move symlinks in -devel +- Fix description + +* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 177.78-2 +- rebuild for rpm fusion + +* Wed Oct 1 2008 Stewart Adam < s.adam at diffingo.com > - 177.78-1 +- Update to 177.78 (beta) + +* Mon Sep 15 2008 Stewart Adam < s.adam at diffingo.com > - 177.70-1 +- Update to 177.70 (beta) + +* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 173.14.12-1 +- Update to 173.14.12 + +* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 173.14.09-1 +- Update to 173.14.09 + +* Wed May 28 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.05-2 +- Only modify modprobe.conf if it exists + +* Wed May 28 2008 kwizart < kwizart at gmail.com > - 173.14.05-1 +- Update to 173.14.05 + +* Wed May 14 2008 kwizart < kwizart at gmail.com > - 173.08-2 +- Fix libwfb replacement - Not needed on Fedora >= 9 + +* Thu Apr 10 2008 kwizart < kwizart at gmail.com > - 173.08-1 +- Update to 173.08 (beta) - Fedora 9 experimental support + See: http://www.nvnews.net/vbulletin/showthread.php?t=111460 + +* Fri Mar 8 2008 kwizart < kwizart at gmail.com > - 171.06-1 +- Update to 171.06 (beta) + +* Wed Feb 27 2008 kwizart < kwizart at gmail.com > - 169.12-1 +- Update to 169.12 + +* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 169.09-5 +- 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> - 169.09-4 +- Filter requires on main package so we don't pull in xorg-x11-drv-nvidia*-libs + +* Fri Feb 1 2008 kwizart < kwizart at gmail.com > - 169.09-3 +- 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 versioned libGL.so from the right path +- Uses pkg0 instead of pkg2 for x86_64 (and remove the lib32 from our loop). + +* Sun Jan 27 2008 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 169.09-2 +- let main package require the libs subpackage + +* Wed Jan 23 2008 Stewart Adam <s.adam AT diffingo DOT com> - 169.09-1 +- Update to 169.09 +- Provides nvidia-glx since we obsolete it +- Make .desktop file to pass desktop-file-validate +- Remove libs-32bit and make a proper multiarch -libs package +- Add empty %%build section + +* Thu Dec 27 2007 kwizart < kwizart at gmail.com > - 169.07-4 +- Provides libcuda.so.1 since AutoProv is disabled for libs-32bit + +* Wed Dec 26 2007 Stewart Adam <s.adam AT diffingo DOT com> - 169.07-3 +- Backport changes from testing branch (provide cuda libraries) + +* Sun Dec 23 2007 Stewart Adam <s.adam AT diffingo DOT com> - 169.07-2 +- Require /usr/lib/libGL.so.1.2 to prevent conflicts +- Do provide libGLcore.so.1 + +* Sat Dec 22 2007 Stewart Adam <s.adam AT diffingo DOT com> - 169.07-1 +- Update to 169.07 + +* Fri Nov 30 2007 Stewart Adam <s.adam AT diffingo DOT com> - 100.14.19-6 +- Don't provide libGL.so.1 (bz#1741) +- Remove shebang for files that are sourced + +* Tue Nov 20 2007 Stewart Adam <s.adam AT diffingo DOT com> - 100.14.19-5 +- Add Requires: which (bz#1662) + +* Thu Nov 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 100.14.19-4 +- Initscript improvements +- Minor bugfixes with scriptlets (don't echo "already disabled" type messages) + +* Fri Oct 12 2007 Stewart Adam < s.adam AT diffingo DOT com > - 100.14.19-3 +- Initscript should disable when module isn't found (bz#1671) + +* Mon Sep 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 100.14.19-2 +- Fix %%post if clause (bz#1632) +- Disable the DisableGLXRootClipping option + +* Thu Sep 20 2007 kwizart < kwizart at gmail.com > - 100.14.19-1 +- Update to 100.14.19 +- Improve desktop file +- Sync between F7 and FC-6 +- Don't replace user env variable + +* Thu Jun 21 2007 Stewart Adam < s.adam AT diffingo DOT com > - 100.14.11-1 +- Update to 100.14.11 + +* Fri Jun 15 2007 Stewart Adam < s.adam AT diffingo DOT com > - 100.14.09-2 +- F7 SELinux fixes (continued) +- Add a new post scriptlet to remove those legacy-layout udev files + +* Sun Jun 10 2007 kwizart < kwizart at gmail.com > - 100.14.09-1 +- Update to Final 100.14.09 + +* Sat Jun 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9762-2 +- Don't use legacy udev layout (Thanks Finalzone for the workaround) + +* Sun May 27 2007 kwizart < kwizart at gmail.com > - 1.0.9762-1 +- Update to 1.0.9762 + +* Sat Apr 28 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9755-3 +- Fixes in the config-display (vendor > majorVendor) + +* Fri Mar 9 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9755-2 +- 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 + +* Thu Mar 8 2007 kwizart < kwizart at gmail.com > - 1.0.9755-1 +- Update to 1.0.9755 + +* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-11 +- Bump for new tag +- fi to end if! + +* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-10 +- Bump for new tag + +* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-9 +- Standardize all summaries and descriptions with other nvidia and fglrx + packages +- Standardize initscript and *config-display with other nvidia and fglrx + packages +- Move paths from nvidia-glx to nvidia +- Start merge with livna-config-display + +* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9746-8 +- Update SHA1SUM + +* Thu Jan 18 2007 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9746-7 +- Fix initscript empty line problem (#1302) +- Fix typo in the readme +- Put in correct sums into SHA1SUM + +* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9746-6 +- Quick fix double libs-32bit -p /sbin/ldconfig + +* Thu Jan 4 2007 kwizart < kwizart at gmail.com > - 1.0.9746-5 +- Create the symlink from libwfb.so to libnvidia-wfb.so.x.y.z + the xorg driver search for libwfb.so (it do not use the SONAME). + http://www.nvnews.net/vbulletin/showthread.php?t=83214 + +* Wed Jan 3 2007 Stewart Adam < s.adam AT diffingo DOT com - 1.0.9746-4 +- Correct mistake in changelog +- add %%verify to /dev nodes (#1324) +- /etc/profile.d/* are sourced, took away exec bit + +* Wed Jan 3 2007 Stewart Adam < s.adam AT diffingo DOT com - 1.0.9746-3 +- Make the 32-bit libs run ldconfig in %%postun and %%post steps +- Possible FIXME for future: "E: xorg-x11-drv-nvidia obsolete-not-provided nvidia-glx' + +* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9746-2 +- Move the libnvidia-wfb.so lib to the Nvidia xorg extension directory. + +* Tue Dec 26 2006 kwizart < kwizart at gmail.com > - 1.0.9746-1 +- Update to 1.0.9746 (Final). +- Fix symlink of the new lib which soname is libnvidia-wfb.so.1 + +* Sun Nov 26 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9742-3 +- use Source0 with "pkg0.run" prefix (smaller) +- use Source1 with "pkg2.run" prefix (cotaints the 32bit libs) + +* Thu Nov 23 2006 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9742-2 +- Fix URL +- Change %%description, as NV30 and below no longer supported +- Update nvidia desktop file + +* Mon Nov 20 2006 kwizart < kwiart at gmail.com > - 1.0.9742-1 +- Update to release 1.0.9742 +- Include libdir/xorg/modules/libnvidia-wfb.so.1.0.9742 + +* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1 +- update to release 1.0.9629 + +* Tue Oct 31 2006 Dams <anvil[AT]livna.org> - 1.0.9626-3 +- Another nvidia-config-display update to fix dumb modules section + +* Tue Oct 24 2006 Dams <anvil[AT]livna.org> - 1.0.9626-2 +- Yet another updated nvidia-config-display : importing python modules + we use is usualy a good idea +- Updated nvidia-config-display + +* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1 +- update to release 1.0.9626 + +* Fri Oct 20 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8776-1 +- update to 1.0.8776-1 -- fixes CVE-2006-5379 + +* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1 +- Nvidia added a png for nvidia-settings, for-loop adjusted accordingly +- update to release 1.0.8774 + +* Wed Aug 09 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-6 +- small changes to sync with legacy package +- place nvidia-bug-report.sh in /usr/bin + +* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5 +- more minor changes to spacing and general layout + +* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4 +- minor changes to spacing, removal of random tabs, re-arrangements +- remove GNOME category from the desktop file + +* Thu May 25 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-3 +- Obsolete old kmods + +* Thu May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-2 +- add missing defattr to files section for sub-package libs-32bit + +* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1 +- update to 1.0.8762 + +* Tue May 16 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-3 +- Conflict with xorg-x11-drv-fglrx and selinux-policy < 2.2.29-2.fc5 +- Ship bug-reporting tool as normal executable and not in %%doc + +* Sun May 14 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 1.0.8756-2 +- Require nvidia-kmod instead of kmod-nvidia (#970). + +* Sat Apr 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-1 +- Update to 8756 +- put 32bit libs in their own package + +* Wed Mar 29 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-9 +- make every use of the 'install' command consistent +- tweak nvidia-settings' desktop file slightly + +* Thu Mar 23 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-8 +- switch to using modprobe.d rather than editing modprobe.conf directly + +* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-7 +- ExclusiveArch i386 and not %%{ix86} -- we don't want to build for athlon&co + +* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-6 +- drop unused patches + +* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-5 +- drop 0.lvn + +* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> +- add dist + +* Wed Feb 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.5 +- use lib64 in nvidia-config-display on x86-64 +- fix path to kernel module in init-script +- add patch from Ville for nvidia-README.Fedora +- match permissions of xorg 7 + +* Wed Feb 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.4 +- More fixes + +* Tue Jan 31 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.3 +- Fix wrong provides + +* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2 +- fix path to kernel module in nvidia-glx-init (thx to Dominik 'Rathann' + Mierzejewski) +- include device files until udev works probably with kernel module + +* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1 +- split into packages for userland and kmod +- rename to xorg-x11-drv-nvidia; yum/rpm should use mesa-libGL{,-devel} then in + the future when seaching for libGL.so{,.1} +- remove kernel-module part +- remove old cruft +- install stuff without Makefile because it forgets mosts a lot of files anyway + +* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2 +- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README +- reference xorg.conf rather than XF86Config in the init script +- improve readability of instructions and comments, fix some typos +- drop epoch, as it seems to be affecting dependencies according to rpmlint +- tweak the nvidia-settings desktop file so it always shows up on the + menu in the right location +- add the manual pages for nvidia-settings and nvidia-xconfig +- remove header entries from the nvidia-glx files list. they belong in -devel +- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64 + release prior to 7174) +- add libXvMCNVIDIA.so +- update to 8178 + +* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1 +- add the manual pages for nvidia-settings and nvidia-xconfig +- install the new nvidia-xconfig utility and associated libs + +* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1 +- Update to 8174 +- desktop entry now Categories=Settings (#665) +- Ship bug-reporting tool in doc (#588) +- 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.7676-0.lvn.3 +- Conflics 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/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 5 Jun 2009 20:05:23 -0000 1.14 +++ .cvsignore 31 Oct 2009 12:07:18 -0000 1.15 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-185.18.14-pkg0.run -NVIDIA-Linux-x86-185.18.14-pkg0.run +NVIDIA-Linux-x86-190.42-pkg0.run +NVIDIA-Linux-x86_64-190.42-pkg0.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 5 Jun 2009 20:05:23 -0000 1.14 +++ sources 31 Oct 2009 12:07:18 -0000 1.15 @@ -1,2 +1,2 @@ -534a36a15caef39118e698a871047f1a NVIDIA-Linux-x86_64-185.18.14-pkg0.run -a91d31a9dec5deb2f9e4ca9a09e0019f NVIDIA-Linux-x86-185.18.14-pkg0.run +f94806feee87de756d14fe3e9bcaf05a NVIDIA-Linux-x86-190.42-pkg0.run +ae431ff849ec01446e6724f9fcfe3bb4 NVIDIA-Linux-x86_64-190.42-pkg0.run

15 years

1
0
0 / 0

rpms/nvidia-kmod/devel nvidia-kmod.spec, 1.49, 1.50 nvidia-kmodtool-excludekernel-filterfile, 1.4, 1.5 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22187/devel Modified Files: .cvsignore sources Added Files: nvidia-kmod.spec nvidia-kmodtool-excludekernel-filterfile Log Message: Update to 190.42 Index: nvidia-kmod.spec =================================================================== RCS file: nvidia-kmod.spec diff -N nvidia-kmod.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nvidia-kmod.spec 31 Oct 2009 12:01:56 -0000 1.50 @@ -0,0 +1,829 @@ +# buildforkernels macro hint: when you build a new version or a new release +# that contains bugfixes or other improvements then you must disable the +# "buildforkernels newest" macro for just that build; immediately after +# queuing that build enable the macro again for subsequent builds; that way +# a new akmod package will only get build when a new one is actually needed +#define buildforkernels newest + +Name: nvidia-kmod +Version: 190.42 +# Taken over by kmodtool +Release: 1%{?dist} +Summary: NVIDIA display driver kernel module +Group: System Environment/Kernel +License: Redistributable, no modification permitted +URL: http://www.nvidia.com/ +# Source is created from these files: +#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run +#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run + +# <switch me> when sources are on kwizart's repo +Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2 +#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers... +# </switch me> + +Source11: nvidia-kmodtool-excludekernel-filterfile + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# needed for plague to make sure it builds for i586 and i686 +ExclusiveArch: i586 i686 x86_64 + +# get the needed BuildRequires (in parts depending on what we build for) +BuildRequires: %{_bindir}/kmodtool +%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } +# kmodtool does its magic here +%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +The nvidia %{version} display driver kernel module for kernel %{kversion}. + +%prep +# error out if there was something wrong with kmodtool +%{?kmodtool_check} +# print kmodtool output for debugging purposes: +kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +%setup -q -c -T -a 0 + +# patch loop +#for arch in x86 x64 +#do +# pushd nvidiapkg-${arch} +# empty +# popd +#done + + +for kernel_version in %{?kernel_versions} ; do +%ifarch %{ix86} + cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*} +%else + cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*} +%endif +done + + +%build +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*}/usr/src/nv/ + ln -s -f Makefile.kbuild Makefile + if [[ "${kernel_version%%___*}" = *xen ]] ; then + CC="cc -D__XEN_TOOLS__ \ + -I${kernel_version##*___}/include/asm/mach-xen" \ + IGNORE_XEN_PRESENCE=1 \ + make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module + else + IGNORE_XEN_PRESENCE=1 \ + make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module + fi + popd +done + + +%install +rm -rf $RPM_BUILD_ROOT +for kernel_version in %{?kernel_versions}; do + install -D -m 0755 _kmod_build_${kernel_version%%___*}/usr/src/nv/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko +done +%{?akmod_install} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%changelog +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedorproject.org> - 190.42-1 +- Update to 190.42 + +* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.36-1.3 +- rebuild for new kernels + +* Wed Sep 30 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.36-1.2 +- rebuild for new kernels + +* Tue Sep 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.36-1.1 +- rebuild for new kernels + +* Sat Aug 29 2009 kwizart < kwizart at gmail.com > - 185.18.36-1 +- Update to 185.18.36 (final) + +* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.14-1.8 +- rebuild for new kernels + +* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.14-1.7 +- rebuild for new kernels + +* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.14-1.6 +- rebuild for new kernels + +* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.14-1.5 +- rebuild for new kernels + +* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.14-1.4 +- rebuild for new kernels + +* Fri Aug 7 2009 kwizart < kwizart at gmail.com > - 185.18.14-1.3 +- Revert to 185.18.14 +- rebuild for new kernels + +* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.14-1.2 +- rebuild for new kernels + +* Mon Jun 22 2009 kwizart < kwizart at gmail.com > - 185.18.14-1.1 +- rebuild for new kernels + +* Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 185.18.14-1 +- Update to 185.18.14 (final) + +* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.8 +- rebuild for final F11 kernel + +* Thu May 28 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.7 +- rebuild for new kernels + +* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.6 +- rebuild for new kernels + +* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.5 +- rebuild for new kernels + +* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.4 +- rebuild for new kernels + +* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.3 +- rebuild for new kernels + +* Sat May 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.2 +- rebuild for new kernels + +* Sun Apr 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.51-1.1 +- rebuild for new kernels + +* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1 +- Update to 180.51 (stable) +- Don't Obsoletes the beta serie anymore (only the newest) + +* Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.37-2.1 +- rebuild for new kernels + +* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.37-2 +- rebuild for new F11 features + +* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 180.37-1 +- Update to 180.37 (prerelease) + +* Thu Feb 26 2009 kwizart < kwizart at gmail.com > - 180.35-2 +- Handle Obsoletes/Provides in nvidia-kmod for nvidia-beta-kmod + +* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 180.35-1 +- Update to 180.35 (prerelease) + +* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.29-1.1 +- rebuild for latest Fedora kernel; + +* Tue Feb 10 2009 kwizart < kwizart at gmail.com > - 180.29-1 +- Update to 180.29 (stable) +- Reintroduce build for i586 since it will match for SSE without PAE CPU. + (remember that nvidia main series needs SSE capable CPU). +- Empty the xen exclusion filter. + +* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.27-1.1 +- rebuild for latest Fedora kernel; + +* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 180.27-1 +- Update to 180.27 (beta) + +* Tue Jan 27 2009 kwizart < kwizart at gmail.com > - 180.25-1 +- Update to 180.25 (beta) + +* Sun Jan 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.3 +- rebuild for latest Fedora kernel; + +* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.2 +- rebuild for latest Fedora kernel; + +* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.1 +- rebuild for latest Fedora kernel; + +* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1 +- Update to 180.22 (stable) + +* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.18-1.2 +- rebuild for latest Fedora kernel; + +* Sun Dec 28 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.18-1.1 +- rebuild for latest Fedora kernel; + +* Sun Dec 28 2008 kwizart < kwizart at gmail.com > - 180.18-1 +- Update to 180.18 (beta) + +* Sun Dec 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.16-1.1 +- rebuild for latest Fedora kernel; + +* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 180.16-1 +- Update to 180.16 + +* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.5 +- rebuild for latest Fedora kernel; + +* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.4 +- rebuilt + +* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.3 +- rebuild for latest Fedora kernel; + +* Wed Nov 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.2 +- rebuild for latest Fedora kernel; + +* Tue Nov 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.1 +- rebuild for latest Fedora kernel; + +* Thu Nov 13 2008 kwizart < kwizart at gmail.com > - 177.82-1 +- Update to 177.82 + +* Sun Nov 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.80-1.4 +- rebuild for latest Fedora kernel; + +* Sun Nov 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.80-1.3 +- rebuild for latest rawhide kernel; + +* Sun Oct 26 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.80-1.2 +- rebuild for latest rawhide kernel + +* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.80-1.1 +- rebuild for latest rawhide kernel + +* Mon Oct 13 2008 kwizart < kwizart at gmail.com > - 177.80-1 +- Update to 177.80 + +* Sun Oct 5 2008 Stewart Adam <s.adam at diffingo.com> - 177.78-3 +- Disable EXTRA_LDFLAGS in patches + +* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.78-2.1 +- rebuild for rpm fusion + +* Wed Oct 1 2008 Stewart Adam < s.adam at diffingo.com > - 177.78-1 +- Update to 177.78 beta + +* Mon Sep 15 2008 Stewart Adam < s.adam at diffingo.com > - 177.70-1 +- Update to 177.70 +- Skip all Xen sanity checks + +* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 173.14.12-1 +- Update to 173.14.12 + +* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 173.14.09-1 +- Update to 173.14.09 +- Remove i586 (driver needs CPU to have SSE) + +* Wed May 28 2008 kwizart < kwizart at gmail.com > - 173.14.05-2 +- Add NVIDIA_kernel-173.14.05-2419292.diff.txt + +* Wed May 28 2008 kwizart < kwizart at gmail.com > - 173.14.05-1 +- Update to 173.14.05 + +* Thu Apr 10 2008 kwizart < kwizart at gmail.com > - 173.08-1 +- Update to 173.08 (beta) - Fedora 9 experimental support + See: http://www.nvnews.net/vbulletin/showthread.php?t=111460 + +* Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 171.06-2 +- Add Patch for 2.6.25rc kernels + +* Fri Mar 8 2008 kwizart < kwizart at gmail.com > - 171.06-1 +- Update to 171.06 (beta) + +* Wed Feb 27 2008 kwizart < kwizart at gmail.com > - 169.12-1 +- Update to 169.12 + +* Sun Feb 3 2008 kwizart < kwizart at gmail.com > - 169.09-5 +- typo fixes + +* Sat Feb 2 2008 kwizart < kwizart at gmail.com > - 169.09-3 +- Reenable debuginfo +- Disable xen check properly (still not working) +- Remove the smbus patch (uneeded). + +* Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 169.09-2 +- rebuild for new kmodtools, akmod adjustments + +* Wed Jan 23 2008 Stewart Adam <s.adam AT diffingo DOT com> - 169.09-1 +- Update to 169.09 +- Fix License tag + +* Sun Jan 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 169.07-2 +- build akmods package + +* Sat Dec 22 2007 Stewart Adam < s.adam AT diffingo DOT com > - 169.07-1 +- Update to 169.07 +- Don't build debug to fix BuildID error + +* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-17 +- rebuilt for F8 kernels + +* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-16 +- rebuilt for latest kernels + +* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-15 +- rebuilt for latest kernels + +* Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-14 +- rebuilt for latest kernels +- adjust to rpmfusion and new kmodtool + +* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-13 +- rebuilt for latest kernels + +* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-12 +- rebuilt for latest kernels + +* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-11 +- rebuilt for latest kernels + +* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-10 +- rebuilt for latest kernels + +* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-9 +- rebuilt for latest kernels + +* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-8 +- rebuilt for latest kernels + +* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-7 +- rebuilt for latest kernels + +* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 100.14.19-6 +- rebuilt for latest kernels + +* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 100.14.19-5 +- rebuilt for latest kernels + +* Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> +- build for rawhide kernels as of today + +* Thu Oct 04 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 100.14.19-3 +- fix typo + +* Wed Oct 03 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 100.14.19-2 +- update for new kmod-helper stuff +- build for newest kernels + +* Thu Sep 20 2007 kwizart < kwizart at gmail.com > - 100.14.19-1 +- Update to Final 100.14.19 + +* Sun Sep 09 2007 Thorsten Leemhuis < fedora AT leemhuis DOT info > - 100.14.11-4 +- Build for latest only + +* Sun Sep 09 2007 Thorsten Leemhuis < fedora AT leemhuis DOT info > - 100.14.11-3 +- Convert to new kmods stuff from livna +- Rebuild for F8T2 and rawhide + +* Fri Aug 10 2007 Stewart Adam < s.adam AT diffingo DOT com > - 100.14.11-2 +- Add patch from nvnews for 2.6.23rc2 support +- Rebuild for F8T1 + +* Thu Jun 21 2007 Stewart Adam < s.adam AT diffingo DOT com > - 100.14.11-1 +- Update to 100.14.11 +- Drop unneeded patches + +* Sun Jun 10 2007 kwizart < kwizart at gmail.com > - 100.14.09-1 +- Update to Final 100.14.09 + +* Sun May 27 2007 kwizart < kwizart at gmail.com > - 1.0.9762-1 +- Update to 1.0.9762 + +* Fri Apr 27 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9755-3 +- Rebuild for F7T4 (fixed kversion) +- Fix changelog dates + +* Fri Apr 27 2007 kwizart < kwizart at gmail.com > - 1.0.9755-2 +- Build for Fedora test4 kernel + +* Thu Mar 8 2007 kwizart < kwizart at gmail.com > - 1.0.9755-1 +- Update to 1.0.9755 +- Build to current 2.6.20-1.2967.fc7 + +* Sun Mar 4 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-7 +- kdump for non-i686 +- Fix dates in changelog + +* Sat Mar 3 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-6 +- No kdump +- New kernel + +* Fri Mar 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-5 +- New kernel +- Make Source0 a URL + +* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9746-4 +- Standardize all summaries and descriptions with other nvidia and fglrx + packages +- Move paths from nvidia-glx to nvidia + +* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9746-3 +- Disable xen variant + +* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9746-2 +- Rebuild for Fedora Core 7 test1 + +* Tue Dec 26 2006 kwizart < kwizart at gmail.com > - 1.0.9746-1 +- Update to release 1.0.9746 (Final). +- Standard version do not support xen kernel. +- Update xen patch: patch-nv-1.0-9625-xenrt.txt + +* Thu Nov 23 2006 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9742-2 +- Change %%description, as NV30 and below no longer supported +- Update nvidia desktop file + +* Mon Nov 20 2006 kwizart < kwiart at gmail.com > - 1.0.9742-1 +- Update to release 1.0.9742 + +* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1 +- update to release 1.0.9629 +- include xen patch (thx to Bob Richmond) + +* Wed Nov 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9626-2 +- include patch from + http://www.nvnews.net/vbulletin/showpost.php?p=996233&postcount=20 + +* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1 +- update to release 1.0.9626 + +* Sat Oct 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8774-2 +- sed-away the config.h include + +* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1 +- update to release 1.0.8774 + +* Thu Aug 10 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5 +- update for kernel 2.6.17-1.2174_FC5 + +* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4 +- forgot to update release field + +* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-3 +- minor changes to spacing, removal of random tabs, re-arrangements + +* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8762-2 +- Invoke kmodtool with bash instead of sh. + +* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1 +- update to 1.0.8762 + +* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-3 +- Require version >= of nvidia-kmod-common. +- Provide nvidia-kmod instead of kmod-nvidia to fix upgrade woes (#970). + +* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2 +- Provide "kernel-modules" instead of "kernel-module" to match yum's config. + +* Sat Apr 08 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8756-1 +- Update to 8756 +- drop patch + +* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-6 +- disable xen0 for now + +* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-5 +- build for 2.6.16-1.2069_FC5 + +* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-4 +- allow to pass kversion and kvariants via command line + +* Sat Mar 18 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-3 +- drop 0.lvn +- use kmodtool from svn +- hardcode kernel and variants + +* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2 +- Some minor fixes +- new kmodtool + +* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1 +- split into packages for userland and kmod +- rename to nvidia-kmod + +* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2 +- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README +- reference xorg.conf rather than XF86Config in the init script +- improve readability of instructions and comments, fix some typos +- drop epoch, as it seems to be affecting dependencies according to rpmlint +- tweak the nvidia-settings desktop file so it always shows up on the + menu in the right location +- add the manual pages for nvidia-settings and nvidia-xconfig +- remove header entries from the nvidia-glx files list. they belong in -devel +- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64 + release prior to 7174) +- add libXvMCNVIDIA.so +- update to 8178 + +* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1 +- add the manual pages for nvidia-settings and nvidia-xconfig +- install the new nvidia-xconfig utility and associated libs + +* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1 +- Update to 8174 +- desktop entry now Categories=Settings (#665) +- Ship bug-reporting tool in doc (#588) +- 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.7676-0.lvn.3 +- Conflics 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: nvidia-kmodtool-excludekernel-filterfile =================================================================== RCS file: nvidia-kmodtool-excludekernel-filterfile diff -N nvidia-kmodtool-excludekernel-filterfile Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 5 Jun 2009 20:04:59 -0000 1.14 +++ .cvsignore 31 Oct 2009 12:01:56 -0000 1.15 @@ -1 +1 @@ -nvidia-kmod-data-185.18.14.tar.bz2 +nvidia-kmod-data-190.42.tar.bz2 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 5 Jun 2009 20:04:59 -0000 1.14 +++ sources 31 Oct 2009 12:01:56 -0000 1.15 @@ -1 +1 @@ -9f75da6926944725c5920c03742a0899 nvidia-kmod-data-185.18.14.tar.bz2 +0109cd36131cd7118f20ab412a45ef5c nvidia-kmod-data-190.42.tar.bz2

15 years

1
0
0 / 0

rpms/nvidia-kmod/F-11 sources, 1.18, 1.19 .cvsignore, 1.17, 1.18 nvidia-kmod.spec, 1.63, 1.64

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/nvidia-kmod/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17317 Modified Files: sources .cvsignore nvidia-kmod.spec Log Message: Update to 190.42 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 29 Aug 2009 14:25:02 -0000 1.18 +++ sources 31 Oct 2009 10:36:20 -0000 1.19 @@ -1 +1 @@ -c66bff8a439ecf34ac21c97215c58991 nvidia-kmod-data-185.18.36.tar.bz2 +0109cd36131cd7118f20ab412a45ef5c nvidia-kmod-data-190.42.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 29 Aug 2009 14:25:02 -0000 1.17 +++ .cvsignore 31 Oct 2009 10:36:20 -0000 1.18 @@ -1 +1 @@ -nvidia-kmod-data-185.18.36.tar.bz2 +nvidia-kmod-data-190.42.tar.bz2 Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/nvidia-kmod.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- nvidia-kmod.spec 20 Oct 2009 17:55:30 -0000 1.63 +++ nvidia-kmod.spec 31 Oct 2009 10:36:20 -0000 1.64 @@ -3,12 +3,12 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +#define buildforkernels newest Name: nvidia-kmod -Version: 185.18.36 +Version: 190.42 # Taken over by kmodtool -Release: 1%{?dist}.3 +Release: 1%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -93,6 +93,9 @@ %changelog +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedorproject.org> - 190.42-1 +- Update to 190.42 + * Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 185.18.36-1.3 - rebuild for new kernels

15 years

1
0
0 / 0

rpms/xorg-x11-drv-nvidia/F-11 xorg-x11-drv-nvidia.spec, 1.30, 1.31 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv16359 Modified Files: xorg-x11-drv-nvidia.spec .cvsignore sources Log Message: - Update to 190.42 Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- xorg-x11-drv-nvidia.spec 10 Oct 2009 17:35:44 -0000 1.30 +++ xorg-x11-drv-nvidia.spec 31 Oct 2009 10:20:42 -0000 1.31 @@ -7,8 +7,8 @@ %endif Name: xorg-x11-drv-nvidia -Version: 185.18.36 -Release: 3%{?dist} +Version: 190.42 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -30,7 +30,9 @@ %define __find_provides %{SOURCE92} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?fedora} >= 11 +%if 0%{?fedora} > 11 || 0%{?rhel} > 5 +ExclusiveArch: i686 x86_64 +%else 0%{?fedora} == 11 ExclusiveArch: i586 x86_64 %else ExclusiveArch: i386 x86_64 @@ -312,6 +314,9 @@ %changelog +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedorproject.org> - 190.42-1 +- Update to 190.42 + * Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 185.18.36-3 - Exclude libvdpau as it is now a separate package. - Avoid Requires/Provides of the libGL.so.1 . rfbz#859 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 29 Aug 2009 14:25:27 -0000 1.16 +++ .cvsignore 31 Oct 2009 10:20:42 -0000 1.17 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-185.18.36-pkg0.run -NVIDIA-Linux-x86-185.18.36-pkg0.run +NVIDIA-Linux-x86_64-190.42-pkg0.run +NVIDIA-Linux-x86-190.42-pkg0.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Aug 2009 14:25:27 -0000 1.17 +++ sources 31 Oct 2009 10:20:42 -0000 1.18 @@ -1,2 +1,2 @@ -c9827059697001fa61518e56fdc24e93 NVIDIA-Linux-x86_64-185.18.36-pkg0.run -cf40656600b8a587e82a801f05fa2d95 NVIDIA-Linux-x86-185.18.36-pkg0.run +ae431ff849ec01446e6724f9fcfe3bb4 NVIDIA-Linux-x86_64-190.42-pkg0.run +f94806feee87de756d14fe3e9bcaf05a NVIDIA-Linux-x86-190.42-pkg0.run

15 years

1
0
0 / 0

rpms/vlc/F-10 .cvsignore, 1.9, 1.10 sources, 1.12, 1.13 vlc.spec, 1.27, 1.28

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13782 Modified Files: .cvsignore sources vlc.spec Log Message: Update to 1.0.3 ReSync for F-10 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Sep 2009 19:22:33 -0000 1.9 +++ .cvsignore 31 Oct 2009 09:36:39 -0000 1.10 @@ -1 +1 @@ -vlc-1.0.2.tar.bz2 +vlc-1.0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 27 Sep 2009 15:43:16 -0000 1.12 +++ sources 31 Oct 2009 09:36:39 -0000 1.13 @@ -1 +1 @@ -69d4e30fe4fc2691780fbeacd40359d2 vlc-1.0.2.tar.bz2 +d0945c2489551c102a3f0f15e4591555 vlc-1.0.3.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-10/vlc.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- vlc.spec 29 Sep 2009 20:25:08 -0000 1.27 +++ vlc.spec 31 Oct 2009 09:36:39 -0000 1.28 @@ -1,14 +1,14 @@ # TODO: libdc1394(juju), modularization (vlc-plugin-foo) #global live555_date 2009.07.28 -#global vlc_rc -rc4 +#global vlc_rc -rc %global vlc_bootstrap 1 Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc -Version: 1.0.2 -Release: 1%{?dist}.2 +Version: 1.0.3 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -41,7 +41,7 @@ BuildRequires: dbus-devel BuildRequires: dirac-devel >= 1.0.0 %{!?_without_directfb:BuildRequires: directfb-devel} -BuildRequires: faac-devel +%{?_with_faac:BuildRequires: faac-devel} BuildRequires: faad2-devel BuildRequires: ffmpeg-devel >= 0.4.9-0 BuildRequires: flac-devel @@ -95,6 +95,7 @@ BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libmusicbrainz-devel +BuildRequires: libshout-devel BuildRequires: lua-devel BuildRequires: minizip-devel BuildRequires: mpeg2dec-devel >= 0.3.2 @@ -143,6 +144,7 @@ %if 0%{?fedora} > 10 Requires: dejavu-sans-fonts +Requires: dejavu-serif-fonts %else Requires: dejavu-fonts %endif @@ -215,16 +217,6 @@ JACK audio plugin for the VLC media player. -%{?_with_dc1394: -%package plugin-dc1394 -Summary: VLC Media Player Plugins for dc1394 -Group: Applications/Multimedia -Requires: %{name}-core%{_isa} = %{version} - -%description plugin-dc1394 -VLC plugin for libdc1394 -} - %prep %setup -q -n %{name}-%{version}%{?vlc_rc} %if 0%{?live555_date:1} @@ -241,7 +233,7 @@ rm modules/access/videodev2.h ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h %if 0%{?vlc_bootstrap:1} -rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 +rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : ./bootstrap %endif @@ -262,7 +254,7 @@ %configure \ --disable-dependency-tracking \ --disable-rpath \ - --enable-debug \ + --enable-release \ --with-binary-version=%{version}-%{release} \ --with-tuning=no \ --enable-switcher \ @@ -271,7 +263,6 @@ %if 0%{?live555_date:1} --with-live555-tree=live \ %endif -%{?_with_dc1394:--enable-dc1394} \ --enable-dv \ --enable-opencv \ --enable-pvr \ @@ -281,6 +272,7 @@ %{!?_with_x264:--disable-x264} \ --enable-shine \ --enable-faad \ +%{!?_with_faac:--disable-faac} \ --enable-twolame \ --enable-real \ --enable-realrtsp \ @@ -291,6 +283,7 @@ --enable-theora \ --enable-dirac \ --enable-libass \ + --enable-shout \ --enable-xcb \ --enable-svg \ --enable-snapshot \ @@ -500,9 +493,6 @@ %exclude %{_libdir}/vlc/audio_output/libjack_plugin.so %exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so %exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so -%{?_with_dc1394: -%exclude %{_libdir}/vlc/access/libdc1394_plugin.so -} %{_libdir}/vlc/ %{_mandir}/man1/vlc*.1* @@ -522,12 +512,6 @@ %{_libdir}/vlc/video_output/libsvgalib_plugin.so %endif -%{?_with_dc1394: -%files plugin-dc1394 -%defattr(-,root,root,-) -%{_libdir}/vlc/access/libdc1394_plugin.so -} - %files devel %defattr(-,root,root,-) %doc HACKING @@ -547,11 +531,24 @@ %changelog +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0.3-1 +- Update to 1.0.3 +- Resync for F-10 + +* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3-0.1_rc +- Update to 1.0.3-rc +- Update bugfix to 20091025 +- Clean dc1394 sub-package + +* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2 +- Update to 1.0-bugfix 20091016 +- Rebuild for x264/ffmpeg + * Sun Sep 27 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.2 - x264 disabled because version isn't new enought (re-enabled --with x264) -* Wed Sep 23 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1 -- Rsync for F-10 +* Sun Sep 20 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1 +- Workaround the compiler bug on x86 x86_64 by disabling optimization. * Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 1.0.2-1 - Update to 1.0.2

15 years

1
0
0 / 0

rpms/vlc/F-11 .cvsignore,1.15,1.16

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13034 Modified Files: .cvsignore Log Message: Update to 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-11/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 20 Sep 2009 09:08:52 -0000 1.15 +++ .cvsignore 31 Oct 2009 09:25:23 -0000 1.16 @@ -1 +1 @@ -vlc-1.0.2.tar.bz2 +vlc-1.0.3.tar.bz2

15 years

1
0
0 / 0

rpms/vlc/F-11 sources,1.20,1.21 vlc.spec,1.45,1.46

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12699 Modified Files: sources vlc.spec Log Message: Update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-11/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 20 Sep 2009 09:08:52 -0000 1.20 +++ sources 31 Oct 2009 09:21:22 -0000 1.21 @@ -1 +1 @@ -69d4e30fe4fc2691780fbeacd40359d2 vlc-1.0.2.tar.bz2 +d0945c2489551c102a3f0f15e4591555 vlc-1.0.3.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-11/vlc.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- vlc.spec 20 Sep 2009 09:08:52 -0000 1.45 +++ vlc.spec 31 Oct 2009 09:21:22 -0000 1.46 @@ -1,13 +1,13 @@ # TODO: libdc1394(juju), modularization (vlc-plugin-foo) #global live555_date 2009.07.28 -#global vlc_rc -rc4 +#global vlc_rc -rc %global vlc_bootstrap 1 Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -41,7 +41,7 @@ BuildRequires: dbus-devel BuildRequires: dirac-devel >= 1.0.0 %{!?_without_directfb:BuildRequires: directfb-devel} -BuildRequires: faac-devel +%{?_with_faac:BuildRequires: faac-devel} BuildRequires: faad2-devel BuildRequires: ffmpeg-devel >= 0.4.9-0 BuildRequires: flac-devel @@ -95,6 +95,7 @@ BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libmusicbrainz-devel +BuildRequires: libshout-devel BuildRequires: lua-devel BuildRequires: minizip-devel BuildRequires: mpeg2dec-devel >= 0.3.2 @@ -216,16 +217,6 @@ JACK audio plugin for the VLC media player. -%{?_with_dc1394: -%package plugin-dc1394 -Summary: VLC Media Player Plugins for dc1394 -Group: Applications/Multimedia -Requires: %{name}-core%{_isa} = %{version} - -%description plugin-dc1394 -VLC plugin for libdc1394 -} - %prep %setup -q -n %{name}-%{version}%{?vlc_rc} %if 0%{?live555_date:1} @@ -239,11 +230,10 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in %patch4 -p1 -b .mmx_pic - rm modules/access/videodev2.h ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h %if 0%{?vlc_bootstrap:1} -rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 +rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : ./bootstrap %endif @@ -273,7 +263,6 @@ %if 0%{?live555_date:1} --with-live555-tree=live \ %endif -%{?_with_dc1394:--enable-dc1394} \ --enable-dv \ --enable-opencv \ --enable-pvr \ @@ -282,6 +271,7 @@ --enable-wma-fixed \ --enable-shine \ --enable-faad \ +%{!?_with_faac:--disable-faac} \ --enable-twolame \ --enable-real \ --enable-realrtsp \ @@ -292,6 +282,7 @@ --enable-theora \ --enable-dirac \ --enable-libass \ + --enable-shout \ --enable-xcb \ --enable-svg \ --enable-snapshot \ @@ -501,9 +492,6 @@ %exclude %{_libdir}/vlc/audio_output/libjack_plugin.so %exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so %exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so -%{?_with_dc1394: -%exclude %{_libdir}/vlc/access/libdc1394_plugin.so -} %{_libdir}/vlc/ %{_mandir}/man1/vlc*.1* @@ -523,12 +511,6 @@ %{_libdir}/vlc/video_output/libsvgalib_plugin.so %endif -%{?_with_dc1394: -%files plugin-dc1394 -%defattr(-,root,root,-) -%{_libdir}/vlc/access/libdc1394_plugin.so -} - %files devel %defattr(-,root,root,-) %doc HACKING @@ -548,6 +530,25 @@ %changelog +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0.3-1 +- Update to 1.0.3 + +* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3-0.1_rc +- Update to 1.0.3-rc +- Update bugfix to 20091025 +- Clean dc1394 sub-package + +* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2 +- Update to 1.0-bugfix 20091016 +- Rebuild for x264/ffmpeg + +* Sun Sep 27 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.2 +- Disable the workaround for the compiler bug. (rhbz#524439) +- Resync with the fonts requirement. + +* Sun Sep 20 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1 +- Workaround the compiler bug on x86 x86_64 by disabling optimization. + * Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 1.0.2-1 - Update to 1.0.2

15 years

1
0
0 / 0

rpms/vlc/devel sources, 1.27, 1.28 vlc.spec, 1.69, 1.70 vlc-1.0-bugfix-20091025.patch, 1.1, NONE

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv12663 Modified Files: sources vlc.spec Removed Files: vlc-1.0-bugfix-20091025.patch Log Message: Update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 25 Oct 2009 16:41:04 -0000 1.27 +++ sources 31 Oct 2009 09:19:22 -0000 1.28 @@ -1 +1 @@ -a83fc8d8a4bc804b27da6bd60b091967 vlc-1.0.3-rc.tar.bz2 +d0945c2489551c102a3f0f15e4591555 vlc-1.0.3.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- vlc.spec 27 Oct 2009 22:10:08 -0000 1.69 +++ vlc.spec 31 Oct 2009 09:19:22 -0000 1.70 @@ -1,14 +1,14 @@ # TODO: libdc1394(juju), modularization (vlc-plugin-foo) #global live555_date 2009.07.28 -%global vlc_rc -rc +#global vlc_rc -rc %global vlc_bootstrap 1 Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc Version: 1.0.3 -Release: 0.2_rc%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -22,7 +22,6 @@ Patch2: 0002-Default-aout-for-pulse.patch Patch3: 300_all_pic.patch Patch4: 310_all_mmx_pic.patch -Patch5: vlc-1.0-bugfix-20091025.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -230,7 +229,6 @@ %patch3 -p1 -b .dmo_pic sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in %patch4 -p1 -b .mmx_pic -%patch5 -p1 -b .bf rm modules/access/videodev2.h ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h @@ -532,10 +530,10 @@ %changelog -* Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 1.0.3.0.2_rc -- Rebuild for x264 +* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0.3-1 +- Update to 1.0.3 -* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3.0.1_rc +* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3-0.1_rc - Update to 1.0.3-rc - Update bugfix to 20091025 - Clean dc1394 sub-package --- vlc-1.0-bugfix-20091025.patch DELETED ---

15 years

1
0
0 / 0

rpms/libquicktime/devel libquicktime.spec,1.12,1.13

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/libquicktime/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27651 Modified Files: libquicktime.spec Log Message: - Add BR schroedinger-devel Index: libquicktime.spec =================================================================== RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libquicktime.spec 27 Oct 2009 21:52:54 -0000 1.12 +++ libquicktime.spec 30 Oct 2009 07:38:01 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -12,6 +12,7 @@ BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel BuildRequires: libvorbis-devel ffmpeg-devel +BuildRequires: schroedinger-devel BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel BuildRequires: libdv-devel >= 0.102-4 x264-devel faad2-devel BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 @@ -134,6 +135,9 @@ # -------------------------------------------------------------------- %changelog +* Fri Oct 30 2009 kwizart <kwizart at gmail.com > - 1.1.3-3 +- Add BR schroedinger-devel + * Tue Oct 27 2009 kwizart <kwizart at gmail.com > - 1.1.3-2 - backport patch from Alexis Ballier.

15 years

1
0
0 / 0

rpms/mplayer/devel mplayer-manlinks.patch, 1.3, 1.4 .cvsignore, 1.13, 1.14 mplayer-config.patch, 1.2, 1.3 mplayer-nodvdcss.patch, 1.5, 1.6 mplayer-qcelp.patch, 1.1, 1.2 mplayer-snapshot.sh, 1.5, 1.6 mplayer.spec, 1.23, 1.24 sources, 1.14, 1.15

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/mplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7265 Modified Files: .cvsignore mplayer-config.patch mplayer-nodvdcss.patch mplayer-qcelp.patch mplayer-snapshot.sh mplayer.spec sources Added Files: mplayer-manlinks.patch Log Message: * Thu Oct 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.111.20091029svn - 20091029 snapshot - rebuild against current x264 - fix debuginfo generation (bug #101) - move aconvert to mencoder package (bug #544) - fix snapshot script not to mangle version string (bug #577) - disable screensaver by default (bug #672) - restore and rebase some of the dropped patches - build against external liba52 - enable dirac decoding via libschroedinger mplayer-manlinks.patch: Index: mplayer-manlinks.patch =================================================================== RCS file: mplayer-manlinks.patch diff -N mplayer-manlinks.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mplayer-manlinks.patch 30 Oct 2009 01:10:22 -0000 1.4 @@ -0,0 +1,31 @@ +diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile +--- mplayer-export-2009-10-29/Makefile.manlinks 2009-10-19 11:56:18.000000000 +0200 ++++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:42:36.000000000 +0100 +@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M + install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) + + install-gui-man-en: install-mplayer-man-en +- cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1 ++ echo ".so mplayer.1" > $(MANDIR)/man1/gmplayer.1 + + install-mencoder-man-en: install-mplayer-man-en +- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ++ echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1 + + install-mplayer-man-en: + $(INSTALL) -d $(MANDIR)/man1 +@@ -933,12 +933,12 @@ install-mplayer-man-en: + + define GUI_MAN_RULE + install-gui-man-$(lang): install-mplayer-man-$(lang) +- cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1 ++ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1 + endef + + define MENCODER_MAN_RULE + install-mencoder-man-$(lang): install-mplayer-man-$(lang) +- cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 ++ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1 + endef + + define MPLAYER_MAN_RULE Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 21 Oct 2009 21:10:53 -0000 1.13 +++ .cvsignore 30 Oct 2009 01:10:22 -0000 1.14 @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-20091021.tar.bz2 +mplayer-export-2009-10-29.tar.bz2 mplayer-config.patch: Index: mplayer-config.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-config.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mplayer-config.patch 19 Aug 2008 12:32:35 -0000 1.2 +++ mplayer-config.patch 30 Oct 2009 01:10:22 -0000 1.3 @@ -1,6 +1,6 @@ -diff -up mplayer-export-2008-08-18/etc/example.conf.orig mplayer-export-2008-08-18/etc/example.conf ---- mplayer-export-2008-08-18/etc/example.conf.orig 2008-02-08 19:33:39.000000000 +0100 -+++ mplayer-export-2008-08-18/etc/example.conf 2008-08-19 13:47:15.000000000 +0200 +diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-10-29/etc/example.conf +--- mplayer-export-2009-10-29/etc/example.conf.config 2008-02-08 19:33:39.000000000 +0100 ++++ mplayer-export-2009-10-29/etc/example.conf 2009-10-29 23:54:30.000000000 +0100 @@ -1,7 +1,7 @@ # # MPlayer configuration file @@ -44,13 +44,16 @@ # cache settings # # Use 8MB input cache by default. -@@ -122,6 +131,9 @@ +@@ -122,6 +131,12 @@ # DVD: Play English audio tracks if available. #alang = en +# A plugged in joystick can interfere with keyboard shortcuts +joystick = no + ++# Inhibit (a XScrnSaver compatible) screensaver while playing a movie ++stop-xscreensaver = yes ++ ################### # DVDNAV Settings # ################### mplayer-nodvdcss.patch: Index: mplayer-nodvdcss.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mplayer-nodvdcss.patch 31 Mar 2009 17:37:39 -0000 1.5 +++ mplayer-nodvdcss.patch 30 Oct 2009 01:10:22 -0000 1.6 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2009-03-29/configure.nodvdcss mplayer-export-2009-03-29/configure ---- mplayer-export-2009-03-29/configure.nodvdcss 2009-03-29 00:21:21.000000000 +0100 -+++ mplayer-export-2009-03-29/configure 2009-03-29 11:20:11.000000000 +0200 -@@ -622,7 +622,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2009-10-29/configure.nodvdcss mplayer-export-2009-10-29/configure +--- mplayer-export-2009-10-29/configure.nodvdcss 2009-10-28 14:55:18.000000000 +0100 ++++ mplayer-export-2009-10-29/configure 2009-10-30 00:36:25.000000000 +0100 +@@ -639,7 +639,7 @@ _dvdnavconfig=dvdnav-config _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto @@ -10,10 +10,10 @@ _xanim=auto _real=auto _live=auto -diff -up mplayer-export-2009-03-29/Makefile.nodvdcss mplayer-export-2009-03-29/Makefile ---- mplayer-export-2009-03-29/Makefile.nodvdcss 2009-03-29 11:20:11.000000000 +0200 -+++ mplayer-export-2009-03-29/Makefile 2009-03-29 11:20:55.000000000 +0200 -@@ -345,11 +345,6 @@ SRCS_COMMON-$(LIBDCA) += +diff -up mplayer-export-2009-10-29/Makefile.nodvdcss mplayer-export-2009-10-29/Makefile +--- mplayer-export-2009-10-29/Makefile.nodvdcss 2009-10-19 11:56:18.000000000 +0200 ++++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:37:10.000000000 +0100 +@@ -150,11 +150,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c @@ -24,20 +24,20 @@ - libdvdcss/libdvdcss.c \ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c - SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ -@@ -745,7 +740,6 @@ DIRS = . \ - libavcodec/x86 \ - libavformat \ - libavutil \ + +@@ -752,7 +747,6 @@ DIRS = . \ + libavutil/ppc \ + libavutil/sh4 \ + libavutil/x86 \ - libdvdcss \ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -852,7 +846,6 @@ version.h: version.sh - # Make sure all generated header files are created. - $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h +@@ -871,7 +865,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h + $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h + $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h --libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) - libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" - libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV) - libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) +-libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) + libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) + libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) + libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) mplayer-qcelp.patch: Index: mplayer-qcelp.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-qcelp.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mplayer-qcelp.patch 9 Aug 2008 09:32:32 -0000 1.1 +++ mplayer-qcelp.patch 30 Oct 2009 01:10:22 -0000 1.2 @@ -1,8 +1,8 @@ -diff -up mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c ---- mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp 2008-01-13 17:00:39.000000000 +0100 -+++ mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c 2008-02-22 21:19:57.000000000 +0100 -@@ -40,6 +40,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT - {"MPA", 0x55}, +diff -up mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c.qcelp mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c +--- mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c.qcelp 2009-05-13 04:58:57.000000000 +0200 ++++ mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c 2009-10-30 00:36:02.000000000 +0100 +@@ -42,6 +42,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT + {"MPA", 0x55}, {"vorbis", mmioFOURCC('v','r','b','s')}, {"mpeg4-generic", mmioFOURCC('M','P','4','A')}, + {"x-Purevoice", mmioFOURCC('Q','c','l','p')}, Index: mplayer-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mplayer-snapshot.sh 21 Oct 2009 23:06:02 -0000 1.5 +++ mplayer-snapshot.sh 30 Oct 2009 01:10:22 -0000 1.6 @@ -14,25 +14,21 @@ pwd=$(pwd) svn=$(date +%Y-%m-%d) dirname=mplayer-export-$svn -mplayer_rev=29776 -ffmpeg_rev=HEAD -dvdnav_rev=HEAD +mplayer_rev={$svn} cd "$tmp" svn checkout -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname cd $dirname rm -rf libdvdcss -for dir in libav* libpostproc ; do +for dir in libav* libdvd* libpostproc ; do cd $dir - svn update -r ${ffmpeg_rev} + svn update -r ${mplayer_rev} cd .. done -svn update -r ${dvdnav_rev} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src libdvdread4 -svn update -r ${dvdnav_rev} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src libdvdnav svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -sed -i -e 's/$SVN-r[0-9]* $/\1rpmfusion /' -e "s/UNKNOWN/$svn_revision/" version.sh +sed -i -e 's/$SVN-r[0-9]* $/\1rpmfusion /' -e "s/UNKNOWN/SVN-r$svn_revision/" version.sh find . -type d -name .svn -print0 | xargs -0r rm -rf cd .. tar jcf "$pwd"/$dirname.tar.bz2 $dirname Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mplayer.spec 21 Oct 2009 21:10:53 -0000 1.23 +++ mplayer.spec 30 Oct 2009 01:10:22 -0000 1.24 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20091021svn +%define pre 20091029svn %define svn 1 -%define svnbuild 20091021 +%define svnbuild 2009-10-29 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.110.%{pre}%{?dist} +Release: 0.111.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -21,11 +21,13 @@ Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 Source10: mplayer-snapshot.sh Patch2: %{name}-config.patch +Patch8: %{name}-manlinks.patch Patch10: %{name}-qcelp.patch Patch14: %{name}-nodvdcss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel +BuildRequires: a52dec-devel BuildRequires: aalib-devel BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel @@ -61,9 +63,10 @@ BuildRequires: live555-devel BuildRequires: lzo-devel >= 2 BuildRequires: pulseaudio-lib-devel +BuildRequires: schroedinger-devel BuildRequires: speex-devel >= 1.1 BuildRequires: twolame-devel -BuildRequires: x264-devel >= 0.0.0-0.14.20080613 +BuildRequires: x264-devel >= 0.0.0-0.26.20091026 BuildRequires: xvidcore-devel >= 0.9.2 BuildRequires: yasm %{?_with_arts:BuildRequires: arts-devel} @@ -142,7 +145,7 @@ --libdir=%{_libdir} \\\ --codecsdir=%{codecdir} \\\ \\\ - --extra-cflags="`echo $RPM_OPT_FLAGS|sed -e s,i386,i486,`" \\\ + --extra-cflags="$RPM_OPT_FLAGS" \\\ --language=all \\\ \\\ --enable-joystick \\\ @@ -161,6 +164,7 @@ --disable-mp3lame-lavc \\\ --disable-x264-lavc \\\ \\\ + --disable-liba52-internal \\\ %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\ --disable-faad-internal \\\ %{!?_with_libmad:--disable-mad} \\\ @@ -191,6 +195,9 @@ %patch2 -p1 -b .config +%patch8 -p1 -b .manlinks +%patch10 -p1 -b .qcelp +%patch14 -p1 -b .nodvdcss doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 @@ -199,13 +206,15 @@ for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done for lang in ru ; do doconv koi8-r utf-8 $lang ; done +mkdir GUI +cp -a `ls -1|grep -v GUI` GUI/ + %build -%{mp_configure}--enable-gui +pushd GUI +%{mp_configure}--enable-gui --disable-mencoder %{__make} %{?_smp_mflags} - -mv -f mplayer gmplayer -%{__make} distclean +popd %{mp_configure} @@ -240,7 +249,7 @@ install -pm 644 etc/{input,menu}.conf $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/ # GUI mplayer -install -pm 755 g%{name} $RPM_BUILD_ROOT%{_bindir}/ +install -pm 755 GUI/%{name} $RPM_BUILD_ROOT%{_bindir}/gmplayer # Default skin install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mplayer/skins @@ -283,7 +292,6 @@ %config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf %config(noreplace) %{_sysconfdir}/mplayer/input.conf %config(noreplace) %{_sysconfdir}/mplayer/menu.conf -%{_bindir}/aconvert %{_bindir}/midentify %{_bindir}/mplayer %dir %{codecdir}/ @@ -308,6 +316,7 @@ %files -n mencoder %defattr(-, root, root, -) +%{_bindir}/aconvert %{_bindir}/mencoder %{_mandir}/man1/mencoder.1* %lang(cs) %{_mandir}/cs/man1/mencoder.1* @@ -334,6 +343,17 @@ %changelog +* Thu Oct 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.111.20091029svn +- 20091029 snapshot +- rebuild against current x264 +- fix debuginfo generation (bug #101) +- move aconvert to mencoder package (bug #544) +- fix snapshot script not to mangle version string (bug #577) +- disable screensaver by default (bug #672) +- restore and rebase some of the dropped patches +- build against external liba52 +- enable dirac decoding via libschroedinger + * Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-0.110.20091021svn - Update to snapshot 20091021 mplayer svn rev: 29776 Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Oct 2009 21:10:53 -0000 1.14 +++ sources 30 Oct 2009 01:10:22 -0000 1.15 @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -416fa47da802f9aa256de0ce98371613 mplayer-export-20091021.tar.bz2 +101e633734544dfc735ea27d218342eb mplayer-export-2009-10-29.tar.bz2

15 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits October 2009