]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/blob - libpng/patches/libpng-1.4.2-pngconf.patch
Change file layout of the makefiles.
[people/pmueller/ipfire-3.x.git] / libpng / patches / libpng-1.4.2-pngconf.patch
1 diff -Nur a/pngconf.h b/pngconf.h
2 --- a/pngconf.h 2010-05-06 12:30:09.000000000 +0200
3 +++ b/pngconf.h 2010-05-09 13:19:16.000000000 +0200
4 @@ -35,6 +35,25 @@
5 # ifdef HAVE_CONFIG_H
6 # include "config.h"
7 # endif
8 +# else
9 +/* pngconf.h is part of the exported API. When a libpng-using application
10 + includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
11 + libpng's config.h available in this case. This means that we do not have the
12 + defines added to config.h and the commandline by libpng's ./configure .
13 +
14 + For all defines from config.h not having them set is not a problem, however
15 + ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
16 + on a platform on which the MMX and SSE asm code in libpng is not supported.
17 +
18 + We do need this define as this define is used to determine whether or not
19 + to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
20 + and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
21 + (ImageMagick for example) to determine whether or not they can use the asm
22 + functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
23 + on which the MMX and SSE asm code in libpng is not supported: */
24 +# ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
25 +# define PNG_NO_ASSEMBLER_CODE
26 +# endif
27 #endif
28
29 /*