[media-libs/openni] updated openni-9999.ebuild
authorMarcel Unbehaun <marcel@frostworx.de>
Fri, 3 Feb 2012 14:15:29 +0000 (15:15 +0100)
committerMarcel Unbehaun <marcel@frostworx.de>
Fri, 3 Feb 2012 14:15:29 +0000 (15:15 +0100)
media-libs/openni/Manifest
media-libs/openni/files/openni-9999-system-jpg-fedora.patch [deleted file]
media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch [deleted file]
media-libs/openni/openni-9999.ebuild

index 5e30116..267a7f7 100644 (file)
@@ -1,3 +1 @@
-AUX openni-9999-system-jpg-fedora.patch 1115 RMD160 a618caea53e02e4b6d5e015b4d74a79a6017f061 SHA1 0af295e2cf5cdda24b35d9432ebc4c311ce87624 SHA256 da7fa40ac476c1483415af30e92ec4ed7d3fe046604d1bb4bf54145a5ef9fe39
-AUX openni-9999-system-tinyxml-fedora.patch 1200 RMD160 c81ecff0ade29567400d5a5a6d55619dec500ca3 SHA1 6b83c09c432d1704816e3769f75d7080b922d1ed SHA256 220284e6ca46934a79456601c73d1e11c9c270762a187e1405d63670f7131449
-EBUILD openni-9999.ebuild 1624 RMD160 b01d97e434cee87433f7761b52644f28278c7450 SHA1 1a397196900f09d4e4e4ff04e32a2c6d701110ff SHA256 6f11d358ef94991d8f4075bac418da54d5754151c352371120abe4e1e4cabfa7
+EBUILD openni-9999.ebuild 1541 RMD160 0c8c801f10390f0dbe7c59857987e254b244f337 SHA1 99a1c7d1d1ecbfd6ee4c7eac0e4e18bed72488ea SHA256 99510a56fe3f646088b8fca577529362a7423c95b9c15b2dcafd091da1a16a88
diff --git a/media-libs/openni/files/openni-9999-system-jpg-fedora.patch b/media-libs/openni/files/openni-9999-system-jpg-fedora.patch
deleted file mode 100644 (file)
index 1ea4c1e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile
---- openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile    2011-11-01 11:08:40.240067646 +0100
-+++ openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile  2011-11-01 11:04:41.000000000 +0100
-@@ -2,17 +2,21 @@
- 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
--include ../../Common/CommonCppMakefile
--
-+ifneq ($(wildcard /usr/lib/libjpeg.so /usr/lib32/libjpeg.so /usr/lib64/libjpeg.so /usr/local/lib/libjpeg.so /usr/local/lib32/libjpeg.so /usr/local/lib64/libjpeg.so),)
-+  USED_LIBS += jpeg
-+else
-+  INC_DIRS  += ../../../../../Source/External/LibJPEG
-+  SRC_FILES += ../../../../../Source/External/LibJPEG/*.c
-+endif
-+  
-+include ../../Common/CommonCppMakefile
diff --git a/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch b/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch
deleted file mode 100644 (file)
index 9c19451..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile
---- openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile       2011-11-01 11:08:40.250067643 +0100
-+++ openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile     2011-11-01 11:05:23.000000000 +0100
-@@ -4,13 +4,11 @@
- INC_DIRS = \
-       ../../../../Include \
--      ../../../../Source \
--      ../../../../Source/External/TinyXml
-+      ../../../../Source
- SRC_FILES = \
-       ../../../../Source/OpenNI/*.cpp \
--      ../../../../Source/OpenNI/Linux-x86/*.cpp \
--      ../../../../Source/External/TinyXml/*.cpp
-+      ../../../../Source/OpenNI/Linux-x86/*.cpp
- ifeq ("$(OSTYPE)","Darwin")
-       INC_DIRS += /opt/local/include
-@@ -19,12 +17,19 @@
- endif
- LIB_NAME = OpenNI
--USED_LIBS = usb-1.0 dl pthread
-+USED_LIBS = usb-1.0 dl
- ifneq ("$(OSTYPE)","Darwin")
--      USED_LIBS += rt 
-+      USED_LIBS += rt
- endif
- DEFINES = XN_EXPORTS
--include ../Common/CommonCppMakefile
-+ifneq ($(wildcard /usr/include/tinyxml.h /usr/local/include/tinyxml.h),)
-+  USED_LIBS += tinyxml
-+else
-+  INC_DIRS += ../../../../Source/External/TinyXml
-+  SRC_FILES += ../../../../Source/External/TinyXml/*.cpp
-+endif
-+
-+include ../Common/CommonCppMakefile
index 13d4d79..5c1e0b4 100644 (file)
@@ -26,33 +26,32 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
        if use !doc; then
-       sed -i -e "s:execute_check(\"doxygen:#execute_check(\"doxygen:g" -i Platform/Linux-x86/CreateRedist/Redist_OpenNi.py
+       sed -i -e "s:execute_check(\"doxygen:#execute_check(\"doxygen:g" -i Platform/Linux/CreateRedist/Redist_OpenNi.py
        fi
-       epatch "${FILESDIR}"/${P}-system-jpg-fedora.patch
-#      epatch "${FILESDIR}"/${P}-system-tinyxml-fedora.patch
 }
 
 src_compile() {
-       cd ${WORKDIR}/${P}/Platform/Linux-x86/Build
+       cd ${WORKDIR}/${P}/Platform/Linux/Build
 #      parallel build fails as lOpenNI is references before it exists
        emake -j1 redist || die "emake failed"
 }
 
 src_install() {
-       cd ${WORKDIR}/${P}/Platform/Linux-x86/Redist
+       cd ${WORKDIR}/${P}/Platform/Linux/Bin/x86-Release
        
        libdir=$(get_libdir)
        dodir /usr/${libdir}
        insinto /usr/${libdir}
-       doins Lib/*.so || die
+       doins *.so || die
        
        insinto /usr/include/ni/
-       doins -r Include/* || die
+       doins -r ../../../../Include/* || die
 
        insinto /usr/bin/
        exeinto /usr/bin/
-       doexe Bin/ni* || die
-       
+       doexe ni* || die
+       doexe NiViewer* || die
+
        dodir /var/lib/ni
 # todo mono and java?
 }