View | Details | Raw Unified | Return to bug 227349 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +9 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	lensfun
4
PORTNAME=	lensfun
5
PORTVERSION=	0.3.2
5
PORTVERSION=	0.3.95
6
PORTREVISION=	2
7
CATEGORIES=	graphics
6
CATEGORIES=	graphics
8
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
7
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
9
8
Lines 26-36 Link Here
26
MAKE_ENV+=	PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE=
25
MAKE_ENV+=	PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE=
27
PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX}
26
PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX}
28
27
29
OPTIONS_DEFINE=	SIMD PYHELPERS
28
OPTIONS_DEFINE=	DOCS SIMD PYHELPERS
30
OPTIONS_DEFAULT=	SIMD PYHELPERS
29
OPTIONS_DEFAULT=	SIMD PYHELPERS
31
OPTIONS_SUB=	yes
30
OPTIONS_SUB=	yes
31
32
PYHELPERS_DESC=	Install database helper scripts (need Python 3)
32
PYHELPERS_DESC=	Install database helper scripts (need Python 3)
33
DOCS_DESC=	Install documentation
33
34
35
DOCS_CMAKE_BOOL=	BUILD_DOC
36
DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
37
			rst2man:textproc/py-docutils
38
DOCS_USES=	python:3.6
39
34
SIMD_CMAKE_OFF=	-DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
40
SIMD_CMAKE_OFF=	-DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
35
41
36
PYHELPERS_CMAKE_ON=	-DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD}
42
PYHELPERS_CMAKE_ON=	-DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD}
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (lensfun-0.3.2.tar.gz) = ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331
1
TIMESTAMP = 1540131932
2
SIZE (lensfun-0.3.2.tar.gz) = 784825
2
SHA256 (lensfun-0.3.95.tar.gz) = 82c29c833c1604c48ca3ab8a35e86b7189b8effac1b1476095c0529afb702808
3
SIZE (lensfun-0.3.95.tar.gz) = 2731561
(-)files/patch-CMakeLists.txt (-50 lines)
Lines 1-50 Link Here
1
--- CMakeLists.txt.orig	2015-11-15 17:07:26 UTC
2
+++ CMakeLists.txt
3
@@ -31,12 +31,18 @@ IF(NOT HAVE_REGEX_H)
4
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex)
5
 ENDIF()
6
 
7
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[XxIi][0-9]?86|[Aa][Mm][Dd]64")
8
+  SET(X86_ON ON)
9
+else()
10
+  SET(X86_ON OFF)
11
+ENDIF()
12
+
13
 # options controlling the build process
14
 OPTION(BUILD_STATIC "Build static library" OFF)
15
 OPTION(BUILD_TESTS "Build test suite" OFF)
16
 OPTION(BUILD_LENSTOOL "Build the lenstool (requires libpng)" OFF)
17
-OPTION(BUILD_FOR_SSE "Build with support for SSE" ON)
18
-OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ON)
19
+OPTION(BUILD_FOR_SSE "Build with support for SSE" ${X86_ON})
20
+OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ${X86_ON})
21
 OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
22
 OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
23
 
24
@@ -62,14 +68,14 @@ ENDIF()
25
 
26
 IF(BUILD_FOR_SSE)
27
   SET(VECTORIZATION_SSE 1)
28
-  IF(CMAKE_COMPILER_IS_GNUCXX)
29
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
30
+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
31
+    SET(VECTORIZATION_SSE_FLAGS "-msse")
32
   ENDIF()
33
 ENDIF()
34
 IF(BUILD_FOR_SSE2)
35
   SET(VECTORIZATION_SSE2 1)
36
-  IF(CMAKE_COMPILER_IS_GNUCXX)
37
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
38
+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
39
+    SET(VECTORIZATION_SSE2_FLAGS "-msse2")
40
   ENDIF()
41
 ENDIF()
42
 
43
@@ -91,6 +97,7 @@ SET(LENSFUN_GLIB_REQUIREMENT_MACRO "GLIB
44
 FIND_PACKAGE(GLIB2 REQUIRED 2.40)
45
 
46
 INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIRS})
