Notification time stamped 2022-10-22 13:58:50 UTC
From 5ab6bcecb6c04d6e467340433401251c81635348 Mon Sep 17 00:00:00 2001 From: Rich Mattes richmattes@gmail.com Date: Mar 09 2017 00:07:17 +0000 Subject: Update to release 0.5.5
---
diff --git a/.gitignore b/.gitignore index ce10859..5666cb0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libfreenect-8d957924f8a82a235aaa44d8c455113f10c0373f.tar.bz2 /libfreenect-b2043d02b66c9c59899bbf09cb1a13206e8fa10d.tar.gz /libfreenect-baec1501c703c731f32eac2bf97c28c77b51fdd8.tar.gz +/libfreenect-ddf092cce09ab4bc97529827a061f1a54a046a17.tar.gz diff --git a/libfreenect-0.5.5-py3.patch b/libfreenect-0.5.5-py3.patch new file mode 100644 index 0000000..b9140f3 --- /dev/null +++ b/libfreenect-0.5.5-py3.patch @@ -0,0 +1,46 @@ +diff -up ./src/fwfetcher.py.py3 ./src/fwfetcher.py +--- ./src/fwfetcher.py.py3 2016-08-28 09:54:21.000000000 -0400 ++++ ./src/fwfetcher.py 2016-12-29 16:52:00.569437210 -0500 +@@ -1,5 +1,3 @@ +-#!/usr/bin/env python2 +- + from __future__ import absolute_import, division, print_function + + import hashlib +@@ -10,10 +8,10 @@ import sys + import time + import zipfile + +-try: ++if sys.version_info[0] > 2: + # Python 3 + from urllib.request import Request, URLError, urlopen +-except ImportError: ++else: + # Python 2 + from urllib2 import Request, URLError, urlopen + +diff -up ./wrappers/python/CMakeLists.txt.py3 ./wrappers/python/CMakeLists.txt +--- ./wrappers/python/CMakeLists.txt.py3 2016-08-28 09:54:21.000000000 -0400 ++++ ./wrappers/python/CMakeLists.txt 2016-12-29 16:49:58.970814941 -0500 +@@ -50,7 +50,7 @@ endif() + # Figure out installation path + execute_process(COMMAND + ${PYTHON${Python_BUILD_VERSION}_EXECUTABLE} +- -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}'))" ++ -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" + OUTPUT_VARIABLE PYTHON${Python_BUILD_VERSION}_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + + # Figure out numpy include path +@@ -84,7 +84,10 @@ target_include_directories(cython${Pytho + + # Install the extension + install(TARGETS cython${Python_BUILD_VERSION}_freenect +- DESTINATION ${PYTHON${Python_BUILD_VERSION}_SITE_PACKAGES}) ++ DESTINATION ${PYTHON${Python_BUILD_VERSION}_SITE_PACKAGES} ++ ARCHIVE DESTINATION ${PYTHON${Python_BUILD_VERSION}_SITE_PACKAGES} ++ LIBRARY DESTINATION ${PYTHON${Python_BUILD_VERSION}_SITE_PACKAGES} ++ ) + + # TODO: decide on what to do with demo_ scripts and were to install + # them diff --git a/libfreenect.spec b/libfreenect.spec index 35f1492..ae8468e 100644 --- a/libfreenect.spec +++ b/libfreenect.spec @@ -1,4 +1,4 @@ -%global commit baec1501c703c731f32eac2bf97c28c77b51fdd8 +%global commit ddf092cce09ab4bc97529827a061f1a54a046a17 %global shortcommit %(c=%{commit}; echo ${c:0:7})
%{?filter_setup: @@ -7,15 +7,15 @@ }
Name: libfreenect -Version: 0.5.3 -Release: 5%{?dist} +Version: 0.5.5 +Release: 1%{?dist} Summary: Device driver for the Kinect -License: GPLv2+ or ASL 2.0 +# 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/%%7Bname%7D/archive/%%7Bcommit%7D/%%7Bname%7D-... -# Fix python installation path discovery -Patch0: %{name}-0.5.2-cmake30.patch # Freenect openni driver is a plugin lib, and doesn't need soversion symlinks Patch1: %{name}-0.4.1-openni2.patch # Detect aarch64 @@ -24,10 +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 -# Fix const/constexpr usage for c++11 -Patch6: %{name}-0.5.3-cpp11.patch +# Fix the installation path for python libs +Patch7: %{name}-0.5.5-py3.patch
BuildRequires: cmake BuildRequires: Cython @@ -37,9 +35,11 @@ BuildRequires: libusb1-devel BuildRequires: libGL-devel BuildRequires: libXi-devel BuildRequires: libXmu-devel -BuildRequires: numpy BuildRequires: opencv-devel -BuildRequires: python-devel +BuildRequires: python2-devel +BuildRequires: python2-numpy +BuildRequires: python3-devel +BuildRequires: python3-numpy
Requires: udev
@@ -83,13 +83,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-opencv package contains the libfreenect binding library for OpenCV development.
-%package python -Summary: Python bindings for %{name} +%package -n python2-%{name} +Summary: Python 2 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: numpy +Requires: python2-numpy +# Until F28 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python%{?_isa} < 0.5.5 +%{?python_provide:%python_provide python2-%{name}}
-%description python -The %{name}-python package contains python bindings for %{name} +%description -n python2-%{name} +The %{name}-python package contains python 2 bindings for %{name} + +%package -n python3-%{name} +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}
%package openni Summary: OpenNI2 driver for the Kinect @@ -102,15 +115,12 @@ It was originally a separate project but is now distributed with libfreenect. %prep %setup -qn %{name}-%{commit} rm -rf platform/windows -%patch0 -p0 -b .cmake30 + %patch1 -p0 -b .openni2 %patch2 -p0 -b .aarch64 %patch3 -p0 -b .libdir %patch4 -p1 -b .secarch -%patch5 -p0 -b .noabort -%if 0%{fedora} > 23 -%patch6 -p0 -b .cpp11 -%endif +%patch7 -p1 -b .py3
%build mkdir build @@ -123,7 +133,7 @@ pushd build -DBUILD_EXAMPLES=ON \ -DBUILD_FAKENECT=ON \ -DBUILD_PYTHON=ON \ - -DBUILD_OPENNI2_DRIVER=ON + -DBUILD_OPENNI2_DRIVER=ON
make %{?_smp_mflags} VERBOSE=1 popd @@ -147,8 +157,6 @@ 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} -# Get rid of the hashbang in the fwfetcher song -sed -i "s|#!/usr/bin/env python||" %{buildroot}%{_datadir}/%{name}/fwfetcher.py
# Move openni plugin: rhbz#1094787 mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/Drivers @@ -162,7 +170,8 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %postun opencv -p /sbin/ldconfig
%files -%doc APACHE20 GPL2 README.md CONTRIB +%license APACHE20 GPL2 +%doc README.md CONTRIB /lib/udev/rules.d/* %{_libdir}/libfreenect.so.* %{_libdir}/libfreenect_sync.so.* @@ -186,8 +195,11 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %files static %{_libdir}/*.a
-%files python -%{python_sitearch}/*.so +%files -n python2-%{name} +%{python2_sitearch}/*.so + +%files -n python3-%{name} +%{python3_sitearch}/*.so
%files fakenect %dir %{_libdir}/fakenect @@ -200,6 +212,9 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %{_libdir}/openni2
%changelog +* Wed Mar 08 2017 Rich Mattes richmattes@gmail.com - 0.5.5-1 +- Update to release 0.5.5 + * Fri Feb 10 2017 Fedora Release Engineering releng@fedoraproject.org - 0.5.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources index c1bfb3c..3db66b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eccbee8ff4e4d3c0487705d201774053 libfreenect-baec1501c703c731f32eac2bf97c28c77b51fdd8.tar.gz +SHA512 (libfreenect-ddf092cce09ab4bc97529827a061f1a54a046a17.tar.gz) = 8f2f5e1b1efd44b44784f58a7551c5fc49b81f0fb6b47688c2bcdc4e9ef3cf87cda7d94f8bdb4354eb486c761f268833e2f06d80be38cd66fe7135acb2f80847
https://src.fedoraproject.org/rpms/libfreenect/c/5ab6bcecb6c04d6e46734043340...
scm-commits@lists.fedoraproject.org