Skip to content

Commit 7786b8f

Browse files
Drop skia backend
Commit 38806bc already disabled the backend from use, now drop the code.
1 parent f246a21 commit 7786b8f

10 files changed

+1
-3540
lines changed

README

-6
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,6 @@ Experimental surface backends
181181
packages and developer dependencies are available at Netlabs:
182182
ftp://ftp.netlabs.org/pub/cairo
183183

184-
skia backend
185-
------------
186-
Requires the skia library as of June 2014. Since skia is not
187-
API stable, building against newer (or older) versions of skia
188-
will probably fail.
189-
190184

191185
Compiling
192186
=========

configure.ac

-26
Original file line numberDiff line numberDiff line change
@@ -249,31 +249,6 @@ AM_CONDITIONAL(CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE, test "x$test_win32_printin
249249

250250
dnl ===========================================================================
251251

252-
dnl NOTE: We're temporarily disabiling this backend to see if anyone
253-
dnl is actually using it. If you are, please mention on the cairo
254-
dnl mailing list.
255-
256-
dnl CAIRO_ENABLE_SURFACE_BACKEND(skia, Skia, no, [
257-
dnl AC_ARG_WITH([skia],
258-
dnl [AS_HELP_STRING([--with-skia=/path/to/skia],
259-
dnl [directory to find compiled skia sources])],
260-
dnl [skia_DIR="$withval"],
261-
dnl [skia_DIR="`pwd`/../skia"])
262-
dnl AC_ARG_WITH([skia-build-type],
263-
dnl [AS_HELP_STRING([--with-skia-build-type=(Release|Debug)]
264-
dnl [build of skia to link with, default is Release])],
265-
dnl [skia_BUILD_TYPE="$withval"],
266-
dnl [skia_BUILD_TYPE="Release"])
267-
dnl skia_NONPKGCONFIG_CFLAGS="-I$skia_DIR/include/config -I$skia_DIR/include/core -I$skia_DIR/include/effects"
268-
dnl if test "x$skia_BUILD_TYPE" = "xRelease"; then
269-
dnl skia_NONPKGCONFIG_CFLAGS="-DSK_RELEASE -DSK_CAN_USE_FLOAT $skia_NONPKGCONFIG_CFLAGS"
270-
dnl fi
271-
dnl skia_NONPKGCONFIG_LIBS="-L$skia_DIR/out/$skia_BUILD_TYPE/lib.target/ -lskia -lstdc++"
272-
dnl AC_SUBST(skia_DIR)
273-
dnl ])
274-
275-
dnl ===========================================================================
276-
277252
CAIRO_ENABLE_SURFACE_BACKEND(os2, OS/2, no, [
278253
case "$host" in
279254
*-*-os2*)
@@ -887,7 +862,6 @@ dnl ===========================================================================
887862

888863
dnl Extra stuff we need to do when building C++ code
889864
need_cxx="no"
890-
dnl AS_IF([test "x$use_skia" = "xyes"], [need_cxx="yes"])
891865
AS_IF([test "x$use_qt" = "xyes"], [need_cxx="yes"])
892866
AS_IF([test "x$use_beos" = "xyes"], [need_cxx="yes"])
893867

src/Makefile.sources

-7
Original file line numberDiff line numberDiff line change
@@ -375,13 +375,6 @@ cairo_win32_font_sources = \
375375
win32/cairo-win32-font.c \
376376
$(NULL)
377377

378-
cairo_skia_headers = cairo-skia.h
379-
cairo_skia_private = skia/cairo-skia-private.h
380-
cairo_skia_cxx_sources = \
381-
skia/cairo-skia-context.cpp \
382-
skia/cairo-skia-surface.cpp \
383-
$(NULL)
384-
385378
cairo_os2_headers = cairo-os2.h
386379
cairo_os2_private = cairo-os2-private.h
387380
cairo_os2_sources = cairo-os2-surface.c

src/cairo-pattern.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4694,7 +4694,7 @@ _cairo_debug_print_surface_pattern (FILE *file,
46944694
case CAIRO_SURFACE_TYPE_DRM: s = "drm"; break;
46954695
case CAIRO_SURFACE_TYPE_TEE: s = "tee"; break;
46964696
case CAIRO_SURFACE_TYPE_XML: s = "xml"; break;
4697-
case CAIRO_SURFACE_TYPE_SKIA: s = "skia"; break;
4697+
case CAIRO_SURFACE_TYPE_SKIA: s = "skia"; break; /* Deprecated */
46984698
case CAIRO_SURFACE_TYPE_SUBSURFACE: s = "subsurface"; break;
46994699
case CAIRO_SURFACE_TYPE_COGL: s = "cogl"; break;
47004700
default: s = "invalid"; ASSERT_NOT_REACHED; break;

0 commit comments

Comments
 (0)