Attachment 248525 Details for Bug 275818 – Update to 2.5.6.0 and switch to qt6

[patch] Update to 2.5.6.0 and switch to qt6

openimageio.diff (text/plain), 3.27 KB, created by Vladimir Druzenko on 2024-02-17 11:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-02-17 11:40:05 UTC

Size: 3.27 KB

patch

obsolete

>diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
>index 2da92211d421..aec3116ebb4b 100644
>--- a/graphics/openimageio/Makefile
>+++ b/graphics/openimageio/Makefile
>@@ -1,11 +1,11 @@
> PORTNAME=	openimageio
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.4.13.0
>+DISTVERSION=	2.5.6.0
> # PORTREVISION must be set with ?= so as not to stomp over
> # py-openimageio's PORTREVISION.
> # Also, just to be on the safe side, when resetting,
> # best keep PORTREVISION?=	0.
>-PORTREVISION?=	7
>+PORTREVISION?=	0
> CATEGORIES?=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
>@@ -28,13 +28,11 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 		libtiff.so:graphics/tiff \
> 		libwebp.so:graphics/webp
> 
>-USES=		cmake jpeg compiler:c++14-lang iconv:wchar_t qt:5
>-
>-USE_QT+=	buildtools:build qmake:build
>+USES=		cmake jpeg compiler:c++14-lang iconv:wchar_t
> 
> USE_GITHUB=	yes
>-GH_ACCOUNT=	OpenImageIO
>-GH_PROJECT=	oiio
>+GH_ACCOUNT=	AcademySoftwareFoundation
>+GH_PROJECT=	OpenImageIO
> 
> CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
> 		STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA \
>@@ -64,11 +62,10 @@ GIF_CMAKE_BOOL=		USE_GIF
> GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
> 
> IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
>-IMAGEVIEWER_USES=	gl
>+IMAGEVIEWER_USES=	gl qt:6
> IMAGEVIEWER_IMPLIES=	TOOLS
>-IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
>-IMAGEVIEWER_USE=	GL=gl,glu,glew \
>-			QT=buildtools,core,gui,opengl,qmake:build,widgets
>+IMAGEVIEWER_CMAKE_BOOL=	USE_OPENGL USE_QT
>+IMAGEVIEWER_USE=	GL=gl,glu,glew QT=base
> 
> OPENCV_CMAKE_BOOL=	USE_OPENCV
> OPENCV_IMPLIES=		OPENJPEG
>@@ -104,8 +101,7 @@ SHL1=		${PORTVERSION:R:R:R}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," \
>-	${WRKSRC}/src/cmake/modules/FindPtex.cmake \
>-	${WRKSRC}/src/cmake/modules/FindJPEGTurbo.cmake
>+	${WRKSRC}/src/cmake/modules/FindPtex.cmake
> 
> .include <bsd.port.options.mk>
> 
>diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
>index 8a355320d328..53887024de33 100644
>--- a/graphics/openimageio/distinfo
>+++ b/graphics/openimageio/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1690298322
>-SHA256 (OpenImageIO-oiio-v2.4.13.0_GH0.tar.gz) = 72b7d2d5edd1049bb7fc09becad4d8be64a9918cdf79bae98b4b32e1fda762cd
>-SIZE (OpenImageIO-oiio-v2.4.13.0_GH0.tar.gz) = 32162551
>+TIMESTAMP = 1702789971
>+SHA256 (AcademySoftwareFoundation-OpenImageIO-v2.5.6.0_GH0.tar.gz) = bcfced40a25ef8576383b44d8bbe3732aa2b8efc7b8614482783d6f90378d307
>+SIZE (AcademySoftwareFoundation-OpenImageIO-v2.5.6.0_GH0.tar.gz) = 52028557
>diff --git a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake
>deleted file mode 100644
>index 5eaeb68d1380..000000000000
>--- a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- src/cmake/modules/FindJPEGTurbo.cmake.orig	2023-01-30 22:36:11 UTC
>-+++ src/cmake/modules/FindJPEGTurbo.cmake
>-@@ -9,7 +9,8 @@ find_path(JPEG_INCLUDE_DIR turbojpeg.h
>- include (FindPackageHandleStandardArgs)
>- 
>- find_path(JPEG_INCLUDE_DIR turbojpeg.h
>--          HINTS /usr/local/opt/jpeg-turbo/include
>-+          HINTS /usr/local
>-+                %%LOCALBASE%%
>-           PATH_SUFFIXES include)
>- set(JPEG_NAMES ${JPEG_NAMES} jpeg libjpeg turbojpeg libturbojpeg)
>-

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 275818: 247111 | 248525 | 248556 | 248721