Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > by-pkgid > 8c1a96618c5f76e0d4006fa5d8b85d82 > files > 2

blender-2.45-2.1mdv2008.0.src.rpm

--- blender/source/blender/imbuf/intern/gen_dynlibtiff.py.tiff	2006-07-08 17:46:28.000000000 +0200
+++ blender/source/blender/imbuf/intern/gen_dynlibtiff.py	2006-07-08 17:51:59.000000000 +0200
@@ -125,12 +125,18 @@
 	/* Try to find libtiff in a couple of standard places */
 	libtiff = PIL_dynlib_open("libtiff.so");
 	if (libtiff != NULL)  return;
+	libtiff = PIL_dynlib_open("libtiff.so.3");
+	if (libtiff != NULL)  return;
 	libtiff = PIL_dynlib_open("libtiff.dll");
 	if (libtiff != NULL)  return;
 	libtiff = PIL_dynlib_open("/usr/lib/libtiff.so");
 	if (libtiff != NULL)  return;
 	/* OSX has version specific library */
+#ifdef __x86_64__
+	libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3");
+#else
 	libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");
+#endif
 	if (libtiff != NULL)  return;
 	libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.so");
 	if (libtiff != NULL)  return;
--- blender/source/blender/imbuf/intern/dynlibtiff.c.tiff	2005-12-02 22:46:52.000000000 +0100
+++ blender/source/blender/imbuf/intern/dynlibtiff.c	2006-07-08 17:51:22.000000000 +0200
@@ -83,9 +83,15 @@
 	/* Try to find libtiff in a couple of standard places */
 	libtiff = PIL_dynlib_open("libtiff.so");
 	if (libtiff != NULL)  return;
+	libtiff = PIL_dynlib_open("libtiff.so.3");
+	if (libtiff != NULL)  return;
 	libtiff = PIL_dynlib_open("libtiff.dll");
 	if (libtiff != NULL)  return;
-	libtiff = PIL_dynlib_open("/usr/lib/libtiff.so");
+#ifdef __x86_64
+	libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3");
+#else
+	libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");
+#endif
 	if (libtiff != NULL)  return;
 	/* OSX has version specific library */
 	libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");