Attachment #236079 for bug #266003

View | Details | Raw Unified | Return to bug 266003
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/graphics/lux/Makefile (-4 / +17 lines)
1	PORTNAME= lux	1	PORTNAME= lux
2	PORTVERSION= 1.1.0a	2	PORTVERSION= 1.1.1
3	CATEGORIES= graphics	3	CATEGORIES= graphics
4	MASTER_SITES= https://bitbucket.org/kfj/pv/get/	4	MASTER_SITES= https://bitbucket.org/kfj/pv/get/
5	PKGNAMESUFFIX= -pv # distinguish from www/lux	5	PKGNAMESUFFIX= -pv # distinguish from www/lux
Lines 15-21 LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE Link Here
15	LICENSE_FILE_SANSATION= ${WRKSRC}/Sansation_1.31_ReadMe.txt	15	LICENSE_FILE_SANSATION= ${WRKSRC}/Sansation_1.31_ReadMe.txt
16	LICENSE_PERMS_SANSATION= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept	16	LICENSE_PERMS_SANSATION= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
17		17
18	BUILD_DEPENDS= vc>0:devel/vc	18	BROKEN_armv6= address space exhaustion in compiler
		19	BROKEN_armv7= address space exhaustion in compiler
		20
19	LIB_DEPENDS= libvigraimpex.so:graphics/vigra \	21	LIB_DEPENDS= libvigraimpex.so:graphics/vigra \
20	libsfml-window.so:devel/sfml \	22	libsfml-window.so:devel/sfml \
21	libexiv2.so:graphics/exiv2	23	libexiv2.so:graphics/exiv2
Lines 29-43 DESKTOP_ENTRIES= "Lux Panorama Viewer" \ Link Here
29	false	31	false
30		32
31	WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT}	33	WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT}
32	COMMIT= b5011de5af40	34	COMMIT= 9ec3fe36f96a
33	PLIST_FILES= bin/lux \	35	PLIST_FILES= bin/lux \
34	share/icons/hicolor/512x512/apps/lux-pv.png \	36	share/icons/hicolor/512x512/apps/lux-pv.png \
35	share/lux/fonts/Sansation_1.31_ReadMe.txt \	37	share/lux/fonts/Sansation_1.31_ReadMe.txt \
36	share/lux/fonts/Sansation_Regular.ttf	38	share/lux/fonts/Sansation_Regular.ttf
37		39
		40	.include <bsd.port.pre.mk>
		41
		42	# cannot use CMAKE_ON after bsd.port.pre.mk
		43	.if ${ARCH} == 'amd64' \|\| ${ARCH} == 'i386'
		44	BUILD_DEPENDS= vc>0:devel/vc
		45	CMAKE_ARGS+= -DFLV_SSSE3=ON -DFLV_SSE42=ON
		46	.else
		47	LIB_DEPENDS+= libhwy.so:devel/highway
		48	CMAKE_ARGS+= -DUSE_HWY_LIBRARY=ON -DFLV_NATIVE=ON
		49	.endif
		50
38	post-install:	51	post-install:
39	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps	52	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
40	${INSTALL_DATA} ${WRKSRC}/scripts/PV_512x512x32.png \	53	${INSTALL_DATA} ${WRKSRC}/scripts/PV_512x512x32.png \
41	${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/lux-pv.png	54	${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/lux-pv.png
42		55
43	.include <bsd.port.mk>	56	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/graphics/lux/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1648645726	1	TIMESTAMP = 1661221714
2	SHA256 (b5011de5af40.tar.bz2) = da653c2c4a0cceac79f330a95153bf17d22315020bd21224c2fa1bba5420bb6b	2	SHA256 (9ec3fe36f96a.tar.bz2) = 339351a7cb9783292bdf6692f9bbe13001ce3ac4219c38714995c38d1e9dee7e
3	SIZE (b5011de5af40.tar.bz2) = 870231	3	SIZE (9ec3fe36f96a.tar.bz2) = 895682




--- CMakeLists.txt.orig	2022-08-22 09:29:31 UTC
+++ CMakeLists.txt
@@ -96,8 +96,8 @@ 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)
 set(i86 FALSE)
 
 if(UNIX OR APPLE)

 	  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")

Return to bug 266003

Lines 1-15 Link Here

(-)b/graphics/lux/files/patch-CMakeLists.txt (-12 / +27 lines)
1	--- CMakeLists.txt.orig 2022-03-28 19:04:00 UTC	1	--- CMakeLists.txt.orig 2022-08-22 09:29:31 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -106,7 +106,7 @@ message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_	3	@@ -96,8 +96,8 @@ message(STATUS "***** SYSTEM PROCESSOR ${CMAKE_SYSTEM_
4	# flavours which are on by default:
5
6	option(FLV_FALLBACK "SETS FALLBACK FLAVOUR" ON)
7	-option(FLV_SSE42 "SETS SSE42 FLAVOUR" OFF)
8	+option(FLV_SSE42 "SETS SSE42 FLAVOUR" ON)
9	option(FLV_AVX "SETS AVX FLAVOUR" ON)
10	option(FLV_AVX2 "SETS AVX2 FLAVOUR" ON)
11	option(FLV_AVX512f "SETS AVX512f FLAVOUR" ON)
12	@@ -115,8 +115,8 @@ option(FLV_NATIVE "SETS NATIVE FLAVOUR" OFF)
13	set(i86 FALSE)	4	set(i86 FALSE)
14		5
15	if(UNIX OR APPLE)	6	if(UNIX OR APPLE)
Lines 20-22 Link Here
20	set(i86 TRUE)	11	set(i86 TRUE)
21	endif()	12	endif()
22	elseif(WIN32)	13	elseif(WIN32)
23	-	14	@@ -558,24 +558,6 @@ install(FILES Sansation_Regular.ttf Sansation_1.31_Rea
		15
		16	find_program(LUX_GITVERSION git)
		17	set(LUX_PACKAGE_RELEASE "UNDEFINED")
		18	-if(LUX_GITVERSION)
		19	- message(STATUS "${LUX_GITVERSION} describe --match ${pv_major}.${pv_minor}.${pv_patch} --tags")
		20	- message(STATUS "WORKING_DIRECTORY = ${CMAKE_SOURCE_DIR}")
		21	- execute_process(COMMAND ${LUX_GITVERSION} describe --match ${pv_major}.${pv_minor}.${pv_patch} --tags
		22	- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
		23	- RESULT_VARIABLE tmp_GIT_RESULT
		24	- OUTPUT_VARIABLE tmp_LUX_PACKAGE_RELEASE
		25	- ERROR_VARIABLE tmp_GIT_ERROR
		26	- OUTPUT_STRIP_TRAILING_WHITESPACE)
		27	- if (tmp_GIT_RESULT EQUAL 0)
		28	- if (tmp_LUX_PACKAGE_RELEASE MATCHES "^${pv_major}.${pv_minor}.${pv_patch}-\([0-9]+\)")
		29	- set(LUX_PACKAGE_RELEASE ${CMAKE_MATCH_1})
		30	- elseif(tmp_LUX_PACKAGE_RELEASE MATCHES "^${pv_major}.${pv_minor}.${pv_patch}")
		31	- set(LUX_PACKAGE_RELEASE 0)
		32	- endif()
		33	- endif()
		34	- message(STATUS "LUX_PACKAGE_RELEASE = ${LUX_PACKAGE_RELEASE}")
		35	-endif()
		36
		37	set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX})
		38	set(CPACK_SET_DESTDIR "ON")