Author: qboosh                       Date: Tue Jan 24 15:29:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new

---- Files affected:
packages/OpenNI:
   OpenNI-link.patch (NONE -> 1.1)  (NEW), OpenNI-nosse.patch (NONE -> 1.1)  
(NEW), OpenNI-system-libs.patch (NONE -> 1.1)  (NEW), OpenNI.spec (NONE -> 1.1) 
 (NEW)

---- Diffs:

================================================================
Index: packages/OpenNI/OpenNI-link.patch
diff -u /dev/null packages/OpenNI/OpenNI-link.patch:1.1
--- /dev/null   Tue Jan 24 16:29:41 2012
+++ packages/OpenNI/OpenNI-link.patch   Tue Jan 24 16:29:35 2012
@@ -0,0 +1,55 @@
+--- 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

================================================================
Index: packages/OpenNI/OpenNI-nosse.patch
diff -u /dev/null packages/OpenNI/OpenNI-nosse.patch:1.1
--- /dev/null   Tue Jan 24 16:29:41 2012
+++ packages/OpenNI/OpenNI-nosse.patch  Tue Jan 24 16:29:35 2012
@@ -0,0 +1,10 @@
+--- OpenNI-OpenNI-1516074/Platform/Linux/Build/Common/Platform.x86.orig        
2012-01-04 12:35:46.000000000 +0100
++++ OpenNI-OpenNI-1516074/Platform/Linux/Build/Common/Platform.x86     
2012-01-24 16:08:44.899709117 +0100
+@@ -19,7 +19,5 @@
+               ifeq ($(SSSE3_ENABLED), 1)
+                       CFLAGS += -mssse3
+               endif
+-      else
+-              DUMMY:=($error "Only SSE2 and SSE3 are supported")
+       endif
+ endif

