Remove old mason

2016-12-15 09:39:46 +00:00
parent 38b2ad298d
commit 708ac04562
733 changed files with 0 additions and 30715 deletions
@@ -1,23 +0,0 @@
-language: cpp
-
-sudo: false
-
-matrix:
-  include:
-    - os: osx
-      compiler: clang
-    - os: linux
-      compiler: clang
-
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
-script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
-
-after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
@@ -1,123 +0,0 @@
-diff --git a/build/configure.ac.tools b/build/configure.ac.tools
-index a24dbce..aaf0e5d 100644
--- a/build/configure.ac.tools
-+++ b/build/configure.ac.tools
-@@ -10,16 +10,3 @@ AC_C_INLINE
- 
- dnl ===========================================================================
- 
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = x; then
-	AC_MSG_ERROR([pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)])
-fi
-
-dnl Check for recent pkg-config which supports Requires.private
-case `$PKG_CONFIG --version` in
-[0.?|0.?.?|0.1[0-7]|0.1[0-7].?]) PKGCONFIG_REQUIRES="Requires"; ;;
-*) PKGCONFIG_REQUIRES="Requires.private"; ;;
-esac
-
-AC_SUBST(PKGCONFIG_REQUIRES)
-
-diff --git a/configure.ac b/configure.ac
-index a04baae..a162a6a 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -321,26 +321,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(gallium, Gallium3D, no, [
- dnl ===========================================================================
- 
- CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
-  use_png=no
-  AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-  if test "x$png_REQUIRES" = x; then
-    # libpng13 is GnuWin32's libpng-1.2.8 :-(
-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
-      if $PKG_CONFIG --exists $l ; then
-        png_REQUIRES=$l
-        use_png=yes
-        break
-      fi
-    done
-  else
-    use_png=yes
-  fi
-
-  if test "x$use_png" = "xyes" ; then 
-    PKG_CHECK_MODULES(png, $png_REQUIRES, , : )
-  else
-    AC_MSG_WARN([Could not find libpng in the pkg-config search path])
-  fi    
-+  use_png=yes
- ])
- 
- dnl ===========================================================================
-@@ -491,35 +472,7 @@ FREETYPE_MIN_RELEASE=2.1.9
- FREETYPE_MIN_VERSION=9.7.3
- 
- CAIRO_ENABLE_FONT_BACKEND(ft, FreeType, auto, [
-
-    PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
-                      [freetype_pkgconfig=yes],
-		      [freetype_pkgconfig=no])
-  
-    if test "x$freetype_pkgconfig" = "xyes"; then
-      ft_REQUIRES="freetype2 >= $FREETYPE_MIN_VERSION $ft_REQUIRES"
-    else
-  
-      if test -z "$FREETYPE_CONFIG"; then
-        AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-      fi
-      if test "x$FREETYPE_CONFIG" = "xno" ; then
-        use_ft='no (freetype-config not found in path or $FREETYPE_CONFIG)'
-      else
-        AC_MSG_CHECKING(freetype2 libtool version)
-
-        FREETYPE_VERSION=`$FREETYPE_CONFIG --version`
-	AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION],
-			   [AC_MSG_RESULT($FREETYPE_VERSION - OK)
-			   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
-			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`],
-			   [AC_MSG_RESULT($FREETYPE_VERSION - Too old)
-			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"])
-      fi
-    fi
-
-  ft_CFLAGS="$FREETYPE_CFLAGS"
-  ft_LIBS="$FREETYPE_LIBS"
-+    use_ft="yes"
- ])
- 
- FONTCONFIG_MIN_VERSION=2.2.95
-@@ -658,19 +611,12 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no)
- dnl ===========================================================================
- 
- CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [
-  pixman_REQUIRES="pixman-1 >= 0.16.0"
-  PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, ,
-    [use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"])
-+  use_image=yes
-   image_REQUIRES=$pixman_REQUIRES
-   image_CFLAGS=$pixman_CFLAGS
-   image_LIBS=$pixman_LIBS
- ])
- 
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
-    AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
-fi
-
-
- dnl ===========================================================================
- 
- CAIRO_ENABLE_SURFACE_BACKEND(mime, mime, always)
-diff --git a/test/Makefile.am b/test/Makefile.am
-index a9495dc..7bef9d5 100644
--- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -71,7 +71,6 @@ endif
- endif
- test_sources += $(test)
- 
-noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
- noinst_SCRIPTS = check-refs.sh
- 
- TESTS += cairo-test-suite$(EXEEXT)
@@ -1,109 +0,0 @@
-#!/usr/bin/env bash
-
-MASON_NAME=cairo
-MASON_VERSION=1.12.18
-MASON_LIB_FILE=lib/libcairo.a
-
-. ${MASON_DIR}/mason.sh
-
-function mason_load_source {
-    mason_download \
-        http://cairographics.org/releases/${MASON_NAME}-${MASON_VERSION}.tar.xz \
-        34e29ec00864859cc26ac3e45a02d7b2cb65d1c8
-
-    mason_extract_tar_xz
-
-    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
-}
-
-function mason_prepare_compile {
-    cd $(dirname ${MASON_ROOT})
-    ${MASON_DIR}/mason install libpng 1.6.16
-    MASON_PNG=$(${MASON_DIR}/mason prefix libpng 1.6.16)
-    ${MASON_DIR}/mason install freetype 2.5.5
-    MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype 2.5.5)
-    ${MASON_DIR}/mason install pixman 0.32.6
-    MASON_PIXMAN=$(${MASON_DIR}/mason prefix pixman 0.32.6)
-    # set up to fix libtool .la files
-    # https://github.com/mapbox/mason/issues/61
-    if [[ $(uname -s) == 'Darwin' ]]; then
-        FIND="\/Users\/travis\/build\/mapbox\/mason"
-    else
-        FIND="\/home\/travis\/build\/mapbox\/mason"
-    fi
-    REPLACE="$(pwd)"
-    REPLACE=${REPLACE////\\/}
-    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_PNG}/lib/libpng.la
-    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_FREETYPE}/lib/libfreetype.la
-    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_PIXMAN}/lib/libpixman-1.la
-}
-
-function mason_compile {
-    # patch cairo to avoid needing pkg-config as a build dep
-    if [[ -f ../../../patch.diff ]]; then
-        patch -N -p1 < ../../../patch.diff
-    else
-        mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
-        curl --retry 3 -s -f -# -L \
-          https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
-          -O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
-        patch -N -p1 < ./patch.diff
-    fi
-    
-    CFLAGS="${CFLAGS} -Wno-enum-conversion -I${MASON_PIXMAN}/include/pixman-1 -I${MASON_FREETYPE}/include/freetype2 -I${MASON_PNG}/include/"
-    LDFLAGS="-L${MASON_PIXMAN}/lib -lpixman-1 -L${MASON_FREETYPE}/lib -lfreetype -L${MASON_PNG}/lib -lpng"
-    CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} ./autogen.sh \
-        --prefix=${MASON_PREFIX} \
-        ${MASON_HOST_ARG} \
-        --enable-static --disable-shared \
-        --enable-pdf=yes \
-        --enable-ft=yes \
-        --enable-png=yes \
-        --enable-svg=yes \
-        --enable-ps=yes \
-        --enable-fc=no \
-        --enable-script=no \
-        --enable-interpreter=no \
-        --enable-quartz=no \
-        --enable-quartz-image=no \
-        --enable-quartz-font=no \
-        --enable-trace=no \
-        --enable-gtk-doc=no \
-        --enable-qt=no \
-        --enable-win32=no \
-        --enable-win32-font=no \
-        --enable-skia=no \
-        --enable-os2=no \
-        --enable-beos=no \
-        --enable-drm=no \
-        --enable-gallium=no \
-        --enable-gl=no \
-        --enable-glesv2=no \
-        --enable-directfb=no \
-        --enable-vg=no \
-        --enable-egl=no \
-        --enable-glx=no \
-        --enable-wgl=no \
-        --enable-test-surfaces=no \
-        --enable-tee=no \
-        --enable-xml=no \
-        --disable-valgrind \
-        --enable-gobject=no \
-        --enable-xlib=no \
-        --enable-xlib-xrender=no \
-        --enable-xcb=no \
-        --enable-xlib-xcb=no \
-        --enable-xcb-shm=no \
-        --enable-full-testing=no \
-        --enable-symbol-lookup=no \
-        --disable-dependency-tracking
-    # The -i and -k flags are to workaround make[6]: [install-data-local] Error 1 (ignored)
-    make V=1 -j${MASON_CONCURRENCY} -i -k
-    make install -i -k
-}
-
-function mason_clean {
-    make clean
-}
-
-mason_run "$@"
@@ -1,23 +0,0 @@
-language: cpp
-
-sudo: false
-
-matrix:
-  include:
-    - os: osx
-      compiler: clang
-    - os: linux
-      compiler: clang
-
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
-script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
-
-after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
@@ -1,96 +0,0 @@
-diff --git a/build/configure.ac.tools b/build/configure.ac.tools
-index a24dbce..aaf0e5d 100644
--- a/build/configure.ac.tools
-+++ b/build/configure.ac.tools
-@@ -10,16 +10,3 @@ AC_C_INLINE
- 
- dnl ===========================================================================
- 
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = x; then
-	AC_MSG_ERROR([pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)])
-fi
-
-dnl Check for recent pkg-config which supports Requires.private
-case `$PKG_CONFIG --version` in
-[0.?|0.?.?|0.1[0-7]|0.1[0-7].?]) PKGCONFIG_REQUIRES="Requires"; ;;
-*) PKGCONFIG_REQUIRES="Requires.private"; ;;
-esac
-
-AC_SUBST(PKGCONFIG_REQUIRES)
-
-diff --git a/configure.ac b/configure.ac
-index 2ce1959..87c71ac 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -321,26 +321,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(gallium, Gallium3D, no, [
- dnl ===========================================================================
- 
- CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
-  use_png=no
-  AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-  if test "x$png_REQUIRES" = x; then
-    # libpng13 is GnuWin32's libpng-1.2.8 :-(
-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
-      if $PKG_CONFIG --exists $l ; then
-        png_REQUIRES=$l
-        use_png=yes
-        break
-      fi
-    done
-  else
-    use_png=yes
-  fi
-
-  if test "x$use_png" = "xyes" ; then 
-    PKG_CHECK_MODULES(png, $png_REQUIRES, , : )
-  else
-    AC_MSG_WARN([Could not find libpng in the pkg-config search path])
-  fi    
-+  use_png=yes
- ])
- 
- dnl ===========================================================================
-@@ -495,10 +476,6 @@ FREETYPE_MIN_RELEASE=2.1.9
- FREETYPE_MIN_VERSION=9.7.3
- 
- CAIRO_ENABLE_FONT_BACKEND(ft, FreeType, auto, [
-
-    PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
-                      [freetype_pkgconfig=yes],
-		      [freetype_pkgconfig=no])
-   
-     if test "x$freetype_pkgconfig" = "xyes"; then
-       ft_REQUIRES="freetype2 >= $FREETYPE_MIN_VERSION $ft_REQUIRES"
-@@ -662,18 +639,12 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no)
- dnl ===========================================================================
- 
- CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [
-  pixman_REQUIRES="pixman-1 >= 0.30.0"
-  PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, ,
-    [use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"])
-+  use_image=yes
-   image_REQUIRES=$pixman_REQUIRES
-   image_CFLAGS=$pixman_CFLAGS
-   image_LIBS=$pixman_LIBS
- ])
- 
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
-    AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
-fi
-
- 
- dnl ===========================================================================
- 
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 950629b..f733dd9 100644
--- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -75,7 +75,6 @@ endif
- endif
- test_sources += $(test)
- 
-noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
- noinst_SCRIPTS = check-refs.sh
- 
- TESTS += cairo-test-suite$(EXEEXT)
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-MASON_NAME=cairo
-MASON_VERSION=1.14.0
-MASON_LIB_FILE=lib/libcairo.a
-
-. ${MASON_DIR}/mason.sh
-
-function mason_load_source {
-    mason_download \
-        http://cairographics.org/releases/${MASON_NAME}-${MASON_VERSION}.tar.xz \
-        69b3923f8f113206f6c0e2972de4469d04b04592
-
-    mason_extract_tar_xz
-
-    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
-}
-
-function mason_prepare_compile {
-    cd $(dirname ${MASON_ROOT})
-    ${MASON_DIR}/mason install libpng 1.6.16
-    MASON_PNG=$(${MASON_DIR}/mason prefix libpng 1.6.16)
-    ${MASON_DIR}/mason install freetype 2.5.4
-    MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype 2.5.4)
-    ${MASON_DIR}/mason install pixman 0.32.6
-    MASON_PIXMAN=$(${MASON_DIR}/mason prefix pixman 0.32.6)
-}
-
-function mason_compile {
-    mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
-    curl --retry 3 -s -f -# -L \
-      https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
-      -O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
-    # patch cairo to avoid needing pkg-config as a build dep
-    patch -N -p1 < ../../../patch.diff
-    CFLAGS="${CFLAGS} -Wno-enum-conversion -I${MASON_PIXMAN}/include/pixman-1 -I${MASON_FREETYPE}/include/freetype2 -I${MASON_PNG}/include/"
-    LDFLAGS="-L${MASON_PIXMAN}/lib -lpixman-1 -L${MASON_FREETYPE}/lib -lfreetype -L${MASON_PNG}/lib -lpng"
-    CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} ./autogen.sh \
-        --prefix=${MASON_PREFIX} \
-        ${MASON_HOST_ARG} \
-        --enable-static --disable-shared \
-        --enable-pdf=yes \
-        --enable-ft=yes \
-        --enable-png=yes \
-        --enable-svg=yes \
-        --enable-ps=yes \
-        --enable-fc=no \
-        --enable-script=no \
-        --enable-interpreter=no \
-        --enable-quartz=no \
-        --enable-quartz-image=no \
-        --enable-quartz-font=no \
-        --enable-trace=no \
-        --enable-gtk-doc=no \
-        --enable-qt=no \
-        --enable-win32=no \
-        --enable-win32-font=no \
-        --enable-skia=no \
-        --enable-os2=no \
-        --enable-beos=no \
-        --enable-drm=no \
-        --enable-gallium=no \
-        --enable-gl=no \
-        --enable-glesv2=no \
-        --enable-directfb=no \
-        --enable-vg=no \
-        --enable-egl=no \
-        --enable-glx=no \
-        --enable-wgl=no \
-        --enable-test-surfaces=no \
-        --enable-tee=no \
-        --enable-xml=no \
-        --disable-valgrind \
-        --enable-gobject=no \
-        --enable-xlib=no \
-        --enable-xlib-xrender=no \
-        --enable-xcb=no \
-        --enable-xlib-xcb=no \
-        --enable-xcb-shm=no \
-        --enable-full-testing=no \
-        --enable-symbol-lookup=no \
-        --disable-dependency-tracking
-    # The -i and -k flags are to workaround make[6]: [install-data-local] Error 1 (ignored)
-    make V=1 -j${MASON_CONCURRENCY} -i -k
-    make install -i -k
-}
-
-function mason_clean {
-    make clean
-}
-
-mason_run "$@"
@@ -1,27 +0,0 @@
-language: cpp
-
-sudo: false
-
-matrix:
-  include:
-    - os: osx
-      osx_image: xcode6
-      compiler: clang
-    - os: osx
-      osx_image: xcode7
-      compiler: clang
-    - os: linux
-      compiler: clang
-
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
-script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
-
-after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
@@ -1,96 +0,0 @@
-diff --git a/build/configure.ac.tools b/build/configure.ac.tools
-index a24dbce..aaf0e5d 100644
--- a/build/configure.ac.tools
-+++ b/build/configure.ac.tools
-@@ -10,16 +10,3 @@ AC_C_INLINE
- 
- dnl ===========================================================================
- 
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = x; then
-	AC_MSG_ERROR([pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)])
-fi
-
-dnl Check for recent pkg-config which supports Requires.private
-case `$PKG_CONFIG --version` in
-[0.?|0.?.?|0.1[0-7]|0.1[0-7].?]) PKGCONFIG_REQUIRES="Requires"; ;;
-*) PKGCONFIG_REQUIRES="Requires.private"; ;;
-esac
-
-AC_SUBST(PKGCONFIG_REQUIRES)
-
-diff --git a/configure.ac b/configure.ac
-index 2ce1959..87c71ac 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -321,26 +321,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(gallium, Gallium3D, no, [
- dnl ===========================================================================
- 
- CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
-  use_png=no
-  AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-  if test "x$png_REQUIRES" = x; then
-    # libpng13 is GnuWin32's libpng-1.2.8 :-(
-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
-      if $PKG_CONFIG --exists $l ; then
-        png_REQUIRES=$l
-        use_png=yes
-        break
-      fi
-    done
-  else
-    use_png=yes
-  fi
-
-  if test "x$use_png" = "xyes" ; then 
-    PKG_CHECK_MODULES(png, $png_REQUIRES, , : )
-  else
-    AC_MSG_WARN([Could not find libpng in the pkg-config search path])
-  fi    
-+  use_png=yes
- ])
- 
- dnl ===========================================================================
-@@ -495,10 +476,6 @@ FREETYPE_MIN_RELEASE=2.1.9
- FREETYPE_MIN_VERSION=9.7.3
- 
- CAIRO_ENABLE_FONT_BACKEND(ft, FreeType, auto, [
-
-    PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
-                      [freetype_pkgconfig=yes],
-		      [freetype_pkgconfig=no])
-   
-     if test "x$freetype_pkgconfig" = "xyes"; then
-       ft_REQUIRES="freetype2 >= $FREETYPE_MIN_VERSION $ft_REQUIRES"
-@@ -662,18 +639,12 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no)
- dnl ===========================================================================
- 
- CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [
-  pixman_REQUIRES="pixman-1 >= 0.30.0"
-  PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, ,
-    [use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"])
-+  use_image=yes
-   image_REQUIRES=$pixman_REQUIRES
-   image_CFLAGS=$pixman_CFLAGS
-   image_LIBS=$pixman_LIBS
- ])
- 
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
-    AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
-fi
-
- 
- dnl ===========================================================================
- 
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 950629b..f733dd9 100644
--- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -75,7 +75,6 @@ endif
- endif
- test_sources += $(test)
- 
-noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
- noinst_SCRIPTS = check-refs.sh
- 
- TESTS += cairo-test-suite$(EXEEXT)
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-MASON_NAME=cairo
-MASON_VERSION=1.14.2
-MASON_LIB_FILE=lib/libcairo.a
-
-. ${MASON_DIR}/mason.sh
-
-function mason_load_source {
-    mason_download \
-        http://cairographics.org/releases/${MASON_NAME}-${MASON_VERSION}.tar.xz \
-        3202106739cb0cb044c910a9b67769c95d0b6bce
-
-    mason_extract_tar_xz
-
-    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
-}
-
-function mason_prepare_compile {
-    cd $(dirname ${MASON_ROOT})
-    ${MASON_DIR}/mason install libpng 1.6.17
-    MASON_PNG=$(${MASON_DIR}/mason prefix libpng 1.6.17)
-    ${MASON_DIR}/mason install freetype 2.6
-    MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype 2.6)
-    ${MASON_DIR}/mason install pixman 0.32.6
-    MASON_PIXMAN=$(${MASON_DIR}/mason prefix pixman 0.32.6)
-}
-
-function mason_compile {
-    mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
-    curl --retry 3 -s -f -# -L \
-      https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
-      -O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
-    # patch cairo to avoid needing pkg-config as a build dep
-    patch -N -p1 < ./patch.diff
-    CFLAGS="${CFLAGS} -Wno-enum-conversion -I${MASON_PIXMAN}/include/pixman-1 -I${MASON_FREETYPE}/include/freetype2 -I${MASON_PNG}/include/"
-    LDFLAGS="-L${MASON_PIXMAN}/lib -lpixman-1 -L${MASON_FREETYPE}/lib -lfreetype -L${MASON_PNG}/lib -lpng"
-    CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} ./autogen.sh \
-        --prefix=${MASON_PREFIX} \
-        ${MASON_HOST_ARG} \
-        --enable-static --disable-shared \
-        --enable-pdf=yes \
-        --enable-ft=yes \
-        --enable-png=yes \
-        --enable-svg=yes \
-        --enable-ps=yes \
-        --enable-fc=no \
-        --enable-script=no \
-        --enable-interpreter=no \
-        --enable-quartz=no \
-        --enable-quartz-image=no \
-        --enable-quartz-font=no \
-        --enable-trace=no \
-        --enable-gtk-doc=no \
-        --enable-qt=no \
-        --enable-win32=no \
-        --enable-win32-font=no \
-        --enable-skia=no \
-        --enable-os2=no \
-        --enable-beos=no \
-        --enable-drm=no \
-        --enable-gallium=no \
-        --enable-gl=no \
-        --enable-glesv2=no \
-        --enable-directfb=no \
-        --enable-vg=no \
-        --enable-egl=no \
-        --enable-glx=no \
-        --enable-wgl=no \
-        --enable-test-surfaces=no \
-        --enable-tee=no \
-        --enable-xml=no \
-        --disable-valgrind \
-        --enable-gobject=no \
-        --enable-xlib=no \
-        --enable-xlib-xrender=no \
-        --enable-xcb=no \
-        --enable-xlib-xcb=no \
-        --enable-xcb-shm=no \
-        --enable-full-testing=no \
-        --enable-symbol-lookup=no \
-        --disable-dependency-tracking
-    # The -i and -k flags are to workaround make[6]: [install-data-local] Error 1 (ignored)
-    make V=1 -j${MASON_CONCURRENCY} -i -k
-    make install -i -k
-}
-
-function mason_clean {
-    make clean
-}
-
-mason_run "$@"
@@ -1,27 +0,0 @@
-language: cpp
-
-sudo: false
-
-matrix:
-  include:
-    - os: osx
-      osx_image: xcode6
-      compiler: clang
-    - os: osx
-      osx_image: xcode7
-      compiler: clang
-    - os: linux
-      compiler: clang
-
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
-script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
-
-after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
@@ -1,96 +0,0 @@
-diff --git a/build/configure.ac.tools b/build/configure.ac.tools
-index a24dbce..aaf0e5d 100644
--- a/build/configure.ac.tools
-+++ b/build/configure.ac.tools
-@@ -10,16 +10,3 @@ AC_C_INLINE
- 
- dnl ===========================================================================
- 
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = x; then
-	AC_MSG_ERROR([pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)])
-fi
-
-dnl Check for recent pkg-config which supports Requires.private
-case `$PKG_CONFIG --version` in
-[0.?|0.?.?|0.1[0-7]|0.1[0-7].?]) PKGCONFIG_REQUIRES="Requires"; ;;
-*) PKGCONFIG_REQUIRES="Requires.private"; ;;
-esac
-
-AC_SUBST(PKGCONFIG_REQUIRES)
-
-diff --git a/configure.ac b/configure.ac
-index 2ce1959..87c71ac 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -321,26 +321,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(gallium, Gallium3D, no, [
- dnl ===========================================================================
- 
- CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
-  use_png=no
-  AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-  if test "x$png_REQUIRES" = x; then
-    # libpng13 is GnuWin32's libpng-1.2.8 :-(
-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
-      if $PKG_CONFIG --exists $l ; then
-        png_REQUIRES=$l
-        use_png=yes
-        break
-      fi
-    done
-  else
-    use_png=yes
-  fi
-
-  if test "x$use_png" = "xyes" ; then 
-    PKG_CHECK_MODULES(png, $png_REQUIRES, , : )
-  else
-    AC_MSG_WARN([Could not find libpng in the pkg-config search path])
-  fi    
-+  use_png=yes
- ])
- 
- dnl ===========================================================================
-@@ -495,10 +476,6 @@ FREETYPE_MIN_RELEASE=2.1.9
- FREETYPE_MIN_VERSION=9.7.3
- 
- CAIRO_ENABLE_FONT_BACKEND(ft, FreeType, auto, [
-
-    PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
-                      [freetype_pkgconfig=yes],
-		      [freetype_pkgconfig=no])
-   
-     if test "x$freetype_pkgconfig" = "xyes"; then
-       ft_REQUIRES="freetype2 >= $FREETYPE_MIN_VERSION $ft_REQUIRES"
-@@ -662,18 +639,12 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no)
- dnl ===========================================================================
- 
- CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [
-  pixman_REQUIRES="pixman-1 >= 0.30.0"
-  PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, ,
-    [use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"])
-+  use_image=yes
-   image_REQUIRES=$pixman_REQUIRES
-   image_CFLAGS=$pixman_CFLAGS
-   image_LIBS=$pixman_LIBS
- ])
- 
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
-    AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
-fi
-
- 
- dnl ===========================================================================
- 
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 950629b..f733dd9 100644
--- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -75,7 +75,6 @@ endif
- endif
- test_sources += $(test)
- 
-noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
- noinst_SCRIPTS = check-refs.sh
- 
- TESTS += cairo-test-suite$(EXEEXT)
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-MASON_NAME=cairo
-MASON_VERSION=1.14.4
-MASON_LIB_FILE=lib/libcairo.a
-
-. ${MASON_DIR}/mason.sh
-
-function mason_load_source {
-    mason_download \
-        http://cairographics.org/releases/${MASON_NAME}-${MASON_VERSION}.tar.xz \
-        ecf18db1e89d99799783757d9026a74012dfafcb
-
-    mason_extract_tar_xz
-
-    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
-}
-
-function mason_prepare_compile {
-    cd $(dirname ${MASON_ROOT})
-    ${MASON_DIR}/mason install libpng 1.6.17
-    MASON_PNG=$(${MASON_DIR}/mason prefix libpng 1.6.17)
-    ${MASON_DIR}/mason install freetype 2.6
-    MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype 2.6)
-    ${MASON_DIR}/mason install pixman 0.32.6
-    MASON_PIXMAN=$(${MASON_DIR}/mason prefix pixman 0.32.6)
-}
-
-function mason_compile {
-    mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
-    curl --retry 3 -s -f -# -L \
-      https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
-      -O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
-    # patch cairo to avoid needing pkg-config as a build dep
-    patch -N -p1 < ./patch.diff
-    CFLAGS="${CFLAGS} -Wno-enum-conversion -I${MASON_PIXMAN}/include/pixman-1 -I${MASON_FREETYPE}/include/freetype2 -I${MASON_PNG}/include/"
-    LDFLAGS="-L${MASON_PIXMAN}/lib -lpixman-1 -L${MASON_FREETYPE}/lib -lfreetype -L${MASON_PNG}/lib -lpng"
-    CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} ./autogen.sh \
-        --prefix=${MASON_PREFIX} \
-        ${MASON_HOST_ARG} \
-        --enable-static --disable-shared \
-        --enable-pdf=yes \
-        --enable-ft=yes \
-        --enable-png=yes \
-        --enable-svg=yes \
-        --enable-ps=yes \
-        --enable-fc=no \
-        --enable-script=no \
-        --enable-interpreter=no \
-        --enable-quartz=no \
-        --enable-quartz-image=no \
-        --enable-quartz-font=no \
-        --enable-trace=no \
-        --enable-gtk-doc=no \
-        --enable-qt=no \
-        --enable-win32=no \
-        --enable-win32-font=no \
-        --enable-skia=no \
-        --enable-os2=no \
-        --enable-beos=no \
-        --enable-drm=no \
-        --enable-gallium=no \
-        --enable-gl=no \
-        --enable-glesv2=no \
-        --enable-directfb=no \
-        --enable-vg=no \
-        --enable-egl=no \
-        --enable-glx=no \
-        --enable-wgl=no \
-        --enable-test-surfaces=no \
-        --enable-tee=no \
-        --enable-xml=no \
-        --disable-valgrind \
-        --enable-gobject=no \
-        --enable-xlib=no \
-        --enable-xlib-xrender=no \
-        --enable-xcb=no \
-        --enable-xlib-xcb=no \
-        --enable-xcb-shm=no \
-        --enable-full-testing=no \
-        --enable-symbol-lookup=no \
-        --disable-dependency-tracking
-    # The -i and -k flags are to workaround make[6]: [install-data-local] Error 1 (ignored)
-    make V=1 -j${MASON_CONCURRENCY} -i -k
-    make install -i -k
-}
-
-function mason_clean {
-    make clean
-}
-
-mason_run "$@"