[svn] r4868 - in trunk/rpms: nvidia-x11-drv xvidcore

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Nov 8 14:45:26 CET 2006


Author: thias
Date: 2006-11-08 14:45:24 +0100 (Wed, 08 Nov 2006)
New Revision: 4868

Added:
   trunk/rpms/nvidia-x11-drv/NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt
Modified:
   trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
   trunk/rpms/xvidcore/xvidcore.spec
Log:
Update nvidia driver to 1.0-9629 and xvidcore to 1.1.2.


Added: trunk/rpms/nvidia-x11-drv/NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt
===================================================================
--- trunk/rpms/nvidia-x11-drv/NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt	                        (rev 0)
+++ trunk/rpms/nvidia-x11-drv/NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt	2006-11-08 13:45:24 UTC (rev 4868)
@@ -0,0 +1,16 @@
+diff -ru usr/src/nv/nv-i2c.c usr/src/nv.NOSMBUS/nv-i2c.c
+--- usr/src/nv/nv-i2c.c	2006-09-15 01:10:17.000000000 +0200
++++ usr/src/nv.NOSMBUS/nv-i2c.c	2006-09-22 21:56:17.259789750 +0200
+@@ -138,11 +138,7 @@
+ 
+ static u32 nv_i2c_algo_functionality(struct i2c_adapter *adap)
+ {
+-    return (I2C_FUNC_I2C |
+-            I2C_FUNC_SMBUS_QUICK |
+-            I2C_FUNC_SMBUS_BYTE |
+-            I2C_FUNC_SMBUS_BYTE_DATA |
+-            I2C_FUNC_SMBUS_WORD_DATA);
++    return I2C_FUNC_I2C;
+ }
+ 
+ static struct i2c_algorithm nv_i2c_algo = {

Modified: trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
===================================================================
--- trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2006-11-06 13:26:33 UTC (rev 4867)
+++ trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2006-11-08 13:45:24 UTC (rev 4868)
@@ -4,7 +4,7 @@
 # ExclusiveDist: fc6
 
 %define majmin          1.0
-%define relver          9626
+%define relver          9629
 %define nvidialibdir    %{_libdir}/nvidia
 %define nvidialib32dir  %{_prefix}/lib/nvidia
 %define desktop_vendor  rpmforge
@@ -14,7 +14,7 @@
 Summary: Proprietary NVIDIA hardware accelerated OpenGL display driver
 Name: nvidia-x11-drv
 Version: %{majmin}.%{relver}
-Release: 3
+Release: 1
 License: Proprietary
 Group: User Interface/X Hardware Support
 URL: http://www.nvidia.com/object/unix.html
@@ -26,6 +26,8 @@
 Source3: nvidia.csh
 Source4: nvidia-config-display
 Source5: nvidia.modprobe
+# http://www.nvnews.net/vbulletin/attachment.php?attachmentid=20486&d=1158955681
+Patch0: NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Required for proper dkms operation
 Requires: gcc
@@ -62,6 +64,7 @@
 # Move all the files back from tmp/ to the main directory
 %{__mv} tmp/* .
 %{__rm} -rf tmp/
+%patch0 -p0
 
 
 %build
@@ -95,11 +98,11 @@
     %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Install libXvMCNVIDIA.*
-%{__mkdir_p} %{buildroot}/%{nvidialibdir}/
+%{__mkdir_p} %{buildroot}%{nvidialibdir}/
 %{__install} -p -m 0755 usr/X11R6/lib/libXvMCNVIDIA.so.* \
-    %{buildroot}/%{nvidialibdir}/
+    %{buildroot}%{nvidialibdir}/
 %{__install} -p -m 0644 usr/X11R6/lib/libXvMCNVIDIA.a \
-    %{buildroot}/%{nvidialibdir}/
+    %{buildroot}%{nvidialibdir}/
 
 # Install X driver and extension (is the nvidia_drv.o useful?)
 %{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/drivers/
@@ -110,34 +113,34 @@
     %{buildroot}%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
 
 # Install GL and tls libs
-%{__mkdir_p} %{buildroot}/%{nvidialibdir}/tls/
+%{__mkdir_p} %{buildroot}%{nvidialibdir}/tls/
 %{__install} -p -m 0755 usr/lib/*.so.%{version} \
-    %{buildroot}/%{nvidialibdir}/
+    %{buildroot}%{nvidialibdir}/
 %{__install} -p -m 0755 usr/lib/tls/*.so.%{version} \
-    %{buildroot}/%{nvidialibdir}/tls/
+    %{buildroot}%{nvidialibdir}/tls/
 
 %ifarch x86_64
 # Install 32bit compat GL and tls libs
-%{__mkdir_p} %{buildroot}/%{nvidialib32dir}/tls/
+%{__mkdir_p} %{buildroot}%{nvidialib32dir}/tls/
 %{__install} -p -m 0755 usr/lib32/*.so.%{version} \
-    %{buildroot}/%{nvidialib32dir}/
+    %{buildroot}%{nvidialib32dir}/
 %{__install} -p -m 0755 usr/lib32/tls/*.so.%{version} \
-    %{buildroot}/%{nvidialib32dir}/tls/
+    %{buildroot}%{nvidialib32dir}/tls/
 %endif
 
 # Create .so symlinks
 for libname in libGLcore libGL libnvidia-cfg libnvidia-tls tls/libnvidia-tls; do
     %{__ln_s} `basename ${libname}`.so.%{version} \
-        %{buildroot}/%{nvidialibdir}/${libname}.so.1
+        %{buildroot}%{nvidialibdir}/${libname}.so.1
     %{__ln_s} `basename ${libname}`.so.%{version} \
-        %{buildroot}/%{nvidialibdir}/${libname}.so
+        %{buildroot}%{nvidialibdir}/${libname}.so
 done
 %ifarch x86_64
 for libname in libGLcore libGL libnvidia-cfg libnvidia-tls tls/libnvidia-tls; do
     %{__ln_s} `basename ${libname}`.so.%{version} \
-        %{buildroot}/%{nvidialib32dir}/${libname}.so.1
+        %{buildroot}%{nvidialib32dir}/${libname}.so.1
     %{__ln_s} `basename ${libname}`.so.%{version} \
-        %{buildroot}/%{nvidialib32dir}/${libname}.so
+        %{buildroot}%{nvidialib32dir}/${libname}.so
 done
 %endif
 
@@ -275,6 +278,12 @@
 
 
 %changelog
+* Wed Nov  8 2006 Matthias Saou <http://freshrpms.net/> 1.0.9629-1
+- Update to 1.0-9629.
+
+* Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.0.9626-4
+- Include patch to fix black X screen on startup (disables i2c, though).
+
 * Mon Oct 30 2006 Matthias Saou <http://freshrpms.net/> 1.0.9626-3
 - 32bit libs weren't being included on x86_64, the 64bits were twice instead.
 

Modified: trunk/rpms/xvidcore/xvidcore.spec
===================================================================
--- trunk/rpms/xvidcore/xvidcore.spec	2006-11-06 13:26:33 UTC (rev 4867)
+++ trunk/rpms/xvidcore/xvidcore.spec	2006-11-08 13:45:24 UTC (rev 4868)
@@ -1,7 +1,6 @@
 # $Id$
 # Authority: matthias
 
-#define prever beta2
 %define somaj  4
 %define somin  1
 
@@ -15,12 +14,12 @@
 
 Summary: Free reimplementation of the OpenDivX video codec
 Name: xvidcore
-Version: 1.1.0
-Release: 3%{?prever:.%{prever}}
+Version: 1.1.2
+Release: 1
 License: XviD
 Group: System Environment/Libraries
 URL: http://www.xvid.org/
-Source: http://downloads.xvid.org/downloads/xvidcore-%{version}%{?prever:-%{prever}}.tar.bz2
+Source: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
 Patch0: xvidcore-1.1.0-verbose-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: yasm
@@ -48,7 +47,7 @@
 
 
 %prep
-%setup -n %{name}-%{version}%{?prever:-%{prever}}
+%setup
 %patch0 -p1 -b .verbose-build
 
 
@@ -77,10 +76,11 @@
 pushd build/generic
     %makeinstall
 popd
-# Make .so and .so.x symlinks to the so.x.y file
+# Make .so and .so.x symlinks to the so.x.y file, +x to get proper stripping
 pushd %{buildroot}%{_libdir}
     %{__ln_s} lib%{name}.so.%{somaj}.%{somin} lib%{name}.so.%{somaj}
     %{__ln_s} lib%{name}.so.%{somaj}.%{somin} lib%{name}.so
+    %{__chmod} +x lib%{name}.so.%{somaj}.%{somin}
 popd
 # Remove unwanted files from the docs
 %{__rm} -f doc/Makefile
@@ -112,6 +112,10 @@
 
 
 %changelog
+* Wed Nov  8 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-1
+- Update to 1.1.2.
+- Chmod +x the shared library to get it stripped and proper debuginfo created.
+
 * Wed May 17 2006 Matthias Saou <http://freshrpms.net/> 1.1.0-3
 - Clear executable stack flag bit from the library (should not be needed).
 




More information about the commits mailing list