Attachment 231156 Details for Bug 260878 – Patch for jasper v2

[patch] Patch for jasper v2

jasper-diustfile-glut-fix-2.patch (text/plain), 5.85 KB, created by Daniel Engberg on 2022-01-19 13:46:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-01-19 13:46:34 UTC

Size: 5.85 KB

patch

obsolete

>diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
>index c28c93781d69..480156cbe5da 100644
>--- a/graphics/jasper/Makefile
>+++ b/graphics/jasper/Makefile
>@@ -1,9 +1,9 @@
> # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
> 
> PORTNAME=	jasper
>-PORTVERSION=	2.0.33
>-DISTVERSIONPREFIX=	version-
>+DISTVERSION=	2.0.33
> 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
>@@ -13,18 +13,20 @@ LICENSE_NAME=	JasPer License Version 2.0
> LICENSE_FILE=	${WRKSRC}/LICENSE
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-USES=		cmake cpe jpeg localbase
>+TEST_DEPENDS=	bash>0:shells/bash
> 
>-CMAKE_OFF=	JAS_ENABLE_AUTOMATIC_DEPENDENCIES JAS_ENABLE_DOC
>-CMAKE_ON=	JAS_ENABLE_LIBJPEG
>+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
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	jasper-software
>+TEST_TARGET=	test
> 
>-CPE_VENDOR=	jasper_project
>+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
>diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
>index bec6d9b22487..f2f7e4d61d08 100644
>--- a/graphics/jasper/distinfo
>+++ b/graphics/jasper/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1628103040
>-SHA256 (jasper-software-jasper-version-2.0.33_GH0.tar.gz) = 38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6
>-SIZE (jasper-software-jasper-version-2.0.33_GH0.tar.gz) = 1959463
>+TIMESTAMP = 1641120830
>+SHA256 (jasper-2.0.33.tar.gz) = 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a
>+SIZE (jasper-2.0.33.tar.gz) = 2027526
>diff --git a/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake b/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake
>deleted file mode 100644
>index dada8cd39136..000000000000
>--- a/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- build/cmake/modules/JasOpenGL.cmake.orig	2020-09-05 14:52:22 UTC
>-+++ build/cmake/modules/JasOpenGL.cmake
>-@@ -4,7 +4,7 @@
>- 
>- if (JAS_ENABLE_OPENGL)
>- 	set(OpenGL_GL_PREFERENCE GLVND)
>--	find_package(OpenGL ${JAS_REQUIRED})
>-+	find_package(OpenGL ${JAS_OPENGL_REQUIRED})
>- 	message("OpenGL library found: ${OPENGL_FOUND}")
>- else()
>- 	set(OPENGL_FOUND false)
>diff --git a/graphics/jasper/files/patch-build_cmake_modules_JasOpenGL.cmake b/graphics/jasper/files/patch-build_cmake_modules_JasOpenGL.cmake
>new file mode 100644
>index 000000000000..f955999d876c
>--- /dev/null
>+++ b/graphics/jasper/files/patch-build_cmake_modules_JasOpenGL.cmake
>@@ -0,0 +1,39 @@
>+--- 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()
>diff --git a/graphics/jasper/files/patch-src_appl_CMakeLists.txt b/graphics/jasper/files/patch-src_appl_CMakeLists.txt
>new file mode 100644
>index 000000000000..bdaee8d07b6f
>--- /dev/null
>+++ b/graphics/jasper/files/patch-src_appl_CMakeLists.txt
>@@ -0,0 +1,13 @@
>+--- 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)
>diff --git a/graphics/jasper/files/patch-src_appl_jiv.c b/graphics/jasper/files/patch-src_appl_jiv.c
>new file mode 100644
>index 000000000000..7508dc5b26dc
>--- /dev/null
>+++ b/graphics/jasper/files/patch-src_appl_jiv.c
>@@ -0,0 +1,11 @@
>+--- src/appl/jiv.c.orig	2021-08-01 20:39:10 UTC
>++++ src/appl/jiv.c
>+@@ -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

Actions: View | Diff

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