File jasper-freeglut.patch of Package jasper

Overview Repositories Revisions Requests Users Attributes Meta

File jasper-freeglut.patch of Package jasper (Revision eeeac507e7a51d8e252f80673ece46ee)

Currently displaying revision eeeac507e7a51d8e252f80673ece46ee , Show latest

diff -Nur jasper-version-2.0.33.orig/build/cmake/modules/JasOpenGL.cmake jasper-version-2.0.33/build/cmake/modules/JasOpenGL.cmake
--- jasper-version-2.0.33.orig/build/cmake/modules/JasOpenGL.cmake	2021-08-01 22:50:31.000000000 +0200
+++ jasper-version-2.0.33/build/cmake/modules/JasOpenGL.cmake	2022-01-30 13:58:04.030121439 +0100
@@ -13,19 +13,18 @@
 	set(JAS_HAVE_OPENGL 0)
 	message("OpenGL include directory: ${OPENGL_INCLUDE_DIR}")
 	message("OpenGL libraries: ${OPENGL_LIBRARIES}")
-	find_package(GLUT ${JAS_REQUIRED})
-	message("GLUT library found: ${GLUT_FOUND}")
-	if (GLUT_FOUND)
-		message("GLUT include directory: ${GLUT_INCLUDE_DIR}")
-		message("GLUT libraries: ${GLUT_LIBRARIES}")
-		set(CMAKE_REQUIRED_INCLUDES ${GLUT_INCLUDE_DIR})
-		check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H)
-		check_include_files(glut.h JAS_HAVE_GLUT_H)
+	find_package(FreeGLUT ${JAS_REQUIRED})
+	message("GLUT library found: ${FreeGLUT_FOUND}")
+	if (FreeGLUT_FOUND)
+		message("GLUT include directory: ${FreeGLUT_INCLUDE_DIR}")
+		message("GLUT libraries: ${FreeGLUT_LIBRARIES}")
+		set(CMAKE_REQUIRED_INCLUDES ${FreeGLUT_INCLUDE_DIR})
+		check_include_files(GL/freeglut.h JAS_HAVE_GL_GLUT_H)
 		if (JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H)
 			set(JAS_HAVE_OPENGL 1)
-			include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+			include_directories(${FreeGLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 		else()
-			message(WARNING "The header files GL/glut.h and glut.h both appear to be missing.")
+			message(WARNING "The header files GL/freeglut.h and glut.h both appear to be missing.")
 			message(WARNING "Disabling OpenGL.")
 		endif()
 	endif()
@@ -49,6 +48,6 @@
 	set(JAS_HAVE_OPENGL 0)
 	set(OPENGL_INCLUDE_DIR "")
 	set(OPENGL_LIBRARIES "")
-	set(GLUT_INCLUDE_DIR "")
+	set(FreeGLUT_INCLUDE_DIR "")
 	set(GLUT_LIBRARIES "")
 endif()
diff -Nur jasper-version-2.0.33.orig/src/appl/CMakeLists.txt jasper-version-2.0.33/src/appl/CMakeLists.txt
--- jasper-version-2.0.33.orig/src/appl/CMakeLists.txt	2021-08-01 22:50:31.000000000 +0200
+++ jasper-version-2.0.33/src/appl/CMakeLists.txt	2022-01-30 13:59:19.422360668 +0100
@@ -23,8 +23,8 @@
 if(JAS_HAVE_OPENGL)
 	add_executable(jiv jiv.c)
 	target_include_directories(jiv PUBLIC
-	  ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-	target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES}
+	  ${FreeGLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+	target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} -lglut
 	  ${OPENGL_LIBRARIES} ${MATH_LIBRARY})
 	set(programs "${programs}" jiv)
 	set(man_pages "${man_pages}" jiv.1)
diff -Nur jasper-version-2.0.33.orig/src/appl/jiv.c jasper-version-2.0.33/src/appl/jiv.c
--- jasper-version-2.0.33.orig/src/appl/jiv.c	2021-08-01 22:50:31.000000000 +0200
+++ jasper-version-2.0.33/src/appl/jiv.c	2022-01-30 13:59:53.774469682 +0100
@@ -68,7 +68,7 @@
 #include <math.h>
 #include <inttypes.h>
 #if defined(JAS_HAVE_GL_GLUT_H)
-#include <GL/glut.h>
+#include <GL/freeglut.h>
 #else
 #include <glut.h>
 #endif

Places

File jasper-freeglut.patch of Package jasper (Revision eeeac507e7a51d8e252f80673ece46ee)

Places