diff --git a/0001-Build-libfreenect_cv-and-cvdemo-as-C-sources.patch b/0001-Build-libfreenect_cv-and-cvdemo-as-C-sources.patch new file mode 100644 index 0000000..73e9583 --- /dev/null +++ b/0001-Build-libfreenect_cv-and-cvdemo-as-C-sources.patch @@ -0,0 +1,66 @@ +From 9e98a0b11fddeabab6ef5e0915b96c950597e53e Mon Sep 17 00:00:00 2001 +From: Rich Mattes +Date: Sat, 26 May 2018 16:11:11 -0400 +Subject: [PATCH 1/2] Build libfreenect_cv and cvdemo as C++ sources + +Signed-off-by: Rich Mattes +--- + wrappers/opencv/CMakeLists.txt | 4 ++-- + wrappers/opencv/{cvdemo.c => cvdemo.cpp} | 0 + wrappers/opencv/{libfreenect_cv.c => libfreenect_cv.cpp} | 0 + wrappers/opencv/libfreenect_cv.h | 4 ++-- + 4 files changed, 4 insertions(+), 4 deletions(-) + rename wrappers/opencv/{cvdemo.c => cvdemo.cpp} (100%) + rename wrappers/opencv/{libfreenect_cv.c => libfreenect_cv.cpp} (100%) + +diff --git a/wrappers/opencv/CMakeLists.txt b/wrappers/opencv/CMakeLists.txt +index 0239075..bc5df19 100644 +--- a/wrappers/opencv/CMakeLists.txt ++++ b/wrappers/opencv/CMakeLists.txt +@@ -2,7 +2,7 @@ + # OpenCV Interface + ###################################################################################### + find_package(OpenCV REQUIRED) +-add_library (freenect_cv SHARED libfreenect_cv.c) ++add_library (freenect_cv SHARED libfreenect_cv.cpp) + set_target_properties (freenect_cv PROPERTIES + VERSION ${PROJECT_VER} + SOVERSION ${PROJECT_APIVER}) +@@ -16,7 +16,7 @@ install (TARGETS freenect_cv + install (FILES "libfreenect_cv.h" + DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR}) + +-add_executable(freenect-cvdemo cvdemo.c) ++add_executable(freenect-cvdemo cvdemo.cpp) + target_link_libraries(freenect-cvdemo freenect freenect_sync freenect_cv ${OpenCV_LIBS}) + install (TARGETS freenect-cvdemo + DESTINATION bin) +diff --git a/wrappers/opencv/cvdemo.c b/wrappers/opencv/cvdemo.cpp +similarity index 100% +rename from wrappers/opencv/cvdemo.c +rename to wrappers/opencv/cvdemo.cpp +diff --git a/wrappers/opencv/libfreenect_cv.c b/wrappers/opencv/libfreenect_cv.cpp +similarity index 100% +rename from wrappers/opencv/libfreenect_cv.c +rename to wrappers/opencv/libfreenect_cv.cpp +diff --git a/wrappers/opencv/libfreenect_cv.h b/wrappers/opencv/libfreenect_cv.h +index b73b60c..55e3582 100644 +--- a/wrappers/opencv/libfreenect_cv.h ++++ b/wrappers/opencv/libfreenect_cv.h +@@ -1,11 +1,11 @@ + #pragma once + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif + +-#include +- + IplImage *freenect_sync_get_depth_cv(int index); + IplImage *freenect_sync_get_rgb_cv(int index); + +-- +2.17.0 + diff --git a/0002-Fix-bugs-in-sync-library-error-handling.patch b/0002-Fix-bugs-in-sync-library-error-handling.patch new file mode 100644 index 0000000..f437b6b --- /dev/null +++ b/0002-Fix-bugs-in-sync-library-error-handling.patch @@ -0,0 +1,51 @@ +From db0e1825ff93133f3ca5735524d78279ede824db Mon Sep 17 00:00:00 2001 +From: Rich Mattes +Date: Sat, 26 May 2018 16:14:01 -0400 +Subject: [PATCH 2/2] Fix bugs in sync library error handling + +fnusb_open_subdevices checked for camera==NULL or res < 0 before +jumping to the failure case. If camera was NULL but res was not +0, the function would return 0 indicating success. This occurs +when a kinect is not plugged into the PC. Forcing res to be +negative when the camera == NULL case allows the failure to open +a device to propagate through an application. + +alloc_kinect in freenect_sync has a check for if freenect_open_device +fails, but the logic is incorrect. freenect_open_device returns 0 on +success and < 0 on error, so adding a check to see if the return is +< 0 corrects detection of the failure case. + +Signed-off-by: Rich Mattes +--- + src/usb_libusb10.c | 1 + + wrappers/c_sync/libfreenect_sync.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/usb_libusb10.c b/src/usb_libusb10.c +index 11de86a..614aeee 100644 +--- a/src/usb_libusb10.c ++++ b/src/usb_libusb10.c +@@ -465,6 +465,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index) + } + + if (res < 0 || camera == NULL) { ++ res = -1; + goto failure; + } + +diff --git a/wrappers/c_sync/libfreenect_sync.c b/wrappers/c_sync/libfreenect_sync.c +index 1b2e049..26a2261 100644 +--- a/wrappers/c_sync/libfreenect_sync.c ++++ b/wrappers/c_sync/libfreenect_sync.c +@@ -249,7 +249,7 @@ static int change_depth_format(sync_kinect_t *kinect, freenect_resolution res, f + static sync_kinect_t *alloc_kinect(int index) + { + sync_kinect_t *kinect = (sync_kinect_t*)malloc(sizeof(sync_kinect_t)); +- if (freenect_open_device(ctx, &kinect->dev, index)) { ++ if (freenect_open_device(ctx, &kinect->dev, index) < 0) { + free(kinect); + return NULL; + } +-- +2.17.0 + diff --git a/libfreenect-0.5.2-cmake30.patch b/libfreenect-0.5.2-cmake30.patch new file mode 100644 index 0000000..fa4f9ed --- /dev/null +++ b/libfreenect-0.5.2-cmake30.patch @@ -0,0 +1,43 @@ +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 2016-02-21 11:19:40.995391145 -0500 +@@ -2,19 +2,18 @@ + # Python extension builder + ###################################################################################### + +-include(FindPythonInterp) +-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))" + OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + + # Figure out numpy include path + 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 +- DESTINATION ${PYTHON_SITE_PACKAGES}) ++ ARCHIVE DESTINATION ${PYTHON_SITE_PACKAGES} ++ LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES} ++ COMPONENT library) + + # TODO: decide on what to do with demo_ scripts and were to install + # them diff --git a/libfreenect-0.5.3-cpp11.patch b/libfreenect-0.5.3-cpp11.patch new file mode 100644 index 0000000..b20069b --- /dev/null +++ b/libfreenect-0.5.3-cpp11.patch @@ -0,0 +1,43 @@ +diff -up ./OpenNI2-FreenectDriver/src/ColorStream.hpp.cpp11 ./OpenNI2-FreenectDriver/src/ColorStream.hpp +--- ./OpenNI2-FreenectDriver/src/ColorStream.hpp.cpp11 2016-02-21 12:18:01.412029788 -0500 ++++ ./OpenNI2-FreenectDriver/src/ColorStream.hpp 2016-02-21 12:18:21.272807345 -0500 +@@ -13,9 +13,9 @@ namespace FreenectDriver + { + public: + // from NUI library & converted to radians +- static const float DIAGONAL_FOV = 73.9 * (M_PI / 180); +- static const float HORIZONTAL_FOV = 62 * (M_PI / 180); +- static const float VERTICAL_FOV = 48.6 * (M_PI / 180); ++ static constexpr float DIAGONAL_FOV = 73.9 * (M_PI / 180); ++ static constexpr float HORIZONTAL_FOV = 62 * (M_PI / 180); ++ static constexpr float VERTICAL_FOV = 48.6 * (M_PI / 180); + + private: + typedef std::map< OniVideoMode, std::pair > FreenectVideoModeMap; +diff -up ./OpenNI2-FreenectDriver/src/DepthStream.hpp.cpp11 ./OpenNI2-FreenectDriver/src/DepthStream.hpp +--- ./OpenNI2-FreenectDriver/src/DepthStream.hpp.cpp11 2016-02-21 12:22:59.048682374 -0500 ++++ ./OpenNI2-FreenectDriver/src/DepthStream.hpp 2016-02-21 12:23:27.387791861 -0500 +@@ -17,9 +17,9 @@ namespace FreenectDriver + { + public: + // from NUI library and converted to radians +- static const float DIAGONAL_FOV = 70 * (M_PI / 180); +- static const float HORIZONTAL_FOV = 58.5 * (M_PI / 180); +- static const float VERTICAL_FOV = 45.6 * (M_PI / 180); ++ static constexpr float DIAGONAL_FOV = 70 * (M_PI / 180); ++ static constexpr float HORIZONTAL_FOV = 58.5 * (M_PI / 180); ++ static constexpr float VERTICAL_FOV = 45.6 * (M_PI / 180); + // from DepthKinectStream.cpp + static const int MAX_VALUE = 10000; + static const unsigned long long GAIN_VAL = 42; +@@ -28,8 +28,8 @@ namespace FreenectDriver + static const unsigned long long PARAM_COEFF_VAL = 4; + static const unsigned long long SHIFT_SCALE_VAL = 10; + static const unsigned long long ZERO_PLANE_DISTANCE_VAL = 120; +- static const double ZERO_PLANE_PIXEL_SIZE_VAL = 0.10520000010728836; +- static const double EMITTER_DCMOS_DISTANCE_VAL = 7.5; ++ static constexpr double ZERO_PLANE_PIXEL_SIZE_VAL = 0.10520000010728836; ++ static constexpr double EMITTER_DCMOS_DISTANCE_VAL = 7.5; + + private: + typedef std::map< OniVideoMode, std::pair > FreenectDepthModeMap; 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(0); ++ try { ++ device = &freenect.createDevice(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-0.7.0-cython3.patch b/libfreenect-0.7.0-cython3.patch new file mode 100644 index 0000000..99bdb67 --- /dev/null +++ b/libfreenect-0.7.0-cython3.patch @@ -0,0 +1,21 @@ +diff -up ./wrappers/python/freenect.pyx.cython3 ./wrappers/python/freenect.pyx +--- ./wrappers/python/freenect.pyx.cython3 2023-08-07 20:46:10.771514185 -0400 ++++ ./wrappers/python/freenect.pyx 2023-08-07 20:54:34.791037845 -0400 +@@ -322,7 +322,7 @@ cpdef open_device(CtxPtr ctx, int index) + + _depth_cb, _video_cb = None, None + +-cdef void depth_cb(freenect_device *dev, void *data, uint32_t timestamp) with gil: ++cdef void depth_cb(freenect_device *dev, void *data, uint32_t timestamp) noexcept with gil: + cdef freenect_frame_mode mode = freenect_get_current_depth_mode(dev) + if not mode.is_valid: + return +@@ -333,7 +333,7 @@ cdef void depth_cb(freenect_device *dev, + pydata = _depth_cb_np(data, &mode) + _depth_cb(dev_out, pydata, timestamp) + +-cdef void video_cb(freenect_device *dev, void *data, uint32_t timestamp) with gil: ++cdef void video_cb(freenect_device *dev, void *data, uint32_t timestamp) noexcept with gil: + cdef freenect_frame_mode mode = freenect_get_current_video_mode(dev) + if not mode.is_valid: + return diff --git a/libfreenect-0.7.5-py3.patch b/libfreenect-0.7.0-py3.patch similarity index 63% rename from libfreenect-0.7.5-py3.patch rename to libfreenect-0.7.0-py3.patch index e938de1..104ef06 100644 --- a/libfreenect-0.7.5-py3.patch +++ b/libfreenect-0.7.0-py3.patch @@ -1,13 +1,13 @@ -diff -up libfreenect-0.7.5/src/fwfetcher.py.py3 libfreenect-0.7.5/src/fwfetcher.py ---- libfreenect-0.7.5/src/fwfetcher.py.py3 2024-01-06 17:57:12.000000000 +0100 -+++ libfreenect-0.7.5/src/fwfetcher.py 2025-11-25 00:20:24.085725755 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - +diff -up ./src/fwfetcher.py.py3 ./src/fwfetcher.py +--- ./src/fwfetcher.py.py3 2023-04-03 17:59:43.000000000 -0400 ++++ ./src/fwfetcher.py 2023-07-13 21:54:27.641914564 -0400 +@@ -1,5 +1,3 @@ +-#!/usr/bin/env python2 +- from __future__ import absolute_import, division, print_function -@@ -10,10 +10,10 @@ import sys + import hashlib +@@ -10,10 +8,10 @@ import sys import time import zipfile @@ -20,9 +20,9 @@ diff -up libfreenect-0.7.5/src/fwfetcher.py.py3 libfreenect-0.7.5/src/fwfetcher. # Python 2 from urllib2 import Request, URLError, urlopen -diff -up libfreenect-0.7.5/wrappers/python/CMakeLists.txt.py3 libfreenect-0.7.5/wrappers/python/CMakeLists.txt ---- libfreenect-0.7.5/wrappers/python/CMakeLists.txt.py3 2024-01-06 17:57:12.000000000 +0100 -+++ libfreenect-0.7.5/wrappers/python/CMakeLists.txt 2025-11-11 09:48:50.045686564 +0100 +diff -up ./wrappers/python/CMakeLists.txt.py3 ./wrappers/python/CMakeLists.txt +--- ./wrappers/python/CMakeLists.txt.py3 2023-04-03 17:59:43.000000000 -0400 ++++ ./wrappers/python/CMakeLists.txt 2023-07-13 21:56:32.387653639 -0400 @@ -19,10 +19,7 @@ find_program(CYTHON_EXECUTABLE cython) # Figure out installation path @@ -35,7 +35,7 @@ diff -up libfreenect-0.7.5/wrappers/python/CMakeLists.txt.py3 libfreenect-0.7.5/ # Figure out numpy include path # todo: CMake >= 3.14 populates this var automatically when using COMPONENTS NumPy -@@ -73,7 +70,10 @@ target_include_directories(cython${Pytho +@@ -56,7 +53,10 @@ target_include_directories(cython${Pytho # Install the extension install(TARGETS cython${Python_BUILD_VERSION}_freenect @@ -47,9 +47,9 @@ diff -up libfreenect-0.7.5/wrappers/python/CMakeLists.txt.py3 libfreenect-0.7.5/ # TODO: decide on what to do with demo_ scripts and were to install # them -diff -up libfreenect-0.7.5/wrappers/python/setup.py.py3 libfreenect-0.7.5/wrappers/python/setup.py ---- libfreenect-0.7.5/wrappers/python/setup.py.py3 2024-01-06 17:57:12.000000000 +0100 -+++ libfreenect-0.7.5/wrappers/python/setup.py 2025-11-11 09:48:50.045794539 +0100 +diff -up ./wrappers/python/setup.py.py3 ./wrappers/python/setup.py +--- ./wrappers/python/setup.py.py3 2023-07-13 21:56:42.085711096 -0400 ++++ ./wrappers/python/setup.py 2023-07-13 21:56:56.680797569 -0400 @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup diff --git a/libfreenect-0.7.5-notimestamp.patch b/libfreenect-0.7.5-notimestamp.patch deleted file mode 100644 index 54b6a6b..0000000 --- a/libfreenect-0.7.5-notimestamp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libfreenect-0.7.5/doc/Doxyfile.tstamp libfreenect-0.7.5/doc/Doxyfile ---- libfreenect-0.7.5/doc/Doxyfile.tstamp 2024-01-06 17:57:12.000000000 +0100 -+++ libfreenect-0.7.5/doc/Doxyfile 2025-11-24 23:51:39.844958326 +0100 -@@ -875,7 +875,7 @@ HTML_COLORSTYLE_GAMMA = 80 - # page will contain the date and time when the page was generated. Setting - # this to NO can help when comparing the output of multiple runs. - --HTML_TIMESTAMP = YES -+HTML_TIMESTAMP = NO - - # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, - # files or namespaces will be aligned in HTML using tables. If set to diff --git a/libfreenect-c99.patch b/libfreenect-c99.patch new file mode 100644 index 0000000..ca11ee5 --- /dev/null +++ b/libfreenect-c99.patch @@ -0,0 +1,31 @@ + Use the recommended way to integrate Cython and NumPy + +This follows the example code in +. + +The previous version results in an int-conversion error with current +compilers. + +Submitted upstream: + +diff --git a/wrappers/python/freenect.pyx b/wrappers/python/freenect.pyx +index 5bda18b42e8243e5..f69483d4b9592daa 100644 +--- a/wrappers/python/freenect.pyx ++++ b/wrappers/python/freenect.pyx +@@ -27,7 +27,6 @@ import numpy as np + cimport numpy as npc + + cdef extern from "numpy/arrayobject.h": +- void import_array() + cdef object PyArray_SimpleNewFromData(int nd, npc.npy_intp *dims, + int typenum, void *data) + +@@ -455,7 +454,7 @@ def base_runloop(CtxPtr ctx, body=None): + except Kill: + pass + +-import_array() ++npc.import_array() + + cdef object _depth_cb_np(void *data, freenect_frame_mode *mode): + cdef npc.npy_intp dims[2] diff --git a/libfreenect.spec b/libfreenect.spec index d3aa0e9..3e082cf 100644 --- a/libfreenect.spec +++ b/libfreenect.spec @@ -1,13 +1,14 @@ +%global __provides_exclude %{python3_sitearch}/.*\.so$ + Name: libfreenect -Version: 0.7.5 -Release: 4%{?dist} +Version: 0.7.0 +Release: 8%{?dist} Summary: Device driver for the Kinect # Core libfreenect is available as Apache-2.0 OR GPL-2.0-only +# # OpenNI driver is available as Apache-2.0 -# fakenect/parson.{c,h} is MIT -# fwfetcher.py is BSD-2-Clause -License: Apache-2.0 AND (GPL-2.0-only OR Apache-2.0) AND MIT AND BSD-2-Clause -URL: https://github.com/OpenKinect/ +License: Apache-2.0 AND (GPL-2.0-only OR Apache-2.0) +URL: http://www.openkinect.org/ 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 @@ -19,12 +20,10 @@ 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 -Patch5: %{name}-0.7.5-py3.patch -# Avoid timestamps in generated docs -Patch6: %{name}-0.7.5-notimestamp.patch - -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} +Patch5: %{name}-0.7.0-py3.patch +# Fix for cython3 +Patch6: %{name}-0.7.0-cython3.patch +Patch7: libfreenect-c99.patch BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -65,8 +64,6 @@ developing applications that use %{name}. %package fakenect Summary: Library to play back recorded data for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -# upstream commit f1bb6e7fbe347754fbfc4613bf43000ef0b0c2b2 -Provides: bundled(parson) %description fakenect Fakenect consists of a "record" program to save dumps from the kinect sensor @@ -86,6 +83,7 @@ library for OpenCV development. Summary: Python 3 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python3-numpy +%{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} The %{name}-python package contains python 3 bindings for %{name} @@ -99,18 +97,19 @@ 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 -q -rm -rv platform/windows +%setup -qn %{name}-%{version} +rm -rf platform/windows %patch -P 0 -p0 -b .videogroup %patch -P 1 -p1 -b .openni2 %patch -P 3 -p0 -b .libdir %patch -P 4 -p1 -b .secarch %patch -P 5 -p1 -b .py3 -%patch -P 6 -p1 -b .tstamp +%patch -P 6 -p1 -b .cython3 +%patch -P 7 -p1 %build -%cmake \ +%cmake3 \ -DBUILD_AUDIO=ON \ -DBUILD_C_SYNC=ON \ -DBUILD_CV=ON \ @@ -122,27 +121,26 @@ rm -rv platform/windows -DBUILD_PYTHON3=ON \ -DBUILD_OPENNI2_DRIVER=ON -%cmake_build +%cmake3_build pushd doc doxygen Doxyfile popd %install -%cmake_install +%cmake3_install # Install the kinect udev rule -mkdir -p %{buildroot}%{_udevrulesdir} +mkdir -p %{buildroot}/lib/udev/rules.d mkdir -p %{buildroot}%{_libdir}/openni2 -install -p -m 0644 platform/linux/udev/51-kinect.rules %{buildroot}%{_udevrulesdir} +install -p -m 0644 platform/linux/udev/51-kinect.rules %{buildroot}/lib/udev/rules.d # Delete libtool archives find %{buildroot} -name '*.la' -exec rm -f {} ';' # Move the fwfetcher script to the correct datadir mkdir -p %{buildroot}%{_datadir}/%{name} -mv %{buildroot}%{_datadir}/fwfetcher.py %{buildroot}%{_datadir}/%{name} -chmod +x %{buildroot}%{_datadir}/%{name}/fwfetcher.py +mv %{buildroot}%{_datadir}/fwfetcher.py %{buildroot}%{_datadir}/%{name} # Move openni plugin: rhbz#1094787 mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/Drivers @@ -150,100 +148,43 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %files %license APACHE20 GPL2 %doc README.md CONTRIB -%{_udevrulesdir}/51-kinect.rules -%{_libdir}/libfreenect.so.0{,.*} -%{_libdir}/libfreenect_sync.so.0{,.*} -%{_bindir}/freenect-camtest -%{_bindir}/freenect-chunkview -%{_bindir}/freenect-cpp_pcview -%{_bindir}/freenect-cppview -%{_bindir}/freenect-glpclview -%{_bindir}/freenect-glview -%{_bindir}/freenect-hiview -%{_bindir}/freenect-micview -%{_bindir}/freenect-regtest -%{_bindir}/freenect-regview -%{_bindir}/freenect-tiltdemo -%{_bindir}/freenect-wavrecord +/lib/udev/rules.d/* +%{_libdir}/libfreenect.so.0* +%{_libdir}/libfreenect_sync.so.0* +%exclude %{_bindir}/freenect-cvdemo +%exclude %{_bindir}/fakenect +%{_bindir}/freenect-* %{_datadir}/%{name} %files opencv %{_bindir}/freenect-cvdemo -%{_libdir}/libfreenect_cv.so.0{,.*} +%{_libdir}/libfreenect_cv.so.* %files devel %doc doc/html %doc examples/*.c wrappers/cpp/cppview.cpp %{_includedir}/libfreenect -%{_libdir}/libfreenect.so -%{_libdir}/libfreenect_cv.so -%{_libdir}/libfreenect_sync.so -%{_libdir}/pkgconfig/libfreenect.pc -%{_libdir}/fakenect/libfakenect.so +%{_libdir}/*.so +%{_libdir}/pkgconfig/* +%{_libdir}/fakenect/*.so %files static -%{_libdir}/libfreenect.a -%{_libdir}/libfreenect_sync.a +%{_libdir}/*.a %files -n python3-%{name} -%{python3_sitearch}/freenect.so +%{python3_sitearch}/*.so %files fakenect %dir %{_libdir}/fakenect %{_bindir}/fakenect-record -%{_libdir}/fakenect/libfakenect.so.0{,.*} +%{_libdir}/fakenect/*.so.* %{_bindir}/fakenect -%{_mandir}/man1/fakenect-record.1.* -%{_mandir}/man1/fakenect.1.* +%{_mandir}/man1/fakenect*1.* %files openni -%license APACHE20 GPL2 %{_libdir}/openni2 %changelog -* Fri Jan 02 2026 Marcin Juszkiewicz - 0.7.5-4 -- Add OpenNI2 driver on riscv64 - -* Wed Dec 10 2025 Nicolas Chauvet - 0.7.5-3 -- Rebuilt for OpenCV-4.12 - -* Mon Nov 24 2025 Dominik Mierzejewski - 0.7.5-2 -- fixed duplicate files warning -- made file lists more explicit -- corrected License tag -- added missing Provides: for bundled parson -- added executable bit to fwfetcher.py script and fixed shebang -- avoid timestamps in generated docs for reproducibility - -* Tue Nov 11 2025 Dominik Mierzejewski - 0.7.5-1 -- Updated to 0.7.5 -- Dropped obsolete patches -- Updated URL - -* Thu Jul 24 2025 Fedora Release Engineering - 0.7.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed Jun 04 2025 Python Maint - 0.7.0-15 -- Rebuilt for Python 3.14 - -* Tue Feb 04 2025 Sérgio Basto - 0.7.0-14 -- Rebuild for opencv-4.11.0 - -* Fri Jan 17 2025 Fedora Release Engineering - 0.7.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Dec 24 2024 Orion Poplawski - 0.7.0-12 -- Rebuild with numpy 2.x (rhbz#2333776) - -* Thu Jul 25 2024 Sérgio Basto - 0.7.0-11 -- Rebuild for opencv 4.10.0 - -* Thu Jul 18 2024 Fedora Release Engineering - 0.7.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Jun 09 2024 Python Maint - 0.7.0-9 -- Rebuilt for Python 3.13 - * Mon Feb 05 2024 Sérgio Basto - 0.7.0-8 - Rebuild for opencv 4.9.0 diff --git a/secarch.patch b/secarch.patch index 4bdca1e..0c7308f 100644 --- a/secarch.patch +++ b/secarch.patch @@ -1,7 +1,6 @@ -Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h -=================================================================== ---- /dev/null -+++ libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h +diff -urN libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h +--- libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h 1970-01-01 01:00:00.000000000 +0100 ++++ libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h 2014-09-18 11:54:01.405363509 +0200 @@ -0,0 +1,41 @@ +/***************************************************************************** +* * @@ -44,10 +43,9 @@ Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33 + +#endif //_ONI_PLATFORM_LINUX_PPC_H_ + -Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h -=================================================================== ---- /dev/null -+++ libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h +diff -urN libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h +--- libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h 1970-01-01 01:00:00.000000000 +0100 ++++ libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h 2014-09-18 11:55:06.169556389 +0200 @@ -0,0 +1,42 @@ +/***************************************************************************** +* * @@ -91,10 +89,9 @@ Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33 + +#endif //_ONI_PLATFORM_LINUX_s390_H_ + -Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h -=================================================================== ---- libfreenect-0.7.5.orig/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h -+++ libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h +diff -urN libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h +--- libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h 2014-09-18 11:51:35.428923550 +0200 ++++ libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h 2014-09-18 11:52:50.242149667 +0200 @@ -27,6 +27,8 @@ #define ONI_PLATFORM_LINUX_ARM 3 #define ONI_PLATFORM_MACOSX 4 @@ -104,57 +101,14 @@ Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33 #if (defined _WIN32) # ifndef RC_INVOKED -@@ -41,6 +43,12 @@ +@@ -41,6 +43,10 @@ # include "Linux-x86/OniPlatformLinux-x86.h" #elif (__linux__ && (__arm__ || __aarch64__)) # include "Linux-Arm/OniPlatformLinux-Arm.h" +#elif (__linux__ && (__powerpc__ || __powerpc64__)) +# include "Linux-ppc/OniPlatformLinux-PPC.h" -+#elif (__linux__ && (__riscv)) -+# include "Linux-riscv/OniPlatformLinux-RISCV.h" +#elif (__linux__ && (__s390__ || __s390x__ )) +# include "Linux-s390/OniPlatformLinux-s390.h" #elif _ARC # include "ARC/OniPlaformARC.h" #elif (__APPLE__) -Index: libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-riscv/OniPlatformLinux-RISCV.h -=================================================================== ---- /dev/null -+++ libfreenect-0.7.5/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-riscv/OniPlatformLinux-RISCV.h -@@ -0,0 +1,36 @@ -+/***************************************************************************** -+* * -+* OpenNI 2.x Alpha * -+* Copyright (C) 2012 PrimeSense Ltd. * -+* * -+* This file is part of OpenNI. * -+* * -+* Licensed under the Apache License, Version 2.0 (the "License"); * -+* you may not use this file except in compliance with the License. * -+* You may obtain a copy of the License at * -+* * -+* http://www.apache.org/licenses/LICENSE-2.0 * -+* * -+* Unless required by applicable law or agreed to in writing, software * -+* distributed under the License is distributed on an "AS IS" BASIS, * -+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * -+* See the License for the specific language governing permissions and * -+* limitations under the License. * -+* * -+*****************************************************************************/ -+#ifndef _ONI_PLATFORM_LINUX_RISCV_H_ -+#define _ONI_PLATFORM_LINUX_RISCV_H_ -+ -+// Start with Linux-x86, and override what's different -+#include "../Linux-x86/OniPlatformLinux-x86.h" -+ -+//--------------------------------------------------------------------------- -+// Platform Basic Definition -+//--------------------------------------------------------------------------- -+#undef ONI_PLATFORM -+#undef ONI_PLATFORM_STRING -+#define ONI_PLATFORM ONI_PLATFORM_LINUX_RISCV -+#define ONI_PLATFORM_STRING "Linux-RISCV" -+ -+#endif //_ONI_PLATFORM_LINUX_RISCV_H_ -+ diff --git a/sources b/sources index 4bba409..4b8b72a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfreenect-0.7.5.tar.gz) = 6ba9ba632d9021b84a8c137837226fadc6e0e091cf89bf092e8ee805610c227c31da95b50c05d5882357cb80d7e4275693d13d1511eb2eb45f15ffffc2d549bf +SHA512 (libfreenect-0.7.0.tar.gz) = ed5dc4e6493afd3ff26e122c36cc7c9e366bd3e243db4b27552b1d07d0a3dc1330ab41f27114c1d9ff2a311113f5eff8a513504567b8322cb85ea29b19f773c4