From cab3ac090b030af5831190ed6bcd7e971902069a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Feb 28 2020 11:53:29 +0000 Subject: Update to 0.6.0 --- diff --git a/.gitignore b/.gitignore index f62c18f..3257e85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -/libfreenect-v0.1.2.tar.bz2 -/libfreenect-de79349de52e0458da38f3eaa721f2ca4b45ff29.tar.gz -/libfreenect-a35642fefd533c6b21864cd3bab7fefb9f0e2f00.tar.gz -/libfreenect-9b671cd7210d16d330a88c7f4e80ce48f42d013e.tar.gz -/libfreenect-8d957924f8a82a235aaa44d8c455113f10c0373f.tar.bz2 -/libfreenect-b2043d02b66c9c59899bbf09cb1a13206e8fa10d.tar.gz -/libfreenect-baec1501c703c731f32eac2bf97c28c77b51fdd8.tar.gz -/libfreenect-ddf092cce09ab4bc97529827a061f1a54a046a17.tar.gz -/libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e.tar.gz +libfreenect-*.tar.* diff --git a/libfreenect.spec b/libfreenect.spec index 892a785..aea9cac 100644 --- a/libfreenect.spec +++ b/libfreenect.spec @@ -1,4 +1,4 @@ -%global commit 88166014859c09f6ad6a93f0862bdcc4e46dc87e +%global commit 48a5c66d98505dd187e6352c2b9aca88985486c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %{?filter_setup: @@ -7,8 +7,8 @@ } Name: libfreenect -Version: 0.5.7 -Release: 15%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Device driver for the Kinect # Core libfreenect is available as ASL 2.0 OR GPLv2 # OpenNI driver is available as ASL 2.0 @@ -26,11 +26,6 @@ Patch3: %{name}-0.4.2-libdir.patch Patch4: secarch.patch # Fix the installation path for python libs Patch7: %{name}-0.5.5-py3.patch -# Fixes to OpenCV support -# https://github.com/OpenKinect/libfreenect/pull/555 -Patch8: 0001-Build-libfreenect_cv-and-cvdemo-as-C-sources.patch -Patch9: 0002-Fix-bugs-in-sync-library-error-handling.patch -# Fixup of OpenCV fixes Patch10: libfreenect-opencv4.patch BuildRequires: gcc-c++ @@ -115,15 +110,11 @@ rm -rf platform/windows %patch3 -p0 -b .libdir %patch4 -p1 -b .secarch %patch7 -p1 -b .py3 -%patch8 -p1 -%patch9 -p1 %patch10 -p1 -b .cv4 %build mkdir build pushd build -# FTBFS with opencv 3.4.1: -# https://bugzilla.redhat.com/show_bug.cgi?id=1551748 %cmake .. \ -DBUILD_AUDIO=ON \ -DBUILD_C_SYNC=ON \ @@ -136,7 +127,7 @@ pushd build -DBUILD_PYTHON3=ON \ -DBUILD_OPENNI2_DRIVER=ON -make %{?_smp_mflags} VERBOSE=1 +%make_build VERBOSE=1 popd pushd doc @@ -144,8 +135,7 @@ doxygen Doxyfile popd %install -rm -rf %{buildroot} -make -C build install DESTDIR=%{buildroot} +%make_install -C build # Install the kinect udev rule mkdir -p %{buildroot}/lib/udev/rules.d @@ -202,6 +192,9 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %{_libdir}/openni2 %changelog +* Fri Feb 28 2020 Nicolas Chauvet - 0.6.0-1 +- Update to 0.6.0 + * Wed Feb 19 2020 Leigh Scott - 0.5.7-15 - Rebuilt for OpenCV 4.2 diff --git a/sources b/sources index 8f88b39..91181c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e.tar.gz) = d4f54deb36381234fd85cfbf4b08e755335aaca9abdec3a370cf465ce5db161b2f7c23ba4a3159b653ae8ff8504691c3982e2601137a40e1ba1c9ae4841ff832 +SHA512 (libfreenect-48a5c66d98505dd187e6352c2b9aca88985486c0.tar.gz) = fad7f63774fe640f95fa3b3ffd1cef2f64576e10e84b5befd3ab97647d92f8527ef8ad344b08d73dbeac3bda71d97235ef8116c8cee45b18dbb8a96851cd5170