- updated to 1.5.7.10

- updated system-libs patch, removed obsolete link patch

diff --git a/OpenNI-link.patch b/OpenNI-link.patch
deleted file mode 100644 (file)
index 1a8e9bf..0000000
--- a/OpenNI-link.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiViewer/Makefile.orig  2012-01-04 12:35:46.000000000 +0100
-+++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiViewer/Makefile       2012-01-22 19:00:47.774268787 +0100
-@@ -11,7 +11,7 @@
- ifeq ("$(OSTYPE)","Darwin")
-       LDFLAGS += -framework OpenGL -framework GLUT
- else
--      USED_LIBS += glut
-+      USED_LIBS += glut GL
- endif
- 
- USED_LIBS += OpenNI
---- OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiSimpleViewer/Makefile.orig    2012-01-04 12:35:46.000000000 +0100
-+++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiSimpleViewer/Makefile 2012-01-22 19:11:47.600957548 +0100
-@@ -11,7 +11,7 @@
- ifeq ("$(OSTYPE)","Darwin")
-       LDFLAGS += -framework OpenGL -framework GLUT
- else
--      USED_LIBS += glut
-+      USED_LIBS += glut GL
- endif
- 
- USED_LIBS += OpenNI
---- OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiUserTracker/Makefile.orig     2012-01-04 12:35:46.000000000 +0100
-+++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiUserTracker/Makefile  2012-01-22 19:26:00.357652766 +0100
-@@ -12,7 +12,7 @@
-       ifeq ("$(OSTYPE)","Darwin")
-               LDFLAGS += -framework OpenGL -framework GLUT
-       else
--              USED_LIBS += glut
-+              USED_LIBS += glut GL
-       endif
- else
-       ifeq "$(GLES_SUPPORTED)" "1"
---- OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiUserSelection/Makefile.orig   2012-01-04 12:35:46.000000000 +0100
-+++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiUserSelection/Makefile        2012-01-22 19:38:42.454344951 +0100
-@@ -12,7 +12,7 @@
-       ifeq ("$(OSTYPE)","Darwin")
-               LDFLAGS += -framework OpenGL -framework GLUT
-       else
--              USED_LIBS += glut
-+              USED_LIBS += glut GL
-       endif
- else
-       ifeq "$(GLES_SUPPORTED)" "1"
---- OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiHandTracker/Makefile.orig     2012-01-04 12:35:46.000000000 +0100
-+++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Samples/NiHandTracker/Makefile  2012-01-22 19:44:53.017690692 +0100
-@@ -11,7 +11,7 @@
- ifeq ("$(OSTYPE)","Darwin")
-       LDFLAGS += -framework OpenGL -framework GLUT
- else
--      USED_LIBS += glut
-+      USED_LIBS += glut GL
- endif
- 
- USED_LIBS += OpenNI

diff --git a/OpenNI-system-libs.patch b/OpenNI-system-libs.patch
index 0931e9b33380613a554e0385b5ae0bd0948cb72f..ed342e45dd7a4ffd9a88d9ccb807b60541dca263 100644 (file)
--- a/OpenNI-system-libs.patch
+++ b/OpenNI-system-libs.patch
@@ -1,16 +1,16 @@
---- OpenNI-OpenNI-1516074/Platform/Linux/Build/Modules/nimCodecs/Makefile.orig 2012-01-04 12:35:46.000000000 +0100
-+++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Modules/nimCodecs/Makefile      2012-01-22 16:47:22.184000731 +0100
+--- OpenNI-OpenNI-1e9524f/Platform/Linux/Build/Modules/nimCodecs/Makefile.orig 2014-07-27 09:25:00.510513520 +0200
++++ OpenNI-OpenNI-1e9524f/Platform/Linux/Build/Modules/nimCodecs/Makefile      2014-07-27 09:26:03.623844205 +0200
 @@ -2,15 +2,13 @@
  
  INC_DIRS = \
        ../../../../../Include \
 -      ../../../../../Source \
--      ../../../../../Source/External/LibJPEG
+-      ../../../../../Externals/LibJPEG
 +      ../../../../../Source
  
  SRC_FILES = \
 -      ../../../../../Source/Modules/nimCodecs/*.cpp \
--      ../../../../../Source/External/LibJPEG/*.c
+-      ../../../../../Externals/LibJPEG/*.c
 +      ../../../../../Source/Modules/nimCodecs/*.cpp
  
  LIB_NAME = nimCodecs

diff --git a/OpenNI.spec b/OpenNI.spec
index 85f1bb89c3dff6dbce313508ffcb4b40bd8e2364..017f8be19e3d15a66775ffba649bbeb0644c16b5 100644 (file)
--- a/OpenNI.spec
+++ b/OpenNI.spec
@@ -13,15 +13,14 @@
 Summary:       OpenNI framework for Natural Interaction devices
 Summary(pl.UTF-8):     Szkielet OpenNI do urządzeń służących interakcji z naturą
 Name:          OpenNI
-Version:       1.5.2.23
-Release:       2
+Version:       1.5.7.10
+Release:       1
 License:       LGPL v3+
 Group:         Libraries
-Source0:       https://github.com/OpenNI/OpenNI/tarball/Stable-%{version}#/%{name}-%{version}.tar.gz
-# Source0-md5: 12389c56bf3685a741f6bcfa068585ff
+Source0:       https://github.com/OpenNI/OpenNI/tarball/Stable-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 5c6072e875a72180a696ee60460ba347
 Patch0:                %{name}-system-libs.patch
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-nosse.patch
+Patch1:                %{name}-nosse.patch
 URL:           http://openni.org/
 BuildRequires: OpenGL-devel
 # for examples
@@ -142,13 +141,10 @@ Requires: mono
 Interfejs .NET do OpenNI.
 
 %prep
-%setup -q -n %{name}-OpenNI-1516074
+%setup -q -n %{name}-OpenNI-1e9524f
 %undos Platform/Linux/Build/Samples/NiUserTracker/Makefile
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-
-sed -i -e 's///' Wrappers/OpenNI.net/*.cs Samples/*.net/*.cs
 
 %build
 %{__make} -C Platform/Linux/Build clean
@@ -186,7 +182,7 @@ cp -pr Include/Linux-Arm $RPM_BUILD_ROOT%{_includedir}/ni
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 install -p ${BDIR}/libOpenNI.jni.so $RPM_BUILD_ROOT%{_libdir}
-cp -p ${BDIR}/org.OpenNI.jar $RPM_BUILD_ROOT%{_javadir}
+cp -p ${BDIR}/org.openni.jar $RPM_BUILD_ROOT%{_javadir}
 %endif
 
 %if %{with mono}
@@ -213,7 +209,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README
+%doc CHANGES NOTICE README
 %attr(755,root,root) %{_bindir}/niLicense
 %attr(755,root,root) %{_bindir}/niReg
 %attr(755,root,root) %{_libdir}/libOpenNI.so
@@ -240,7 +236,7 @@ fi
 %files -n java-OpenNI
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenNI.jni.so
-%{_javadir}/org.OpenNI.jar
+%{_javadir}/org.openni.jar
 %endif
 
 %if %{with mono}