From 49ee32eeca564833bf0aded3bf7d5836076e1aef Mon Sep 17 00:00:00 2001 From: 5schatten Date: Sun, 12 May 2019 19:24:32 +0200 Subject: [PATCH] cairo: updated to 1.16.0 / reworked configure opts --- packages/graphics/cairo/package.mk | 154 +++++++++++++++-------------- 1 file changed, 79 insertions(+), 75 deletions(-) diff --git a/packages/graphics/cairo/package.mk b/packages/graphics/cairo/package.mk index ac9ac8d91e..dde4358122 100644 --- a/packages/graphics/cairo/package.mk +++ b/packages/graphics/cairo/package.mk @@ -1,87 +1,91 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cairo" -PKG_VERSION="1.14.10" -PKG_SHA256="7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09" +PKG_VERSION="1.16.0" +PKG_SHA256="5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" PKG_LICENSE="LGPL" PKG_SITE="http://cairographics.org/" -PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://cairographics.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib freetype fontconfig glib libpng pixman" PKG_LONGDESC="Cairo is a vector graphics library with cross-device output support." -PKG_TOOLCHAIN="configure" # ToDo +PKG_TOOLCHAIN="configure" -if [ "$OPENGL" != "no" ]; then - PKG_DEPENDS_TARGET+=" $OPENGL" -fi +configure_package() { + if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libXrender libX11 mesa" + fi -if [ "$OPENGLES" != "no" ]; then - PKG_DEPENDS_TARGET+=" $OPENGLES" -fi + if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" + elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + fi +} -if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXrender libX11 mesa" - PKG_CAIRO_CONFIG="--x-includes="$SYSROOT_PREFIX/usr/include" \ - --x-libraries="$SYSROOT_PREFIX/usr/lib" \ - --enable-xlib \ - --enable-xlib-xrender \ - --enable-gl \ - --enable-glx \ - --disable-glesv2 \ - --disable-egl \ - --with-x" -else - PKG_CAIRO_CONFIG="--disable-xlib \ - --disable-xlib-xrender \ - --disable-gl \ - --disable-glx \ - --enable-glesv2 \ - --enable-egl \ - --without-x" -fi +pre_configure_target() { + PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ + --enable-shared \ + --disable-static \ + --disable-gtk-doc \ + --enable-largefile \ + --enable-atomic \ + --disable-gcov \ + --disable-valgrind \ + --disable-xcb \ + --disable-xlib-xcb \ + --disable-xcb-shm \ + --disable-qt \ + --disable-quartz \ + --disable-quartz-font \ + --disable-quartz-image \ + --disable-win32 \ + --disable-win32-font \ + --disable-os2 \ + --disable-beos \ + --disable-cogl \ + --disable-drm \ + --disable-gallium \ + --enable-png \ + --disable-directfb \ + --disable-vg \ + --disable-wgl \ + --disable-script \ + --enable-ft \ + --enable-fc \ + --enable-ps \ + --enable-pdf \ + --enable-svg \ + --disable-test-surfaces \ + --disable-tee \ + --disable-xml \ + --enable-pthread \ + --enable-gobject=yes \ + --disable-full-testing \ + --disable-trace \ + --enable-interpreter \ + --disable-symbol-lookup \ + --enable-some-floating-point \ + --with-gnu-ld" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CAIRO_CONFIG \ - --disable-silent-rules \ - --enable-shared \ - --disable-static \ - --disable-gtk-doc \ - --enable-largefile \ - --enable-atomic \ - --disable-gcov \ - --disable-valgrind \ - --disable-xcb \ - --disable-xlib-xcb \ - --disable-xcb-shm \ - --disable-qt \ - --disable-quartz \ - --disable-quartz-font \ - --disable-quartz-image \ - --disable-win32 \ - --disable-win32-font \ - --disable-skia \ - --disable-os2 \ - --disable-beos \ - --disable-cogl \ - --disable-drm \ - --disable-gallium \ - --enable-png \ - --disable-directfb \ - --disable-vg \ - --disable-wgl \ - --disable-script \ - --enable-ft \ - --enable-fc \ - --enable-ps \ - --enable-pdf \ - --enable-svg \ - --disable-test-surfaces \ - --disable-tee \ - --disable-xml \ - --enable-pthread \ - --enable-gobject=yes \ - --disable-full-testing \ - --disable-trace \ - --enable-interpreter \ - --disable-symbol-lookup \ - --enable-some-floating-point \ - --with-gnu-ld" + if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_CONFIGURE_OPTS_TARGET+=" --x-includes="${SYSROOT_PREFIX}/usr/include" \ + --x-libraries="${SYSROOT_PREFIX}/usr/lib" \ + --enable-xlib \ + --enable-xlib-xrender \ + --enable-gl \ + --enable-glx \ + --disable-glesv2 \ + --disable-egl \ + --with-x" + else + PKG_CONFIGURE_OPTS_TARGET+=" --disable-xlib \ + --disable-xlib-xrender \ + --disable-gl \ + --disable-glx \ + --enable-glesv2 \ + --enable-egl \ + --without-x" + fi +}