diff options
Diffstat (limited to 'dev-libs/OpenNI/files')
| -rw-r--r-- | dev-libs/OpenNI/files/jpeg.patch | 23 | ||||
| -rw-r--r-- | dev-libs/OpenNI/files/soname.patch | 13 | ||||
| -rw-r--r-- | dev-libs/OpenNI/files/tinyxml.patch | 29 |
3 files changed, 65 insertions, 0 deletions
diff --git a/dev-libs/OpenNI/files/jpeg.patch b/dev-libs/OpenNI/files/jpeg.patch new file mode 100644 index 000000000000..46f5dfd3d873 --- /dev/null +++ b/dev-libs/OpenNI/files/jpeg.patch @@ -0,0 +1,23 @@ +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 + diff --git a/dev-libs/OpenNI/files/soname.patch b/dev-libs/OpenNI/files/soname.patch new file mode 100644 index 000000000000..b12a1e892e0f --- /dev/null +++ b/dev-libs/OpenNI/files/soname.patch @@ -0,0 +1,13 @@ +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 diff --git a/dev-libs/OpenNI/files/tinyxml.patch b/dev-libs/OpenNI/files/tinyxml.patch new file mode 100644 index 000000000000..801cabbd7708 --- /dev/null +++ b/dev-libs/OpenNI/files/tinyxml.patch @@ -0,0 +1,29 @@ +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 |