Attachment 111177 Details for Bug 152400 – nv.patch

[patch] nv.patch

nv.patch (text/plain), 7.33 KB, created by Sender Ghost on 2011-01-22 03:20:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sender Ghost

Created: 2011-01-22 03:20:51 UTC

Size: 7.33 KB

patch

obsolete

>diff -ruN nvidia-driver.orig/Makefile nvidia-driver/Makefile
>--- nvidia-driver.orig/Makefile	2010-12-08 09:28:28.000000000 +0600
>+++ nvidia-driver/Makefile	2011-01-22 08:01:19.000000000 +0600
>@@ -6,18 +6,18 @@
> #
> 
> PORTNAME=	nvidia-driver
>-DISTVERSION?=	256.53
>+DISTVERSION?=	260.19.36
> PORTREVISION?=	0			# As a reminder it can be overridden
> CATEGORIES=	x11 kld
> MASTER_SITES=	${MASTER_SITE_NVIDIA}
>-ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
> # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
> DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
> 
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
> 
>-NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
>+ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
>+USE_XORG=	xorg-server
> USE_GL=		gl
> USE_LDCONFIG=	yes
> SUB_FILES=	pkg-message
>@@ -57,14 +57,8 @@
> 
> .include <bsd.port.pre.mk>
> 
>-# XXX Should use ${PKG_INFO} but it does not expand for some reason XXX
>-#
>-XSERVVERSION!=	/usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true
>-LIBGLVERSION!=	/usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true
>-
>-.if empty(XSERVVERSION)
>-IGNORE=		needs an X server implementation installed
>-.endif
>+XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
>+LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
> 
> PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
> 		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
>@@ -138,6 +132,7 @@
> pre-su-install:
> # XXX This port silently assumes PREFIX == LOCALBASE XXX
> 	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
>+	@${MKDIR} ${PREFIX}/${MODULESDIR}/extensions
> 
> post-install: .SILENT
> # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
>diff -ruN nvidia-driver.orig/distinfo nvidia-driver/distinfo
>--- nvidia-driver.orig/distinfo	2010-12-08 13:37:21.000000000 +0600
>+++ nvidia-driver/distinfo	2011-01-22 08:21:58.000000000 +0600
>@@ -1,7 +1,7 @@
>-SHA256 (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 3c3d3a96f6ec79b86815423c4be38c819b2ff26124a8885421e34f60a3c70655
>-SIZE (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 26347367
>-SHA256 (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 2b849ec63dca049a36ba3d2d97fdf8af06bd3d9c0051ebeec1e0cb60bec416a2
>-SIZE (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 26963917
>+SHA256 (NVIDIA-FreeBSD-x86-260.19.36.tar.gz) = 03e41a19ad93668034efa8306983b57b69fcca1e328a5a70c9295096fb9675d5
>+SIZE (NVIDIA-FreeBSD-x86-260.19.36.tar.gz) = 27282754
>+SHA256 (NVIDIA-FreeBSD-x86_64-260.19.36.tar.gz) = ff922fa17704cadd3332b4b5ef5647733ba8d9ea97407c2166d1cad4bfdc54c2
>+SIZE (NVIDIA-FreeBSD-x86_64-260.19.36.tar.gz) = 27951746
> SHA256 (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 3389c1b2faf68bab3ebd55593539580e418ef3beba29428ae2fe11a9a5154ebb
> SIZE (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 17555603
> SHA256 (NVIDIA-FreeBSD-x86-96.43.19.tar.gz) = b5dce181cc654a729ba06dd528a180d14a792b0328fcfbf86bb0f819285c0dd5
>diff -ruN nvidia-driver.orig/pkg-plist nvidia-driver/pkg-plist
>--- nvidia-driver.orig/pkg-plist	2010-09-25 02:11:00.000000000 +0700
>+++ nvidia-driver/pkg-plist	2011-01-16 06:12:05.000000000 +0600
>@@ -1,14 +1,10 @@
>-@comment I can't add the below files to the package because pkg_delete
>-@comment will complain when removing this package:
>-@comment     %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
>-@comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
>-@comment     lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
>-@comment They are however restored when this package is removed:
> @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
> @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
> @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
>+%%MODULESDIR%%/extensions/libglx.so
> @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
> @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
>+lib/libGL.so.1
> @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
> lib/libnvidia-tls.so.1
> lib/libnvidia-tls.so
>diff -ruN nvidia-settings.orig/Makefile nvidia-settings/Makefile
>--- nvidia-settings.orig/Makefile	2010-10-13 21:07:04.000000000 +0700
>+++ nvidia-settings/Makefile	2011-01-22 08:01:06.000000000 +0600
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	nvidia-settings
>-PORTVERSION=	256.53
>+PORTVERSION=	260.19.36
> CATEGORIES=	x11
> MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
> 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
>diff -ruN nvidia-settings.orig/distinfo nvidia-settings/distinfo
>--- nvidia-settings.orig/distinfo	2010-10-13 21:07:04.000000000 +0700
>+++ nvidia-settings/distinfo	2011-01-22 08:20:57.000000000 +0600
>@@ -1,3 +1,2 @@
>-MD5 (nvidia-settings-256.53.tar.bz2) = 6bcc65485ec194791228a7df0ab62750
>-SHA256 (nvidia-settings-256.53.tar.bz2) = d2a7310c11c0fa83bf6c565ebf7bd6a2054b67edd0d34bb6caa2129579981f49
>-SIZE (nvidia-settings-256.53.tar.bz2) = 1458846
>+SHA256 (nvidia-settings-260.19.36.tar.bz2) = 61d7cf54473725da528a9ee0d4ab3b29c38da45c4ae4e9549be014b9939a1c9f
>+SIZE (nvidia-settings-260.19.36.tar.bz2) = 1536035
>diff -ruN nvidia-settings.orig/files/patch-Makefile nvidia-settings/files/patch-Makefile
>--- nvidia-settings.orig/files/patch-Makefile	2010-10-13 21:07:04.000000000 +0700
>+++ nvidia-settings/files/patch-Makefile	2010-11-19 14:26:10.000000000 +0600
>@@ -1,6 +1,6 @@
>---- Makefile.orig
>-+++ Makefile
>-@@ -149,11 +149,14 @@ install: NVIDIA_SETTINGS_install MANPAGE
>+--- Makefile.orig	2010-11-05 10:46:56.000000000 +0600
>++++ Makefile	2010-11-19 14:24:16.000000000 +0600
>+@@ -155,11 +155,14 @@
>  
>  NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
>  	$(MKDIR) $(bindir)
>diff -ruN nvidia-xconfig.orig/Makefile nvidia-xconfig/Makefile
>--- nvidia-xconfig.orig/Makefile	2010-10-13 21:05:17.000000000 +0700
>+++ nvidia-xconfig/Makefile	2011-01-22 08:00:57.000000000 +0600
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	nvidia-xconfig
>-PORTVERSION=	256.53
>+PORTVERSION=	260.19.36
> CATEGORIES=	x11
> MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
> 		ftp://download1.nvidia.com/XFree86/nvidia-xconfig/
>diff -ruN nvidia-xconfig.orig/distinfo nvidia-xconfig/distinfo
>--- nvidia-xconfig.orig/distinfo	2010-10-13 21:05:17.000000000 +0700
>+++ nvidia-xconfig/distinfo	2011-01-22 08:20:35.000000000 +0600
>@@ -1,3 +1,2 @@
>-MD5 (nvidia-xconfig-256.53.tar.bz2) = 244c346026d0b562e9fa4ae6fcd40104
>-SHA256 (nvidia-xconfig-256.53.tar.bz2) = e8f8ab26cbd2fc90ef1745fb6d9463be3332442e468c8cf89dd1505b69329777
>-SIZE (nvidia-xconfig-256.53.tar.bz2) = 96488
>+SHA256 (nvidia-xconfig-260.19.36.tar.bz2) = 6e50fb08be8fd80a7294dc46e227eb9f1da06161bbcc1908ddbc5aefb777c55e
>+SIZE (nvidia-xconfig-260.19.36.tar.bz2) = 97913
>diff -ruN nvidia-xconfig.orig/files/patch-Makefile nvidia-xconfig/files/patch-Makefile
>--- nvidia-xconfig.orig/files/patch-Makefile	2010-10-13 21:05:17.000000000 +0700
>+++ nvidia-xconfig/files/patch-Makefile	2010-11-19 14:29:21.000000000 +0600
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2010-10-13 22:56:07.000000000 +0900
>-+++ Makefile	2010-10-13 22:58:01.000000000 +0900
>-@@ -95,11 +95,11 @@
>+--- Makefile.orig	2010-11-05 10:47:04.000000000 +0600
>++++ Makefile	2010-11-19 14:29:06.000000000 +0600
>+@@ -115,11 +115,11 @@
>  
>  NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
>  	$(MKDIR) $(bindir)

Actions: View | Diff

Attachments on bug 152400: 111175 | 111176 | 111177 | 111178 | 111179 | 111180 | 111181 | 111182 | 111183 | 111184 | 111185 | 111186 | 111187