fix cairo/pixman config.h conflict problem.

2024-11-29 10:38:47 +08:00 · 2019-08-15 06:28:23 +08:00 · 2019-08-15 06:28:23 +08:00 · 44fdbb44b5
commit 44fdbb44b5
parent cbe5e0ae2c
44 changed files with 47 additions and 45 deletions
--- a/3rd/cairo/cairo/cairo-damage-private.h
+++ b/3rd/cairo/cairo/cairo-damage-private.h
@ -38,7 +38,7 @@

 #include "cairo-types-private.h"

-#include <pixman.h>
+#include <pixman/pixman.h>

 CAIRO_BEGIN_DECLS

--- a/3rd/cairo/cairo/cairo-image-surface-private.h
+++ b/3rd/cairo/cairo/cairo-image-surface-private.h
@ -41,7 +41,7 @@
 #include "cairo-surface-private.h"

 #include <stddef.h>
-#include <pixman.h>
+#include <pixman/pixman.h>

 CAIRO_BEGIN_DECLS

--- a/3rd/cairo/cairo/cairo-pixman-private.h
+++ b/3rd/cairo/cairo/cairo-pixman-private.h
@ -40,7 +40,7 @@

 #include "cairo-pixman-private.h" /* keep make check happy */

-#include <pixman.h>
+#include <pixman/pixman.h>

 #if PIXMAN_VERSION < PIXMAN_VERSION_ENCODE(0,22,0)
 #define pixman_image_composite32 pixman_image_composite
--- a/3rd/cairo/cairo/cairo-region-private.h
+++ b/3rd/cairo/cairo/cairo-region-private.h
@ -42,7 +42,7 @@
 #include "cairo-types-private.h"
 #include "cairo-reference-count-private.h"

-#include <pixman.h>
+#include <pixman/pixman.h>

 CAIRO_BEGIN_DECLS

--- a/3rd/cairo/cairo/cairoint.h
+++ b/3rd/cairo/cairo/cairoint.h
@ -68,7 +68,7 @@
 #include <stdio.h>

 #include "cairo.h"
-#include <pixman.h>
+#include <pixman/pixman.h>

 #include "cairo-compiler-private.h"
 #include "cairo-error-private.h"
--- a/3rd/pixman/pixman/pixman-access.c
+++ b/3rd/pixman/pixman/pixman-access.c
@ -25,7 +25,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-arm-neon.c
+++ b/3rd/pixman/pixman/pixman-arm-neon.c
@ -27,7 +27,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <string.h>
--- a/3rd/pixman/pixman/pixman-arm-simd.c
+++ b/3rd/pixman/pixman/pixman-arm-simd.c
@ -24,7 +24,7 @@
 *
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-arm.c
+++ b/3rd/pixman/pixman/pixman-arm.c
@ -20,7 +20,7 @@
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-bits-image.c
+++ b/3rd/pixman/pixman/pixman-bits-image.c
@ -27,7 +27,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <stdio.h>
 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-combine-float.c
+++ b/3rd/pixman/pixman/pixman-combine-float.c
@ -26,7 +26,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <math.h>
--- a/3rd/pixman/pixman/pixman-combine32.c
+++ b/3rd/pixman/pixman/pixman-combine32.c
@ -22,7 +22,7 @@
 * SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <math.h>
--- a/3rd/pixman/pixman/pixman-conical-gradient.c
+++ b/3rd/pixman/pixman/pixman-conical-gradient.c
@ -25,7 +25,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-edge.c
+++ b/3rd/pixman/pixman/pixman-edge.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <string.h>
--- a/3rd/pixman/pixman/pixman-fast-path.c
+++ b/3rd/pixman/pixman/pixman-fast-path.c
@ -24,7 +24,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <string.h>
 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-filter.c
+++ b/3rd/pixman/pixman/pixman-filter.c
@ -29,7 +29,7 @@
 #include <math.h>
 #include <assert.h>
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include "pixman-private.h"

--- a/3rd/pixman/pixman/pixman-general.c
+++ b/3rd/pixman/pixman/pixman-general.c
@ -26,7 +26,7 @@
 * SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <stdlib.h>
 #include <string.h>
--- a/3rd/pixman/pixman/pixman-glyph.c
+++ b/3rd/pixman/pixman/pixman-glyph.c
@ -25,7 +25,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include "pixman-private.h"

--- a/3rd/pixman/pixman/pixman-gradient-walker.c
+++ b/3rd/pixman/pixman/pixman-gradient-walker.c
@ -24,7 +24,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include "pixman-private.h"

--- a/3rd/pixman/pixman/pixman-image.c
+++ b/3rd/pixman/pixman/pixman-image.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-implementation.c
+++ b/3rd/pixman/pixman/pixman-implementation.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <stdlib.h>
 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-linear-gradient.c
+++ b/3rd/pixman/pixman/pixman-linear-gradient.c
@ -26,7 +26,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <stdlib.h>
 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-matrix.c