47
+LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS})
48
 
49
 
50
 IF(BUILD_STATIC)
(-)pkg-plist (-58 / +168 lines)
Lines 1-64 Link Here
1
%%PYHELPERS%%bin/g-lensfun-update-data
1
%%PYHELPERS%%bin/g-lensfun-update-data
2
%%PYHELPERS%%bin/lensfun-add-adapter
2
%%PYHELPERS%%bin/lensfun-add-adapter
3
%%PYHELPERS%%bin/lensfun-convert-lcp
3
%%PYHELPERS%%bin/lensfun-update-data
4
%%PYHELPERS%%bin/lensfun-update-data
4
include/lensfun/lensfun.h
5
include/lensfun/lensfun.h
5
lib/liblensfun.so
6
lib/liblensfun.so
6
lib/liblensfun.so.1
7
lib/liblensfun.so.0.3.95
7
lib/liblensfun.so.0.3.2
8
lib/liblensfun.so.2
9
%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info
10
%%PYTHON_SITELIBDIR%%/lensfun/__init__.py
11
%%PYTHON_SITELIBDIR%%/lensfun/__pycache__/__init__.cpython-36.pyc
8
libdata/pkgconfig/lensfun.pc
12
libdata/pkgconfig/lensfun.pc
9
%%DATADIR%%/version_1/6x6.xml
13
%%PYHELPERS%%man/man1/g-lensfun-update-data.1.gz
10
%%DATADIR%%/version_1/actioncams.xml
14
%%PYHELPERS%%man/man1/lensfun-add-adapter.1.gz
11
%%DATADIR%%/version_1/compact-canon.xml
15
%%PYHELPERS%%man/man1/lensfun-update-data.1.gz
12
%%DATADIR%%/version_1/compact-casio.xml
16
%%PORTDOCS%%%%DOCSDIR%%/addcamera.html
13
%%DATADIR%%/version_1/compact-fujifilm.xml
17
%%PORTDOCS%%%%DOCSDIR%%/addlens.html
14
%%DATADIR%%/version_1/compact-kodak.xml
18
%%PORTDOCS%%%%DOCSDIR%%/annotated.html
15
%%DATADIR%%/version_1/compact-konica-minolta.xml
19
%%PORTDOCS%%%%DOCSDIR%%/basearch.html
16
%%DATADIR%%/version_1/compact-leica.xml
20
%%PORTDOCS%%%%DOCSDIR%%/bc_s.png
17
%%DATADIR%%/version_1/compact-nikon.xml
21
%%PORTDOCS%%%%DOCSDIR%%/bdwn.png
18
%%DATADIR%%/version_1/compact-olympus.xml
22
%%PORTDOCS%%%%DOCSDIR%%/build.html
19
%%DATADIR%%/version_1/compact-panasonic.xml
23
%%PORTDOCS%%%%DOCSDIR%%/cc-by-ca.html
20
%%DATADIR%%/version_1/compact-pentax.xml
24
%%PORTDOCS%%%%DOCSDIR%%/classes.html
21
%%DATADIR%%/version_1/compact-ricoh.xml
25
%%PORTDOCS%%%%DOCSDIR%%/closed.png
22
%%DATADIR%%/version_1/compact-samsung.xml
26
%%PORTDOCS%%%%DOCSDIR%%/corrections.html
23
%%DATADIR%%/version_1/compact-sigma.xml
27
%%PORTDOCS%%%%DOCSDIR%%/credits.html
24
%%DATADIR%%/version_1/compact-sony.xml
28
%%PORTDOCS%%%%DOCSDIR%%/database.html
25
%%DATADIR%%/version_1/contax.xml
29
%%PORTDOCS%%%%DOCSDIR%%/db_versions.html
26
%%DATADIR%%/version_1/generic.xml
30
%%PORTDOCS%%%%DOCSDIR%%/dbformat.html
27
%%DATADIR%%/version_1/mil-canon.xml
31
%%PORTDOCS%%%%DOCSDIR%%/dbsearch.html
28
%%DATADIR%%/version_1/mil-fujifilm.xml
32
%%PORTDOCS%%%%DOCSDIR%%/doc.png
29
%%DATADIR%%/version_1/mil-nikon.xml
33
%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
30
%%DATADIR%%/version_1/mil-olympus.xml
34
%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
31
%%DATADIR%%/version_1/mil-panasonic.xml
35
%%PORTDOCS%%%%DOCSDIR%%/dynsections.js
32
%%DATADIR%%/version_1/mil-pentax.xml
36
%%PORTDOCS%%%%DOCSDIR%%/el_camera.html
33
%%DATADIR%%/version_1/mil-samsung.xml
37
%%PORTDOCS%%%%DOCSDIR%%/el_lens.html
34
%%DATADIR%%/version_1/mil-samyang.xml
38
%%PORTDOCS%%%%DOCSDIR%%/el_mount.html
35
%%DATADIR%%/version_1/mil-sigma.xml
39
%%PORTDOCS%%%%DOCSDIR%%/elem_calibration.html
36
%%DATADIR%%/version_1/mil-sony.xml
40
%%PORTDOCS%%%%DOCSDIR%%/example_8c-example.html
37
%%DATADIR%%/version_1/mil-tamron.xml
41
%%PORTDOCS%%%%DOCSDIR%%/examples.html
38
%%DATADIR%%/version_1/mil-zeiss.xml
42
%%PORTDOCS%%%%DOCSDIR%%/files.html
39
%%DATADIR%%/version_1/misc.xml
43
%%PORTDOCS%%%%DOCSDIR%%/filldb.html
40
%%DATADIR%%/version_1/rf-leica.xml
44
%%PORTDOCS%%%%DOCSDIR%%/folderclosed.png
41
%%DATADIR%%/version_1/slr-canon.xml
45
%%PORTDOCS%%%%DOCSDIR%%/folderopen.png
42
%%DATADIR%%/version_1/slr-hasselblad.xml
46
%%PORTDOCS%%%%DOCSDIR%%/functions.html
43
%%DATADIR%%/version_1/slr-konica-minolta.xml
47
%%PORTDOCS%%%%DOCSDIR%%/functions_func.html
44
%%DATADIR%%/version_1/slr-leica.xml
48
%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
45
%%DATADIR%%/version_1/slr-nikon.xml
49
%%PORTDOCS%%%%DOCSDIR%%/globals.html
46
%%DATADIR%%/version_1/slr-olympus.xml
50
%%PORTDOCS%%%%DOCSDIR%%/globals_defs.html
47
%%DATADIR%%/version_1/slr-panasonic.xml
51
%%PORTDOCS%%%%DOCSDIR%%/globals_enum.html
48
%%DATADIR%%/version_1/slr-pentax.xml
52
%%PORTDOCS%%%%DOCSDIR%%/globals_eval.html
49
%%DATADIR%%/version_1/slr-ricoh.xml
53
%%PORTDOCS%%%%DOCSDIR%%/globals_func.html
50
%%DATADIR%%/version_1/slr-samsung.xml
54
%%PORTDOCS%%%%DOCSDIR%%/globals_type.html
51
%%DATADIR%%/version_1/slr-samyang.xml
55
%%PORTDOCS%%%%DOCSDIR%%/globals_vars.html
52
%%DATADIR%%/version_1/slr-schneider.xml
56
%%PORTDOCS%%%%DOCSDIR%%/gpl.html
53
%%DATADIR%%/version_1/slr-sigma.xml
57
%%PORTDOCS%%%%DOCSDIR%%/group__Auxiliary.html
54
%%DATADIR%%/version_1/slr-soligor.xml
58
%%PORTDOCS%%%%DOCSDIR%%/group__Camera.html
55
%%DATADIR%%/version_1/slr-sony.xml
59
%%PORTDOCS%%%%DOCSDIR%%/group__Correction.html
56
%%DATADIR%%/version_1/slr-tamron.xml
60
%%PORTDOCS%%%%DOCSDIR%%/group__Database.html
57
%%DATADIR%%/version_1/slr-tokina.xml
61
%%PORTDOCS%%%%DOCSDIR%%/group__Lens.html
58
%%DATADIR%%/version_1/slr-ussr.xml
62
%%PORTDOCS%%%%DOCSDIR%%/group__Mount.html
59
%%DATADIR%%/version_1/slr-vivitar.xml
63
%%PORTDOCS%%%%DOCSDIR%%/index.html
60
%%DATADIR%%/version_1/slr-zeiss.xml
64
%%PORTDOCS%%%%DOCSDIR%%/jquery.js
61
%%DATADIR%%/version_1/timestamp.txt
65
%%PORTDOCS%%%%DOCSDIR%%/lensfun-add-adapter.html
62
%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.2-py%%PYTHON_VER%%.egg-info
66
%%PORTDOCS%%%%DOCSDIR%%/lensfun-convert-lcp.html
63
%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__init__.py
67
%%PORTDOCS%%%%DOCSDIR%%/lensfun-update-data.html
64
%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
68
%%PORTDOCS%%%%DOCSDIR%%/lensfun_8h.html
69
%%PORTDOCS%%%%DOCSDIR%%/lensfun_8h_source.html
70
%%PORTDOCS%%%%DOCSDIR%%/lenstool_8cpp-example.html
71
%%PORTDOCS%%%%DOCSDIR%%/lgpl.html
72
%%PORTDOCS%%%%DOCSDIR%%/license.html
73
%%PORTDOCS%%%%DOCSDIR%%/menu.js
74
%%PORTDOCS%%%%DOCSDIR%%/menudata.js
75
%%PORTDOCS%%%%DOCSDIR%%/modules.html
76
%%PORTDOCS%%%%DOCSDIR%%/nav_f.png
77
%%PORTDOCS%%%%DOCSDIR%%/nav_g.png
78
%%PORTDOCS%%%%DOCSDIR%%/nav_h.png
79
%%PORTDOCS%%%%DOCSDIR%%/open.png
80
%%PORTDOCS%%%%DOCSDIR%%/pages.html
81
%%PORTDOCS%%%%DOCSDIR%%/perspective-correction.html
82
%%PORTDOCS%%%%DOCSDIR%%/programming.html
83
%%PORTDOCS%%%%DOCSDIR%%/samplecode.html
84
%%PORTDOCS%%%%DOCSDIR%%/splitbar.png
85
%%PORTDOCS%%%%DOCSDIR%%/structlfCamera-members.html
86
%%PORTDOCS%%%%DOCSDIR%%/structlfCamera.html
87
%%PORTDOCS%%%%DOCSDIR%%/structlfDatabase-members.html
88
%%PORTDOCS%%%%DOCSDIR%%/structlfDatabase.html
89
%%PORTDOCS%%%%DOCSDIR%%/structlfLens-members.html
90
%%PORTDOCS%%%%DOCSDIR%%/structlfLens.html
91
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibAttributes-members.html
92
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibAttributes.html
93
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibCrop-members.html
94
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibCrop.html
95
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibDistortion-members.html
96
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibDistortion.html
97
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibFov-members.html
98
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibFov.html
99
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibTCA-members.html
100
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibTCA.html
101
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibVignetting-members.html
102
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibVignetting.html
103
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibrationSet-members.html
104
%%PORTDOCS%%%%DOCSDIR%%/structlfLensCalibrationSet.html
105
%%PORTDOCS%%%%DOCSDIR%%/structlfModifier-members.html
106
%%PORTDOCS%%%%DOCSDIR%%/structlfModifier.html
107
%%PORTDOCS%%%%DOCSDIR%%/structlfMount-members.html
108
%%PORTDOCS%%%%DOCSDIR%%/structlfMount.html
109
%%PORTDOCS%%%%DOCSDIR%%/structlfParameter-members.html
110
%%PORTDOCS%%%%DOCSDIR%%/structlfParameter.html
111
%%PORTDOCS%%%%DOCSDIR%%/sync_off.png
112
%%PORTDOCS%%%%DOCSDIR%%/sync_on.png
113
%%PORTDOCS%%%%DOCSDIR%%/tab_a.png
114
%%PORTDOCS%%%%DOCSDIR%%/tab_b.png
115
%%PORTDOCS%%%%DOCSDIR%%/tab_h.png
116
%%PORTDOCS%%%%DOCSDIR%%/tab_s.png
117
%%PORTDOCS%%%%DOCSDIR%%/tabs.css
118
%%PORTDOCS%%%%DOCSDIR%%/tfun_8cpp-example.html
119
%%DATADIR%%/version_2/6x6.xml
120
%%DATADIR%%/version_2/actioncams.xml
121
%%DATADIR%%/version_2/compact-canon.xml
122
%%DATADIR%%/version_2/compact-casio.xml
123
%%DATADIR%%/version_2/compact-fujifilm.xml
124
%%DATADIR%%/version_2/compact-kodak.xml
125
%%DATADIR%%/version_2/compact-konica-minolta.xml
126
%%DATADIR%%/version_2/compact-leica.xml
127
%%DATADIR%%/version_2/compact-nikon.xml
128
%%DATADIR%%/version_2/compact-olympus.xml
129
%%DATADIR%%/version_2/compact-panasonic.xml
130
%%DATADIR%%/version_2/compact-pentax.xml
131
%%DATADIR%%/version_2/compact-ricoh.xml
132
%%DATADIR%%/version_2/compact-samsung.xml
133
%%DATADIR%%/version_2/compact-sigma.xml
134
%%DATADIR%%/version_2/compact-sony.xml
135
%%DATADIR%%/version_2/contax.xml
136
%%DATADIR%%/version_2/generic.xml
137
%%DATADIR%%/version_2/lensfun-database.dtd
138
%%DATADIR%%/version_2/lensfun-database.xsd
139
%%DATADIR%%/version_2/mil-canon.xml
140
%%DATADIR%%/version_2/mil-fujifilm.xml
141
%%DATADIR%%/version_2/mil-nikon.xml
142
%%DATADIR%%/version_2/mil-olympus.xml
143
%%DATADIR%%/version_2/mil-panasonic.xml
144
%%DATADIR%%/version_2/mil-pentax.xml
145
%%DATADIR%%/version_2/mil-samsung.xml
146
%%DATADIR%%/version_2/mil-samyang.xml
147
%%DATADIR%%/version_2/mil-sigma.xml
148
%%DATADIR%%/version_2/mil-sony.xml
149
%%DATADIR%%/version_2/mil-tamron.xml
150
%%DATADIR%%/version_2/mil-tokina.xml
151
%%DATADIR%%/version_2/mil-zeiss.xml
152
%%DATADIR%%/version_2/misc.xml
153
%%DATADIR%%/version_2/rf-leica.xml
154
%%DATADIR%%/version_2/slr-canon.xml
155
%%DATADIR%%/version_2/slr-hasselblad.xml
156
%%DATADIR%%/version_2/slr-konica-minolta.xml
157
%%DATADIR%%/version_2/slr-leica.xml
158
%%DATADIR%%/version_2/slr-nikon.xml
159
%%DATADIR%%/version_2/slr-olympus.xml
160
%%DATADIR%%/version_2/slr-panasonic.xml
161
%%DATADIR%%/version_2/slr-pentax.xml
162
%%DATADIR%%/version_2/slr-ricoh.xml
163
%%DATADIR%%/version_2/slr-samsung.xml
164
%%DATADIR%%/version_2/slr-samyang.xml
165
%%DATADIR%%/version_2/slr-schneider.xml
166
%%DATADIR%%/version_2/slr-sigma.xml
167
%%DATADIR%%/version_2/slr-soligor.xml
168
%%DATADIR%%/version_2/slr-sony.xml
169
%%DATADIR%%/version_2/slr-tamron.xml
170
%%DATADIR%%/version_2/slr-tokina.xml
171
%%DATADIR%%/version_2/slr-ussr.xml
172
%%DATADIR%%/version_2/slr-vivitar.xml
173
%%DATADIR%%/version_2/slr-zeiss.xml
174
%%DATADIR%%/version_2/timestamp.txt

Return to bug 227349