Commit Graph

193 Commits

Author SHA1 Message Date
Adam Harvey
d7a45a67be Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Switch to using freetype-config for freetype detection.
2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c Switch to using freetype-config for freetype detection.
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.

The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.

Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
2013-12-07 19:39:40 -08:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Remi Collet
36eee5b994 Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory 2013-05-08 07:37:40 +02:00
Remi Collet
0cae9a15d7 Move (back) missing functions in system libgd to gd_compat
- display libPng version in all cases
- gd_compat.c in ext/gd (nothing in ext/gd/libgd)
2013-05-05 09:54:27 +02:00
Remi Collet
54d6f8b34e gd: missing comma 2013-05-05 06:52:28 +02:00
Remi Collet
2ab270011d gd: fix typo and cleanups 2013-05-04 20:36:32 +02:00
Ondřej Surý
2a2ac5f2be Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/. 2013-05-04 16:50:13 +02:00
Ondřej Surý
5e9c6c3b64 Rewrite Xpm library check so it doesn't break on MultiArch systems 2013-05-04 16:50:08 +02:00
Ondřej Surý
8a90aad35b Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef 2013-05-04 16:50:06 +02:00
Ondřej Surý
2fc17d83cb * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm 2013-05-04 16:50:03 +02:00
Ondřej Surý
6aedadce0a Allow to use new GD-2.1.0 function from system library 2013-05-04 16:49:35 +02:00
Remi Collet
3a8ceed844 allow use of gdImageCreateFromJpegEx with system libgd 2013-04-24 16:15:11 +02:00
Remi Collet
aa4b0af20f gd: provide imageflip with system libgd when available 2013-04-24 14:32:03 +02:00
Remi Collet
9819d81ddf enable WebP with system libgd when available 2013-04-23 13:46:10 +02:00
Pierre Joye
87f5d9aa1b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye
c480bf3fb2 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye
224a67fb9f add external 2.1 detection and fix gd_compat for 2.1+ 2013-04-10 20:12:25 +02:00
Pierre Joye
00a53ca817 - config.m4 sync with .w32 2013-03-20 07:52:23 +01:00
Pierre Joye
a991360344 - add image crop support 2013-02-28 17:24:23 +01:00
Pierre Joye
98e43de7c5 - add new file for m4 as well 2013-02-27 16:02:54 +01:00
Rasmus Lerdorf
2954832b97 Check headers first and let the CHECK_LIBRARY macro
handle checking for the library. This makes it 
correctly handle non-standard system paths as long
as gcc knows about them. Should fix the build on
Ubuntu natty.
2011-05-12 08:19:37 +00:00
Rasmus Lerdorf
155972b117 Check headers first and let the CHECK_LIBRARY macro
handle checking for the library. This makes it 
correctly handle non-standard system paths as long
as gcc knows about them. Should fix the build on
Ubuntu natty.
2011-05-12 08:19:37 +00:00
Pierre Joye
cccc349aa5 - initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g) 2010-10-04 22:30:35 +00:00
Pierre Joye
f726afbfeb - [DOC] always enable imagecolormatch 2009-05-27 08:18:24 +00:00
Pierre Joye
59ec80c572 - MFH: [DOC] always enable imagerotate (bundled or system gd) 2009-05-27 07:18:05 +00:00
Pierre Joye
a008f130cd - MFH: [DOC] - add image(filled)ellipse to the compat layer (work around a bug in debian too, function is declared but not present in the lib...) 2009-05-26 20:14:31 +00:00
Pierre Joye
b682f42915 - [DOC] always enable imagefilter and imageconvolution, even when built against system's gd 2009-05-26 12:50:40 +00:00
Pierre Joye
c559d4fb30 - always add libgd/ 2009-05-26 08:53:13 +00:00
Pierre Joye
039a154633 - #47812, undefined symbol: gdJpegGetVersionInt
- #46015, Build fails with system gd
- enable gd_compat when built using system's gd
2009-04-07 09:26:22 +00:00
Takeshi Abe
40d3b2f7f3 MFH: added pixelate filter. 2009-01-14 19:06:12 +00:00
Scott MacVicar
62de800b36 Remove freetype1 support 2008-07-18 01:16:25 +00:00
foobar
7ed3c4536d MFH: Fix some configure --help texts 2007-07-03 17:25:43 +00:00
foobar
c5e8992942 MFH: - Fixed bug #41555 (configure failure: regression caused by fix for #41265) 2007-06-01 21:34:17 +00:00
foobar
3f6cb452ee MFH:- Prevent bugs like #41265 being submitted from now on. 2007-05-04 21:57:47 +00:00
Pierre Joye
6ef9642b16 - MFH:
- remove double lock (tween colors cache is created in each thread, the
   cache mutex is already locked earlier)
 - #40858, other TS improvements for gd freetype cache management
   cache initialization and shutdown is now done in MINIT and MSHUTDOWN.
2007-04-04 00:47:55 +00:00
Pierre Joye
cb11ba761e - MFH: CVE-2007-1001, integer overflow with invalid wbmp images 2007-03-10 12:18:36 +00:00
Pierre Joye
f458ff3dac - MFH: add better zlib detection 2006-12-26 10:42:50 +00:00
Antony Dovgal
1cbe552f4d change "-o" to "||" (fixes potential problems on weird systems where test doesn't support -o) 2005-11-29 18:26:02 +00:00
foobar
a20383ba06 - Unify the "configure --help" texts 2005-05-29 23:17:16 +00:00
Antony Dovgal
5cd3bd2ea7 gdImageGifCtx() is always available in bundled lib 2005-05-17 12:22:51 +00:00
foobar
1ee0293680 - Install GD header files 2005-05-07 03:19:42 +00:00
foobar
a2177b2e8e - Fixed bug #31396 (compile fails with gd 2.0.33 without freetype) 2005-01-04 06:51:45 +00:00
foobar
69eec3f3b9 MFB_4_3: Quote macro names in AC_DEFUN() 2004-12-30 07:08:39 +00:00
Joe Orton
7263c220dd More PHP_LIBDIR fixes for lib64 platforms. 2004-12-13 10:30:21 +00:00
Joe Orton
2685ca935f Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib
to support multi-ABI platforms.
2004-11-03 14:32:52 +00:00
Ilia Alshanetsky
47bf193c53 Added missing comma. Thanks Tony. 2004-07-27 12:44:25 +00:00
Ilia Alshanetsky
69a5253284 Fixed bug #29349 (imagecreatefromstring() crashes with external GD library)
Original Patch By: adconrad at debian dot org
2004-07-27 00:27:06 +00:00
Stefan Esser
e58e6efd4d Merge changes from GD 2.0.28 2004-07-22 22:38:59 +00:00
Ilia Alshanetsky
8d6cfb797b Synchronized bundled GD library with GD 2.0.17
. GD is now thread-safe thanks to wrappers around freetype library
 . Significant optimization to png writing code.
 . Miscellaneous fixes.
Fixed memory leak inside php_imagettftext_common()
Make ext/gd compile with GD 2.0.17+ (gdFreeFontCache() is not avaliable)
2003-12-25 22:12:12 +00:00