diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/OpenNI/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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 |