Update to 0.6.1

Drop-PROJECT_VER_MINOR-in-APIVER.patch

@@ -1,28 +0,0 @@
-From 79e357efa8a0a4d60ab8bb9e8d189f12ac4627d1 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Fri, 28 Feb 2020 14:54:47 +0100
-Subject: [PATCH] Drop PROJECT_VER_MINOR in APIVER
-
-This will change SONAME to libfreenect.so.0 instead of 0.6
-
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e71ea97..37d6e94 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,7 +51,7 @@ set (PROJECT_VER_PATCH 1)
- set (PROJECT_VER
-   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
- set (PROJECT_APIVER
--  "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}")
-+  "${PROJECT_VER_MAJOR}")
- 
- OPTION(BUILD_REDIST_PACKAGE "Build libfreenect in a legally-redistributable manner (only affects audio)" ON)
- OPTION(BUILD_EXAMPLES "Build example programs" ON)
--- 
-2.24.1
-

libfreenect-0.4.1-openni2.patch

@@ -1,12 +0,0 @@
-diff -up ./OpenNI2-FreenectDriver/CMakeLists.txt.openni2 ./OpenNI2-FreenectDriver/CMakeLists.txt
---- ./OpenNI2-FreenectDriver/CMakeLists.txt.openni2	2014-05-02 19:44:28.783577819 -0400
-+++ ./OpenNI2-FreenectDriver/CMakeLists.txt	2014-05-02 19:44:31.992726677 -0400
-@@ -10,8 +10,6 @@ set(CMAKE_CXX_FLAGS "-Wno-gnu-static-flo
- 
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/OpenNI2-FreenectDriver)
- set_target_properties(FreenectDriver PROPERTIES
--  VERSION ${PROJECT_VER}
--  SOVERSION ${PROJECT_APIVER}
-   OUTPUT_NAME FreenectDriver)
-   
- add_definitions(-DPROJECT_VER="${PROJECT_VER}")

libfreenect-opencv4.patch

@@ -1,21 +0,0 @@
-diff -up libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp.cv4 libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp
---- libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp.cv4	2020-01-27 13:26:58.804395458 +0100
-+++ libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp	2020-01-27 13:26:58.808395477 +0100
-@@ -1,5 +1,4 @@
--#include <opencv/cv.h>
--#include <opencv/highgui.h>
-+#include <opencv2/highgui/highgui_c.h>
- #include <stdio.h>
- #include "libfreenect_cv.h"
- 
-diff -up libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h.cv4 libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h
---- libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h.cv4	2020-01-27 13:26:58.804395458 +0100
-+++ libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h	2020-01-27 13:29:39.237158488 +0100
-@@ -1,6 +1,6 @@
- #pragma once
- 
--#include <opencv/cv.h>
-+#include <opencv2/core/core_c.h>
- 
- #ifdef __cplusplus
- extern "C" {

libfreenect-openni2.patch

@@ -0,0 +1,12 @@
+diff -up libfreenect-0.6.1/OpenNI2-FreenectDriver/CMakeLists.txt.openni2 libfreenect-0.6.1/OpenNI2-FreenectDriver/CMakeLists.txt
+--- libfreenect-0.6.1/OpenNI2-FreenectDriver/CMakeLists.txt.openni2	2020-05-25 11:14:11.573900769 +0200
++++ libfreenect-0.6.1/OpenNI2-FreenectDriver/CMakeLists.txt	2020-05-25 11:22:13.057933733 +0200
+@@ -12,8 +12,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
+ 
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/OpenNI2-FreenectDriver)
+ set_target_properties(FreenectDriver PROPERTIES
+-  VERSION ${PROJECT_VER}
+-  SOVERSION ${PROJECT_APIVER}
+   OUTPUT_NAME FreenectDriver)
+ 
+ add_definitions(-DPROJECT_VER="${PROJECT_VER}")

libfreenect.spec

@@ -4,27 +4,25 @@
 %global __provides_exclude %{python_sitearch}/.*\.so$
 
 Name:           libfreenect
-Version:        0.6.0
-Release:        3%{?dist}
+Version:        0.6.1
+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
 License:        ASL 2.0 and (GPLv2 or ASL 2.0)
 URL:            http://www.openkinect.org/
 
-Source0:        https://github.com/OpenKinect/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+Source0:        https://github.com/OpenKinect/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 # Edit udev rule to only allow access to the device from the video group
 Patch0:         %{name}-0.5.7-videogroup.patch
 # Freenect openni driver is a plugin lib, and doesn't need soversion symlinks
-Patch1:         %{name}-0.4.1-openni2.patch
+Patch1:         %{name}-openni2.patch
 # Allow for proper libdir
 Patch3:         %{name}-0.4.2-libdir.patch
 # BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1143912
 Patch4:         secarch.patch
 # Fix the installation path for python libs
 Patch7:         %{name}-0.5.5-py3.patch
-Patch10:        libfreenect-opencv4.patch
-Patch11:        Drop-PROJECT_VER_MINOR-in-APIVER.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
@@ -100,16 +98,15 @@ OpenNI2 driver. It allows OpenNI2 to use Kinect hardware on Linux and OSX.
 It was originally a separate project but is now distributed with libfreenect.
 
 %prep
-%setup -qn %{name}-%{commit}
+%setup -qn %{name}-%{version}
 rm -rf platform/windows
 
 %patch0 -p0 -b .videogroup
-%patch1 -p0 -b .openni2
+%patch1 -p1 -b .openni2
 %patch3 -p0 -b .libdir
 %patch4 -p1 -b .secarch
 %patch7 -p1 -b .py3
-%patch10 -p1 -b .cv4
-%patch11 -p1 -b .drop
+
 
 %build
 mkdir build
@@ -191,6 +188,9 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/
 %{_libdir}/openni2
 
 %changelog
+* Mon May 25 2020 Nicolas Chauvet <kwizart@gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
 * Tue Mar 03 2020 Nicolas Chauvet <kwizart@gmail.com> - 0.6.0-3
 - Update to new ABI
 

sources

@@ -1 +1 @@
-SHA512 (libfreenect-48a5c66d98505dd187e6352c2b9aca88985486c0.tar.gz) = fad7f63774fe640f95fa3b3ffd1cef2f64576e10e84b5befd3ab97647d92f8527ef8ad344b08d73dbeac3bda71d97235ef8116c8cee45b18dbb8a96851cd5170
+SHA512 (libfreenect-0.6.1.tar.gz) = 832cf6f184b71f1a447068c3a7b745471a81ffa5e026ef9cfab9c479e26f4dcd49cb60ffde5238ba18e132c7bb4dd6b812a5b0e443bd0dbb99ea748e359a0e16