Author: malat-guest
Date: 2011-10-26 20:37:42 +0000 (Wed, 26 Oct 2011)
New Revision: 8305
Added:
trunk/packages/micromanager/trunk/debian/patches/fixupfreeimage.patch
Modified:
trunk/packages/micromanager/trunk/debian/patches/series
Log:
try to get freeimage working
Added: trunk/packages/micromanager/trunk/debian/patches/fixupfreeimage.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixupfreeimage.patch
(rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixupfreeimage.patch
2011-10-26 20:37:42 UTC (rev 8305)
@@ -0,0 +1,29 @@
+Index: micromanager-1.4.6/DeviceAdapters/configure.in
+===================================================================
+--- micromanager-1.4.6.orig/DeviceAdapters/configure.in 2011-10-26
22:33:10.000000000 +0200
++++ micromanager-1.4.6/DeviceAdapters/configure.in 2011-10-26
22:35:21.000000000 +0200
+@@ -174,17 +174,17 @@
+
+ # LibFreeImage
+ AC_MSG_CHECKING(for libFreeImage headers)
+-AM_CONDITIONAL([LIBFREEIMAGEFOUND], [test -f
"../../3rdpartypublic/FreeImage/Dist/FreeImage"])
+-if test -f "../../3rdpartypublic/FreeImage/Dist/FreeImage.h"; then
++AM_CONDITIONAL([LIBFREEIMAGEFOUND], [test -f "/usr/include"])
++if test -f "/usr/include/FreeImage.h"; then
+ AC_MSG_RESULT([found])
+- AC_FIND_FILE([libfreeimage.a], [/usr/lib /usr/lib64 /usr/local/$ARCH/lib],
FREEIMAGELIBDIR)
++ AC_FIND_FILE([libfreeimage.so], [/usr/lib /usr/lib64
/usr/local/$ARCH/lib], FREEIMAGELIBDIR)
+ if test x$FREEIMAGELIBDIR = xNO; then
+ buildsc=false
+- AC_MSG_RESULT(["libfreeimage.a" not found...])
++ AC_MSG_RESULT(["libfreeimage.so" not found...])
+ else
+- AC_MSG_RESULT(["libfreeimage.a" found])
+- AC_SUBST(LIBFREEIMAGE, "$FREEIMAGELIBDIR/libfreeimage.a")
+- AC_SUBST(LIBFREEIMAGE_CXXFLAGS,
"-I../../../3rdpartypublic/FreeImage/Dist
-I../../../3rdpartypublic/FreeImage/Wrapper/FreeImagePlus ")
++ AC_MSG_RESULT(["libfreeimage.so" found])
++ AC_SUBST(LIBFREEIMAGE, "$FREEIMAGELIBDIR/libfreeimage.so")
++ AC_SUBST(LIBFREEIMAGE_CXXFLAGS, "-I/usr/include ")
+ fi
+ else
+ buildsc=false
Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series 2011-10-26
20:14:11 UTC (rev 8304)
+++ trunk/packages/micromanager/trunk/debian/patches/series 2011-10-26
20:37:42 UTC (rev 8305)
@@ -1,3 +1,4 @@
fixupcommonsmath.patch
fixupabsolutelayout.patch
fixext.patch
+fixupfreeimage.patch
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
