From owner-svn-ports-head@freebsd.org Fri Dec 27 17:21:42 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 958221C97CF; Fri, 27 Dec 2019 17:21:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47ktsf2zJvz4Knd; Fri, 27 Dec 2019 17:21:42 +0000 (UTC) (envelope-from bapt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 615B61C146; Fri, 27 Dec 2019 17:21:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBRHLgS6028899; Fri, 27 Dec 2019 17:21:42 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBRHLfOk028591; Fri, 27 Dec 2019 17:21:41 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201912271721.xBRHLfOk028591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 27 Dec 2019 17:21:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521014 - in head/graphics/jasper: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/graphics/jasper: . files X-SVN-Commit-Revision: 521014 X-SVN-Commit-Repository: ports 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.29 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, 27 Dec 2019 17:21:42 -0000 Author: bapt Date: Fri Dec 27 17:21:41 2019 New Revision: 521014 URL: https://svnweb.freebsd.org/changeset/ports/521014 Log: Fix build with opengl option off Reported by: jrm Added: head/graphics/jasper/files/patch-CMakeLists.txt (contents, props changed) Modified: head/graphics/jasper/Makefile head/graphics/jasper/pkg-plist Modified: head/graphics/jasper/Makefile ============================================================================== --- head/graphics/jasper/Makefile Fri Dec 27 16:52:47 2019 (r521013) +++ head/graphics/jasper/Makefile Fri Dec 27 17:21:41 2019 (r521014) @@ -22,7 +22,8 @@ USE_GITHUB= yes GH_ACCOUNT= mdadams -OPENGL_CMAKE_BOOL= JAS_ENABLE_OPENGL +OPENGL_CMAKE_OFF= -DJAS_ENABLE_OPENGL=false +OPENGL_CMAKE_ON= -DJAS_ENABLE_OPENGL=true OPENGL_USES= gl xorg OPENGL_USE= GL=glut XORG=x11,xext,xi,xmu Added: head/graphics/jasper/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jasper/files/patch-CMakeLists.txt Fri Dec 27 17:21:41 2019 (r521014) @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2019-03-12 18:04:35 UTC ++++ CMakeLists.txt +@@ -267,8 +267,8 @@ message("JAS_HAVE_LIBJPEG: ${JAS_HAVE_LIBJPEG}") + # Check for the OpenGL and GLUT libraries. + ################################################################################ + +-find_package(OpenGL ${JAS_REQUIRED}) + message("JAS_ENABLE_OPENGL: ${JAS_ENABLE_OPENGL}") ++find_package(OpenGL ${JAS_OPENGL_REQUIRED}) + message("OpenGL library found: ${OPENGL_FOUND}") + if (JAS_ENABLE_OPENGL AND OPENGL_FOUND) + set(JAS_HAVE_OPENGL 0) Modified: head/graphics/jasper/pkg-plist ============================================================================== --- head/graphics/jasper/pkg-plist Fri Dec 27 16:52:47 2019 (r521013) +++ head/graphics/jasper/pkg-plist Fri Dec 27 17:21:41 2019 (r521014) @@ -28,7 +28,7 @@ libdata/pkgconfig/jasper.pc man/man1/imgcmp.1.gz man/man1/imginfo.1.gz man/man1/jasper.1.gz -man/man1/jiv.1.gz +%%OPENGL%%man/man1/jiv.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/jasper.pdf %%PORTDOCS%%%%DOCSDIR%%/jpeg2000.pdf