Notification time stamped 2022-10-22 13:58:49 UTC
From dde914a82ac05f587196d95ea5b13d8df977bf05 Mon Sep 17 00:00:00 2001 From: Rich Mattes richmattes@gmail.com Date: Feb 21 2016 17:00:41 +0000 Subject: Update to release 0.5.3 (rhbz#1272803)
- Fix rawhide FTBFS (rhbz#1307722) - Patch freenct-cppview to catch exception when no freenect device is present (rhbz#1310356)
---
diff --git a/.gitignore b/.gitignore index 7cc6e14..ce10859 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libfreenect-9b671cd7210d16d330a88c7f4e80ce48f42d013e.tar.gz /libfreenect-8d957924f8a82a235aaa44d8c455113f10c0373f.tar.bz2 /libfreenect-b2043d02b66c9c59899bbf09cb1a13206e8fa10d.tar.gz +/libfreenect-baec1501c703c731f32eac2bf97c28c77b51fdd8.tar.gz diff --git a/libfreenect-0.5.2-cmake30.patch b/libfreenect-0.5.2-cmake30.patch index 61b59b6..fa4f9ed 100644 --- a/libfreenect-0.5.2-cmake30.patch +++ b/libfreenect-0.5.2-cmake30.patch @@ -1,24 +1,36 @@ diff -up ./wrappers/python/CMakeLists.txt.cmake30 ./wrappers/python/CMakeLists.txt --- ./wrappers/python/CMakeLists.txt.cmake30 2015-01-26 22:01:37.000000000 -0500 -+++ ./wrappers/python/CMakeLists.txt 2015-03-04 10:19:13.007395503 -0500 -@@ -2,14 +2,14 @@ ++++ ./wrappers/python/CMakeLists.txt 2016-02-21 11:19:40.995391145 -0500 +@@ -2,19 +2,18 @@ # Python extension builder ######################################################################################
-include(FindPythonInterp) -+#include(FindPythonInterp) - include(FindPythonLibs) - +-include(FindPythonLibs) +- ++include(FindPkgConfig) ++pkg_check_modules(PYTHON python2) find_program(CYTHON_EXECUTABLE cython)
# Figure out installation path execute_process(COMMAND - ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}')" -+ ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ++ ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
# Figure out numpy include path -@@ -33,7 +33,9 @@ include_directories(${PYTHON_INCLUDE_PAT + execute_process(COMMAND +- ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.get_include()" ++ ${PYTHON_EXECUTABLE} -c "import numpy; print (numpy.get_include())" + OUTPUT_VARIABLE NUMPY_INCLUDE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) + + # How to Cython the .pyx file +@@ -29,11 +28,13 @@ set_target_properties(cython_freenect PR + OUTPUT_NAME "freenect" + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + target_link_libraries(cython_freenect freenect_sync ${PYTHON_LIBRARIES}) +-include_directories(${PYTHON_INCLUDE_PATH} ../c_sync/ ${NUMPY_INCLUDE_PATH}) ++include_directories(${PYTHON_INCLUDE_DIRS} ../c_sync/ ${NUMPY_INCLUDE_PATH})
# Install the extension install(TARGETS cython_freenect diff --git a/libfreenect-0.5.3-noabort.patch b/libfreenect-0.5.3-noabort.patch new file mode 100644 index 0000000..67e0eba --- /dev/null +++ b/libfreenect-0.5.3-noabort.patch @@ -0,0 +1,18 @@ +diff -up ./wrappers/cpp/cppview.cpp.noabort ./wrappers/cpp/cppview.cpp +--- ./wrappers/cpp/cppview.cpp.noabort 2016-02-21 11:03:00.653334752 -0500 ++++ ./wrappers/cpp/cppview.cpp 2016-02-21 11:04:51.022655752 -0500 +@@ -348,7 +348,13 @@ void *gl_threadfunc(void *arg) + } + + int main(int argc, char **argv) { +- device = &freenect.createDevice<MyFreenectDevice>(0); ++ try { ++ device = &freenect.createDevice<MyFreenectDevice>(0); ++ } ++ catch (std::exception &e) { ++ std::cerr << std::endl << "Exception starting Freenect device : " << e.what() << std::endl; ++ exit(1); ++ } + device->startVideo(); + device->startDepth(); + gl_threadfunc(NULL); diff --git a/libfreenect.spec b/libfreenect.spec index 07ec4d6..5a729dc 100644 --- a/libfreenect.spec +++ b/libfreenect.spec @@ -1,4 +1,4 @@ -%global commit b2043d02b66c9c59899bbf09cb1a13206e8fa10d +%global commit baec1501c703c731f32eac2bf97c28c77b51fdd8 %global shortcommit %(c=%{commit}; echo ${c:0:7})
%{?filter_setup: @@ -7,8 +7,8 @@ }
Name: libfreenect -Version: 0.5.2 -Release: 6%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Device driver for the Kinect License: GPLv2+ or ASL 2.0 URL: http://www.openkinect.org/ @@ -24,6 +24,8 @@ Patch2: %{name}-0.4.2-aarch64.patch Patch3: %{name}-0.4.2-libdir.patch # BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1143912 Patch4: secarch.patch +# Catch exception in freenect-cppview when a freenect device is not presenet +Patch5: %{name}-0.5.3-noabort.patch
BuildRequires: cmake BuildRequires: Cython @@ -103,6 +105,7 @@ rm -rf platform/windows %patch2 -p0 -b .aarch64 %patch3 -p0 -b .libdir %patch4 -p1 -b .secarch +%patch5 -p0 -b .noabort
%build mkdir build @@ -192,6 +195,11 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %{_libdir}/openni2
%changelog +* Sun Feb 21 2016 Rich Mattes richmattes@gmail.com - 0.5.3-1 +- Update to release 0.5.3 (rhbz#1272803) +- Fix rawhide FTBFS (rhbz#1307722) +- Patch freenct-cppview to catch exception when no freenect device is present (rhbz#1310356) + * Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 0.5.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources index 62c38a8..c1bfb3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9f76e9fa6d48e570e4dcbd7a3947fc8 libfreenect-b2043d02b66c9c59899bbf09cb1a13206e8fa10d.tar.gz +eccbee8ff4e4d3c0487705d201774053 libfreenect-baec1501c703c731f32eac2bf97c28c77b51fdd8.tar.gz
https://src.fedoraproject.org/rpms/libfreenect/c/dde914a82ac05f587196d95ea5b...
scm-commits@lists.fedoraproject.org