summaryrefslogtreecommitdiff
path: root/graphics/TiffIO/patches/patch-aa
blob: affe90a215c4248993bdd038a90140ddd1e31b80 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
$NetBSD: patch-aa,v 1.1 2006/02/23 17:59:50 joerg Exp $

--- TiffIO.pri.orig	2006-02-23 02:30:46.000000000 +0100
+++ TiffIO.pri
@@ -23,11 +23,7 @@
 CONFIG -= debug_and_release debug_and_release_target
 CONFIG += qt
 
-isEmpty(TIFF): TIFF=$$(TIFF)
-isEmpty(TIFF): TIFF=libtiff-3.7.2
-message( +++++ Using TIFF $${TIFF} )
-!exists( $$TIFF/tiffio.h ) : error( Unable to find libtiff )
-INCLUDEPATH = $$TIFF $$INCLUDEPATH
+INCLUDEPATH = $${PREFIX}/include $$INCLUDEPATH
 INCLUDEPATH -= /usr/include
 
 #Note: All *_SUPPORT flags are set inside tif_config.h
@@ -40,70 +36,10 @@ win32: !jpeg: CONFIG += no-jpeg
 #       (that generates link error on Qt4/nmake compiles).
 DEFINES += TIF_PLATFORM_CONSOLE=1
 
-HEADERS += \
-    $$TIFF/tiffio.h
-
 SOURCES += \
     TiffIO.cpp
 
-##############################################################################
-# Auto detect, for linux, if a tiff plateform was required
-
-linux: !exists( $$TIFF/tif_aux.c ) : CONFIG += libtiff
-!libtiff {
-	message( +++++ Using internal $$TIFF sources )
-
-	HEADERS += \
-    	$$TIFF/tiff.h          \
-    	$$TIFF/tiffiop.h       \
-    	$$TIFF/tiffvers.h      \
-    	$$TIFF/tif_config.h
-
-	SOURCES += \
-    	$$TIFF/tif_aux.c       \
-    	$$TIFF/tif_close.c     \
-    	$$TIFF/tif_codec.c     \
-    	$$TIFF/tif_color.c     \
-    	$$TIFF/tif_compress.c  \
-    	$$TIFF/tif_dir.c       \
-    	$$TIFF/tif_dirinfo.c   \
-    	$$TIFF/tif_dirread.c   \
-    	$$TIFF/tif_dirwrite.c  \
-    	$$TIFF/tif_dumpmode.c  \
-    	$$TIFF/tif_error.c     \
-    	$$TIFF/tif_extension.c \
-    	$$TIFF/tif_fax3.c      \
-    	$$TIFF/tif_fax3sm.c    \
-    	$$TIFF/tif_flush.c     \
-    	$$TIFF/tif_getimage.c  \
-    	$$TIFF/tif_luv.c       \
-    	$$TIFF/tif_next.c      \
-    	$$TIFF/tif_open.c      \
-    	$$TIFF/tif_packbits.c  \
-    	$$TIFF/tif_predict.c   \
-    	$$TIFF/tif_print.c     \
-    	$$TIFF/tif_read.c      \
-    	$$TIFF/tif_strip.c     \
-    	$$TIFF/tif_swab.c      \
-    	$$TIFF/tif_thunder.c   \
-    	$$TIFF/tif_tile.c      \
-    	$$TIFF/tif_version.c   \
-    	$$TIFF/tif_warning.c   \
-    	$$TIFF/tif_write.c
-
-	!no-zlib: SOURCES += $$TIFF/tif_zip.c $$TIFF/tif_pixarlog.c
- 	 no-zlib: DEFINES += NO_ZLIB=1
-	!no-lzw:  SOURCES += $$TIFF/tif_lzw.c
- 	 no-lzw:  DEFINES += NO_LZW=1
-	!no-jpeg: SOURCES += $$TIFF/tif_jpeg.c
- 	 no-jpeg: DEFINES += NO_JPEG=1
-
-	win32: SOURCES += $$TIFF/tif_win32.c
-	unix : SOURCES += $$TIFF/tif_unix.c
-} else {
-	message( Using system Tiff )
-	LIBS *= -ltiff
-}
+LIBS *= -ltiff
 
 ##############################################################################
 # Auto-detect Qt3 or Qt4 support mode...