From 6175410c0c9c89d846eeaffa1ff6c8fc58f3e158 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Feb 2018 23:56:32 +0100 Subject: [PATCH] MEGAsdk: update to 3.3.1. --- common/shlibs | 3 +-- srcpkgs/MEGAsdk/patches/01-include.patch | 10 ++++++++++ srcpkgs/MEGAsdk/patches/megacmd-03-include.patch | 14 -------------- srcpkgs/MEGAsdk/template | 15 ++++++++------- 4 files changed, 19 insertions(+), 23 deletions(-) create mode 100644 srcpkgs/MEGAsdk/patches/01-include.patch delete mode 100644 srcpkgs/MEGAsdk/patches/megacmd-03-include.patch diff --git a/common/shlibs b/common/shlibs index 2b8d16d725d..3766515c5c9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2987,13 +2987,12 @@ libtermbox.so.1 termbox-1.1.0_1 libmysofa.so.0 libmysofa-0.6_1 libzinnia.so.0 libzinnia-0.06_1 libdnet.so.1 libdnet-1.12_1 -libmega.so.30207 libmega-3.2.7_1 libgtkd-3.so.0 gtkd-3.7.0_1 libgtkdsv-3.so.0 gtkd-3.7.0_1 libvted-3.so.0 gtkd-3.7.0_1 libpeasd-3.so.0 gtkd-3.7.0_1 libgstreamerd-3.so.0 gtkd-3.7.0_1 -libmega.so.30208 MEGAsdk-3.2.8_1 +libmega.so.30300 MEGAsdk-3.3.1_1 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1 libgpod.so.4 libgpod-0.8.3_1 libi2c.so.0 i2c-tools-4.0_1 diff --git a/srcpkgs/MEGAsdk/patches/01-include.patch b/srcpkgs/MEGAsdk/patches/01-include.patch new file mode 100644 index 00000000000..65e5e6b8468 --- /dev/null +++ b/srcpkgs/MEGAsdk/patches/01-include.patch @@ -0,0 +1,10 @@ +--- include/Makefile.am 2018-02-02 13:43:23.000000000 +0100 ++++ - 2018-02-28 21:39:59.128449601 +0100 +@@ -53,6 +53,7 @@ + mega/mega_dict-src.h \ + mega/gfx/freeimage.h \ + mega/gfx/GfxProcCG.h \ ++ mega/mega_http_parser.h \ + mega/mediafileattribute.h + + if BUILD_MEGAAPI diff --git a/srcpkgs/MEGAsdk/patches/megacmd-03-include.patch b/srcpkgs/MEGAsdk/patches/megacmd-03-include.patch deleted file mode 100644 index 6c892e4528f..00000000000 --- a/srcpkgs/MEGAsdk/patches/megacmd-03-include.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git include/Makefile.am include/Makefile.am -index 2cb4070e..0f2e28b1 100644 ---- include/Makefile.am -+++ include/Makefile.am -@@ -52,7 +52,8 @@ nobase_libmegainclude_HEADERS = \ - mega/mega_zxcvbn.h \ - mega/mega_dict-src.h \ - mega/gfx/freeimage.h \ -- mega/gfx/GfxProcCG.h -+ mega/gfx/GfxProcCG.h \ -+ mega/mega_http_parser.h - - if BUILD_MEGAAPI - nobase_libmegainclude_HEADERS += megaapi.h megaapi_impl.h diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index 37a34cbfeac..278bfb116e0 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,29 +1,29 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk -version=3.2.8 +version=3.3.1 revision=1 wrksrc=sdk-${version} build_style=gnu-configure -configure_args="--disable-megacmd --enable-chat --disable-examples $(vopt_with libuv)" +configure_args="--enable-chat --disable-examples $(vopt_with libuv)" make_build_args='LIBTOOLFLAGS="--tag=CXX"' hostmakedepends="autogen doxygen autoconf automake gettext libtool" makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel - libuv-devel" + libuv-devel $(vopt_if mediainfo libmediainfo-devel)" checkdepends="gtest-devel" short_desc="The official client for cloud service mega.nz" maintainer="John " license="2-clause-BSD" homepage="https://mega.nz" distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz" -checksum=4344445d63f4a8a52570ed06da2aa8c3833644c24c947419f155ef305aefa0ea +checksum=da00cbff64eba5b83a98c78347f8def3350fcf2c74ba4d4f03e099e42a1566e6 replaces="libmega>=0" -build_options="libuv" +build_options="libuv mediainfo" case "$XBPS_TARGET_MACHINE" in *-musl);; - *) build_options_default="libuv";; + *) build_options_default="libuv mediainfo";; esac pre_configure() { @@ -46,7 +46,8 @@ MEGAsdk-qt_package() { MEGAsdk-devel_package() { depends="MEGAsdk>=${version}_${revision} libcurl-devel crypto++-devel c-ares-devel - sqlite-devel freeimage-devel libsodium-devel $(vopt_if libuv libuv-devel)" + sqlite-devel freeimage-devel libsodium-devel $(vopt_if libuv libuv-devel) + $(vopt_if mediainfo libmediainfo-devel)" short_desc+=" - development files" replaces="libmega-devel>=0" pkg_install() {