Merge pull request #2490 from awiouy/90-mono-58

mono: update to 5.8.0.108
This commit is contained in:
Christian Hewitt 2018-02-13 18:43:39 +04:00 committed by GitHub
commit 95161da105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 9 deletions

View File

@ -17,12 +17,12 @@
################################################################################ ################################################################################
PKG_NAME="libgdiplus" PKG_NAME="libgdiplus"
PKG_VERSION="5.4" PKG_VERSION="5.6"
PKG_SHA256="ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58" PKG_SHA256="6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://github.com/mono/libgdiplus" PKG_SITE="https://github.com/mono/libgdiplus"
PKG_URL="https://github.com/mono/libgdiplus/archive/$PKG_VERSION.tar.gz" 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_LONGDESC="An Open Source implementation of the GDI+ API"
PKG_TOOLCHAIN="autotools" PKG_TOOLCHAIN="autotools"
@ -31,6 +31,12 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-shared \
--with-libjpeg=$TARGET_PREFIX \ --with-libjpeg=$TARGET_PREFIX \
--with-libtiff=$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() { makeinstall_target() {
make install DESTDIR=$INSTALL make install DESTDIR=$INSTALL
} }

View File

@ -1,3 +1,6 @@
110
- Update to 5.8.0.108
109 109
- Update to 5.4.1.6 - Update to 5.4.1.6

View File

@ -17,9 +17,9 @@
################################################################################ ################################################################################
PKG_NAME="mono" PKG_NAME="mono"
PKG_VERSION="5.4.1.6" PKG_VERSION="5.8.0.108"
PKG_SHA256="bdfda0fe9ad5ce20bb2cf9e9bf28fed40f324141297479824e1f65d97da565df" PKG_SHA256="ecd7c55c2f62caa65fb360ace74a45ee44bbe2de046566d90594ba66c082f39c"
PKG_REV="109" PKG_REV="110"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="MIT" PKG_LICENSE="MIT"
PKG_SITE="http://www.mono-project.com" PKG_SITE="http://www.mono-project.com"
@ -83,9 +83,6 @@ addon() {
"$ADDON_BUILD/$PKG_ADDON_ID/bin/mono" "$ADDON_BUILD/$PKG_ADDON_ID/bin/mono"
cp -L "$(get_build_dir cairo)/.install_pkg/usr/lib/libcairo.so.2" \ 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 libgdiplus)/.install_pkg/usr/lib/libgdiplus.so" \
"$(get_build_dir mono_sqlite)/.install_pkg/usr/lib/libsqlite3.so.0" \ "$(get_build_dir mono_sqlite)/.install_pkg/usr/lib/libsqlite3.so.0" \
"$(get_build_dir pixman)/.install_pkg/usr/lib/libpixman-1.so.0" \ "$(get_build_dir pixman)/.install_pkg/usr/lib/libpixman-1.so.0" \

View File

@ -57,6 +57,14 @@ elif [ "$DISPLAYSERVER" = "weston" ]; then
--enable-glesv2 \ --enable-glesv2 \
--enable-egl \ --enable-egl \
--without-x" --without-x"
else
PKG_CAIRO_CONFIG="--disable-xlib \
--disable-xlib-xrender \
--disable-gl \
--disable-glx \
--disable-glesv2 \
--disable-egl \
--without-x"
fi fi
PKG_CONFIGURE_OPTS_TARGET="$PKG_CAIRO_CONFIG \ PKG_CONFIGURE_OPTS_TARGET="$PKG_CAIRO_CONFIG \