Update to 7.24.1
[openwrt/svn-archive/archive.git] / libs / vips / patches / 001-no_cpp.patch
1 diff -u --recursive vips-7.24.1-vanilla/configure.in vips-7.24.1/configure.in
2 --- vips-7.24.1-vanilla/configure.in 2011-03-29 22:09:45.465282663 -0500
3 +++ vips-7.24.1/configure.in 2011-03-29 22:18:40.786482911 -0500
4 @@ -143,7 +143,6 @@
5 AC_PROG_AWK
6 AC_PROG_CC
7 AC_PROG_CC_STDC
8 -AC_PROG_CXX
9 AC_C_CONST
10 AC_C_RESTRICT
11 AC_PROG_RANLIB
12 @@ -615,7 +614,6 @@
13 # in AC_OUTPUT, but that seems to break for some combinations of sh/m4
14 AC_OUTPUT([
15 vips-7.24.pc
16 - vipsCC-7.24.pc
17 Makefile
18 libvips/include/vips/version.h
19 libvips/include/Makefile
20 @@ -624,7 +622,6 @@
21 libvips/acquire/Makefile
22 libvips/arithmetic/Makefile
23 libvips/boolean/Makefile
24 - libvips/cimg/Makefile
25 libvips/colour/Makefile
26 libvips/conversion/Makefile
27 libvips/convolution/Makefile
28 @@ -641,9 +638,6 @@
29 libvips/relational/Makefile
30 libvips/resample/Makefile
31 libvips/video/Makefile
32 - libvipsCC/include/Makefile
33 - libvipsCC/include/vips/Makefile
34 - libvipsCC/Makefile
35 tools/Makefile
36 tools/iofuncs/Makefile
37 tools/mosaicing/Makefile
38 @@ -655,7 +649,6 @@
39 tools/scripts/light_correct
40 tools/scripts/shrink_width
41 swig/Makefile
42 - swig/vipsCC/Makefile
43 swig/python/setup.py
44 man/Makefile
45 doc/Makefile
46 diff -u --recursive vips-7.24.1-vanilla/libvips/Makefile.am vips-7.24.1/libvips/Makefile.am
47 --- vips-7.24.1-vanilla/libvips/Makefile.am 2011-03-29 22:09:45.525280200 -0500
48 +++ vips-7.24.1/libvips/Makefile.am 2011-03-29 22:16:08.223081415 -0500
49 @@ -1,14 +1,3 @@
50 -# only build in the cimg dir if C++ is enabled
51 -if ENABLE_CXX
52 -C_COMPILE_DIR = cimg
53 -C_DIST_DIR =
54 -C_LIB = cimg/libcimg.la
55 -else
56 -C_COMPILE_DIR =
57 -C_DIST_DIR = cimg
58 -C_LIB =
59 -endif
60 -
61 SUBDIRS = \
62 include \
63 acquire \
64 @@ -19,7 +8,6 @@
65 conversion \
66 deprecated \
67 convolution \
68 - $(C_COMPILE_DIR) \
69 format \
70 freq_filt \
71 histograms_lut \
72 @@ -36,9 +24,6 @@
73 lib_LTLIBRARIES = libvips.la
74
75 libvips_la_SOURCES = dummy.c
76 -if ENABLE_CXX
77 -libvips_la_SOURCES += dummy2.cc
78 -endif
79
80 # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end
81 libvips_la_LIBADD = \
82 @@ -50,7 +35,6 @@
83 conversion/libconversion.la \
84 convolution/libconvolution.la \
85 deprecated/libdeprecated.la \
86 - $(C_LIB) \
87 format/libformat.la \
88 freq_filt/libfreq_filt.la \
89 histograms_lut/libhistograms_lut.la \
90 @@ -64,13 +48,6 @@
91 video/libvideo.la \
92 @VIPS_LIBS@
93
94 -if ENABLE_CXX
95 -libvips_la_LIBADD += @VIPS_CXX_LIBS@
96 -endif
97 -
98 libvips_la_LDFLAGS = \
99 -no-undefined \
100 -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@
101 -
102 -EXTRA_DIST = \
103 - $(C_DIST_DIR)
104 diff -u --recursive vips-7.24.1-vanilla/libvips/resample/Makefile.am vips-7.24.1/libvips/resample/Makefile.am
105 --- vips-7.24.1-vanilla/libvips/resample/Makefile.am 2011-03-29 22:09:45.546279339 -0500
106 +++ vips-7.24.1/libvips/resample/Makefile.am 2011-03-29 22:16:28.918185323 -0500
107 @@ -2,23 +2,6 @@
108 # you'd think we could just define a couple of variables, but that seems to
109 # confuse libtool and make it link the library with g++
110 # instead, have two completely different paths
111 -if ENABLE_CXX
112 -
113 -libresample_la_SOURCES = \
114 - im_affine.c \
115 - interpolate.c \
116 - im_shrink.c \
117 - im_stretch3.c \
118 - im_rightshift_size.c \
119 - transform.c \
120 - resample_dispatch.c \
121 - bicubic.cpp \
122 - lbb.cpp \
123 - nohalo.cpp \
124 - vsqbs.cpp \
125 - templates.h
126 -
127 -else
128
129 libresample_la_SOURCES = \
130 im_affine.c \
131 @@ -29,15 +12,6 @@
132 transform.c \
133 resample_dispatch.c
134
135 -EXTRA_DIST = \
136 - bicubic.cpp \
137 - lbb.cpp \
138 - nohalo.cpp \
139 - vsqbs.cpp \
140 - templates.h
141 -
142 -endif
143 -
144 noinst_LTLIBRARIES = libresample.la
145
146 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@