Attachment 236079 Details for Bug 266003 – graphics/lux: update to 1.1.1

[patch] graphics/lux: update to 1.1.1

0001-graphics-lux-update-to-1.1.1.patch (text/plain), 4.84 KB, created by Robert Clausecker on 2022-08-23 16:08:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-08-23 16:08:05 UTC

Size: 4.84 KB

patch

obsolete

>From 73a6e60a2ca729bbb294ceb2693cf4b030aebef4 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 23 Aug 2022 07:07:17 +0200
>Subject: [PATCH] graphics/lux: update to 1.1.1
>
> - switch non-x86 to highway-based SIMD code
>
>Upstream changes:
>
> - better SIMD support for non-x86 through Google highway
> - full masking and stacking support for PTOs
>---
> graphics/lux/Makefile                   | 21 +++++++++++---
> graphics/lux/distinfo                   |  6 ++--
> graphics/lux/files/patch-CMakeLists.txt | 38 ++++++++++++++++++-------
> 3 files changed, 47 insertions(+), 18 deletions(-)
>
>diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile
>index 3ca569c3aa1f..2c40f5fac9fc 100644
>--- a/graphics/lux/Makefile
>+++ b/graphics/lux/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	lux
>-PORTVERSION=	1.1.0a
>+PORTVERSION=	1.1.1
> CATEGORIES=	graphics
> MASTER_SITES=	https://bitbucket.org/kfj/pv/get/
> PKGNAMESUFFIX=	-pv	# distinguish from www/lux
>@@ -15,7 +15,9 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE
> LICENSE_FILE_SANSATION=	${WRKSRC}/Sansation_1.31_ReadMe.txt
> LICENSE_PERMS_SANSATION=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
> 
>-BUILD_DEPENDS=	vc>0:devel/vc
>+BROKEN_armv6=	address space exhaustion in compiler
>+BROKEN_armv7=	address space exhaustion in compiler
>+
> LIB_DEPENDS=	libvigraimpex.so:graphics/vigra \
> 		libsfml-window.so:devel/sfml \
> 		libexiv2.so:graphics/exiv2
>@@ -29,15 +31,26 @@ DESKTOP_ENTRIES=	"Lux Panorama Viewer" \
> 			false
> 
> WRKSRC=		${WRKDIR}/kfj-pv-${COMMIT}
>-COMMIT=		b5011de5af40
>+COMMIT=		9ec3fe36f96a
> PLIST_FILES=	bin/lux \
> 		share/icons/hicolor/512x512/apps/lux-pv.png \
> 		share/lux/fonts/Sansation_1.31_ReadMe.txt \
> 		share/lux/fonts/Sansation_Regular.ttf
> 
>+.include <bsd.port.pre.mk>
>+
>+# cannot use CMAKE_ON after bsd.port.pre.mk
>+.if ${ARCH} == 'amd64' || ${ARCH} == 'i386'
>+BUILD_DEPENDS=	vc>0:devel/vc
>+CMAKE_ARGS+=	-DFLV_SSSE3=ON -DFLV_SSE42=ON
>+.else
>+LIB_DEPENDS+=	libhwy.so:devel/highway
>+CMAKE_ARGS+=	-DUSE_HWY_LIBRARY=ON -DFLV_NATIVE=ON
>+.endif
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
> 	${INSTALL_DATA} ${WRKSRC}/scripts/PV_512x512x32.png \
> 	    ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/lux-pv.png
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/graphics/lux/distinfo b/graphics/lux/distinfo
>index 8c90a45cce74..a7dddb571ff9 100644
>--- a/graphics/lux/distinfo
>+++ b/graphics/lux/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1648645726
>-SHA256 (b5011de5af40.tar.bz2) = da653c2c4a0cceac79f330a95153bf17d22315020bd21224c2fa1bba5420bb6b
>-SIZE (b5011de5af40.tar.bz2) = 870231
>+TIMESTAMP = 1661221714
>+SHA256 (9ec3fe36f96a.tar.bz2) = 339351a7cb9783292bdf6692f9bbe13001ce3ac4219c38714995c38d1e9dee7e
>+SIZE (9ec3fe36f96a.tar.bz2) = 895682
>diff --git a/graphics/lux/files/patch-CMakeLists.txt b/graphics/lux/files/patch-CMakeLists.txt
>index 5378953d52d5..8fb3a862b519 100644
>--- a/graphics/lux/files/patch-CMakeLists.txt
>+++ b/graphics/lux/files/patch-CMakeLists.txt
>@@ -1,15 +1,6 @@
>---- CMakeLists.txt.orig	2022-03-28 19:04:00 UTC
>+--- CMakeLists.txt.orig	2022-08-22 09:29:31 UTC
> +++ CMakeLists.txt
>-@@ -106,7 +106,7 @@ message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_
>- # flavours which are on by default:
>- 
>- option(FLV_FALLBACK "SETS FALLBACK FLAVOUR" ON)
>--option(FLV_SSE42    "SETS SSE42 FLAVOUR"    OFF)
>-+option(FLV_SSE42    "SETS SSE42 FLAVOUR"    ON)
>- option(FLV_AVX      "SETS AVX FLAVOUR"      ON)
>- option(FLV_AVX2     "SETS AVX2 FLAVOUR"     ON)
>- option(FLV_AVX512f  "SETS AVX512f FLAVOUR"  ON)
>-@@ -115,8 +115,8 @@ option(FLV_NATIVE   "SETS NATIVE FLAVOUR"   OFF)
>+@@ -96,8 +96,8 @@ message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_
>  set(i86 FALSE)
>  
>  if(UNIX OR APPLE)
>@@ -20,3 +11,28 @@
>  	  set(i86 TRUE)
>    endif()
>  elseif(WIN32)
>+@@ -558,24 +558,6 @@ install(FILES Sansation_Regular.ttf Sansation_1.31_Rea
>+ 
>+ find_program(LUX_GITVERSION git)
>+ set(LUX_PACKAGE_RELEASE "UNDEFINED")
>+-if(LUX_GITVERSION)
>+-  message(STATUS "${LUX_GITVERSION} describe --match ${pv_major}.${pv_minor}.${pv_patch} --tags")
>+-  message(STATUS "WORKING_DIRECTORY = ${CMAKE_SOURCE_DIR}")
>+-  execute_process(COMMAND ${LUX_GITVERSION} describe --match ${pv_major}.${pv_minor}.${pv_patch} --tags
>+-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
>+-    RESULT_VARIABLE tmp_GIT_RESULT
>+-    OUTPUT_VARIABLE tmp_LUX_PACKAGE_RELEASE
>+-    ERROR_VARIABLE tmp_GIT_ERROR
>+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
>+-  if (tmp_GIT_RESULT EQUAL 0)
>+-    if (tmp_LUX_PACKAGE_RELEASE MATCHES "^${pv_major}.${pv_minor}.${pv_patch}-$[0-9]+$")
>+-      set(LUX_PACKAGE_RELEASE ${CMAKE_MATCH_1})
>+-    elseif(tmp_LUX_PACKAGE_RELEASE MATCHES "^${pv_major}.${pv_minor}.${pv_patch}")
>+-      set(LUX_PACKAGE_RELEASE 0)
>+-    endif()
>+-  endif()
>+-  message(STATUS "LUX_PACKAGE_RELEASE = ${LUX_PACKAGE_RELEASE}")
>+-endif()
>+ 
>+ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX})
>+ set(CPACK_SET_DESTDIR "ON")
>-- 
>2.37.1
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 266003: 236079