From owner-svn-ports-head@freebsd.org Fri Aug 19 22:29:41 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F278BBF990; Fri, 19 Aug 2016 22:29:41 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE22516C5; Fri, 19 Aug 2016 22:29:40 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JMTexo032867; Fri, 19 Aug 2016 22:29:40 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JMTdxs032864; Fri, 19 Aug 2016 22:29:39 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201608192229.u7JMTdxs032864@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 19 Aug 2016 22:29:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420496 - head/x11/nvidia-driver X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 22:29:41 -0000 Author: danfe Date: Fri Aug 19 22:29:39 2016 New Revision: 420496 URL: https://svnweb.freebsd.org/changeset/ports/420496 Log: Deorbit support for nVidia driver legacy versions, part 3: - libnvidia-cfg.so* files are always installed since version 81.074 - Au contraire, libnvidia-wfb.so.1 is not (since version 195.022) - Remove now useless checks for NVVERSIONs before 180.029 and 185.01829 (always false) and after 304.128 (always true) - Unconditionally rename libGLcore -> libnvidia-glcore in pkg-plist (been that way since version 256.053) Modified: head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/pkg-plist Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Fri Aug 19 22:19:11 2016 (r420495) +++ head/x11/nvidia-driver/Makefile Fri Aug 19 22:29:39 2016 (r420496) @@ -198,24 +198,9 @@ post-install: .SILENT ${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \ ${STAGEDIR}${PREFIX}/bin # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's -.if ${NVVERSION} < 81.074 - ${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST} -.endif -.if ${NVVERSION} < 97.046 || ${NVVERSION} >= 195.022 - ${REINPLACE_CMD} -e '/wfb/d' ${TMPPLIST} -.endif -.if ${NVVERSION} < 180.029 - ${REINPLACE_CMD} -e '/vdpau/d' ${TMPPLIST} -.elif ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 +.if ${NVVERSION} < 310.019 ${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST} .endif -.if ${NVVERSION} < 185.01829 - ${REINPLACE_CMD} -e '/libcuda/d' ${TMPPLIST} -.endif -.if ${NVVERSION} >= 256.053 - ${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \ - /usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST} -.endif .if ${NVVERSION} >= 310.019 ${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST} .else # some applications need this symlink (see PR ports/72877) Modified: head/x11/nvidia-driver/pkg-plist ============================================================================== --- head/x11/nvidia-driver/pkg-plist Fri Aug 19 22:19:11 2016 (r420495) +++ head/x11/nvidia-driver/pkg-plist Fri Aug 19 22:29:39 2016 (r420496) @@ -7,8 +7,6 @@ lib/libGLESv1_CM.so lib/libGLESv1_CM.so.1 lib/.nvidia/libGLESv2.so lib/.nvidia/libGLESv2.so.2 -lib/libGLcore.so -lib/libGLcore.so.1 lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.so.1 @@ -17,6 +15,8 @@ lib/libnvidia-cfg.so lib/libnvidia-cfg.so.1 lib/libnvidia-eglcore.so lib/libnvidia-eglcore.so.1 +lib/libnvidia-glcore.so +lib/libnvidia-glcore.so.1 lib/libnvidia-glsi.so lib/libnvidia-glsi.so.1 lib/libnvidia-tls.so @@ -26,7 +26,6 @@ lib/vdpau/libvdpau_nvidia.so.1 %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/.nvidia/libglx.so %%MODULESDIR%%/extensions/.nvidia/libglx.so.1 -%%MODULESDIR%%/libnvidia-wfb.so.1 /%%KMODDIR%%/nvidia.ko %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1 @@ -36,14 +35,12 @@ lib/vdpau/libvdpau_nvidia.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2 -%%LINUX%%%%LINUXBASE%%/usr/lib/libGLcore.so.%%SHLIB_VERSION%% -%%LINUX%%%%LINUXBASE%%/usr/lib/libGLcore.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%% +%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%% -%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so