From 128118d9ab9d3012fc2f6e25f6989cd0086fc1cf Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Jul 16 2020 21:20:02 +0000 Subject: Update to 2.36.0 --- diff --git a/.gitignore b/.gitignore index a9b34f0..3aba0e5 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /librealsense-2.31.0.tar.gz /librealsense-2.33.1.tar.gz /librealsense-2.35.2.tar.gz +/librealsense-2.36.0.tar.gz diff --git a/librealsense.remove-cflags.patch b/librealsense.remove-cflags.patch index 57d7146..6dbb1c8 100644 --- a/librealsense.remove-cflags.patch +++ b/librealsense.remove-cflags.patch @@ -1,11 +1,3 @@ -commit 4cac00b3e63611de515a2bc3810673ef48f212e8 -Author: Till Hofmann -Date: Wed Jan 23 11:22:55 2019 +0000 - - Remove some CFLAGS modification - - 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 7e794cc7d..c9bf2c0f8 100644 --- a/CMake/unix_config.cmake diff --git a/librealsense.separate-python-target.patch b/librealsense.separate-python-target.patch deleted file mode 100644 index e872ce1..0000000 --- a/librealsense.separate-python-target.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/CMake/pyrealsense2Config.cmake.in b/CMake/pyrealsense2Config.cmake.in -new file mode 100644 -index 000000000..645029498 ---- /dev/null -+++ b/CMake/pyrealsense2Config.cmake.in -@@ -0,0 +1,10 @@ -+@PACKAGE_INIT@ -+ -+set(pyrealsense2_VERSION_MAJOR "@REALSENSE_VERSION_MAJOR@") -+set(pyrealsense2_VERSION_MINOR "@REALSENSE_VERSION_MINOR@") -+set(pyrealsense2_VERSION_PATCH "@REALSENSE_VERSION_PATCH@") -+ -+set(pyrealsense2_VERSION ${realsense2_VERSION_MAJOR}.${realsense2_VERSION_MINOR}.${realsense2_VERSION_PATCH}) -+ -+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 c2941bbd2..15beb299c 100644 ---- a/wrappers/python/CMakeLists.txt -+++ b/wrappers/python/CMakeLists.txt -@@ -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() - -+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 +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) --install(TARGETS pyrealsense2 EXPORT realsense2Targets -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} --) - - set(RAW_RS - pybackend.cpp -@@ -128,13 +134,36 @@ set_target_properties(pybackend2 PROPERTIES - set_target_properties(pybackend2 PROPERTIES FOLDER Wrappers/python) - include_directories(pybackend2 ../../include) - --install(TARGETS pybackend2 -- EXPORT realsense2Targets -+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/pyrealsense2ConfigVersion.cmake" -+ VERSION ${REALSENSE_VERSION_STRING} COMPATIBILITY AnyNewerVersion) -+ -+configure_package_config_file(../../CMake/pyrealsense2Config.cmake.in pyrealsense2Config.cmake -+ INSTALL_DESTINATION ${CMAKECONFIG_PY_INSTALL_DIR} -+ INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/bin -+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR -+) -+ -+install(TARGETS pybackend2 pyrealsense2 -+ EXPORT pyrealsense2Targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${PYTHON_INSTALL_DIR} -+ ARCHIVE DESTINATION ${PYTHON_INSTALL_DIR} - ) - -+install(EXPORT pyrealsense2Targets -+ FILE pyrealsense2Targets.cmake -+ NAMESPACE pyrealsense2:: -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") -+ -+install(FILES "${CMAKE_BINARY_DIR}/wrappers/python/pyrealsense2Config.cmake" -+ DESTINATION ${CMAKECONFIG_PY_INSTALL_DIR} -+) -+ -+install(FILES "${CMAKE_BINARY_DIR}/wrappers/python/pyrealsense2ConfigVersion.cmake" -+ DESTINATION ${CMAKECONFIG_PY_INSTALL_DIR} -+) -+ -+ - if (BUILD_PYTHON_DOCS) - add_subdirectory(docs) - endif() diff --git a/librealsense.spec b/librealsense.spec index f3e875c..f5ecc61 100644 --- a/librealsense.spec +++ b/librealsense.spec @@ -1,6 +1,7 @@ +%global abiver 2.36 Name: librealsense -Version: 2.35.2 -Release: 2%{?dist} +Version: 2.36.0 +Release: 1%{?dist} Summary: Cross-platform camera capture for Intel RealSense License: ASL 2.0 and BSD @@ -10,8 +11,6 @@ Source0: https://github.com/IntelRealSense/librealsense/archive/v%{versio # This was discussed with upstream, but upstream wants to keep those flags. Patch0: librealsense.remove-cflags.patch Patch1: librealsense.realsense-file-shared-library.patch -# https://github.com/IntelRealSense/librealsense/pull/6220 -Patch2: librealsense.separate-python-target.patch BuildRequires: cmake BuildRequires: cmake(glfw3) @@ -119,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.35* -%{_libdir}/librealsense2-gl.so.2.35* -%{_libdir}/librealsense2.so.2.35* +%{_libdir}/librealsense-file.so.%{abiver}* +%{_libdir}/librealsense2-gl.so.%{abiver}* +%{_libdir}/librealsense2.so.%{abiver}* %{_datadir}/realsense %{_bindir}/realsense-viewer %{_bindir}/rs-align @@ -174,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.35* +%{python3_sitearch}/pyrealsense2/pyrealsense2*.so.%{abiver}* %{python3_sitearch}/pyrealsense2/pybackend2*.so.2* %files -n python3-%{name}-devel @@ -188,6 +187,9 @@ install -p -m755 config/usb-R200-in{,_udev} %{buildroot}/%{_datadir}/realsense %changelog +* Thu Jul 16 2020 Till Hofmann - 2.36.0-1 +- Update to 2.36.0 + * Wed Jun 24 2020 Till Hofmann - 2.35.2-2 - Explicitly BR python3-setuptools (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/GCPGM34ZGEOVUHSBGZTRYR5XKHTIJ3T7/) diff --git a/sources b/sources index 13d8676..3ce8b76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (librealsense-2.35.2.tar.gz) = 91c47f09f98909a8eda99d0811feddac49cd71260039ff7afee0990505aacf41518c245bc083b6599375ab5df0b69c83558f5ff1222159cf2d4847e6a49e7e96 +SHA512 (librealsense-2.36.0.tar.gz) = cd9d68223bc0f0a766fa72f56532ecadc34582cbaa83f29e29e3c95018c8cc3d3b925ff3d98bb41c1b5adbcc301cd73d33a6b179ee9fc11a01413f7221cd6dc5