Attachment #231156 for bug #260878




# Created by: Maxim Sobolev <sobomax@FreeBSD.org>

PORTNAME=	jasper
DISTVERSION=	2.0.33
DISTVERSIONPREFIX=	version-
CATEGORIES=	graphics
MASTER_SITES=	https://github.com/jasper-software/${PORTNAME}/releases/download/version-${DISTVERSION}/

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	Implementation of the codec specified in the JPEG-2000 standard

LICENSE_FILE=	${WRKSRC}/LICENSE
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

TEST_DEPENDS=	bash>0:shells/bash

USES=		cmake cpe jpeg localbase:ldflags pkgconfig shebangfix
CPE_VENDOR=	jasper_project
SHEBANG_FILES=	test/bin/jpcod test/bin/jpdec test/bin/jpenc test/bin/utilities
USE_LDCONFIG=	yes

DOCSDIR=	${PREFIX}/share/doc/JasPer

TEST_TARGET=	test
GH_ACCOUNT=	jasper-software

CMAKE_OFF=	JAS_ENABLE_AUTOMATIC_DEPENDENCIES JAS_ENABLE_DOC
CMAKE_ON=	JAS_ENABLE_LIBJPEG
CMAKE_ARGS=	-DBASH_PROGRAM:STRING="${LOCALBASE}/bin/bash"

OPTIONS_DEFINE=	OPENGL DOCS
OPTIONS_DEFAULT=OPENGL

Lines 1-3 Link Here

(-)b/graphics/jasper/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1628103040	1	TIMESTAMP = 1641120830
2	SHA256 (jasper-software-jasper-version-2.0.33_GH0.tar.gz) = 38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6	2	SHA256 (jasper-2.0.33.tar.gz) = 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a
3	SIZE (jasper-software-jasper-version-2.0.33_GH0.tar.gz) = 1959463	3	SIZE (jasper-2.0.33.tar.gz) = 2027526

Removed Link Here

(-)a/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake (-11 lines)
1	--- build/cmake/modules/JasOpenGL.cmake.orig 2020-09-05 14:52:22 UTC
2	+++ build/cmake/modules/JasOpenGL.cmake
3	@@ -4,7 +4,7 @@
4
5	if (JAS_ENABLE_OPENGL)
6	set(OpenGL_GL_PREFERENCE GLVND)
7	- find_package(OpenGL ${JAS_REQUIRED})
8	+ find_package(OpenGL ${JAS_OPENGL_REQUIRED})
9	message("OpenGL library found: ${OPENGL_FOUND}")
10	else()
11	set(OPENGL_FOUND false)




--- build/cmake/modules/JasOpenGL.cmake.orig	2021-08-01 20:39:10 UTC
+++ build/cmake/modules/JasOpenGL.cmake
@@ -13,19 +13,19 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
 	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)
+	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)
 		check_include_files(glut.h JAS_HAVE_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 +49,6 @@ else()
 	set(JAS_HAVE_OPENGL 0)
 	set(OPENGL_INCLUDE_DIR "")
 	set(OPENGL_LIBRARIES "")
-	set(GLUT_INCLUDE_DIR "")
+	set(FreeGLUT_INCLUDE_DIR "")
 	set(GLUT_LIBRARIES "")
 endif()




--- src/appl/CMakeLists.txt.orig	2021-08-01 20:39:10 UTC
+++ src/appl/CMakeLists.txt
@@ -23,8 +23,8 @@ set(man_pages "${man_pages}" imgcmp.1)
 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)

Added Link Here

(-)b/graphics/jasper/files/patch-src_appl_jiv.c (+11 lines)
1	--- src/appl/jiv.c.orig 2021-08-01 20:39:10 UTC
2	+++ src/appl/jiv.c
3	@@ -68,7 +68,7 @@
4	#include <math.h>
5	#include <inttypes.h>
6	#if defined(JAS_HAVE_GL_GLUT_H)
7	-#include <GL/glut.h>
8	+#include <GL/freeglut.h>
9	#else
10	#include <glut.h>
11	#endif

Return to bug 260878

Lines 1-9 Link Here

(-)b/graphics/jasper/Makefile (-8 / +10 lines)
1	# Created by: Maxim Sobolev <sobomax@FreeBSD.org>	1	# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
2		2
3	PORTNAME= jasper	3	PORTNAME= jasper
4	PORTVERSION= 2.0.33	4	DISTVERSION= 2.0.33
5	DISTVERSIONPREFIX= version-
6	CATEGORIES= graphics	5	CATEGORIES= graphics
		6	MASTER_SITES= https://github.com/jasper-software/${PORTNAME}/releases/download/version-${DISTVERSION}/