================================================================
Index: packages/OpenNI/OpenNI-system-libs.patch
diff -u /dev/null packages/OpenNI/OpenNI-system-libs.patch:1.1
--- /dev/null   Tue Jan 24 16:29:41 2012
+++ packages/OpenNI/OpenNI-system-libs.patch    Tue Jan 24 16:29:35 2012
@@ -0,0 +1,21 @@
+--- 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
+@@ -2,15 +2,13 @@
+ 
+ INC_DIRS = \
+       ../../../../../Include \
+-      ../../../../../Source \
+-      ../../../../../Source/External/LibJPEG
++      ../../../../../Source
+ 
+ SRC_FILES = \
+-      ../../../../../Source/Modules/nimCodecs/*.cpp \
+-      ../../../../../Source/External/LibJPEG/*.c
++      ../../../../../Source/Modules/nimCodecs/*.cpp
+ 
+ LIB_NAME = nimCodecs
+-USED_LIBS = OpenNI
++USED_LIBS = OpenNI jpeg
+ 
+ include ../../Common/CommonCppMakefile
+ 

================================================================
Index: packages/OpenNI/OpenNI.spec
diff -u /dev/null packages/OpenNI/OpenNI.spec:1.1
--- /dev/null   Tue Jan 24 16:29:41 2012
+++ packages/OpenNI/OpenNI.spec Tue Jan 24 16:29:35 2012
@@ -0,0 +1,250 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without apidocs         # API documentation
+%bcond_without java            # Java wrappers
+%bcond_without mono            # Mono/.NET wrappers
+%bcond_with    sse2            # use SSE2 instructions
+%bcond_with    sse3            # use SSE3 instructions
+%bcond_with    ssse3           # use SSE3 and SSSE3 instructions
+#
+%if %{with ssse}
+%define        with_sse3       1
+%endif
+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:       1
+License:       LGPL v3+
+Group:         Libraries
+Source0:       
https://github.com/OpenNI/OpenNI/tarball/Stable-%{version}#/%{name}-%{version}.tar.gz
+# Source0-md5: 12389c56bf3685a741f6bcfa068585ff
+Patch0:                %{name}-system-libs.patch
+Patch1:                %{name}-link.patch
+Patch2:                %{name}-nosse.patch
+URL:           http://openni.org/
+BuildRequires: OpenGL-devel
+%{?with_apidocs:BuildRequires: doxygen}
+#BuildRequires:        freeglut-devel >= 3
+%{?with_apidocs:BuildRequires: graphviz}
+%{?with_java:BuildRequires:    jdk >= 1.6.0}
+BuildRequires: libjpeg-devel
+BuildRequires: libstdc++-devel >= 6:4.0
+BuildRequires: libusb-devel >= 1.0.8
+%{?with_mono:BuildRequires:    mono-csharp}
+BuildRequires: python >= 1:2.6
+BuildRequires: sed >= 4.0
+ExclusiveArch: %{ix86} %{x8664} arm
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%ifarch %{ix86}
+%define                openni_platform x86
+%endif
+%ifarch %{x8664}
+%define                openni_platform x64
+%endif
+%ifarch arm
+%define                openni_platform Arm
+%endif
+
+%description
+OpenNI framework provides an application programming interface (API)
+for writing applications utilizing natural interaction. This API
+covers communication with both low level devices (e.g. vision and
+audio sensors), as well as high-level middleware solutions (e.g. for
+visual tracking using computer vision).
+
+The OpenNI Framework provides the interface for physical devices and
+for middleware components. The API enables modules to be registered in
+the OpenNI framework and used to produce sensory data. Selecting the
+hardware or middleware module is easy and flexible.
+
+%description -l pl.UTF-8
+Szkielet OpenNI zapewnia interfejs programistyczny (API) dla aplikacji
+wykorzystujących interakcję z naturą. API to pokrywa komunikację
+zarówno z urządzeniami niskiego poziomu (takimi jak czujniki obrazu i
+dźwięku), jak i rozwiązaniami wysokiego poziomu warstwy pośredniej
+(np. do wizualnego śledzenia przy użyciu obrazu komputerowego).
+
+Szkielet OpenNI zapewnia interfejs dla fizycznych urządzeń oraz
+komponentów warstwy pośredniej. API pozwala na rejestrowanie modułów w
+szkielecie OpenNI i wykorzystywanie do tworzenia danych sensorycznych.
+Wybór sprzętu i modułu pośredniego jest prosty i elastyczny.
+
+%package devel
+Summary:       Header files for OpenNI library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki OpenNI
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+Header files for OpenNI library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki OpenNI.
+
+%package doc
+Summary:       OpenNI user guide
+Summary(pl.UTF-8):     Podręcznik użytkownika OpenNI
+Group:         Documentation
+
+%description doc
+OpenNI user guide in PDF format.
+
+%description doc -l pl.UTF-8
+Podręcznik użytkownika OpenNI w formacie PDF.
+
+%package apidocs
+Summary:       OpenNI API documentation
+Summary(pl.UTF-8):     Dokumentacja API biblioteki OpenNI
+Group:         Documentation
+
+%description apidocs
+API and internal documentation for OpenNI library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki OpenNI.
+
+%package -n java-OpenNI
+Summary:       Java wrapper for OpenNI
+Summary(pl.UTF-8):     Interfejs Javy do OpenNI
+Group:         Libraries/Java
+Requires:      %{name} = %{version}-%{release}
+Requires:      jpackage-utils
+Requires:      jre >= 1.6.0
+
+%description -n java-OpenNI
+Java wrapper for OpenNI.
+
+%description -n java-OpenNI -l pl.UTF-8
+Interfejs Javy do OpenNI.
+
+%package -n dotnet-OpenNI
+Summary:       .NET wrapper for OpenNI
+Summary(pl.UTF-8):     Interfejs .NET do OpenNI
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      mono
+
+%description -n dotnet-OpenNI
+.NET wrapper for OpenNI.
+
+%description -n dotnet-OpenNI -l pl.UTF-8
+Interfejs .NET do OpenNI.
+
+%prep
+%setup -q -n OpenNI-OpenNI-1516074
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+sed -i -e 's///' Wrappers/OpenNI.net/*.cs Samples/*.net/*.cs
+
+%build
+%{__make} -C Platform/Linux/Build clean
+export CFLAGS="%{rpmcflags}"
+%{__make} -C Platform/Linux/Build \
+       CFG=PLD \
+       CXX="%{__cxx}" \
+       HOSTPLATFORM=%{openni_platform} \
+       SSE_GENERATION=%{?with_sse3:3}%{!?with_sse3:%{?with_sse2:2}} \
+       %{?with_ssse3:SSSE3_ENABLED=1} \
+       %{!?with_mono:MONO_INSTALLED=0} \
+       %{!?with_java:ALL_JAVA_PROJS= JAVA_SAMPLES=}
+
+%if %{with apidocs}
+cd Source/DoxyGen
+doxygen Doxyfile
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/ni,/var/lib/ni}
+
+BDIR=Platform/Linux/Bin/%{openni_platform}-PLD
+install ${BDIR}/ni{Reg,License} $RPM_BUILD_ROOT%{_bindir}
+install ${BDIR}/libOpenNI.so $RPM_BUILD_ROOT%{_libdir}
+install ${BDIR}/libnim{Codecs,MockNodes,Recorder}.so $RPM_BUILD_ROOT%{_libdir}
+cp -p Include/*.h $RPM_BUILD_ROOT%{_includedir}/ni
+%ifarch %{ix86} %{x8664}
+cp -pr Include/Linux-x86 $RPM_BUILD_ROOT%{_includedir}/ni
+%endif
+%ifarch arm
+cp -pr Include/Linux-Arm $RPM_BUILD_ROOT%{_includedir}/ni
+%endif
+
+%if %{with java}
+install -d $RPM_BUILD_ROOT%{_javadir}
+install ${BDIR}/libOpenNI.jni.so $RPM_BUILD_ROOT%{_libdir}
+install ${BDIR}/org.OpenNI.jar $RPM_BUILD_ROOT%{_javadir}
+%endif
+
+%if %{with mono}
+gacutil -i ${BDIR}/OpenNI.net.dll -package 2.0 -root 
$RPM_BUILD_ROOT%{_prefix}/lib
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+for mod in libnimMockNodes.so libnimCodecs.so libnimRecorder.so ; do
+       %{_bindir}/niReg -r %{_libdir}/$mod
+done
+
+%preun
+if [ "$1" = "0" ]; then
+       for mod in libnimMockNodes.so libnimCodecs.so libnimRecorder.so ; do
+               %{_bindir}/niReg -u %{_libdir}/$mod
+       done
+fi
+
+%postun        -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc CHANGES README
+%attr(755,root,root) %{_bindir}/niLicense
+%attr(755,root,root) %{_bindir}/niReg
+%attr(755,root,root) %{_libdir}/libOpenNI.so
+%attr(755,root,root) %{_libdir}/libnimCodecs.so
+%attr(755,root,root) %{_libdir}/libnimMockNodes.so
+%attr(755,root,root) %{_libdir}/libnimRecorder.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/ni
+
+%files doc
+%defattr(644,root,root,755)
+%doc Documentation/OpenNI_UserGuide.pdf
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc Source/DoxyGen/html/*.{bmp,css,html,js,png}
+%endif
+
+%if %{with java}
+%files -n java-OpenNI
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libOpenNI.jni.so
+%{_javadir}/org.OpenNI.jar
+%endif
+
+%if %{with mono}
+%files -n dotnet-OpenNI
+%defattr(644,root,root,755)
+%{_prefix}/lib/mono/2.0/OpenNI.net.dll
+%{_prefix}/lib/mono/gac/OpenNI.net
+%endif
+
+%define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <[email protected]>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1  2012/01/24 15:29:35  qboosh
+- new
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to