Attachment 163834 Details for Bug 205006 – v1

[patch] v1

sse_detect.diff (text/plain), 3.85 KB, created by Jan Beich on 2015-12-04 05:01:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-12-04 05:01:59 UTC

Size: 3.85 KB

patch

obsolete

>Index: graphics/lensfun/Makefile
>===================================================================
>--- graphics/lensfun/Makefile	(revision 402854)
>+++ graphics/lensfun/Makefile	(working copy)
>@@ -19,13 +19,10 @@ USE_GNOME=	glib20
> USE_LDCONFIG=	yes
> CMAKE_ARGS=	-DBUILD_AUXFUN:BOOL=ON -DINSTALL_HELPER_SCRIPTS:BOOL=OFF
> 
>-.if ! ${MACHINE_CPU:Msse} == "sse"
>-CMAKE_ARGS+=	-DBUILD_FOR_SSE:BOOL=OFF
>-.endif
>+OPTIONS_DEFINE=	SIMD
>+OPTIONS_DEFAULT=SIMD # runtime detection
> 
>-.if ! ${MACHINE_CPU:Msse2} == "sse2"
>-CMAKE_ARGS+=	-DBUILD_FOR_SSE2:BOOL=OFF
>-.endif
>+SIMD_CMAKE_OFF=	-DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},libdata,' \
>Index: graphics/lensfun/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/lensfun/files/patch-CMakeLists.txt	(revision 402854)
>+++ graphics/lensfun/files/patch-CMakeLists.txt	(working copy)
>@@ -1,24 +1,46 @@
> --- CMakeLists.txt.orig	2014-09-30 17:37:34 UTC
> +++ CMakeLists.txt
>-@@ -46,15 +46,11 @@ ENDIF()
>+@@ -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")
>--  ENDIF()
>-+  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")
>--  ENDIF()
>-+  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()
>  
>- IF(WIN32)
>-@@ -68,6 +64,7 @@ ENDIF()
>+@@ -68,6 +74,7 @@ ENDIF()
>  # find dependencies
>  FIND_PACKAGE(GLIB2 REQUIRED)
>  INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
>Index: graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt
>===================================================================
>--- graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt	(nonexistent)
>+++ graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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()
>
>Property changes on: graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 205006: 163834