* [gentoo-commits] proj/gamerlay:master commit in: media-libs/openni/, media-libs/openni/files/
@ 2011-11-01 10:24 Marcel Unbehaun
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2011-11-01 10:24 UTC (permalink / raw
To: gentoo-commits
commit: b2e0af39505cc9c727ac5725a9150d35ee3b51b5
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Tue Nov 1 10:23:43 2011 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Tue Nov 1 10:23:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b2e0af39
[media-libs/openni] use system jpg (and soon tinyxml) - fedora patch
---
.../files/openni-9999-system-jpg-fedora.patch | 31 ++++++++++++++
.../files/openni-9999-system-tinyxml-fedora.patch | 42 ++++++++++++++++++++
media-libs/openni/openni-9999.ebuild | 6 ++-
3 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/media-libs/openni/files/openni-9999-system-jpg-fedora.patch b/media-libs/openni/files/openni-9999-system-jpg-fedora.patch
new file mode 100644
index 0000000..1ea4c1e
--- /dev/null
+++ b/media-libs/openni/files/openni-9999-system-jpg-fedora.patch
@@ -0,0 +1,31 @@
+diff -Naur openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile
+--- openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile 2011-11-01 11:08:40.240067646 +0100
++++ openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile 2011-11-01 11:04:41.000000000 +0100
+@@ -2,17 +2,21 @@
+
+ INC_DIRS = \
+ ../../../../../Include \
+- ../../../../../Source \
+- ../../../../../Source/External/LibJPEG
++ ../../../../../Source
+
+ SRC_FILES = \
+- ../../../../../Source/Modules/nimCodecs/*.cpp \
+- ../../../../../Source/External/LibJPEG/*.c
++ ../../../../../Source/Modules/nimCodecs/*.cpp
+
+ LIB_NAME = nimCodecs
+ USED_LIBS = OpenNI
+
+-include ../../Common/CommonCppMakefile
+-
++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),)
++ USED_LIBS += jpeg
++else
++ INC_DIRS += ../../../../../Source/External/LibJPEG
++ SRC_FILES += ../../../../../Source/External/LibJPEG/*.c
++endif
++
++include ../../Common/CommonCppMakefile
+
+
diff --git a/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch b/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch
new file mode 100644
index 0000000..9c19451
--- /dev/null
+++ b/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch
@@ -0,0 +1,42 @@
+diff -Naur openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile
+--- openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile 2011-11-01 11:08:40.250067643 +0100
++++ openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile 2011-11-01 11:05:23.000000000 +0100
+@@ -4,13 +4,11 @@
+
+ INC_DIRS = \
+ ../../../../Include \
+- ../../../../Source \
+- ../../../../Source/External/TinyXml
++ ../../../../Source
+
+ SRC_FILES = \
+ ../../../../Source/OpenNI/*.cpp \
+- ../../../../Source/OpenNI/Linux-x86/*.cpp \
+- ../../../../Source/External/TinyXml/*.cpp
++ ../../../../Source/OpenNI/Linux-x86/*.cpp
+
+ ifeq ("$(OSTYPE)","Darwin")
+ INC_DIRS += /opt/local/include
+@@ -19,12 +17,19 @@
+ endif
+
+ LIB_NAME = OpenNI
+-USED_LIBS = usb-1.0 dl pthread
++USED_LIBS = usb-1.0 dl
+ ifneq ("$(OSTYPE)","Darwin")
+- USED_LIBS += rt
++ USED_LIBS += rt
+ endif
+ DEFINES = XN_EXPORTS
+
+-include ../Common/CommonCppMakefile
++ifneq ($(wildcard /usr/include/tinyxml.h /usr/local/include/tinyxml.h),)
++ USED_LIBS += tinyxml
++else
++ INC_DIRS += ../../../../Source/External/TinyXml
++ SRC_FILES += ../../../../Source/External/TinyXml/*.cpp
++endif
++
++include ../Common/CommonCppMakefile
+
+
diff --git a/media-libs/openni/openni-9999.ebuild b/media-libs/openni/openni-9999.ebuild
index 3a5124f..13d4d79 100644
--- a/media-libs/openni/openni-9999.ebuild
+++ b/media-libs/openni/openni-9999.ebuild
@@ -19,13 +19,17 @@ IUSE="doc graphviz"
DEPEND="dev-libs/libusb
media-libs/freeglut
graphviz? ( media-gfx/graphviz )
- doc? ( app-doc/doxygen )"
+ doc? ( app-doc/doxygen )
+ virtual/jpeg"
+# dev-libs/tinyxml"
RDEPEND="${DEPEND}"
src_prepare() {
if use !doc; then
sed -i -e "s:execute_check(\"doxygen:#execute_check(\"doxygen:g" -i Platform/Linux-x86/CreateRedist/Redist_OpenNi.py
fi
+ epatch "${FILESDIR}"/${P}-system-jpg-fedora.patch
+# epatch "${FILESDIR}"/${P}-system-tinyxml-fedora.patch
}
src_compile() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: media-libs/openni/, media-libs/openni/files/
@ 2012-02-03 14:13 Marcel Unbehaun
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2012-02-03 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 21d2089745dcfc011263f797966556296ed498e2
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Fri Feb 3 14:15:29 2012 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Fri Feb 3 14:15:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=21d20897
[media-libs/openni] updated openni-9999.ebuild
---
.../files/openni-9999-system-jpg-fedora.patch | 31 --------------
.../files/openni-9999-system-tinyxml-fedora.patch | 42 --------------------
media-libs/openni/openni-9999.ebuild | 17 ++++----
3 files changed, 8 insertions(+), 82 deletions(-)
diff --git a/media-libs/openni/files/openni-9999-system-jpg-fedora.patch b/media-libs/openni/files/openni-9999-system-jpg-fedora.patch
deleted file mode 100644
index 1ea4c1e..0000000
--- a/media-libs/openni/files/openni-9999-system-jpg-fedora.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile
---- openni-9999/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile 2011-11-01 11:08:40.240067646 +0100
-+++ openni-9999-p/Platform/Linux-x86/Build/Modules/nimCodecs/Makefile 2011-11-01 11:04:41.000000000 +0100
-@@ -2,17 +2,21 @@
-
- INC_DIRS = \
- ../../../../../Include \
-- ../../../../../Source \
-- ../../../../../Source/External/LibJPEG
-+ ../../../../../Source
-
- SRC_FILES = \
-- ../../../../../Source/Modules/nimCodecs/*.cpp \
-- ../../../../../Source/External/LibJPEG/*.c
-+ ../../../../../Source/Modules/nimCodecs/*.cpp
-
- LIB_NAME = nimCodecs
- USED_LIBS = OpenNI
-
--include ../../Common/CommonCppMakefile
--
-+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),)
-+ USED_LIBS += jpeg
-+else
-+ INC_DIRS += ../../../../../Source/External/LibJPEG
-+ SRC_FILES += ../../../../../Source/External/LibJPEG/*.c
-+endif
-+
-+include ../../Common/CommonCppMakefile
-
-
diff --git a/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch b/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch
deleted file mode 100644
index 9c19451..0000000
--- a/media-libs/openni/files/openni-9999-system-tinyxml-fedora.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile
---- openni-9999/Platform/Linux-x86/Build/OpenNI/Makefile 2011-11-01 11:08:40.250067643 +0100
-+++ openni-9999-p/Platform/Linux-x86/Build/OpenNI/Makefile 2011-11-01 11:05:23.000000000 +0100
-@@ -4,13 +4,11 @@
-
- INC_DIRS = \
- ../../../../Include \
-- ../../../../Source \
-- ../../../../Source/External/TinyXml
-+ ../../../../Source
-
- SRC_FILES = \
- ../../../../Source/OpenNI/*.cpp \
-- ../../../../Source/OpenNI/Linux-x86/*.cpp \
-- ../../../../Source/External/TinyXml/*.cpp
-+ ../../../../Source/OpenNI/Linux-x86/*.cpp
-
- ifeq ("$(OSTYPE)","Darwin")
- INC_DIRS += /opt/local/include
-@@ -19,12 +17,19 @@
- endif
-
- LIB_NAME = OpenNI
--USED_LIBS = usb-1.0 dl pthread
-+USED_LIBS = usb-1.0 dl
- ifneq ("$(OSTYPE)","Darwin")
-- USED_LIBS += rt
-+ USED_LIBS += rt
- endif
- DEFINES = XN_EXPORTS
-
--include ../Common/CommonCppMakefile
-+ifneq ($(wildcard /usr/include/tinyxml.h /usr/local/include/tinyxml.h),)
-+ USED_LIBS += tinyxml
-+else
-+ INC_DIRS += ../../../../Source/External/TinyXml
-+ SRC_FILES += ../../../../Source/External/TinyXml/*.cpp
-+endif
-+
-+include ../Common/CommonCppMakefile
-
-
diff --git a/media-libs/openni/openni-9999.ebuild b/media-libs/openni/openni-9999.ebuild
index 13d4d79..5c1e0b4 100644
--- a/media-libs/openni/openni-9999.ebuild
+++ b/media-libs/openni/openni-9999.ebuild
@@ -26,33 +26,32 @@ RDEPEND="${DEPEND}"
src_prepare() {
if use !doc; then
- sed -i -e "s:execute_check(\"doxygen:#execute_check(\"doxygen:g" -i Platform/Linux-x86/CreateRedist/Redist_OpenNi.py
+ sed -i -e "s:execute_check(\"doxygen:#execute_check(\"doxygen:g" -i Platform/Linux/CreateRedist/Redist_OpenNi.py
fi
- epatch "${FILESDIR}"/${P}-system-jpg-fedora.patch
-# epatch "${FILESDIR}"/${P}-system-tinyxml-fedora.patch
}
src_compile() {
- cd ${WORKDIR}/${P}/Platform/Linux-x86/Build
+ cd ${WORKDIR}/${P}/Platform/Linux/Build
# parallel build fails as lOpenNI is references before it exists
emake -j1 redist || die "emake failed"
}
src_install() {
- cd ${WORKDIR}/${P}/Platform/Linux-x86/Redist
+ cd ${WORKDIR}/${P}/Platform/Linux/Bin/x86-Release
libdir=$(get_libdir)
dodir /usr/${libdir}
insinto /usr/${libdir}
- doins Lib/*.so || die
+ doins *.so || die
insinto /usr/include/ni/
- doins -r Include/* || die
+ doins -r ../../../../Include/* || die
insinto /usr/bin/
exeinto /usr/bin/
- doexe Bin/ni* || die
-
+ doexe ni* || die
+ doexe NiViewer* || die
+
dodir /var/lib/ni
# todo mono and java?
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-03 14:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-01 10:24 [gentoo-commits] proj/gamerlay:master commit in: media-libs/openni/, media-libs/openni/files/ Marcel Unbehaun
-- strict thread matches above, loose matches on Subject: below --
2012-02-03 14:13 Marcel Unbehaun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox