Date: Wed, 08 Sep 2010 05:08:49 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150369: [patch] x11/nvidia-driver: prevent conflict with multimedia/libvdpau Message-ID: <86aantxcri.fsf@gmail.com> Resent-Message-ID: <201009080120.o881K3Cg015718@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150369
>Category: ports
>Synopsis: [patch] x11/nvidia-driver: prevent conflict with multimedia/libvdpau
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 08 01:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
Don't install vdpau headers, wrapper and tracing library, cf. ports/150368
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: x11/nvidia-driver/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11/nvidia-driver/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- x11/nvidia-driver/Makefile 24 May 2010 03:01:56 -0000 1.98
+++ x11/nvidia-driver/Makefile 8 Sep 2010 00:23:26 -0000
@@ -7,7 +7,7 @@
PORTNAME= nvidia-driver
DISTVERSION?= 195.36.15
-PORTREVISION?= 0 # As a reminder it can be overridden
+PORTREVISION?= 1 # As a reminder it can be overridden
CATEGORIES= x11 kld
MASTER_SITES= ${MASTER_SITE_NVIDIA}
ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/}
@@ -144,8 +144,6 @@ post-install:
.if ${NVVERSION} < 1802900
@${REINPLACE_CMD} '/vdpau/d' ${TMPPLIST}
.else
- @${MKDIR} ${PREFIX}/include/vdpau
- @${LN} -sf ${DOCSDIR}/vdpau*.h ${PREFIX}/include/vdpau
.endif
.if ${NVVERSION} < 1851829
@${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST}
Index: x11/nvidia-driver/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/x11/nvidia-driver/pkg-plist,v
retrieving revision 1.27
diff -u -p -r1.27 pkg-plist
--- x11/nvidia-driver/pkg-plist 10 Apr 2010 13:40:07 -0000 1.27
+++ x11/nvidia-driver/pkg-plist 8 Sep 2010 01:07:44 -0000
@@ -10,26 +10,19 @@
@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%%
@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
-include/vdpau/vdpau.h
-include/vdpau/vdpau_x11.h
-@dirrm include/vdpau
lib/libnvidia-tls.so.1
lib/libnvidia-tls.so
lib/libnvidia-cfg.so.1
lib/libnvidia-cfg.so
lib/libGLcore.so.1
lib/libGLcore.so
-lib/libvdpau.so.1
-lib/libvdpau.so
lib/vdpau/libvdpau_nvidia.so.1
lib/libvdpau_nvidia.so
-lib/vdpau/libvdpau_trace.so.1
-lib/libvdpau_trace.so
lib/libXvMCNVIDIA.so.1
lib/libXvMCNVIDIA.so
lib/libXvMCNVIDIA.a
lib/libXvMCNVIDIA_dynamic.so.1
-@dirrm lib/vdpau
+@dirrmtry lib/vdpau
%%MODULESDIR%%/libnvidia-wfb.so.1
%%MODULESDIR%%/drivers/nvidia_drv.so
%%MODULESDIR%%/extensions/libglx.so.1
Index: x11/nvidia-driver/files/patch-lib::Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11/nvidia-driver/files/patch-lib::Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-lib::Makefile
--- x11/nvidia-driver/files/patch-lib::Makefile 19 Apr 2008 17:54:30 -0000 1.4
+++ x11/nvidia-driver/files/patch-lib::Makefile 8 Sep 2010 00:21:27 -0000
@@ -1,11 +1,28 @@
--- lib/Makefile.orig Fri Jun 17 09:44:23 2005
+++ lib/Makefile Wed Jun 22 19:12:16 2005
-@@ -6,7 +6,7 @@
+@@ -6,15 +6,13 @@ SUBDIR= libGL \
+ libnvidia-tls \
+ libnvidia-cfg \
+ libGLcore \
+- libvdpau \
+ libvdpau_nvidia \
+- libvdpau_trace \
+ libXvMCNVIDIA
+
FIND_DIRS= /usr/lib \
- ${LOCALBASE}/lib
+ ${X11BASE}/lib
-.if exists(/compat/linux)
+.if exists(/compat/linux) && !defined(WITHOUT_LINUX)
SUBDIR+= compat
FIND_DIRS+= /compat/linux/lib \
/compat/linux/usr/lib \
+@@ -27,7 +25,7 @@ FIND_FILES!=(find ${FIND_DIRS} \
+ -name libnvidia-tls.so\* -or \
+ -name libnvidia-cfg.so\* -or \
+ -name libGLcore.\* -or \
+- -name libvdpau\* -or \
++ -name libvdpau_nvidia\* -or \
+ -name libXvMCNVIDIA.\* -or \
+ -name libglx.\* \
+ | xargs ${ECHO})
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86aantxcri.fsf>