From owner-svn-ports-head@freebsd.org Wed Aug 24 15:43:31 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 6BF5EBC469E; Wed, 24 Aug 2016 15:43:31 +0000 (UTC) (envelope-from woodsb02@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 24A73190F; Wed, 24 Aug 2016 15:43:31 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OFhULR094965; Wed, 24 Aug 2016 15:43:30 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OFhUas094964; Wed, 24 Aug 2016 15:43:30 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201608241543.u7OFhUas094964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Wed, 24 Aug 2016 15:43:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420803 - head/astro/google-earth 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: Wed, 24 Aug 2016 15:43:31 -0000 Author: woodsb02 Date: Wed Aug 24 15:43:30 2016 New Revision: 420803 URL: https://svnweb.freebsd.org/changeset/ports/420803 Log: astro/google-earth: Allow installation with NVIDIA legacy drivers PR: 201693 Submitted by: cmangin@arobas.net Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D7629 Modified: head/astro/google-earth/Makefile Modified: head/astro/google-earth/Makefile ============================================================================== --- head/astro/google-earth/Makefile Wed Aug 24 15:31:58 2016 (r420802) +++ head/astro/google-earth/Makefile Wed Aug 24 15:43:30 2016 (r420803) @@ -2,7 +2,7 @@ PORTNAME= google-earth PORTVERSION= 6.0.3.2197 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 3 CATEGORIES= astro deskutils geography MASTER_SITES= http://dl.google.com/earth/client/advanced/previous/:previous \ @@ -20,7 +20,12 @@ RESTRICTED= Not really sure about the re WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/ -OPTIONS_DEFINE= NVIDIA +OPTIONS_DEFAULT= LINUX_DRI +OPTIONS_SINGLE= LIBGL +OPTIONS_SINGLE_LIBGL= LINUX_DRI NVIDIA_GL NVIDIA_GL_340 NVIDIA_GL_304 +LINUX_DRI_DESC= libGL support via Linux DRI libraries +NVIDIA_GL_340_DESC= libGL support via nvidia-driver-340 +NVIDIA_GL_304_DESC= libGL support via nvidia-driver-304 USE_LINUX= yes USE_LINUX_APPS= xorglibs curl nss @@ -31,8 +36,10 @@ USE_PERL5= patch build UNMAKESELF= ${LOCALBASE}/bin/unmakeself -NVIDIA_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver -NVIDIA_USE_OFF= LINUX_APPS=dri,libpciaccess +NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver +NVIDIA_GL_340_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver-340 +NVIDIA_GL_304_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver-304 +LINUX_DRI_USE= LINUX_APPS=dri,libpciaccess # Fixed by the first post-patch target line? Also, linprocfs needs to be mounted. #BROKEN= seems to crash on >= 9.x/amd64: http://www.freebsd.org/cgi/query-pr.cgi?pr=160422