| 1 |
commit: b2e0af39505cc9c727ac5725a9150d35ee3b51b5 |
| 2 |
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de> |
| 3 |
AuthorDate: Tue Nov 1 10:23:43 2011 +0000 |
| 4 |
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de> |
| 5 |
CommitDate: Tue Nov 1 10:23:43 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b2e0af39 |
| 7 |
|
| 8 |
[media-libs/openni] use system jpg (and soon tinyxml) - fedora patch |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/openni-9999-system-jpg-fedora.patch | 31 ++++++++++++++ |
| 12 |
.../files/openni-9999-system-tinyxml-fedora.patch | 42 ++++++++++++++++++++ |
| 13 |
media-libs/openni/openni-9999.ebuild | 6 ++- |
| 14 |
3 files changed, 78 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/openni/files/openni-9999-system-jpg-fedora.patch b/media-libs/openni/files/openni-9999-system-jpg-fedora.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..1ea4c1e |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-libs/openni/files/openni-9999-system-jpg-fedora.patch |
| 21 |
@@ -0,0 +1,31 @@ |
| 22 |
+diff -Naur openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile |
| 23 |
+--- openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile 2011-11-01 11:08:40.240067646 +0100 |
| 24 |
++++ openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile 2011-11-01 11:04:41.000000000 +0100 |
| 25 |
+@@ -2,17 +2,21 @@ |
| 26 |
+ |
| 27 |
+ INC_DIRS = \ |
| 28 |
+ ../../../../../Include \ |
| 29 |
+- ../../../../../Source \ |
| 30 |
+- ../../../../../Source/External/LibJPEG |
| 31 |
++ ../../../../../Source |
| 32 |
+ |
| 33 |
+ SRC_FILES = \ |
| 34 |
+- ../../../../../Source/Modules/nimCodecs/*.cpp \ |
| 35 |
+- ../../../../../Source/External/LibJPEG/*.c |
| 36 |
++ ../../../../../Source/Modules/nimCodecs/*.cpp |
| 37 |
+ |
| 38 |
+ LIB_NAME = nimCodecs |
| 39 |
+ USED_LIBS = OpenNI |
| 40 |
+ |
| 41 |
+-include ../../Common/CommonCppMakefile |
| 42 |
+- |
| 43 |
++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),) |
| 44 |
++ USED_LIBS += jpeg |
| 45 |
++else |
| 46 |
++ INC_DIRS += ../../../../../Source/External/LibJPEG |
| 47 |
++ SRC_FILES += ../../../../../Source/External/LibJPEG/*.c |
| 48 |
++endif |
| 49 |
++ |
| 50 |
++include ../../Common/CommonCppMakefile |
| 51 |
+ |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch b/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch |
| 55 |
new file mode 100644 |
| 56 |
index 0000000..9c19451 |
| 57 |
--- /dev/null |
| 58 |
+++ b/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch |
| 59 |
@@ -0,0 +1,42 @@ |
| 60 |
+diff -Naur openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile |
| 61 |
+--- openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile 2011-11-01 11:08:40.250067643 +0100 |
| 62 |
++++ openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile 2011-11-01 11:05:23.000000000 +0100 |
| 63 |
+@@ -4,13 +4,11 @@ |
| 64 |
+ |
| 65 |
+ INC_DIRS = \ |
| 66 |
+ ../../../../Include \ |
| 67 |
+- ../../../../Source \ |
| 68 |
+- ../../../../Source/External/TinyXml |
| 69 |
++ ../../../../Source |
| 70 |
+ |
| 71 |
+ SRC_FILES = \ |
| 72 |
+ ../../../../Source/OpenNI/*.cpp \ |
| 73 |
+- ../../../../Source/OpenNI/Linux-x86/*.cpp \ |
| 74 |
+- ../../../../Source/External/TinyXml/*.cpp |
| 75 |
++ ../../../../Source/OpenNI/Linux-x86/*.cpp |
| 76 |
+ |
| 77 |
+ ifeq ("$(OSTYPE)","Darwin") |
| 78 |
+ INC_DIRS += /opt/local/include |
| 79 |
+@@ -19,12 +17,19 @@ |
| 80 |
+ endif |
| 81 |
+ |
| 82 |
+ LIB_NAME = OpenNI |
| 83 |
+-USED_LIBS = usb-1.0 dl pthread |
| 84 |
++USED_LIBS = usb-1.0 dl |
| 85 |
+ ifneq ("$(OSTYPE)","Darwin") |
| 86 |
+- USED_LIBS += rt |
| 87 |
++ USED_LIBS += rt |
| 88 |
+ endif |
| 89 |
+ DEFINES = XN_EXPORTS |
| 90 |
+ |
| 91 |
+-include ../Common/CommonCppMakefile |
| 92 |
++ifneq ($(wildcard /usr/include/tinyxml.h /usr/local/include/tinyxml.h),) |
| 93 |
++ USED_LIBS += tinyxml |
| 94 |
++else |
| 95 |
++ INC_DIRS += ../../../../Source/External/TinyXml |
| 96 |
++ SRC_FILES += ../../../../Source/External/TinyXml/*.cpp |
| 97 |
++endif |
| 98 |
++ |
| 99 |
++include ../Common/CommonCppMakefile |
| 100 |
+ |
| 101 |
+ |
| 102 |
|
| 103 |
diff --git a/media-libs/openni/openni-9999.ebuild b/media-libs/openni/openni-9999.ebuild |
| 104 |
index 3a5124f..13d4d79 100644 |
| 105 |
--- a/media-libs/openni/openni-9999.ebuild |
| 106 |
+++ b/media-libs/openni/openni-9999.ebuild |
| 107 |
@@ -19,13 +19,17 @@ IUSE="doc graphviz" |
| 108 |
DEPEND="dev-libs/libusb |
| 109 |
media-libs/freeglut |
| 110 |
graphviz? ( media-gfx/graphviz ) |
| 111 |
- doc? ( app-doc/doxygen )" |
| 112 |
+ doc? ( app-doc/doxygen ) |
| 113 |
+ virtual/jpeg" |
| 114 |
+# dev-libs/tinyxml" |
| 115 |
RDEPEND="${DEPEND}" |
| 116 |
|
| 117 |
src_prepare() { |
| 118 |
if use !doc; then |
| 119 |
sed -i -e "s:execute_check(\"doxygen:#execute_check(\"doxygen:g" -i Platform/Linux-x86/CreateRedist/Redist_OpenNi.py |
| 120 |
fi |
| 121 |
+ epatch "${FILESDIR}"/${P}-system-jpg-fedora.patch |
| 122 |
+# epatch "${FILESDIR}"/${P}-system-tinyxml-fedora.patch |
| 123 |
} |
| 124 |
|
| 125 |
src_compile() { |
Archives