From 1bee53d925202cf5cd2ffe7c03289759e9d65088 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mar 05 2018 21:55:56 +0000 Subject: Bump to 0.5.7, disable OpenCV for now (#1551748) --- diff --git a/libfreenect-0.4.2-aarch64.patch b/libfreenect-0.4.2-aarch64.patch deleted file mode 100644 index d91ad4d..0000000 --- a/libfreenect-0.4.2-aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h.aarch64 ./OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h ---- ./OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h.aarch64 2014-05-05 18:15:56.817039757 -0400 -+++ ./OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h 2014-05-05 18:16:43.015509240 -0400 -@@ -39,7 +39,7 @@ - # include "Android-Arm/OniPlatformAndroid-Arm.h" - #elif (__linux__ && (__i386__ || __x86_64__)) - # include "Linux-x86/OniPlatformLinux-x86.h" --#elif (__linux__ && __arm__) -+#elif (__linux__ && (__arm__ || __aarch64__)) - # include "Linux-Arm/OniPlatformLinux-Arm.h" - #elif _ARC - # include "ARC/OniPlaformARC.h" diff --git a/libfreenect.spec b/libfreenect.spec index 7e89cae..d5e3e5d 100644 --- a/libfreenect.spec +++ b/libfreenect.spec @@ -1,4 +1,4 @@ -%global commit ddf092cce09ab4bc97529827a061f1a54a046a17 +%global commit 88166014859c09f6ad6a93f0862bdcc4e46dc87e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %{?filter_setup: @@ -7,8 +7,8 @@ } Name: libfreenect -Version: 0.5.5 -Release: 6%{?dist} +Version: 0.5.7 +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 @@ -18,8 +18,6 @@ URL: http://www.openkinect.org/ Source0: https://github.com/OpenKinect/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz # Freenect openni driver is a plugin lib, and doesn't need soversion symlinks Patch1: %{name}-0.4.1-openni2.patch -# Detect aarch64 -Patch2: %{name}-0.4.2-aarch64.patch # Allow for proper libdir Patch3: %{name}-0.4.2-libdir.patch # BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1143912 @@ -35,12 +33,21 @@ BuildRequires: libusb1-devel BuildRequires: libGL-devel BuildRequires: libXi-devel BuildRequires: libXmu-devel -BuildRequires: opencv-devel +# FTBFS with opencv 3.4.1: +# https://bugzilla.redhat.com/show_bug.cgi?id=1551748 +#BuildRequires: opencv-devel BuildRequires: python2-devel BuildRequires: python2-numpy BuildRequires: python3-devel BuildRequires: python3-numpy +# We had to disable build of OpenCV bindings when OpenCV went to +# 3.4.1: https://bugzilla.redhat.com/show_bug.cgi?id=1551748 +# This is to make updates work for systems which have the package +# installed. The version should *not* be bumped, if we ever get the +# bindings building again, we don't want newer versions obsoleted +Obsoletes: %{name}-opencv < 0.5.7 + Requires: udev %description @@ -75,13 +82,15 @@ and a library that can be linked to, providing an interface compatible with freenect. This allows you to save data and repeat for experiments, debug problems, share datasets, and experiment with the kinect without having one. -%package opencv -Summary: OpenCV bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +# FTBFS with opencv 3.4.1: +# https://bugzilla.redhat.com/show_bug.cgi?id=1551748 +#package opencv +#Summary: OpenCV bindings for %{name} +#Requires: %{name}%{?_isa} = %{version}-%{release} -%description opencv -The %{name}-opencv package contains the libfreenect binding -library for OpenCV development. +#description opencv +#The %{name}-opencv package contains the libfreenect binding +#library for OpenCV development. %package -n python2-%{name} Summary: Python 2 bindings for %{name} @@ -117,7 +126,6 @@ It was originally a separate project but is now distributed with libfreenect. rm -rf platform/windows %patch1 -p0 -b .openni2 -%patch2 -p0 -b .aarch64 %patch3 -p0 -b .libdir %patch4 -p1 -b .secarch %patch7 -p1 -b .py3 @@ -125,10 +133,12 @@ rm -rf platform/windows %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 \ - -DBUILD_CV=ON \ + -DBUILD_CV=OFF \ -DBUILD_REDIST_PACKAGE=ON \ -DBUILD_EXAMPLES=ON \ -DBUILD_FAKENECT=ON \ @@ -165,9 +175,11 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %postun -p /sbin/ldconfig -%post opencv -p /sbin/ldconfig +# FTBFS with opencv 3.4.1: +# https://bugzilla.redhat.com/show_bug.cgi?id=1551748 +#post opencv -p /sbin/ldconfig -%postun opencv -p /sbin/ldconfig +#postun opencv -p /sbin/ldconfig %files %license APACHE20 GPL2 @@ -180,9 +192,11 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %{_bindir}/freenect-* %{_datadir}/%{name} -%files opencv -%{_bindir}/freenect-cvdemo -%{_libdir}/libfreenect_cv.so.* +# FTBFS with opencv 3.4.1: +# https://bugzilla.redhat.com/show_bug.cgi?id=1551748 +#files opencv +#{_bindir}/freenect-cvdemo +#{_libdir}/libfreenect_cv.so.* %files devel %doc doc/html @@ -212,8 +226,9 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/ %{_libdir}/openni2 %changelog -* Mon Mar 05 2018 Adam Williamson - 0.5.5-6 -- Rebuild for opencv soname bump +* Mon Mar 05 2018 Adam Williamson - 0.5.7-1 +- Bump to 0.5.7 (bug fixes) +- Disable openCV support for now (see #1551748) * Wed Feb 07 2018 Fedora Release Engineering - 0.5.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild