[cairo-commit] Branch '1.14' - boilerplate/Makefile.win32.features build/Makefile.win32.features build/Makefile.win32.features-h configure.ac README src/Makefile.sources src/Makefile.win32.features
Bryce Harrington
bryce at kemper.freedesktop.org
Thu Jan 4 05:38:19 UTC 2018
README | 4 +++
boilerplate/Makefile.win32.features | 12 ----------
build/Makefile.win32.features | 1
build/Makefile.win32.features-h | 3 --
configure.ac | 40 ++++++++++++++++++------------------
src/Makefile.sources | 12 +++++-----
src/Makefile.win32.features | 16 --------------
7 files changed, 30 insertions(+), 58 deletions(-)
New commits:
commit ac43e15bb574a578368b7377daaef016678e9679
Author: Bryce Harrington <bryce at osg.samsung.com>
Date: Wed Jan 3 21:32:36 2018 -0800
Hide skia backend from users
Comment out the skia backend in configure.ac to avoid presenting it as
an option to users.
Skia is not API stable and is not available in a packaged/versioned
form. This results in Cairo's skia backend constantly being out of date
and broken, since it will only work with a specific Skia snapshot. The
last time the cairo skia backend was updated was 2014, and it hadn't
been updated very regularly prior to that. For these reasons, unless
someone raises an interest in using and/or maintaining the backend,
we'll consider dropping it entirely.
diff --git a/README b/README
index 0be9947d..5581b3ab 100644
--- a/README
+++ b/README
@@ -187,6 +187,10 @@ Experimental surface backends
API stable, building against newer (or older) versions of skia
will probably fail.
+ (As of Jan 1, 2018 the skia backend is disabled. Please contact
+ the Cairo maintainers if you are interested in using and/or
+ maintaining it.)
+
Compiling
=========
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features
index e60a95ba..c361d066 100644
--- a/boilerplate/Makefile.win32.features
+++ b/boilerplate/Makefile.win32.features
@@ -151,18 +151,6 @@ enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_font_cxx_sour
enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
endif
-unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_skia_headers)
-all_cairo_boilerplate_headers += $(cairo_boilerplate_skia_headers)
-all_cairo_boilerplate_private += $(cairo_boilerplate_skia_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_skia_cxx_sources)
-all_cairo_boilerplate_sources += $(cairo_boilerplate_skia_sources)
-ifeq ($(CAIRO_HAS_SKIA_SURFACE),1)
-enabled_cairo_boilerplate_headers += $(cairo_boilerplate_skia_headers)
-enabled_cairo_boilerplate_private += $(cairo_boilerplate_skia_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_skia_cxx_sources)
-enabled_cairo_boilerplate_sources += $(cairo_boilerplate_skia_sources)
-endif
-
unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
all_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
all_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features
index 8cb155dc..928ff60f 100644
--- a/build/Makefile.win32.features
+++ b/build/Makefile.win32.features
@@ -11,7 +11,6 @@ CAIRO_HAS_QUARTZ_FONT=0
CAIRO_HAS_QUARTZ_IMAGE_SURFACE=0
CAIRO_HAS_WIN32_SURFACE=1
CAIRO_HAS_WIN32_FONT=1
-CAIRO_HAS_SKIA_SURFACE=0
CAIRO_HAS_OS2_SURFACE=0
CAIRO_HAS_BEOS_SURFACE=0
CAIRO_HAS_DRM_SURFACE=0
diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h
index 13904cfa..97e72abb 100644
--- a/build/Makefile.win32.features-h
+++ b/build/Makefile.win32.features-h
@@ -38,9 +38,6 @@ endif
ifeq ($(CAIRO_HAS_WIN32_FONT),1)
@echo "#define CAIRO_HAS_WIN32_FONT 1" >> $(top_srcdir)/src/cairo-features.h
endif
-ifeq ($(CAIRO_HAS_SKIA_SURFACE),1)
- @echo "#define CAIRO_HAS_SKIA_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h
-endif
ifeq ($(CAIRO_HAS_OS2_SURFACE),1)
@echo "#define CAIRO_HAS_OS2_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h
endif
diff --git a/configure.ac b/configure.ac
index 2ce19599..e80f156f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,25 +244,25 @@ fi
AM_CONDITIONAL(CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE, test "x$test_win32_printing" = "xyes")
dnl ===========================================================================
-
-CAIRO_ENABLE_SURFACE_BACKEND(skia, Skia, no, [
- AC_ARG_WITH([skia],
- [AS_HELP_STRING([--with-skia=/path/to/skia],
- [directory to find compiled skia sources])],
- [skia_DIR="$withval"],
- [skia_DIR="`pwd`/../skia"])
- AC_ARG_WITH([skia-build-type],
- [AS_HELP_STRING([--with-skia-build-type=(Release|Debug)]
- [build of skia to link with, default is Release])],
- [skia_BUILD_TYPE="$withval"],
- [skia_BUILD_TYPE="Release"])
- skia_NONPKGCONFIG_CFLAGS="-I$skia_DIR/include/config -I$skia_DIR/include/core -I$skia_DIR/include/effects"
- if test "x$skia_BUILD_TYPE" = "xRelease"; then
- skia_NONPKGCONFIG_CFLAGS="-DSK_RELEASE -DSK_CAN_USE_FLOAT $skia_NONPKGCONFIG_CFLAGS"
- fi
- skia_NONPKGCONFIG_LIBS="-L$skia_DIR/out/$skia_BUILD_TYPE/lib.target/ -lskia -lstdc++"
- AC_SUBST(skia_DIR)
-])
+dnl
+dnl CAIRO_ENABLE_SURFACE_BACKEND(skia, Skia, no, [
+dnl AC_ARG_WITH([skia],
+dnl [AS_HELP_STRING([--with-skia=/path/to/skia],
+dnl [directory to find compiled skia sources])],
+dnl [skia_DIR="$withval"],
+dnl [skia_DIR="`pwd`/../skia"])
+dnl AC_ARG_WITH([skia-build-type],
+dnl [AS_HELP_STRING([--with-skia-build-type=(Release|Debug)]
+dnl [build of skia to link with, default is Release])],
+dnl [skia_BUILD_TYPE="$withval"],
+dnl [skia_BUILD_TYPE="Release"])
+dnl skia_NONPKGCONFIG_CFLAGS="-I$skia_DIR/include/config -I$skia_DIR/include/core -I$skia_DIR/include/effects"
+dnl if test "x$skia_BUILD_TYPE" = "xRelease"; then
+dnl skia_NONPKGCONFIG_CFLAGS="-DSK_RELEASE -DSK_CAN_USE_FLOAT $skia_NONPKGCONFIG_CFLAGS"
+dnl fi
+dnl skia_NONPKGCONFIG_LIBS="-L$skia_DIR/out/$skia_BUILD_TYPE/lib.target/ -lskia -lstdc++"
+dnl AC_SUBST(skia_DIR)
+dnl ])
dnl ===========================================================================
@@ -839,7 +839,7 @@ dnl ===========================================================================
dnl Extra stuff we need to do when building C++ code
need_cxx="no"
-AS_IF([test "x$use_skia" = "xyes"], [need_cxx="yes"])
+dnl AS_IF([test "x$use_skia" = "xyes"], [need_cxx="yes"])
AS_IF([test "x$use_qt" = "xyes"], [need_cxx="yes"])
AS_IF([test "x$use_beos" = "xyes"], [need_cxx="yes"])
diff --git a/src/Makefile.sources b/src/Makefile.sources
index fac24d79..43cb4cad 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -367,12 +367,12 @@ cairo_win32_font_sources = \
win32/cairo-win32-font.c \
$(NULL)
-cairo_skia_headers = cairo-skia.h
-cairo_skia_private = skia/cairo-skia-private.h
-cairo_skia_cxx_sources = \
- skia/cairo-skia-context.cpp \
- skia/cairo-skia-surface.cpp \
- $(NULL)
+# cairo_skia_headers = cairo-skia.h
+# cairo_skia_private = skia/cairo-skia-private.h
+# cairo_skia_cxx_sources = \
+# skia/cairo-skia-context.cpp \
+# skia/cairo-skia-surface.cpp \
+# $(NULL)
cairo_os2_headers = cairo-os2.h
cairo_os2_private = cairo-os2-private.h
diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features
index 2274f4ad..58cb974c 100644
--- a/src/Makefile.win32.features
+++ b/src/Makefile.win32.features
@@ -197,22 +197,6 @@ ifeq ($(CAIRO_HAS_WIN32_FONT),1)
enabled_cairo_pkgconf += cairo-win32-font.pc
endif
-unsupported_cairo_headers += $(cairo_skia_headers)
-all_cairo_headers += $(cairo_skia_headers)
-all_cairo_private += $(cairo_skia_private)
-all_cairo_cxx_sources += $(cairo_skia_cxx_sources)
-all_cairo_sources += $(cairo_skia_sources)
-ifeq ($(CAIRO_HAS_SKIA_SURFACE),1)
-enabled_cairo_headers += $(cairo_skia_headers)
-enabled_cairo_private += $(cairo_skia_private)
-enabled_cairo_cxx_sources += $(cairo_skia_cxx_sources)
-enabled_cairo_sources += $(cairo_skia_sources)
-endif
-all_cairo_pkgconf += cairo-skia.pc
-ifeq ($(CAIRO_HAS_SKIA_SURFACE),1)
-enabled_cairo_pkgconf += cairo-skia.pc
-endif
-
unsupported_cairo_headers += $(cairo_os2_headers)
all_cairo_headers += $(cairo_os2_headers)
all_cairo_private += $(cairo_os2_private)
More information about the cairo-commit
mailing list