aballier 14/12/19 14:22:38
Added: jpeg.patch rpath.patch pthread.patch
libopenni2.pc.in soname.patch
Log:
Initial import, ebuild by me
Signed-off-by: [email protected]
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
160F534A)
Revision Changes Path
1.1 dev-libs/OpenNI2/files/jpeg.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/jpeg.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/jpeg.patch?rev=1.1&content-type=text/plain
Index: jpeg.patch
===================================================================
Index: OpenNI2-9999/Source/Core/Makefile
===================================================================
--- OpenNI2-9999.orig/Source/Core/Makefile
+++ OpenNI2-9999/Source/Core/Makefile
@@ -5,14 +5,12 @@ BIN_DIR = ../../Bin
INC_DIRS = \
../../Include \
../../ThirdParty/PSCommon/XnLib/Include \
- ../Drivers/OniFile/Formats \
- ../../ThirdParty/LibJPEG
+ ../Drivers/OniFile/Formats
SRC_FILES = \
*.cpp \
../Drivers/OniFile/Formats/XnCodec.cpp \
- ../Drivers/OniFile/Formats/XnStreamCompression.cpp \
- ../../ThirdParty/LibJPEG/*.c \
+ ../Drivers/OniFile/Formats/XnStreamCompression.cpp
ifeq ("$(OSTYPE)","Darwin")
INC_DIRS += /opt/local/include
@@ -23,7 +21,7 @@ endif
LIB_NAME = OpenNI2
LIB_DIRS = ../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
-USED_LIBS = XnLib dl pthread
+USED_LIBS = XnLib jpeg dl pthread
ifneq ("$(OSTYPE)","Darwin")
USED_LIBS += rt
endif
Index: OpenNI2-9999/Source/Drivers/OniFile/Makefile
===================================================================
--- OpenNI2-9999.orig/Source/Drivers/OniFile/Makefile
+++ OpenNI2-9999/Source/Drivers/OniFile/Makefile
@@ -6,14 +6,12 @@ INC_DIRS = \
. \
../../../Include \
../../../ThirdParty/PSCommon/XnLib/Include \
- ../../../ThirdParty/LibJPEG \
Formats
SRC_FILES = \
*.cpp \
Formats/*.cpp \
- XnLibExtensions/*.cpp \
- ../../../ThirdParty/LibJPEG/*.c
+ XnLibExtensions/*.cpp
ifeq ("$(OSTYPE)","Darwin")
@@ -25,7 +23,7 @@ endif
LIB_NAME = OniFile
LIB_DIRS = ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
-USED_LIBS = XnLib pthread
+USED_LIBS = XnLib jpeg pthread
ifneq ("$(OSTYPE)","Darwin")
USED_LIBS += rt
endif
Index: OpenNI2-9999/Source/Drivers/PS1080/Makefile
===================================================================
--- OpenNI2-9999.orig/Source/Drivers/PS1080/Makefile
+++ OpenNI2-9999/Source/Drivers/PS1080/Makefile
@@ -7,7 +7,6 @@ INC_DIRS = \
Include \
../../../Include \
../../../ThirdParty/PSCommon/XnLib/Include \
- ../../../ThirdParty/LibJPEG \
../../DepthUtils
SRC_FILES = \
@@ -16,8 +15,7 @@ SRC_FILES = \
DriverImpl/*.cpp\
Formats/*.cpp \
Include/*.cpp \
- Sensor/*.cpp \
- ../../../ThirdParty/LibJPEG/*.c
+ Sensor/*.cpp
ifeq ("$(OSTYPE)","Darwin")
@@ -30,7 +28,7 @@ LIB_NAME = PS1080
LIB_DIRS += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
LIB_DIRS += $(BIN_DIR)/$(PLATFORM)-$(CFG)
-USED_LIBS = XnLib dl pthread DepthUtils
+USED_LIBS = XnLib jpeg dl pthread DepthUtils
ifneq ("$(OSTYPE)","Darwin")
USED_LIBS += rt usb-1.0 udev
else
1.1 dev-libs/OpenNI2/files/rpath.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/rpath.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/rpath.patch?rev=1.1&content-type=text/plain
Index: rpath.patch
===================================================================
Index: OpenNI2-9999/ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
===================================================================
--- OpenNI2-9999.orig/ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
+++ OpenNI2-9999/ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
@@ -93,8 +93,6 @@ ifneq "$(LIB_NAME)" ""
endif
ifneq "$(EXE_NAME)" ""
OUTPUT_NAME = $(EXE_NAME)
- # We want the executables to look for the .so's locally first:
- LDFLAGS += -Wl,-rpath ./
OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES) $(LDFLAGS)
endif
ifneq "$(SLIB_NAME)" ""
1.1 dev-libs/OpenNI2/files/pthread.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/pthread.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/pthread.patch?rev=1.1&content-type=text/plain
Index: pthread.patch
===================================================================
commit 716cffb2888bb2a0fa3264a22085caf8ce26368f
Author: Pedro Asad <[email protected]>
Date: Wed Oct 8 18:18:57 2014 -0300
Added a missing -lpthread flag to one Makefile
The lack of the -lpthread flag on Source/Tools/NiViewer/Makefile
prevented the
whole project from compiling correctly on Ubuntu 14.04 64 bit. Just added
the
missing flag to this Makefile, according to the same solution for issue
47 of
the old OpenNI2 Github repository, that boils down to a similar problem
and
can be found here, on Github
https://github.com/OpenNI/OpenNI2/issues/47
diff --git a/Source/Tools/NiViewer/Makefile b/Source/Tools/NiViewer/Makefile
index 1eba049..1b5714d 100644
--- a/Source/Tools/NiViewer/Makefile
+++ b/Source/Tools/NiViewer/Makefile
@@ -26,7 +26,7 @@ else
endif
LIB_DIRS += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
-USED_LIBS += OpenNI2 XnLib
+USED_LIBS += OpenNI2 XnLib pthread
EXE_NAME = NiViewer
1.1 dev-libs/OpenNI2/files/libopenni2.pc.in
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/libopenni2.pc.in?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/libopenni2.pc.in?rev=1.1&content-type=text/plain
Index: libopenni2.pc.in
===================================================================
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/@libdir@
includedir=${prefix}/include/openni2
Name: OpenNI2
Description: A general purpose driver for all OpenNI cameras.
Version: @version@
Cflags: -I${includedir}
Libs: -L${libdir} -lOpenNI2 -L${libdir}/OpenNI2/Drivers -lDummyDevice -lOniFile
-lPS1080
1.1 dev-libs/OpenNI2/files/soname.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/soname.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI2/files/soname.patch?rev=1.1&content-type=text/plain
Index: soname.patch
===================================================================
Index: OpenNI2-9999/ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
===================================================================
--- OpenNI2-9999.orig/ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
+++ OpenNI2-9999/ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
@@ -84,7 +84,7 @@ ifneq "$(LIB_NAME)" ""
ifneq ("$(OSTYPE)","Darwin")
LDFLAGS += -Wl,--no-undefined
OUTPUT_NAME = lib$(LIB_NAME).so
- OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES)
$(LDFLAGS) -shared
+ OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES)
-Wl,-soname,$(OUTPUT_NAME) $(LDFLAGS) -shared
else
LDFLAGS += -undefined error
OUTPUT_NAME = lib$(LIB_NAME).dylib
