Attachment #232823 for bug #262943

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

Lines 536-541 Link Here

(-)b/graphics/Makefile (+1 lines)
536	SUBDIR += linux-c7-tiff	536	SUBDIR += linux-c7-tiff
537	SUBDIR += linux-c7-wayland	537	SUBDIR += linux-c7-wayland
538	SUBDIR += lua-gd	538	SUBDIR += lua-gd
		539	SUBDIR += lux
539	SUBDIR += luminance-qt5	540	SUBDIR += luminance-qt5
540	SUBDIR += lximage-qt	541	SUBDIR += lximage-qt
541	SUBDIR += magnum	542	SUBDIR += magnum




PORTNAME=	lux
PORTVERSION=	1.1.0a
CATEGORIES=	graphics
MASTER_SITES=	https://bitbucket.org/kfj/pv/get/
PKGNAMESUFFIX=	-pv	# distinguish from www/lux
DISTNAME=	${COMMIT}

MAINTAINER=	fuz@fuz.su
COMMENT=	Panorama and image viewer

LICENSE=	GPLv3 SANSATION
LICENSE_COMB=	multi
LICENSE_NAME_SANSATION=	Sansation freeware font family license
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
LIB_DEPENDS=	libvigraimpex.so:graphics/vigra \
		libsfml-window.so:devel/sfml \
		libexiv2.so:graphics/exiv2

USES=		cmake dos2unix pkgconfig tar:bz2
DOS2UNIX_FILES=	tinyfiledialogs.c
CONFLICTS=	lux
DESKTOP_ENTRIES=	"Lux Panorama Viewer" \
			"panorama and image viewer" "lux-pv" "lux" \
			"Graphics;ImageProcessing;Photography;Viewer;" \
			false

WRKSRC=		${WRKDIR}/kfj-pv-${COMMIT}
COMMIT=		b5011de5af40
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

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>

Added Link Here

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




--- CMakeLists.txt.orig	2022-03-28 19:04:00 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)
 set(i86 FALSE)
 
 if(UNIX OR APPLE)
-  if (    ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64
-       OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i686)
+  if (    ${CMAKE_SYSTEM_PROCESSOR} STREQUAL amd64
+       OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386)
 	  set(i86 TRUE)
   endif()
 elseif(WIN32)




--- tinyfiledialogs.c.orig	2022-03-08 00:31:39 UTC
+++ tinyfiledialogs.c
@@ -47,13 +47,6 @@ Thanks for contributions, bug corrections & thorough t
 - Paul Rouget
 */
 
-
-#ifndef __sun
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 2 /* to accept POSIX 2 in old ANSI C standards */
-#endif
-#endif
-
 #if !defined(_WIN32) && ( defined(__GNUC__) || defined(__clang__) )
 #if !defined(_GNU_SOURCE)
  #define _GNU_SOURCE /* used only to resolve symbolic links. Can be commented out */




lux is an image viewer for 'normal' images and the most common types of
panoramic images, typically showing a 'rectilinear' view to the image
data, which looks as if this view had been taken with an 'ordinary'
lens.  The view can be zoomed, panned, scrolled, rotated and modified in
several ways.  lux displays images, it does not modify them.  But it can
produce high-quality images from the view it shows.  lux can also
produce synoptic views of several images and do stitching, HDR blending,
exposure fusions, focus stacks and deghosting, usually from 'PTO' files,
processing a subset of the panotools standard used by panorama stitching
software like hugin.

WWW: https://bitbucket.org/kfj/pv

Return to bug 262943

Added Link Here

(-)b/graphics/lux/Makefile (+43 lines)
1	PORTNAME= lux
2	PORTVERSION= 1.1.0a
3	CATEGORIES= graphics
4	MASTER_SITES= https://bitbucket.org/kfj/pv/get/
5	PKGNAMESUFFIX= -pv # distinguish from www/lux
6	DISTNAME= ${COMMIT}
7
8	MAINTAINER= fuz@fuz.su
9	COMMENT= Panorama and image viewer
10
11	LICENSE= GPLv3 SANSATION
12	LICENSE_COMB= multi
13	LICENSE_NAME_SANSATION= Sansation freeware font family license
14	LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE
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
17
18	BUILD_DEPENDS= vc>0:devel/vc
19	LIB_DEPENDS= libvigraimpex.so:graphics/vigra \
20	libsfml-window.so:devel/sfml \
21	libexiv2.so:graphics/exiv2
22
23	USES= cmake dos2unix pkgconfig tar:bz2
24	DOS2UNIX_FILES= tinyfiledialogs.c
25	CONFLICTS= lux
26	DESKTOP_ENTRIES= "Lux Panorama Viewer" \
27	"panorama and image viewer" "lux-pv" "lux" \
28	"Graphics;ImageProcessing;Photography;Viewer;" \
29	false
30
31	WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT}
32	COMMIT= b5011de5af40
33	PLIST_FILES= bin/lux \
34	share/icons/hicolor/512x512/apps/lux-pv.png \
35	share/lux/fonts/Sansation_1.31_ReadMe.txt \
36	share/lux/fonts/Sansation_Regular.ttf
37
38	post-install:
39	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
40	${INSTALL_DATA} ${WRKSRC}/scripts/PV_512x512x32.png \
41	${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/lux-pv.png
42
43	.include <bsd.port.mk>

Added Link Here

(-)b/graphics/lux/files/patch-CMakeLists.txt (+22 lines)
1	--- CMakeLists.txt.orig 2022-03-28 19:04:00 UTC
2	+++ CMakeLists.txt
3	@@ -106,7 +106,7 @@ 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)
14
15	if(UNIX OR APPLE)
16	- if ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64
17	- OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i686)
18	+ if ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL amd64
19	+ OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386)
20	set(i86 TRUE)
21	endif()
22	elseif(WIN32)

Added Link Here

(-)b/graphics/lux/files/patch-tinyfiledialogs.c (+16 lines)
1	--- tinyfiledialogs.c.orig 2022-03-08 00:31:39 UTC
2	+++ tinyfiledialogs.c
3	@@ -47,13 +47,6 @@ Thanks for contributions, bug corrections & thorough t
4	- Paul Rouget
5	*/
6
7	-
8	-#ifndef __sun
9	-#ifndef _POSIX_C_SOURCE
10	-#define _POSIX_C_SOURCE 2 /* to accept POSIX 2 in old ANSI C standards */
11	-#endif
12	-#endif
13	-
14	#if !defined(_WIN32) && ( defined(__GNUC__) \|\| defined(__clang__) )
15	#if !defined(_GNU_SOURCE)
16	#define _GNU_SOURCE /* used only to resolve symbolic links. Can be commented out */

Added Link Here

(-)b/graphics/lux/pkg-descr (-1 / +12 lines)
0	-	1	lux is an image viewer for 'normal' images and the most common types of
		2	panoramic images, typically showing a 'rectilinear' view to the image
		3	data, which looks as if this view had been taken with an 'ordinary'
		4	lens. The view can be zoomed, panned, scrolled, rotated and modified in
		5	several ways. lux displays images, it does not modify them. But it can
		6	produce high-quality images from the view it shows. lux can also
		7	produce synoptic views of several images and do stitching, HDR blending,
		8	exposure fusions, focus stacks and deghosting, usually from 'PTO' files,
		9	processing a subset of the panotools standard used by panorama stitching
		10	software like hugin.
		11
		12	WWW: https://bitbucket.org/kfj/pv