7		7
8	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
9	COMMENT= Implementation of the codec specified in the JPEG-2000 standard	9	COMMENT= Implementation of the codec specified in the JPEG-2000 standard
Lines 13-30 LICENSE_NAME= JasPer License Version 2.0 Link Here
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
15		15
16	USES= cmake cpe jpeg localbase	16	TEST_DEPENDS= bash>0:shells/bash
17		17
18	CMAKE_OFF= JAS_ENABLE_AUTOMATIC_DEPENDENCIES JAS_ENABLE_DOC	18	USES= cmake cpe jpeg localbase:ldflags pkgconfig shebangfix
19	CMAKE_ON= JAS_ENABLE_LIBJPEG	19	CPE_VENDOR= jasper_project
		20	SHEBANG_FILES= test/bin/jpcod test/bin/jpdec test/bin/jpenc test/bin/utilities
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21		22
22	DOCSDIR= ${PREFIX}/share/doc/JasPer	23	DOCSDIR= ${PREFIX}/share/doc/JasPer
23		24
24	USE_GITHUB= yes	25	TEST_TARGET= test
25	GH_ACCOUNT= jasper-software
26		26
27	CPE_VENDOR= jasper_project	27	CMAKE_OFF= JAS_ENABLE_AUTOMATIC_DEPENDENCIES JAS_ENABLE_DOC
		28	CMAKE_ON= JAS_ENABLE_LIBJPEG
		29	CMAKE_ARGS= -DBASH_PROGRAM:STRING="${LOCALBASE}/bin/bash"
28		30
29	OPTIONS_DEFINE= OPENGL DOCS	31	OPTIONS_DEFINE= OPENGL DOCS
30	OPTIONS_DEFAULT=OPENGL	32	OPTIONS_DEFAULT=OPENGL

Added Link Here

(-)b/graphics/jasper/files/patch-build_cmake_modules_JasOpenGL.cmake (+39 lines)
1	--- build/cmake/modules/JasOpenGL.cmake.orig 2021-08-01 20:39:10 UTC
2	+++ build/cmake/modules/JasOpenGL.cmake
3	@@ -13,19 +13,19 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
4	set(JAS_HAVE_OPENGL 0)
5	message("OpenGL include directory: ${OPENGL_INCLUDE_DIR}")
6	message("OpenGL libraries: ${OPENGL_LIBRARIES}")
7	- find_package(GLUT ${JAS_REQUIRED})
8	- message("GLUT library found: ${GLUT_FOUND}")
9	- if (GLUT_FOUND)
10	- message("GLUT include directory: ${GLUT_INCLUDE_DIR}")
11	- message("GLUT libraries: ${GLUT_LIBRARIES}")
12	- set(CMAKE_REQUIRED_INCLUDES ${GLUT_INCLUDE_DIR})
13	- check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H)
14	+ find_package(FreeGLUT ${JAS_REQUIRED})
15	+ message("GLUT library found: ${FreeGLUT_FOUND}")
16	+ if (FreeGLUT_FOUND)
17	+ message("GLUT include directory: ${FreeGLUT_INCLUDE_DIR}")
18	+ message("GLUT libraries: ${FreeGLUT_LIBRARIES}")
19	+ set(CMAKE_REQUIRED_INCLUDES ${FreeGLUT_INCLUDE_DIR})
20	+ check_include_files(GL/freeglut.h JAS_HAVE_GL_GLUT_H)
21	check_include_files(glut.h JAS_HAVE_GLUT_H)
22	if (JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H)
23	set(JAS_HAVE_OPENGL 1)
24	- include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
25	+ include_directories(${FreeGLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
26	else()
27	- message(WARNING "The header files GL/glut.h and glut.h both appear to be missing.")
28	+ message(WARNING "The header files GL/freeglut.h and glut.h both appear to be missing.")
29	message(WARNING "Disabling OpenGL.")
30	endif()
31	endif()
32	@@ -49,6 +49,6 @@ else()
33	set(JAS_HAVE_OPENGL 0)
34	set(OPENGL_INCLUDE_DIR "")
35	set(OPENGL_LIBRARIES "")
36	- set(GLUT_INCLUDE_DIR "")
37	+ set(FreeGLUT_INCLUDE_DIR "")
38	set(GLUT_LIBRARIES "")
39	endif()

Added Link Here

(-)b/graphics/jasper/files/patch-src_appl_CMakeLists.txt (+13 lines)
1	--- src/appl/CMakeLists.txt.orig 2021-08-01 20:39:10 UTC
2	+++ src/appl/CMakeLists.txt
3	@@ -23,8 +23,8 @@ set(man_pages "${man_pages}" imgcmp.1)
4	if(JAS_HAVE_OPENGL)
5	add_executable(jiv jiv.c)
6	target_include_directories(jiv PUBLIC
7	- ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
8	- target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES}
9	+ ${FreeGLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
10	+ target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} -lglut
11	${OPENGL_LIBRARIES} ${MATH_LIBRARY})
12	set(programs "${programs}" jiv)
13	set(man_pages "${man_pages}" jiv.1)