+++ b/3rd/pixman/pixman/pixman-matrix.c
@ -25,7 +25,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <math.h>
--- a/3rd/pixman/pixman/pixman-mips-dspr2.c
+++ b/3rd/pixman/pixman/pixman-mips-dspr2.c
@ -30,7 +30,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-mips.c
+++ b/3rd/pixman/pixman/pixman-mips.c
@ -20,7 +20,7 @@
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-mmx.c
+++ b/3rd/pixman/pixman/pixman-mmx.c
@ -30,7 +30,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #if defined USE_X86_MMX || defined USE_ARM_IWMMXT || defined USE_LOONGSON_MMI
--- a/3rd/pixman/pixman/pixman-noop.c
+++ b/3rd/pixman/pixman/pixman-noop.c
@ -22,7 +22,7 @@
 * DEALINGS IN THE SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <string.h>
 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-ppc.c
+++ b/3rd/pixman/pixman/pixman-ppc.c
@ -20,7 +20,7 @@
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-radial-gradient.c
+++ b/3rd/pixman/pixman/pixman-radial-gradient.c
@ -28,7 +28,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <stdlib.h>
 #include <math.h>
--- a/3rd/pixman/pixman/pixman-region16.c
+++ b/3rd/pixman/pixman/pixman-region16.c
@ -23,7 +23,7 @@
 * Author: Soren Sandmann <sandmann@redhat.com>
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #undef PIXMAN_DISABLE_DEPRECATED
--- a/3rd/pixman/pixman/pixman-region32.c
+++ b/3rd/pixman/pixman/pixman-region32.c
@ -23,7 +23,7 @@
 * Author: Soren Sandmann <sandmann@redhat.com>
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman-solid-fill.c
+++ b/3rd/pixman/pixman/pixman-solid-fill.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include "pixman-private.h"

--- a/3rd/pixman/pixman/pixman-sse2.c
+++ b/3rd/pixman/pixman/pixman-sse2.c
@ -27,7 +27,7 @@
 * Based on work by Owen Taylor and Søren Sandmann
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 /* PSHUFD is slow on a lot of old processors, and new processors have SSSE3 */
--- a/3rd/pixman/pixman/pixman-ssse3.c
+++ b/3rd/pixman/pixman/pixman-ssse3.c
@ -24,7 +24,7 @@
 * Author: Soren Sandmann (soren.sandmann@gmail.com)
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-timer.c
+++ b/3rd/pixman/pixman/pixman-timer.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-trap.c
+++ b/3rd/pixman/pixman/pixman-trap.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include <stdio.h>
--- a/3rd/pixman/pixman/pixman-utils.c
+++ b/3rd/pixman/pixman/pixman-utils.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include <stdio.h>
 #include <stdlib.h>
--- a/3rd/pixman/pixman/pixman-vmx.c
+++ b/3rd/pixman/pixman/pixman-vmx.c
@ -26,7 +26,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include "pixman-private.h"
 #include "pixman-combine32.h"
--- a/3rd/pixman/pixman/pixman-x86.c
+++ b/3rd/pixman/pixman/pixman-x86.c
@ -20,7 +20,7 @@
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif

 #include "pixman-private.h"
--- a/3rd/pixman/pixman/pixman.c
+++ b/3rd/pixman/pixman/pixman.c
@ -24,7 +24,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 #include "pixman-private.h"

--- a/3rd/pixman/pixman/pixman.h
+++ b/3rd/pixman/pixman/pixman.h
@ -69,7 +69,7 @@ SOFTWARE.
 #ifndef PIXMAN_H__
 #define PIXMAN_H__

-#include <pixman-version.h>
+#include "pixman-version.h"

 #ifdef  __cplusplus
 #define PIXMAN_BEGIN_DECLS extern "C" {
--- a/awtk_config.py
+++ b/awtk_config.py
@ -38,7 +38,7 @@ if OS_NAME == 'Windows':
 else:
  NANOVG_BACKEND='GL3'

-#VGCANVAS='CAIRO'
+VGCANVAS='CAIRO'
 #NANOVG_BACKEND='GLES2'
 #NANOVG_BACKEND='GLES3'
 #NANOVG_BACKEND='AGG'
@ -178,8 +178,7 @@ CPPPATH=[TK_ROOT,
  TK_3RD_ROOT, 
  joinPath(TK_SRC, 'ext_widgets'), 
  joinPath(TK_3RD_ROOT, 'pixman'), 
-  joinPath(TK_3RD_ROOT, 'pixman/pixman'), 
-  joinPath(TK_3RD_ROOT, 'cairo/cairo'), 
+  joinPath(TK_3RD_ROOT, 'cairo'),
  joinPath(TK_3RD_ROOT, 'bgfx/bgfx/include'), 
  joinPath(TK_3RD_ROOT, 'bgfx/bx/include'), 
  joinPath(TK_3RD_ROOT, 'bgfx/bimg/include'), 
--- a/docs/changes.md
+++ b/docs/changes.md
@ -1,4 +1,7 @@
 # 最新动态
+* 2019/08/15
+  * 修改cairo/pixman config.h冲突的问题(感谢陈谭提供补丁)
+
 * 2019/08/14
  * 完善文档。
  * 增加宏TK\_XML\_MAX\_ATTRS用于控制XML属性的最大个数(缺省24)。
--- a/src/vgcanvas/vgcanvas_cairo.c
+++ b/src/vgcanvas/vgcanvas_cairo.c
@ -24,7 +24,7 @@
 #include "tkc/utf8.h"

 #include "base/vgcanvas.h"
-#include "cairo.h"
+#include "cairo/cairo.h"
 #include "tkc/mem.h"
 #include "tkc/darray.h"