Revision: 28907
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28907
Author: damien78
Date: 2010-05-21 19:02:46 +0200 (Fri, 21 May 2010)
Log Message:
-----------
OSX 10.4/powerpc : add static libs for libtiff (3.9.2)
Modified Paths:
--------------
trunk/lib/darwin-8.0.0-powerpc/README
trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiff.h
trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffconf.h
trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffio.h
trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffio.hxx
trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffvers.h
Added Paths:
-----------
trunk/lib/darwin-8.0.0-powerpc/tiff/lib/
trunk/lib/darwin-8.0.0-powerpc/tiff/lib/libtiff.a
trunk/lib/darwin-8.0.0-powerpc/tiff/lib/libtiffxx.a
Modified: trunk/lib/darwin-8.0.0-powerpc/README
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/README 2010-05-21 15:46:56 UTC (rev
28906)
+++ trunk/lib/darwin-8.0.0-powerpc/README 2010-05-21 17:02:46 UTC (rev
28907)
@@ -1,3 +1,5 @@
+python (version 3.1.1)
+tiff (version 3.9.2)
ffmpeg (version 0.5)
ogg (version 1.1.4)
vorbis (version 1.2.3)
@@ -10,6 +12,14 @@
The following configuration parameters were used to build the libs:
+Python:
+./configure CC=gcc-4.0 CXX=gcc-4.0 --disable-shared
--enable-universalsdk=/Developer/SDKs/MacOSX10.4u.sdk
--with-universal-archs="32-bit"
+
+then lip to remove i386 binary from library
+
+TIFF:
+./configure --disable-shared
--with-jpeg-include-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/include
--with-jpeg-lib-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/lib
--with-apple-opengl-framework --build=powerpc-apple-darwin9.8.0 CC="gcc-4.0"
CXX="g++-4.0" CFLAGS="-arch ppc -mcpu=powerpc -isysroot
/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch ppc
-mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-mmacosx-version-min=10.4" LDFLAGS="-arch ppc -mcpu=powerpc -isysroot
/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+
LAME:
./configure --host=powerpc-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch ppc
-mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-mmacosx-version-min=10.4" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot
/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch ppc
-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
Modified: trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiff.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiff.h 2010-05-21 15:46:56 UTC
(rev 28906)
+++ trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiff.h 2010-05-21 17:02:46 UTC
(rev 28907)
@@ -1,4 +1,4 @@
-/* $Id: tiff.h 5898 2005-11-23 01:07:29Z lukep $ */
+/* $Id: tiff.h,v 1.43 2006-10-05 15:20:40 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -26,6 +26,9 @@
#ifndef _TIFF_
#define _TIFF_
+
+#include "tiffconf.h"
+
/*
* Tag Image File Format (TIFF)
*
@@ -40,33 +43,16 @@
* (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
*
* For Big TIFF design notes see the following link
- * http://gdal.maptools.org/twiki/bin/view/libtiff/BigTIFFDesign
+ * http://www.remotesensing.org/libtiff/bigtiffdesign.html
*/
#define TIFF_VERSION 42
#define TIFF_BIGTIFF_VERSION 43
#define TIFF_BIGENDIAN 0x4d4d
#define TIFF_LITTLEENDIAN 0x4949
-
+#define MDI_LITTLEENDIAN 0x5045
+#define MDI_BIGENDIAN 0x4550
/*
- * The so called TIFF types conflict with definitions from inttypes.h
- * included from sys/types.h on AIX (at least using VisualAge compiler).
- * We try to work around this by detecting this case. Defining
- * _TIFF_DATA_TYPEDEFS_ short circuits the later definitions in tiff.h, and
- * we will in the holes not provided for by inttypes.h.
- *
- * See http://bugzilla.remotesensing.org/show_bug.cgi?id=39
- */
-#if defined(_H_INTTYPES) && defined(_ALL_SOURCE) && defined(USING_VISUALAGE)
-
-#define _TIFF_DATA_TYPEDEFS_
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned int uint32;
-
-#endif
-
-/*
* Intrinsic data types required by the file format:
*
* 8-bit quantities int8/uint8
@@ -74,23 +60,27 @@
* 32-bit quantities int32/uint32
* strings unsigned char*
*/
-#ifndef _TIFF_DATA_TYPEDEFS_
-#define _TIFF_DATA_TYPEDEFS_
+#ifndef HAVE_INT8
typedef signed char int8; /* NB: non-ANSI compilers may not grok
*/
+#endif
typedef unsigned char uint8;
+#ifndef HAVE_INT16
typedef short int16;
+#endif
typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) ||
defined(__LP64__) || defined(__arch64__) || defined(__sparcv9)
+#if SIZEOF_INT == 4
+#ifndef HAVE_INT32
typedef int int32;
+#endif
typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
-#else
+#elif SIZEOF_LONG == 4
+#ifndef HAVE_INT32
typedef long int32;
+#endif
typedef unsigned long uint32; /* sizeof (uint32) must == 4 */
#endif
-#endif /* _TIFF_DATA_TYPEDEFS_ */
-
/* For TIFFReassignTagToIgnore */
enum TIFFIgnoreSense /* IGNORE tag table */
{
@@ -586,6 +576,72 @@
#define TIFFTAG_SGILOGENCODE 65561 /* SGILog data encoding control*/
#define SGILOGENCODE_NODITHER 0 /* do not dither encoded values*/
#define SGILOGENCODE_RANDITHER 1 /* randomly dither encd values */
+
+/*
+ * EXIF tags
+ */
+#define EXIFTAG_EXPOSURETIME 33434 /* Exposure time */
+#define EXIFTAG_FNUMBER 33437 /* F number */
+#define EXIFTAG_EXPOSUREPROGRAM 34850 /* Exposure program */
+#define EXIFTAG_SPECTRALSENSITIVITY 34852 /* Spectral sensitivity */
+#define EXIFTAG_ISOSPEEDRATINGS 34855 /* ISO speed rating */
+#define EXIFTAG_OECF 34856 /* Optoelectric conversion
+ factor */
+#define EXIFTAG_EXIFVERSION 36864 /* Exif version */
+#define EXIFTAG_DATETIMEORIGINAL 36867 /* Date and time of original
+ data generation */
+#define EXIFTAG_DATETIMEDIGITIZED 36868 /* Date and time of digital
+ data generation */
+#define EXIFTAG_COMPONENTSCONFIGURATION 37121 /* Meaning of each
component */
+#define EXIFTAG_COMPRESSEDBITSPERPIXEL 37122 /* Image compression mode */
+#define EXIFTAG_SHUTTERSPEEDVALUE 37377 /* Shutter speed */
+#define EXIFTAG_APERTUREVALUE 37378 /* Aperture */
+#define EXIFTAG_BRIGHTNESSVALUE 37379 /* Brightness */
+#define EXIFTAG_EXPOSUREBIASVALUE 37380 /* Exposure bias */
+#define EXIFTAG_MAXAPERTUREVALUE 37381 /* Maximum lens aperture */
+#define EXIFTAG_SUBJECTDISTANCE 37382 /* Subject distance */
+#define EXIFTAG_METERINGMODE 37383 /* Metering mode */
+#define EXIFTAG_LIGHTSOURCE 37384 /* Light source */
+#define EXIFTAG_FLASH 37385 /* Flash */
+#define EXIFTAG_FOCALLENGTH 37386 /* Lens focal length */
+#define EXIFTAG_SUBJECTAREA 37396 /* Subject area */
+#define EXIFTAG_MAKERNOTE 37500 /* Manufacturer notes */
+#define EXIFTAG_USERCOMMENT 37510 /* User comments */
+#define EXIFTAG_SUBSECTIME 37520 /* DateTime subseconds */
+#define EXIFTAG_SUBSECTIMEORIGINAL 37521 /* DateTimeOriginal subseconds
*/
+#define EXIFTAG_SUBSECTIMEDIGITIZED 37522 /* DateTimeDigitized subseconds
*/
+#define EXIFTAG_FLASHPIXVERSION 40960 /* Supported Flashpix
version */
+#define EXIFTAG_COLORSPACE 40961 /* Color space information */
+#define EXIFTAG_PIXELXDIMENSION 40962 /* Valid image width */
+#define EXIFTAG_PIXELYDIMENSION 40963 /* Valid image height */
+#define EXIFTAG_RELATEDSOUNDFILE 40964 /* Related audio file */
+#define EXIFTAG_FLASHENERGY 41483 /* Flash energy */
+#define EXIFTAG_SPATIALFREQUENCYRESPONSE 41484 /* Spatial frequency response */
+#define EXIFTAG_FOCALPLANEXRESOLUTION 41486 /* Focal plane X resolution */
+#define EXIFTAG_FOCALPLANEYRESOLUTION 41487 /* Focal plane Y resolution */
+#define EXIFTAG_FOCALPLANERESOLUTIONUNIT 41488 /* Focal plane resolution unit
*/
+#define EXIFTAG_SUBJECTLOCATION 41492 /* Subject location */
+#define EXIFTAG_EXPOSUREINDEX 41493 /* Exposure index */
+#define EXIFTAG_SENSINGMETHOD 41495 /* Sensing method */
+#define EXIFTAG_FILESOURCE 41728 /* File source */
+#define EXIFTAG_SCENETYPE 41729 /* Scene type */
+#define EXIFTAG_CFAPATTERN 41730 /* CFA pattern */
+#define EXIFTAG_CUSTOMRENDERED 41985 /* Custom image processing */
+#define EXIFTAG_EXPOSUREMODE 41986 /* Exposure mode */
+#define EXIFTAG_WHITEBALANCE 41987 /* White balance */
+#define EXIFTAG_DIGITALZOOMRATIO 41988 /* Digital zoom ratio */
+#define EXIFTAG_FOCALLENGTHIN35MMFILM 41989 /* Focal length in 35 mm film */
+#define EXIFTAG_SCENECAPTURETYPE 41990 /* Scene capture type */
+#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
+#define EXIFTAG_CONTRAST 41992 /* Contrast */
+#define EXIFTAG_SATURATION 41993 /* Saturation */
+#define EXIFTAG_SHARPNESS 41994 /* Sharpness */
+#define EXIFTAG_DEVICESETTINGDESCRIPTION 41995 /* Device settings description
*/
+#define EXIFTAG_SUBJECTDISTANCERANGE 41996 /* Subject distance range */
+#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
+#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
+#define EXIFTAG_IMAGEUNIQUEID 42016 /* Unique image ID */
+
#endif /* _TIFF_ */
/* vim: set ts=8 sts=8 sw=8 noet: */
Modified: trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffconf.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffconf.h 2010-05-21
15:46:56 UTC (rev 28906)
+++ trunk/lib/darwin-8.0.0-powerpc/tiff/include/tiffconf.h 2010-05-21
17:02:46 UTC (rev 28907)
@@ -1,22 +1,40 @@
-/* libtiff/tiffconf.h. Generated by configure. */
+/* libtiff/tiffconf.h. Generated from tiffconf.h.in by configure. */
/*
Configuration defines for installed libtiff.
- Editing this file no longer has any effect on the libtiff build!
+ This file maintained for backward compatibility. Do not use definitions
+ from this file in your programs.
*/
#ifndef _TIFFCONF_
#define _TIFFCONF_
+/* Define to 1 if the system has the type `int16'. */
+/* #undef HAVE_INT16 */
+
+/* Define to 1 if the system has the type `int32'. */
+/* #undef HAVE_INT32 */
+
+/* Define to 1 if the system has the type `int8'. */
+/* #undef HAVE_INT8 */
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* Compatibility stuff. */
+
/* Define as 0 or 1 according to the floating point format suported by the
machine */
#define HAVE_IEEEFP 1
/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER FILLORDER_MSB2LSB
+#define HOST_FILLORDER FILLORDER_LSB2MSB
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
(Intel) */
-#define HOST_BIGENDIAN 1
+#define HOST_BIGENDIAN 0
/* Support CCITT Group 3 & 4 algorithms */
#define CCITT_SUPPORT 1
@@ -24,6 +42,9 @@
/* Support JPEG compression (requires IJG JPEG library) */
#define JPEG_SUPPORT 1
+/* Support JBIG compression (requires JBIG-KIT library) */
+/* #undef JBIG_SUPPORT */
+
/* Support LogLuv high dynamic range encoding */
#define LOGLUV_SUPPORT 1
@@ -35,7 +56,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
