Attachment 231574 Details for Bug 260878 – proposal patch for graphics/jasper

[patch] proposal patch for graphics/jasper

patch.diff (text/plain), 1.27 KB, created by Tatsuki Makino on 2022-02-06 05:35:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2022-02-06 05:35:23 UTC

Size: 1.27 KB

patch

obsolete

>diff --git a/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake b/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake
>index dada8cd391..eded181558 100644
>--- a/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake
>+++ b/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake
>@@ -1,4 +1,4 @@
>---- build/cmake/modules/JasOpenGL.cmake.orig	2020-09-05 14:52:22 UTC
>+--- build/cmake/modules/JasOpenGL.cmake.orig	2021-08-01 20:39:10 UTC
> +++ build/cmake/modules/JasOpenGL.cmake
> @@ -4,7 +4,7 @@
>  
>@@ -9,3 +9,21 @@
>  	message("OpenGL library found: ${OPENGL_FOUND}")
>  else()
>  	set(OPENGL_FOUND false)
>+@@ -32,6 +32,9 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
>+ 	# On some systems (e.g., Fedora 21), there is a bug in the cmake code
>+ 	# that detects GLUT libraries.  The following ugliness is a workaround for 
>+ 	# this problem.
>++	if(PKG_CONFIG_FOUND)
>++		set(GLUT_LIBRARIES "${GLUT_LINK_LIBRARIES}")
>++	else(PKG_CONFIG_FOUND)
>+ 	if (NOT GLUT_Xmu_LIBRARY OR NOT GLUT_Xmi_LIBRARY)
>+ 		if (NOT GLUT_Xmu_LIBRARY)
>+ 			set(GLUT_Xmu_LIBRARY "")
>+@@ -45,6 +48,7 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
>+ 		endif()
>+ 		set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}")
>+ 	endif()
>++	endif(PKG_CONFIG_FOUND)
>+ else()
>+ 	set(JAS_HAVE_OPENGL 0)
>+ 	set(OPENGL_INCLUDE_DIR "")

Actions: View | Diff

Attachments on bug 260878: 230624 | 231156 | 231574 | 231705 | 231736