From 69f504f20ba7cfa7ca7094e60526d926e237b943 Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Jun 15 2020 10:27:15 +0000 Subject: Update to 2.35.2 --- diff --git a/.gitignore b/.gitignore index 2ed3518..a9b34f0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /librealsense-2.30.0.tar.gz /librealsense-2.31.0.tar.gz /librealsense-2.33.1.tar.gz +/librealsense-2.35.2.tar.gz diff --git a/librealsense.remove-cflags.patch b/librealsense.remove-cflags.patch index ff1fa7a..57d7146 100644 --- a/librealsense.remove-cflags.patch +++ b/librealsense.remove-cflags.patch @@ -1,4 +1,4 @@ -commit 5dc178c8a29f4aa27e4f4a493831571b89748867 +commit 4cac00b3e63611de515a2bc3810673ef48f212e8 Author: Till Hofmann Date: Wed Jan 23 11:22:55 2019 +0000 @@ -7,10 +7,10 @@ Date: Wed Jan 23 11:22:55 2019 +0000 We want to use the distro's CFLAGS as close as possible. diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake -index 2ecd1ed02..c9bf2c0f8 100644 +index 7e794cc7d..c9bf2c0f8 100644 --- a/CMake/unix_config.cmake +++ b/CMake/unix_config.cmake -@@ -2,26 +2,10 @@ message(STATUS "Setting Unix configurations") +@@ -2,27 +2,10 @@ message(STATUS "Setting Unix configurations") macro(os_set_flags) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -21,10 +21,11 @@ index 2ecd1ed02..c9bf2c0f8 100644 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") +- add_definitions(-DRASPBERRY_PI) +- 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") @@ -34,7 +35,7 @@ index 2ecd1ed02..c9bf2c0f8 100644 - 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) diff --git a/librealsense.separate-python-target.patch b/librealsense.separate-python-target.patch index 57e085e..e872ce1 100644 --- a/librealsense.separate-python-target.patch +++ b/librealsense.separate-python-target.patch @@ -15,22 +15,28 @@ index 000000000..645029498 +include("${CMAKE_CURRENT_LIST_DIR}/pyrealsense2Targets.cmake") +set(realsense2_LIBRARY pyrealsense2::pyrealsense2) diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt -index a070973c4..8816a3460 100644 +index c2941bbd2..15beb299c 100644 --- a/wrappers/python/CMakeLists.txt +++ b/wrappers/python/CMakeLists.txt -@@ -7,6 +7,11 @@ if (NOT BUILD_PYTHON_BINDINGS) +@@ -7,6 +7,17 @@ if (NOT BUILD_PYTHON_BINDINGS) message(WARNING "Python Bindings being built despite unset option because they are required for python documentation") endif() -+find_package(Python REQUIRED COMPONENTS Interpreter Development) -+ -+set(PYTHON_INSTALL_DIR "${Python_SITEARCH}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") -+set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") ++if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) ++ find_package(Python REQUIRED COMPONENTS Interpreter Development) ++ set(PYTHON_INSTALL_DIR "${Python_SITEARCH}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") ++ set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") ++else() ++ find_package(PythonInterp REQUIRED) ++ find_package(PythonLibs REQUIRED) ++ set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") ++ set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") ++endif() + set(DEPENDENCIES realsense2) add_subdirectory(third_party/pybind11) -@@ -34,11 +39,6 @@ target_link_libraries(pyrealsense2 PRIVATE ${DEPENDENCIES}) +@@ -34,11 +45,6 @@ target_link_libraries(pyrealsense2 PRIVATE ${DEPENDENCIES}) set_target_properties(pyrealsense2 PROPERTIES VERSION ${REALSENSE_VERSION_STRING} SOVERSION "${REALSENSE_VERSION_MAJOR}.${REALSENSE_VERSION_MINOR}") set_target_properties(pyrealsense2 PROPERTIES FOLDER Wrappers/python) @@ -42,7 +48,7 @@ index a070973c4..8816a3460 100644 set(RAW_RS pybackend.cpp -@@ -127,13 +127,36 @@ set_target_properties(pybackend2 PROPERTIES +@@ -128,13 +134,36 @@ set_target_properties(pybackend2 PROPERTIES set_target_properties(pybackend2 PROPERTIES FOLDER Wrappers/python) include_directories(pybackend2 ../../include) @@ -82,6 +88,4 @@ index a070973c4..8816a3460 100644 + if (BUILD_PYTHON_DOCS) add_subdirectory(docs) --endif() -\ No newline at end of file -+endif() + endif() diff --git a/librealsense.spec b/librealsense.spec index 3c1fb17..9459eaf 100644 --- a/librealsense.spec +++ b/librealsense.spec @@ -1,6 +1,6 @@ Name: librealsense -Version: 2.33.1 -Release: 6%{?dist} +Version: 2.35.2 +Release: 1%{?dist} Summary: Cross-platform camera capture for Intel RealSense License: ASL 2.0 and BSD @@ -118,9 +118,9 @@ install -p -m755 config/usb-R200-in{,_udev} %{buildroot}/%{_datadir}/realsense %files %license LICENSE %doc readme.md -%{_libdir}/librealsense-file.so.2.33* -%{_libdir}/librealsense2-gl.so.2.33* -%{_libdir}/librealsense2.so.2.33* +%{_libdir}/librealsense-file.so.2.35* +%{_libdir}/librealsense2-gl.so.2.35* +%{_libdir}/librealsense2.so.2.35* %{_datadir}/realsense %{_bindir}/realsense-viewer %{_bindir}/rs-align @@ -173,7 +173,7 @@ install -p -m755 config/usb-R200-in{,_udev} %{buildroot}/%{_datadir}/realsense %files -n python3-%{name} %dir %{python3_sitearch}/pyrealsense2 -%{python3_sitearch}/pyrealsense2/pyrealsense2*.so.2.33* +%{python3_sitearch}/pyrealsense2/pyrealsense2*.so.2.35* %{python3_sitearch}/pyrealsense2/pybackend2*.so.2* %files -n python3-%{name}-devel @@ -187,6 +187,9 @@ install -p -m755 config/usb-R200-in{,_udev} %{buildroot}/%{_datadir}/realsense %changelog +* Mon Jun 15 2020 Till Hofmann - 2.35.2-1 +- Update to 2.35.2 + * Tue May 26 2020 Miro Hrončok - 2.33.1-6 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 6bc86cf..13d8676 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (librealsense-2.33.1.tar.gz) = c5e8ac8c175be6cbd96b7c1476ad3065eb3d6f0ff60f9764d6e2a01078ed6ec9f038e6c1f6d53209c099396fd0a0f944aef272b08a36cf5a97576db139ea037a +SHA512 (librealsense-2.35.2.tar.gz) = 91c47f09f98909a8eda99d0811feddac49cd71260039ff7afee0990505aacf41518c245bc083b6599375ab5df0b69c83558f5ff1222159cf2d4847e6a49e7e96