Hello community, here is the log from the commit of package librealsense for openSUSE:Factory checked in at 2020-04-29 20:53:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librealsense (Old) and /work/SRC/openSUSE:Factory/.librealsense.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librealsense" Wed Apr 29 20:53:05 2020 rev:3 rq:798860 version:2.33.1+git20200305.ge0b160f01 Changes: -------- --- /work/SRC/openSUSE:Factory/librealsense/librealsense.changes 2020-03-11 18:55:50.763688287 +0100 +++ /work/SRC/openSUSE:Factory/.librealsense.new.2738/librealsense.changes 2020-04-29 20:54:40.145312157 +0200 @@ -1,0 +2,6 @@ +Wed Apr 29 10:08:35 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Fix build on %arm and aarch64: + * 0001-Fix-aarch64-arm-detection.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-aarch64-arm-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librealsense.spec ++++++ --- /var/tmp/diff_new_pack.Dh19zu/_old 2020-04-29 20:54:41.829316015 +0200 +++ /var/tmp/diff_new_pack.Dh19zu/_new 2020-04-29 20:54:41.829316015 +0200 @@ -17,7 +17,6 @@ %define libver 2 - Name: librealsense Version: 2.33.1+git20200305.ge0b160f01 Release: 0 @@ -27,6 +26,8 @@ URL: https://github.com/IntelRealSense/librealsense Source: %{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM - https://github.com/IntelRealSense/librealsense/pull/6321 +Patch1: 0001-Fix-aarch64-arm-detection.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: freeglut-devel ++++++ 0001-Fix-aarch64-arm-detection.patch ++++++ >From 6a61d5a946c84d37266a08bbfd90e34849e13517 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet <guillaume.gar...@arm.com> Date: Wed, 29 Apr 2020 12:03:44 +0200 Subject: [PATCH] Fix aarch64/arm detection --- guillaume: updated to match current version in openSUSE CMake/unix_config.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake index 0de80e38a..7e794cc7d 100644 --- a/CMake/unix_config.cmake +++ b/CMake/unix_config.cmake @@ -7,10 +7,10 @@ macro(os_set_flags) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar -Wsequence-point -Wformat -Wformat-security") execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE MACHINE) - if(${MACHINE} MATCHES "arm-linux-gnueabihf") + if(${MACHINE} MATCHES "arm-*") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -mfloat-abi=hard -ftree-vectorize -latomic") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -mfloat-abi=hard -ftree-vectorize -latomic") - elseif(${MACHINE} MATCHES "aarch64-linux-gnu") + elseif(${MACHINE} MATCHES "aarch64-*") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mstrict-align -ftree-vectorize") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstrict-align -ftree-vectorize") elseif(${MACHINE} MATCHES "powerpc64(le)?-linux-gnu") @@ -21,7 +21,7 @@ macro(os_set_flags) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mssse3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3") set(LRS_TRY_USE_AVX true) - endif(${MACHINE} MATCHES "arm-linux-gnueabihf") + endif(${MACHINE} MATCHES "arm-*") if(BUILD_WITH_OPENMP) find_package(OpenMP REQUIRED) -- 2.26.1
