Fix build with opengl option off

Reported by:	jrm
This commit is contained in:
Baptiste Daroussin
2019-12-27 17:21:41 +00:00
parent 0735393d14
commit a4e17888a0
3 changed files with 15 additions and 2 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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