packages: xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3...
baggins
baggins at pld-linux.org
Mon Feb 6 23:26:31 CET 2012
Author: baggins Date: Mon Feb 6 22:26:31 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 11
- dropped multigl bcond and all the hacks around it,
interoperability is perfectly doable by default without it
---- Files affected:
packages/xorg-driver-video-nvidia-legacy3:
xorg-driver-video-nvidia-legacy3.spec (1.76 -> 1.77) , 10-nvidia-modules.conf (NONE -> 1.1) (NEW), 10-nvidia.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec
diff -u packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.76 packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.77
--- packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.76 Sat Feb 4 15:32:04 2012
+++ packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec Mon Feb 6 23:26:26 2012
@@ -9,7 +9,6 @@
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
-%bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
%bcond_with verbose # verbose build (V=1)
%if "%{_alt_kernel}" != "%{nil}"
@@ -21,14 +20,13 @@
%endif
%define no_install_post_check_so 1
-%define rel 10
%define pname xorg-driver-video-nvidia-legacy3
Summary: Linux Drivers for nVidia GeForce/Quadro Chips (173.14.xx series)
Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
Name: %{pname}%{_alt_kernel}
Version: 173.14.31
-Release: %{rel}%{?with_multigl:.mgl}
+Release: 11
License: nVidia Binary
Group: X11
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
@@ -36,6 +34,8 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
# Source1-md5: d53e8faf8ac90ad98b8998f25f121535
Source2: %{pname}-xinitrc.sh
+Source3: 10-nvidia.conf
+Source4: 10-nvidia-modules.conf
Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-legacy-desktop.patch
URL: http://www.nvidia.com/object/unix.html
@@ -46,7 +46,7 @@
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
-Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{release}
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) <= 10.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
@@ -99,19 +99,13 @@
Summary: OpenGL (GL and GLX) Nvidia libraries
Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia
Group: X11/Development/Libraries
-#Requires: %{pname} = %{epoch}:%{version}-%{rel}
+#Requires: %{pname} = %{epoch}:%{version}-%{release}
Provides: OpenGL = 2.1
Provides: OpenGL-GLX = 1.4
-%if %{without multigl}
-Obsoletes: Mesa
-%endif
Obsoletes: X11-OpenGL-core < 1:7.0.0
Obsoletes: X11-OpenGL-libGL < 1:7.0.0
Obsoletes: XFree86-OpenGL-core < 1:7.0.0
Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
-%if %{without multigl}
-Conflicts: Mesa-libGL
-%endif
%description libs
NVIDIA OpenGL (GL and GLX only) implementation libraries.
@@ -124,7 +118,7 @@
Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok
Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX)
Group: X11/Development/Libraries
-Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{release}
Provides: OpenGL-GLX-devel = 1.4
Provides: OpenGL-devel = 2.1
Obsoletes: X11-OpenGL-devel-base
@@ -148,7 +142,7 @@
Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár
Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA
Group: X11/Development/Libraries
-Requires: %{pname}-devel = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-devel = %{epoch}:%{version}-%{release}
%description static
Static XvMCNVIDIA library.
@@ -172,7 +166,7 @@
Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához
Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia
Group: Applications/System
-Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}-%{release}
Suggests: pkgconfig
Obsoletes: XFree86-driver-nvidia-progs
@@ -190,12 +184,12 @@
Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez.
Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia
-Release: %{rel}@%{_kernel_ver_str}
+Release: %{release}@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel}
-Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}-%{release}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -243,12 +237,11 @@
rm -rf $RPM_BUILD_ROOT
%if %{with userspace}
-install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions/nvidia} \
$RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
-%if %{with multigl}
install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
-%endif
+install -d $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
cp -p usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
@@ -256,52 +249,47 @@
cp -p usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
+sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvidia-modules.conf
+
for f in \
usr/lib/tls/libnvidia-tls.so.%{version} \
usr/lib/libnvidia-cfg.so.%{version} \
usr/lib/libGL{,core}.so.%{version} \
usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
-%if %{without multigl}
usr/X11R6/lib/libXvMCNVIDIA.a \
; do
- install $f $RPM_BUILD_ROOT%{_libdir}
-done
-%else
-; do
install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
done
-cp -p usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
-%endif
install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia
install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
install -p usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia
cp -p usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
-ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
+ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
-%if %{with multigl}
+%ifarch %{x8664}
+echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf
+%else
echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%endif
# OpenGL ABI for Linux compatibility
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
-ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
+ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so
-ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
+ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA.so
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
-%else
-# OpenGL ABI for Linux compatibility
-ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
-ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
-ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
-ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
-%endif
+/sbin/ldconfig -n %{_libdir}/nvidia
+/sbin/ldconfig -n %{_libdir}/xorg/modules/extensions/nvidia
%endif
%if %{with kernel}
@@ -317,9 +305,6 @@
kernel-video-nvidia-legacy3-%{version}
EOF
-/sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
-# until versioned SONAME is built for nvidia_drv.so, update symlink manually
-ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -335,21 +320,17 @@
%defattr(644,root,root,755)
%doc LICENSE
%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
-%if %{with multigl}
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
-%else
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
-%endif
-%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf
+%{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf
%files libs
%defattr(644,root,root,755)
-%if %{with multigl}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf
%dir %{_libdir}/nvidia
%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
@@ -358,34 +339,20 @@
%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
-%else
-%attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
-# symlink for binary apps which fail to conform Linux OpenGL ABI
-# (and dlopen libGL.so instead of libGL.so.1)
-%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) %{_libdir}/libGLcore.so.*.*
-%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
-%attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
-%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
-%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
-%endif
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
+%attr(755,root,root) %{_libdir}/nvidia/libGL.so
+%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so
%dir %{_includedir}/GL
%{_includedir}/GL/gl.h
%{_includedir}/GL/glext.h
%{_includedir}/GL/glx.h
%{_includedir}/GL/glxext.h
-%if %{with multigl}
-%attr(755,root,root) %{_libdir}/libGL.so
-%endif
%files static
%defattr(644,root,root,755)
-%{_libdir}/libXvMCNVIDIA.a
+%{_libdir}/nvidia/libXvMCNVIDIA.a
%files doc
%defattr(644,root,root,755)
@@ -414,6 +381,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.77 2012/02/06 22:26:26 baggins
+- rel 11
+- dropped multigl bcond and all the hacks around it,
+ interoperability is perfectly doable by default without it
+
Revision 1.76 2012/02/04 14:32:04 arekm
- release 10
================================================================
Index: packages/xorg-driver-video-nvidia-legacy3/10-nvidia-modules.conf
diff -u /dev/null packages/xorg-driver-video-nvidia-legacy3/10-nvidia-modules.conf:1.1
--- /dev/null Mon Feb 6 23:26:31 2012
+++ packages/xorg-driver-video-nvidia-legacy3/10-nvidia-modules.conf Mon Feb 6 23:26:26 2012
@@ -0,0 +1,4 @@
+Section "Files"
+ ModulePath "@@LIBDIR@@/xorg/modules/extensions/nvidia"
+ ModulePath "@@LIBDIR@@/xorg/modules"
+EndSection
================================================================
Index: packages/xorg-driver-video-nvidia-legacy3/10-nvidia.conf
diff -u /dev/null packages/xorg-driver-video-nvidia-legacy3/10-nvidia.conf:1.1
--- /dev/null Mon Feb 6 23:26:31 2012
+++ packages/xorg-driver-video-nvidia-legacy3/10-nvidia.conf Mon Feb 6 23:26:26 2012
@@ -0,0 +1,5 @@
+Section "Device"
+ Identifier "NVIDIA"
+ Driver "nvidia"
+EndSection
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec?r1=1.76&r2=1.77&f=u
More information about the pld-cvs-commit
mailing list