New upstream 0.6.4

This commit is contained in:
Phil Wyett 2022-09-24 06:38:30 +01:00
commit 2f8a148d04
3 changed files with 7 additions and 69 deletions

View file

@ -1,58 +0,0 @@
--- wrappers/cpp/CMakeLists.txt.orig 2022-01-26 21:08:55.022364517 +0000
+++ wrappers/cpp/CMakeLists.txt 2022-01-26 21:09:55.781482241 +0000
@@ -6,6 +6,7 @@
if (BUILD_EXAMPLES)
set(THREADS_USE_PTHREADS_WIN32 true)
find_package(Threads)
+ set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL)
find_package(GLUT)
@@ -18,8 +19,8 @@
target_compile_features(freenect-cppview PUBLIC cxx_std_11)
target_compile_features(freenect-cpp_pcview PUBLIC cxx_std_11)
- target_link_libraries(freenect-cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
- target_link_libraries(freenect-cpp_pcview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-cpp_pcview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
install(TARGETS freenect-cppview freenect-cpp_pcview
DESTINATION bin)
--- examples/CMakeLists.txt.orig 2022-01-26 20:51:31.842178661 +0000
+++ examples/CMakeLists.txt 2022-01-26 21:15:39.575806682 +0000
@@ -13,6 +13,7 @@
# Most viewers need pthreads and GLUT.
set(THREADS_USE_PTHREADS_WIN32 true)
find_package(Threads)
+set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL)
find_package(GLUT)
@@ -25,11 +26,11 @@
add_executable(freenect-chunkview chunkview.c)
add_executable(freenect-micview micview.c)
- target_link_libraries(freenect-glview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
- target_link_libraries(freenect-regview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
- target_link_libraries(freenect-hiview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
- target_link_libraries(freenect-chunkview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
- target_link_libraries(freenect-micview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-glview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-regview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-hiview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-chunkview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ target_link_libraries(freenect-micview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
install(TARGETS freenect-glview freenect-regview freenect-hiview freenect-chunkview freenect-micview
DESTINATION bin)
@@ -51,7 +52,7 @@
if (OPENGL_FOUND AND GLUT_FOUND)
include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
add_executable(freenect-glpclview glpclview.c)
- target_link_libraries(freenect-glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${MATH_LIB})
+ target_link_libraries(freenect-glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${MATH_LIB})
install(TARGETS freenect-glpclview
DESTINATION bin)
endif ()

View file

@ -1,11 +1,8 @@
%global commit 48a5c66d98505dd187e6352c2b9aca88985486c0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global __provides_exclude %{python3_sitearch}/.*\.so$
Name: libfreenect
Version: 0.6.2
Release: 9%{?dist}
Version: 0.6.4
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
@ -23,8 +20,6 @@ Patch3: %{name}-0.4.2-libdir.patch
Patch4: secarch.patch
# Fix the installation path for python libs
Patch5: %{name}-0.6.2-py3.patch
# BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2045802
Patch6: %{name}-0.6.2-cmake-gl-glut.patch
BuildRequires: gcc-c++
BuildRequires: cmake3
@ -46,7 +41,6 @@ libfreenect is a free and open source library that provides access to the
Kinect device. Currently, the library supports the RGB webcam, the depth
image, the LED, and the tilt motor.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -107,8 +101,6 @@ rm -rf platform/windows
%patch3 -p0 -b .libdir
%patch4 -p1 -b .secarch
%patch5 -p1 -b .py3
%patch6 -p0 -b .cmake-gl-glut
%build
%cmake3 \
@ -187,6 +179,10 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/
%{_libdir}/openni2
%changelog
* Sat Sep 24 2022 Phil Wyett <philip.wyett@kathenas.org> - 0.6.4-1
- New upstream version 0.6.4
- Remove old globals
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (libfreenect-0.6.2.tar.gz) = e232487fe62a81161e6e74d34a625d6e86ca56befc1692590ecf863ce6b96b9094b3042557e8a4801a7a1fb3eade4cb02d647cc57dd6b043e7b891d48ff1cba1
SHA512 (libfreenect-0.6.4.tar.gz) = 761f81331fa5d2b3366eeb96716b270c35490501e30659db8bc5940ae50ccc5996773f0b339ece31779e57ccf1755e547f83d6a31b40f156e6e60b6269ae9feb