From d9d9414b4ec7d64ac6fd61b168454c9e717c8459 Mon Sep 17 00:00:00 2001 From: awiouy Date: Sun, 11 Feb 2018 23:13:53 +0100 Subject: [PATCH 1/3] cairo: also build without weston or x11 --- packages/graphics/cairo/package.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/graphics/cairo/package.mk b/packages/graphics/cairo/package.mk index 17e708bdfb..0ef9d6941c 100644 --- a/packages/graphics/cairo/package.mk +++ b/packages/graphics/cairo/package.mk @@ -57,6 +57,14 @@ elif [ "$DISPLAYSERVER" = "weston" ]; then --enable-glesv2 \ --enable-egl \ --without-x" +else + PKG_CAIRO_CONFIG="--disable-xlib \ + --disable-xlib-xrender \ + --disable-gl \ + --disable-glx \ + --disable-glesv2 \ + --disable-egl \ + --without-x" fi PKG_CONFIGURE_OPTS_TARGET="$PKG_CAIRO_CONFIG \ From 69d878460d63e46cc63c5b661fa5a42a030a728b Mon Sep 17 00:00:00 2001 From: awiouy Date: Sun, 11 Feb 2018 23:14:33 +0100 Subject: [PATCH 2/3] libgdiplus: update to 5.6 --- .../addon-depends/mono-depends/libgdiplus/package.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/mono-depends/libgdiplus/package.mk b/packages/addons/addon-depends/mono-depends/libgdiplus/package.mk index 47155e20e3..e733bf23e2 100644 --- a/packages/addons/addon-depends/mono-depends/libgdiplus/package.mk +++ b/packages/addons/addon-depends/mono-depends/libgdiplus/package.mk @@ -17,12 +17,12 @@ ################################################################################ PKG_NAME="libgdiplus" -PKG_VERSION="5.4" -PKG_SHA256="ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58" +PKG_VERSION="5.6" +PKG_SHA256="6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756" PKG_LICENSE="GPL" PKG_SITE="https://github.com/mono/libgdiplus" PKG_URL="https://github.com/mono/libgdiplus/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain giflib libjpeg-turbo tiff libXext libexif glib cairo" +PKG_DEPENDS_TARGET="toolchain cairo giflib glib libjpeg-turbo tiff" PKG_LONGDESC="An Open Source implementation of the GDI+ API" PKG_TOOLCHAIN="autotools" @@ -31,6 +31,12 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-shared \ --with-libjpeg=$TARGET_PREFIX \ --with-libtiff=$TARGET_PREFIX" +if [ "$DISPLAYSERVER" = "x11" ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXext libexif" +else + PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --without-x11" +fi + makeinstall_target() { make install DESTDIR=$INSTALL } From 5bb15a8117681ba249a723778000092abedfbd49 Mon Sep 17 00:00:00 2001 From: awiouy Date: Sun, 11 Feb 2018 23:59:18 +0100 Subject: [PATCH 3/3] mono: update to 5.8.0.108 --- packages/addons/tools/mono/changelog.txt | 3 +++ packages/addons/tools/mono/package.mk | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/addons/tools/mono/changelog.txt b/packages/addons/tools/mono/changelog.txt index 5bf3ff3fbb..63f06c459e 100644 --- a/packages/addons/tools/mono/changelog.txt +++ b/packages/addons/tools/mono/changelog.txt @@ -1,3 +1,6 @@ +110 +- Update to 5.8.0.108 + 109 - Update to 5.4.1.6 diff --git a/packages/addons/tools/mono/package.mk b/packages/addons/tools/mono/package.mk index 908b4b6251..128062d427 100644 --- a/packages/addons/tools/mono/package.mk +++ b/packages/addons/tools/mono/package.mk @@ -17,9 +17,9 @@ ################################################################################ PKG_NAME="mono" -PKG_VERSION="5.4.1.6" -PKG_SHA256="bdfda0fe9ad5ce20bb2cf9e9bf28fed40f324141297479824e1f65d97da565df" -PKG_REV="109" +PKG_VERSION="5.8.0.108" +PKG_SHA256="ecd7c55c2f62caa65fb360ace74a45ee44bbe2de046566d90594ba66c082f39c" +PKG_REV="110" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://www.mono-project.com" @@ -83,9 +83,6 @@ addon() { "$ADDON_BUILD/$PKG_ADDON_ID/bin/mono" cp -L "$(get_build_dir cairo)/.install_pkg/usr/lib/libcairo.so.2" \ - "$(get_build_dir libX11)/.install_pkg/usr/lib/libX11.so.6" \ - "$(get_build_dir libXext)/.install_pkg/usr/lib/libXext.so.6" \ - "$(get_build_dir libexif)/.install_pkg/usr/lib/libexif.so.12" \ "$(get_build_dir libgdiplus)/.install_pkg/usr/lib/libgdiplus.so" \ "$(get_build_dir mono_sqlite)/.install_pkg/usr/lib/libsqlite3.so.0" \ "$(get_build_dir pixman)/.install_pkg/usr/lib/libpixman-1.so.0" \