aballier 14/12/19 14:19:09 Added: jpeg.patch soname.patch tinyxml.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/OpenNI/files/jpeg.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI/files/jpeg.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI/files/jpeg.patch?rev=1.1&content-type=text/plain Index: jpeg.patch =================================================================== Index: OpenNI-9999/Platform/Linux/Build/Modules/nimCodecs/Makefile =================================================================== --- OpenNI-9999.orig/Platform/Linux/Build/Modules/nimCodecs/Makefile +++ OpenNI-9999/Platform/Linux/Build/Modules/nimCodecs/Makefile @@ -2,15 +2,13 @@ BIN_DIR = ../../../Bin INC_DIRS = \ ../../../../../Include \ - ../../../../../Source \ - ../../../../../Externals/LibJPEG + ../../../../../Source SRC_FILES = \ - ../../../../../Source/Modules/nimCodecs/*.cpp \ - ../../../../../Externals/LibJPEG/*.c + ../../../../../Source/Modules/nimCodecs/*.cpp LIB_NAME = nimCodecs -USED_LIBS = OpenNI +USED_LIBS = OpenNI jpeg include ../../Common/CommonCppMakefile 1.1 dev-libs/OpenNI/files/soname.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI/files/soname.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI/files/soname.patch?rev=1.1&content-type=text/plain Index: soname.patch =================================================================== Index: OpenNI-9999/Platform/Linux/Build/Common/CommonCppMakefile =================================================================== --- OpenNI-9999.orig/Platform/Linux/Build/Common/CommonCppMakefile +++ OpenNI-9999/Platform/Linux/Build/Common/CommonCppMakefile @@ -78,7 +78,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,$(notdir $(OUTPUT_FILE)) $(LDFLAGS) -shared else LDFLAGS += -undefined error OUTPUT_NAME = lib$(LIB_NAME).dylib 1.1 dev-libs/OpenNI/files/tinyxml.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI/files/tinyxml.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/OpenNI/files/tinyxml.patch?rev=1.1&content-type=text/plain Index: tinyxml.patch =================================================================== Index: OpenNI-9999/Platform/Linux/Build/OpenNI/Makefile =================================================================== --- OpenNI-9999.orig/Platform/Linux/Build/OpenNI/Makefile +++ OpenNI-9999/Platform/Linux/Build/OpenNI/Makefile @@ -4,13 +4,11 @@ BIN_DIR = ../../Bin INC_DIRS = \ ../../../../Include \ - ../../../../Source \ - ../../../../Externals/TinyXml + ../../../../Source SRC_FILES = \ ../../../../Source/OpenNI/*.cpp \ - ../../../../Source/OpenNI/Linux/*.cpp \ - ../../../../Externals/TinyXml/*.cpp + ../../../../Source/OpenNI/Linux/*.cpp ifeq ("$(OSTYPE)","Darwin") INC_DIRS += /opt/local/include @@ -19,7 +17,7 @@ ifeq ("$(OSTYPE)","Darwin") endif LIB_NAME = OpenNI -USED_LIBS = usb-1.0 dl pthread +USED_LIBS = usb-1.0 dl pthread tinyxml ifneq ("$(OSTYPE)","Darwin") USED_LIBS += rt endif
