Merge pull request #668 from awiouy/mono7

Backport of Mono, Emby and WebGrab+Plus

packages/addons/addon-depends/emby-depends/imagemagick/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="imagemagick"
-PKG_VERSION="6.9.4-9"
+PKG_VERSION="6.9.5-5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"

packages/addons/service/emby/changelog.txt

@@ -1,3 +1,8 @@
+7.0.102
+- Updated to version 3.0.6070
+- Build for all architectures
+- Refer to libsqlite3.so.0 instead of libsqlite3.so
+
 7.0.101
 - Updated to version 3.0.5985
 - Removed mono build dependency

packages/addons/service/emby/package.mk

@@ -17,9 +17,9 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.0.5985"
-PKG_REV="101"
-PKG_ARCH="arm x86_64"
+PKG_VERSION="3.0.6070"
+PKG_REV="102"
+PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
@@ -29,16 +29,14 @@ PKG_SECTION="service"
 PKG_SHORTDESC="Emby: a personal media server"
 PKG_LONGDESC="Emby ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
+PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby (beta)"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="7.0"
 PKG_ADDON_REQUIRES="tools.mono:0.0.0"
 
-PKG_AUTORECONF="no"
-
 unpack() {
   mkdir -p $PKG_BUILD
 }
@@ -53,7 +51,11 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
-  unzip -q $ROOT/$SOURCES/$PKG_NAME/$PKG_SOURCE_NAME -d $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
+  unzip -q $ROOT/$SOURCES/$PKG_NAME/$PKG_SOURCE_NAME \
+        -d $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
+
+  sed -i 's/libsqlite3.so/libsqlite3.so.0/g' \
+      $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono/System.Data.SQLite.dll.config
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -PR $(get_build_dir imagemagick)/.install_pkg/usr/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib/

packages/addons/service/webgrabplus/package.mk

@@ -1,7 +1,7 @@
 PKG_NAME="webgrabplus"
 PKG_VERSION="56.29pre-20160807"
 PKG_REV="102"
-PKG_ARCH="arm x86_64"
+PKG_ARCH="any"
 PKG_LICENSE="prop."
 PKG_SITE="http://www.webgrabplus.com/"
 PKG_URL="https://github.com/awiouy/webgrabplus/archive/$PKG_VERSION.tar.gz"

packages/addons/tools/mono/changelog.txt

@@ -1,2 +1,7 @@
+7.0.101
+- Update to 4.2.1.102
+- Build static for all projects and architectures
+- Remove uneeded binaries and libraries
+
 7.0.100
 - Initial release

packages/addons/tools/mono/package.mk

@@ -17,9 +17,9 @@
 ################################################################################
 
 PKG_NAME="mono"
-PKG_VERSION="4.0.5.1"
-PKG_REV="100"
-PKG_ARCH="arm x86_64"
+PKG_VERSION="4.2.1.102"
+PKG_REV="101"
+PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.mono-project.com"
 PKG_URL="http://download.mono-project.com/sources/mono/$PKG_NAME-$PKG_VERSION.tar.bz2"
@@ -32,70 +32,63 @@ PKG_LONGDESC="Mono ($PKG_VERSION) is a software platform designed to allow devel
 PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
-PKG_ADDON_NAME="Mono (beta)"
+PKG_ADDON_NAME="Mono"
 PKG_ADDON_TYPE="xbmc.python.script"
 PKG_ADDON_REPOVERSION="7.0"
-
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 prefix="/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"
-configure_opts="--prefix=$prefix         \
-                --bindir=$prefix/bin     \
-                --sysconfdir=$prefix/etc \
-                --disable-boehm          \
-                --without-mcs-docs"
-PKG_CONFIGURE_OPTS_HOST="$configure_opts --disable-libraries --enable-static"
-PKG_CONFIGURE_OPTS_TARGET="$configure_opts --disable-mcs-build"
+options="--build=$HOST_NAME \
+         --prefix=$prefix \
+         --bindir=$prefix/bin \
+         --sbindir=$prefix/sbin \
+         --sysconfdir=$prefix/etc \
+         --libexecdir=$prefix/lib \
+         --localstatedir=/var \
+         --disable-boehm \
+         --disable-libraries \
+         --without-mcs-docs"
 
-pre_configure_host() {
+configure_host() {
   cp -PR ../* .
+  ./configure $options --host=$HOST_NAME
 }
 
 makeinstall_host() {
   : # nop
 }
 
-pre_configure_target() {
+configure_target() {
   cp -PR ../* .
+  strip_lto
+  ./configure $options --host=$TARGET_NAME \
+                       --disable-mcs-build
 }
 
 makeinstall_target() {
   make -C "$ROOT/$PKG_BUILD/.$HOST_NAME" install DESTDIR="$INSTALL"
   make -C "$ROOT/$PKG_BUILD/.$TARGET_NAME" install DESTDIR="$INSTALL"
-  rm -fr "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/include"
-  rm -fr "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/share/man"
   $STRIP "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/bin/mono"
 }
 
 addon() {
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID"  
-  cp -PR "$PKG_BUILD/.install_pkg/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"/* "$ADDON_BUILD/$PKG_ADDON_ID/"
+  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID"
+  
+  cp -PR "$PKG_BUILD/.install_pkg/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"/* \
+         "$ADDON_BUILD/$PKG_ADDON_ID/"
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  for p in           \
-    bigreqsproto     \
-    cairo            \
-    inputproto       \
-    kbproto          \
-    libexif          \
-    libpthread-stubs \
-    libX11           \
-    libXau           \
-    libxcb           \
-    libXext          \
-    pixman           \
-    xcb-proto        \
-    xcmiscproto      \
-    xextproto        \
-    xproto           \
-    xtrans           \
-    libgdiplus       \
-    mono_sqlite
-  do
-    d=$(get_build_dir $p)/.install_pkg/usr/lib
-    if [ -d $d ]
-    then
-      cp -PR $d/* $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    fi
-  done
+  rm -fr "$ADDON_BUILD/$PKG_ADDON_ID/include" \
+         "$ADDON_BUILD/$PKG_ADDON_ID/share/man"
+
+  mv "$ADDON_BUILD/$PKG_ADDON_ID/bin/mono-sgen" \
+     "$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" \
+        "$ADDON_BUILD/$PKG_ADDON_ID/lib"
 }