Attachment #163834 for bug #205006

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




USE_LDCONFIG=	yes
CMAKE_ARGS=	-DBUILD_AUXFUN:BOOL=ON -DINSTALL_HELPER_SCRIPTS:BOOL=OFF

OPTIONS_DEFINE=	SIMD
OPTIONS_DEFAULT=SIMD # runtime detection
.endif

SIMD_CMAKE_OFF=	-DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
CMAKE_ARGS+=	-DBUILD_FOR_SSE2:BOOL=OFF
.endif

post-patch:
	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},libdata,' \




--- CMakeLists.txt.orig	2014-09-30 17:37:34 UTC
+++ CMakeLists.txt
@@ -28,12 +28,18 @@ IF(NOT HAVE_REGEX_H)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex)
 ENDIF()
 
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[XxIi][0-9]?86|[Aa][Mm][Dd]64")
+  SET(X86_ON ON)
+else()
+  SET(X86_ON OFF)
+ENDIF()
+
 # options controlling the build process
 OPTION(BUILD_STATIC "Build static library" OFF)
 OPTION(BUILD_TESTS "Build test programs" OFF)
 OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF)
-OPTION(BUILD_FOR_SSE "Build with support for SSE" ON)
-OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ON)
+OPTION(BUILD_FOR_SSE "Build with support for SSE" ${X86_ON})
+OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ${X86_ON})
 OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
 OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
 
@@ -46,14 +52,14 @@ ENDIF()
 
 IF(BUILD_FOR_SSE)
   SET(VECTORIZATION_SSE 1)
-  IF(CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    SET(VECTORIZATION_SSE_FLAGS "-msse")
   ENDIF()
 ENDIF()
 IF(BUILD_FOR_SSE2)
   SET(VECTORIZATION_SSE2 1)
-  IF(CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    SET(VECTORIZATION_SSE2_FLAGS "-msse2")
   ENDIF()
 ENDIF()
 
@@ -68,6 +74,7 @@ ENDIF()
@@ -68,6 +64,7 @@ ENDIF()
 # find dependencies
 FIND_PACKAGE(GLIB2 REQUIRED)
 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})




--- libs/lensfun/CMakeLists.txt.orig	2014-09-30 17:37:34 UTC
+++ libs/lensfun/CMakeLists.txt
@@ -9,6 +9,11 @@ IF(WIN32)
   LIST(APPEND LENSFUN_SRC windows/auxfun.cpp)
 ENDIF()
 
+SET_SOURCE_FILES_PROPERTIES(mod-color-sse.cpp mod-coord-sse.cpp
+  PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE_FLAGS}")
+SET_SOURCE_FILES_PROPERTIES(mod-color-sse2.cpp
+  PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE2_FLAGS}")
+
 IF(BUILD_STATIC)
   ADD_LIBRARY(lensfun STATIC ${LENSFUN_SRC})
 ELSE()

Return to bug 205006

Lines 19-31 USE_GNOME= glib20 Link Here

(-)graphics/lensfun/Makefile (-6 / +3 lines)
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20	CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON -DINSTALL_HELPER_SCRIPTS:BOOL=OFF	20	CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON -DINSTALL_HELPER_SCRIPTS:BOOL=OFF
21		21
22	.if ! ${MACHINE_CPU:Msse} == "sse"	22	OPTIONS_DEFINE= SIMD
23	CMAKE_ARGS+= -DBUILD_FOR_SSE:BOOL=OFF	23	OPTIONS_DEFAULT=SIMD # runtime detection
24	.endif
25		24
26	.if ! ${MACHINE_CPU:Msse2} == "sse2"	25	SIMD_CMAKE_OFF= -DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
27	CMAKE_ARGS+= -DBUILD_FOR_SSE2:BOOL=OFF
28	.endif
29		26
30	post-patch:	27	post-patch:
31	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},libdata,' \	28	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},libdata,' \

Lines 1-24 Link Here

(-)graphics/lensfun/files/patch-CMakeLists.txt (-7 / +29 lines)
1	--- CMakeLists.txt.orig 2014-09-30 17:37:34 UTC	1	--- CMakeLists.txt.orig 2014-09-30 17:37:34 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -46,15 +46,11 @@ ENDIF()	3	@@ -28,12 +28,18 @@ IF(NOT HAVE_REGEX_H)
		4	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex)
		5	ENDIF()
4		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 programs" OFF)
		16	OPTION(BUILD_AUXFUN "Build auxfun library (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	@@ -46,14 +52,14 @@ ENDIF()
		25
5	IF(BUILD_FOR_SSE)	26	IF(BUILD_FOR_SSE)
6	SET(VECTORIZATION_SSE 1)	27	SET(VECTORIZATION_SSE 1)
7	- IF(CMAKE_COMPILER_IS_GNUCXX)	28	- IF(CMAKE_COMPILER_IS_GNUCXX)
8	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")	29	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
9	- ENDIF()	30	+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
10	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")	31	+ SET(VECTORIZATION_SSE_FLAGS "-msse")
		32	ENDIF()
11	ENDIF()	33	ENDIF()
12	IF(BUILD_FOR_SSE2)	34	IF(BUILD_FOR_SSE2)
13	SET(VECTORIZATION_SSE2 1)	35	SET(VECTORIZATION_SSE2 1)
14	- IF(CMAKE_COMPILER_IS_GNUCXX)	36	- IF(CMAKE_COMPILER_IS_GNUCXX)
15	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")	37	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
16	- ENDIF()	38	+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
17	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")	39	+ SET(VECTORIZATION_SSE2_FLAGS "-msse2")
		40	ENDIF()
18	ENDIF()	41	ENDIF()
19		42
20	IF(WIN32)	43	@@ -68,6 +74,7 @@ ENDIF()
21	@@ -68,6 +64,7 @@ ENDIF()
22	# find dependencies	44	# find dependencies
23	FIND_PACKAGE(GLIB2 REQUIRED)	45	FIND_PACKAGE(GLIB2 REQUIRED)
24	INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})	46	INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})

Line 0 Link Here

(-)graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt (+14 lines)
	1	--- libs/lensfun/CMakeLists.txt.orig 2014-09-30 17:37:34 UTC
	2	+++ libs/lensfun/CMakeLists.txt
	3	@@ -9,6 +9,11 @@ IF(WIN32)
	4	LIST(APPEND LENSFUN_SRC windows/auxfun.cpp)
	5	ENDIF()
	6
	7	+SET_SOURCE_FILES_PROPERTIES(mod-color-sse.cpp mod-coord-sse.cpp
	8	+ PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE_FLAGS}")
	9	+SET_SOURCE_FILES_PROPERTIES(mod-color-sse2.cpp
	10	+ PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE2_FLAGS}")
	11	+
	12	IF(BUILD_STATIC)
	13	ADD_LIBRARY(lensfun STATIC ${LENSFUN_SRC})
	14	ELSE()