From owner-svn-ports-head@FreeBSD.ORG Thu Dec 26 08:45:05 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 201684EB; Thu, 26 Dec 2013 08:45:05 +0000 (UTC) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A8CBB1E5B; Thu, 26 Dec 2013 08:45:04 +0000 (UTC) Received: from lqc.issp.ac.ru [77.236.34.156:52204] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with LOGIN) by mail.issp.ac.ru with ESMTP/inet id rBQ8isk0094921 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Thu, 26 Dec 2013 12:44:55 +0400 (MSK) From: Max Brazhnikov To: Alexey Dokuchaev Subject: Re: svn commit: r337471 - head/x11/nvidia-driver Date: Thu, 26 Dec 2013 08:44:55 +0000 Message-ID: <1823597.YjeyBRSRct@mercury.ph.man.ac.uk> User-Agent: KMail/4.10.5 (FreeBSD/9.2-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <201312260642.rBQ6givo031365@svn.freebsd.org> References: <201312260642.rBQ6givo031365@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 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: Thu, 26 Dec 2013 08:45:05 -0000 On Thu, 26 Dec 2013 06:42:44 +0000Thu Dec 26 06:42:43 2013 Alexey Dokuchaev wrote: > Author: danfe > Date: Thu Dec 26 06:42:43 2013 > New Revision: 337471 > URL: http://svnweb.freebsd.org/changeset/ports/337471 > > Log: > Update to version 331.20. > > Modified: > head/x11/nvidia-driver/Makefile > head/x11/nvidia-driver/distinfo > head/x11/nvidia-driver/pkg-plist > > Modified: head/x11/nvidia-driver/Makefile > ============================================================================== > --- head/x11/nvidia-driver/Makefile Thu Dec 26 02:47:52 2013 (r337470) > +++ head/x11/nvidia-driver/Makefile Thu Dec 26 06:42:43 2013 (r337471) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= nvidia-driver > -DISTVERSION?= 319.32 > +DISTVERSION?= 331.20 > # Always try to set PORTREVISION as it can be overridden by the slave ports > PORTREVISION?= 0 > CATEGORIES= x11 > @@ -99,7 +99,7 @@ IGNORE= requires fairly recent FreeBSD- > .endif > > .if ${NVVERSION} < 1952200 > -# ABI version is hardcoded inside the binary, so specify it explicitly > +# ABI version is hardcoded inside the binary, so specify it explicitly here > LIB_DEPENDS= libm.so.3:${PORTSDIR}/misc/compat5x > .endif > > @@ -243,6 +243,10 @@ post-install: .SILENT > .else # some applications need this symlink (see PR ports/72877) > ${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 > .endif > +.if ${NVVERSION} < 3311300 > + ${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \ > + ${TMPPLIST} > +.endif > .if ${NVVERSION} >= 1952200 > ${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE} > .endif > > Modified: head/x11/nvidia-driver/distinfo > ============================================================================== > --- head/x11/nvidia-driver/distinfo Thu Dec 26 02:47:52 2013 (r337470) > +++ head/x11/nvidia-driver/distinfo Thu Dec 26 06:42:43 2013 (r337471) > @@ -1,7 +1,7 @@ > -SHA256 (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = d434055e1c11e5d091054531049d2fcaecdc4856756ce5998fe70130c542426f > -SIZE (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = 34441850 > -SHA256 (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 7aa65881e014a001a2b19b17f3ff8a510c306062466cdf1acb1a4c993466487e > -SIZE (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 34048762 > +SHA256 (NVIDIA-FreeBSD-x86_64-331.20.tar.gz) = 6a0396e828427fb928f18faa72288208702c3067c25c29ed3815a68a06e244c5 > +SIZE (NVIDIA-FreeBSD-x86_64-331.20.tar.gz) = 46616176 > +SHA256 (NVIDIA-FreeBSD-x86-331.20.tar.gz) = dca5c90a99ab151d97c1cbb23f37c7834867ce32f88c6916b2295b3945363b7e > +SIZE (NVIDIA-FreeBSD-x86-331.20.tar.gz) = 55524337 > SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934 > SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351 > SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d > > Modified: head/x11/nvidia-driver/pkg-plist > ============================================================================== > --- head/x11/nvidia-driver/pkg-plist Thu Dec 26 02:47:52 2013 (r337470) > +++ head/x11/nvidia-driver/pkg-plist Thu Dec 26 06:42:43 2013 (r337471) > @@ -2,6 +2,12 @@ bin/nvidia-bug-report.sh > lib/.nvidia/libGL.so > lib/.nvidia/libGL.so.1 > @dirrm lib/.nvidia > +lib/libEGL.so > +lib/libEGL.so.1 > +lib/libGLESv1_CM.so > +lib/libGLESv1_CM.so.1 > +lib/libGLESv2.so > +lib/libGLESv2.so.2 Unfortunately, the port now conflicts with graphics/libEGL and graphics/libglesv2.