Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv8174

Modified Files:
        openni-sensor-primesense.info 
Log Message:
more install_name fixes and path changes in the source code

Index: openni-sensor-primesense.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/openni-sensor-primesense.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openni-sensor-primesense.info       21 Jan 2012 00:55:17 -0000      1.3
+++ openni-sensor-primesense.info       21 Jan 2012 03:06:32 -0000      1.4
@@ -1,8 +1,7 @@
-# TODO add postinst script to run niReg
-# TODO http://roxlu.com/blog/entry/116/openni-and-sensorkinect-driver-for-mac-/
+# TODO install Java stuff
 Package: openni-sensor-primesense
 Version: 5.1.0.41
-Revision: 2
+Revision: 3
 Homepage: http://www.openni.org
 License: GPL3+
 Maintainer: Hans-Christoph Steiner <h...@eds.org>
@@ -15,13 +14,23 @@
 #
 BuildDepends: fink (>= 0.28), openni
 Depends: darwin (>= 10-1),  %n-shlibs (= %v-%r), openni
-BuildDependsOnly: true
+Conflicts: openni-sensor-avin2-sensorkinect
+Recommends: primesense-nite
 #
 PatchScript: <<
   sed -i 's|-arch i386 -arch x86_64|-I%p/include -I%p/include/ni 
-DXN_OPEN_NI_FILES_LOCATION="%p/etc/ni"|' \
       %b/Platform/Linux/Build/Common/Platform.x86
   sed -i 's|-arch i386 -arch x86_64|-L%p/lib|' \
       %b/Platform/Linux/Build/Common/Platform.x86
+  sed -i 's|/var/log|%p/var/log|g' \
+      %b/Source/Utils/XnSensorServer/SensorServer.cpp
+  sed -i 's|strConfigDir = "."|strConfigDir = "%p/etc/primesense"|' \
+      %b/Source/Utils/XnSensorServer/SensorServer.cpp
+  sed -i 's|/usr/bin|%p/bin|' \
+      %b/Source/XnDeviceSensorV2/XnSensorClient.cpp
+  sed -i 's|/usr/etc|%p/etc|g' %b/README
+  sed -i 's|/usr|%p|' %b/README
+  sed -i 's|/var|%p/var|g' %b/README
 <<
 CompileScript: <<
   make -C %b/Platform/Linux/Build
@@ -47,6 +56,15 @@
   install_name_tool -id %p/lib/libXnFormats.dylib  %i/lib/libXnFormats.dylib
   # update links to point to installed location
   install_name_tool -change ../../Bin/x86-Release/libXnCore.dylib 
%p/lib/libXnCore.dylib \
+      %i/bin/XnSensorServer
+  install_name_tool -change ../../Bin/x86-Release/libXnFormats.dylib 
%p/lib/libXnFormats.dylib \
+      %i/bin/XnSensorServer
+  install_name_tool -change ../../Bin/x86-Release/libXnDDK.dylib 
%p/lib/libXnDDK.dylib \
+      %i/bin/XnSensorServer
+  install_name_tool -change ../../Bin/x86-Release/libXnDeviceSensorV2.dylib 
%p/lib/libXnDeviceSensorV2.dylib \
+      %i/bin/XnSensorServer
+  #
+  install_name_tool -change ../../Bin/x86-Release/libXnCore.dylib 
%p/lib/libXnCore.dylib \
       %i/lib/libXnDDK.dylib
   install_name_tool -change ../../Bin/x86-Release/libXnFormats.dylib 
%p/lib/libXnFormats.dylib \
       %i/lib/libXnDDK.dylib
@@ -64,6 +82,7 @@
       %i/lib/libXnDeviceSensorV2.dylib
   install_name_tool -change ../../Bin/x86-Release/libXnDDK.dylib 
%p/lib/libXnDDK.dylib \
       %i/lib/libXnDeviceSensorV2.dylib
+  #
   install_name_tool -change ../../Bin/x86-Release/libXnCore.dylib 
%p/lib/libXnCore.dylib \
       %i/lib/libXnFormats.dylib
   # create empty dirs for other related packages to use
@@ -86,7 +105,8 @@
 <<
 SplitOff: <<
   Package: %N-shlibs
-    Depends: openni-shlibs
+  Depends: openni-shlibs
+  Conflicts: openni-sensor-avin2-sensorkinect-shlibs
   Files: <<
     %p/lib/libXnCore.dylib
     %p/lib/libXnDDK.dylib


------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to