summaryrefslogtreecommitdiff
path: root/external/cairo
AgeCommit message (Collapse)Author
2019-02-26cairo: upgrade to release 1.16.0Michael Stahl
This fixes some minor CVEs. Not including the fix for CVE-2018-18064, which does not affect LO because we use the default implementation of FT_Memory which uses free/malloc. Change-Id: Ic047ed52cff3fdeba068f1b8d303c6c96c69addd Reviewed-on: https://gerrit.libreoffice.org/68088 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit caeaa7b90e42c60ec407e1f0cd5b5db2b30f55d2) Reviewed-on: https://gerrit.libreoffice.org/68217 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-25bump to latest cairoCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/58134 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 00f6bec6b70130327313b9e203625272ef05ae93) fix own-cairo edge case build Reviewed-on: https://gerrit.libreoffice.org/59663 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 30020423bd76c6770db1627cfec684708ab3427c) Change-Id: I001da359569d37afe482cdbb50e9c8b3ced24aff Reviewed-on: https://gerrit.libreoffice.org/68216 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2018-01-29fix android red and blue channel swap on jpegs w/ 24bit RGB surfaceChristian Lohmaier
that was introduced with 54596087e57ea533253e19eea594d9b6c06e8d26 without adjusting for Android accordingly Change-Id: Ie6a2001ab13ecec959da9b57bb49e1bac76e8691
2017-12-30update android rgba cairo patch to apply againCaolán McNamara
Change-Id: Iaee918439f8472bab7fab2cf545ac2e420d614ab
2017-12-26vcl-svp: add 24-bit (3-byte) RGB surface support to CairoAshod Nakashian
(cherry picked from commit e8ba02b1d56dc7b59a4f0a7373995b28653a0597) Reviewed-on: https://gerrit.libreoffice.org/46681 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 31c044e2501b9d4a0917e4e09133660bbe2a24dc) Change-Id: I7707219eae4c2d6d40c8dc957207b63d3049a75f Reviewed-on: https://gerrit.libreoffice.org/47010 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-12-23pixman: drop cached glyphs above size watermarkAshod Nakashian
The glyphs cache only tracked the number of glyphs in the cache, which isn't very useful when the glyphs vary in size from a few bytes to dozens of megabytes. In terms of memory footprint, we are interested not just in the number of cached glyphs, but also in the total memory usage. We now track the pixel-size of each glyph and drop as many as necessary to fall below the set threshold which is currently 4 MBs. There was no performance loss observed after this patch on a diverse set of documents of all types (if anything, a very modest performance win was hinted in some cases), with significant memory reduction in some cases where dozens of megabytes were previously left stale in the cache. Change-Id: I377a4c1e59611fca6bf253dd9fa90f75b5295d4b Reviewed-on: https://gerrit.libreoffice.org/45378 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 407660a08c8df27d7cd44435eefa31bd92364a3c) (cherry picked from commit ded39dc17a34127a872b11abddc32bbbb5aae047) Reviewed-on: https://gerrit.libreoffice.org/46987 Tested-by: Jenkins <ci@libreoffice.org>
2017-11-24ubsan: runtime error: left shift of 249 by 24 placesCaolán McNamara
pixman-bits-image.c:309:20: runtime error: left shift of 249 by 24 places cannot be represented in type 'int' Change-Id: I4f67752f7826225cd2175198084a29ac248b873f Reviewed-on: https://gerrit.libreoffice.org/45226 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-24ubsan: runtime error: left shift of 255 by 24 placesCaolán McNamara
pixman-fast-path.c:2839:21: runtime error: left shift of 255 by 24 places cannot be represented in type 'int' Change-Id: I9afeee371aeef24bfc0c809b142b424c653fea2e Reviewed-on: https://gerrit.libreoffice.org/45223 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-24ubsan: pixman.c:347:10: runtime error: left shift of negative value -1Caolán McNamara
with fdo64256-1.docx Change-Id: I27dc510b1f178d535bc6b2dace34cdae1d9cd62a Reviewed-on: https://gerrit.libreoffice.org/45222 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-22cairo: drop no longer needed patch for androidChristian Lohmaier
Change-Id: I7f52cc8686556e21b9d2b5fdf43ce13307bcfac0
2017-11-22ofz#4372 Undefined-shiftCaolán McNamara
upstreamed as https://bugs.freedesktop.org/show_bug.cgi?id=103845 Change-Id: I48430b2ab62991345863bceeaf3a6918f9dd1fda Reviewed-on: https://gerrit.libreoffice.org/45078 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-09upload cairo 1.14.10David Tardon
Change-Id: Ibdb107d816fe51399e54e02b529bbca77ce12ae0 Reviewed-on: https://gerrit.libreoffice.org/44506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-09-15consistent naming of externals: png -> libpngMichael Stahl
Change-Id: I82d95e74318600b390d5add716773c658817e504 Reviewed-on: https://gerrit.libreoffice.org/42296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-08ZLIB_LIBS must be passed into external/cairo as LIBS, not LDFLAGSStephan Bergmann
Change-Id: I76bd966d6932b3b3210d04137f18f928276ce631
2017-02-10Remove MinGW supportStephan Bergmann
In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-04add freeype to cairo's use externalsCaolán McNamara
Change-Id: I408c48ce0b28534b232b5d401ed13f7af76ed2ed Reviewed-on: https://gerrit.libreoffice.org/33915 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-02-01upload cairo 1.14.8David Tardon
Change-Id: I3f602b881477653f51025fce72d22a0499e7f077 Reviewed-on: https://gerrit.libreoffice.org/33806 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-12-20enable building cairo statically with DISABLE_DYNLOADINGCaolán McNamara
Change-Id: I45cfb14be3a92754c698fd553605b3a252a53e53 Reviewed-on: https://gerrit.libreoffice.org/32221 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-08build internal cairo without X support in --disable-gui modeCaolán McNamara
Change-Id: Id27fb0b0b25adebccc8ca2fa6182a483a0d0c1de
2016-11-04fix external deps for cairoDavid Tardon
Change-Id: Iba03576ee9a114ea8dc20d8ff70a953e11c6d3e7
2016-08-25cairo: try if --disable-xcb fixes android buildMichael Stahl
Change-Id: I2a49f4e2b60fb51e4ec03dd82b7e54d1f39d887a
2016-08-24cairo: upgrade pixman to release 0.34.0, cairo to release 1.14.6Michael Stahl
* from pixman-0.24.4.patch drop: - Android support config.sub: obsoleted by new upstream autoconf - configure Mac OS X 10.4 (unsupported) linker warning - configure getisax Solaris check: it's unclear why this would give a wrong result on Linux, it certainly does't on Fedora 24... - __inline__ workaround looks fixed upstream * drop pixman-0.24.4.android.patch: obsoleted by new upstream autoconf * from cairo-1.10.2.patch drop: - Makefile.win32.common: drop this for now, we don't build cairo on windows and paths in this patch are still dmake INPATH... - Android support config.sub: obsoleted by new upstream autoconf - configure "libpng15" should be obsolete since it's overridden by png_CFLAGS/png_LIBS anyway - configure Mac OS X 10.4 (unsupported) linker warning - cairo-output-stream.c: fixed upstream - cairo-ft-font.c: presumed obsolete, FcResultOutOfMemory added in 2004 * drop cairo.dlsym.lcdfilter.patch: FT_Library_SetLcdFilter since 2.3.0 so exists in RHEL 6 baseline (2.3.11) * drop cairo-1.10.2-oldfontconfig.patch: RHEL 6 baseline has fontconfig 2.8.0 so 2.2.95 isn't "too new" * drop cairo-1.10.2.wntmsc.patch: we don't build cairo on windows currently, and this doesn't apply * drop no-flto-clang.patch: fixed upstream * remove definition of COMPRESS var that appears to be completely unused Change-Id: I5d782b9267c348c266ef369db2f8ac2c3c70b90d Reviewed-on: https://gerrit.libreoffice.org/28365 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-03-29cairo: fix malformed conditionals, these should have empty "then" branchMichael Stahl
Change-Id: Idc83582f0b4317a4d272bc5fa8eaf2dc98785fc6
2016-03-25fix headless buildOliver Specht
disables OpenGL and glew usage, lets --without-gui do what --without-x did before and disables X related test Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb Reviewed-on: https://gerrit.libreoffice.org/23474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2016-03-24FREETYPE_CFLAGS is already set when using external freetypeKorrawit Pruegsanusak
When you're on Debian derivatives, using internal cairo but external (system's) freetype, the "ft2build.h" is in /usr/include/freetype2/, not /usr/include/, which is already in FREETYPE_CFLAGS since configure.ac Change-Id: I24c697776bd77d423ebeafd38315cb76cad28f9b Reviewed-on: https://gerrit.libreoffice.org/23334 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-29Android autoconf fixesPeter Foley
Change-Id: I3429f6a80dd7e080e8f2634ca744d1dac5ea1865 Reviewed-on: https://gerrit.libreoffice.org/21558 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-16android x86 doesn't define ffs in libc, use compiler builtin insteadChristian Lohmaier
Change-Id: Ifde1184e469fc9a74de007a0caf27750b2ffbcbb
2015-12-17Android: cairo build needs fontconfig and png headersChristian Lohmaier
Change-Id: If7c2279281851b3234ab5982e3c34058a7b8f50c
2015-11-23Do all svp text rendering with cairoCaolán McNamara
enabling us to delete a whole pile of foo For android we patch cairo, which is internal in that case, to swap the rgb components so that cairo then matches the OpenGL GL_RGBA format so we can use it there where we don't have GL_BGRA support. Change-Id: I25e34889c7b7263438b143dd2a2ad882fb0f190a
2015-11-16build cairo on androidCaolán McNamara
Change-Id: Ie2f7662a4cc3955963517f265894b8f6a495ece8 Reviewed-on: https://gerrit.libreoffice.org/19991 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-16don't allow caito to add -flto to its own cflagsCaolán McNamara
Change-Id: I22c66755e8e5ede01cf3e5f21c910f759b55de7a
2015-11-12Generalize COM_GCC_IS_CLANG -> COM_IS_CLANGStephan Bergmann
...in anticipation of building with clang-cl.exe on Windows Change-Id: I1d723c9d3b5ca8a2bc6b27ef0189a7b053581398 Reviewed-on: https://gerrit.libreoffice.org/19928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2014-02-27normalize values of CROSS_COMPILINGMichael Stahl
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-12normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIGMichael Stahl
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-27gbuild: remove gb_ExternalPackage_add_library_for_installMichael Stahl
Deliver all external libraries to INSTDIR directly. Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
2013-10-24cairo: use libraries from WORKDIRMichael Stahl
Change-Id: Ieb28a48c5fe3b0d89261ff790ecc9db2b5bbf21c
2013-10-18Fix building from inside modules moved to externalKhaled Hosny
Change-Id: Id6023dc3751fe70984f489682be17d1ab1855f71
2013-10-17fdo#70393: move cairo to a subdir of externalKhaled Hosny
Change-Id: I5a5d43521d3d7227dadd05525e2c69c63a3f1c1b Reviewed-on: https://gerrit.libreoffice.org/6284 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
generated by cgit (git 2.34.1) at 2024-07-13 16:51:51 +0000