teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MEGAsdk: update to 3.3.8. & MEGAcmd: update to 3.6.6.0 (#133) 

* MEGAsdk: update to 3.3.8.

* MEGAsync: update to 3.6.6.0.

* MEGAcmd: rebuild against MEGAsdk-3.3.8_1
This commit is contained in:
John Zimmermann 2018-06-19 21:00:15 +02:00 committed by cr6git
parent 11ebc03a5a
commit 0f7ad1c702
7 changed files with 67 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -3055,7 +3055,7 @@ libvted-3.so.0 libvted-3.7.0_2
libpeasd-3.so.0 libpeasd-3.7.0_2
libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
libmega.so.30300 MEGAsdk-3.3.1_1
libmega.so.30308 MEGAsdk-3.3.8_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

2
srcpkgs/MEGAcmd/template
View File

@ -1,7 +1,7 @@
# Template file for 'MEGAcmd'
pkgname=MEGAcmd
version=0.9.7
revision=2
revision=3
build_style=gnu-configure
make_build_args='LIBTOOLFLAGS="--tag=CXX"'
hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config"

10
srcpkgs/MEGAsdk/patches/01-include.patch
View File

@ -1,10 +0,0 @@
--- 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

82
srcpkgs/MEGAsdk/patches/megacmd-02-qt.patch
View File

@ -1,4 +1,6 @@
--- a/bindings/qt/sdk.pri
diff --git bindings/qt/sdk.pri bindings/qt/sdk.pri
index c64482fc..0c9c4520 100644
--- bindings/qt/sdk.pri
+++ bindings/qt/sdk.pri
@@ -2,7 +2,7 @@
MEGASDK_BASE_PATH = $$PWD/../../
@ -9,51 +11,75 @@
src/backofftimer.cpp \
src/base64.cpp \
src/command.cpp \
@@ -41,7 +41,7 @@ SOURCES += src/attrmap.cpp \
src/mega_utf8proc.cpp
@@ -42,7 +42,7 @@ SOURCES += src/attrmap.cpp \
src/mediafileattribute.cpp
CONFIG(USE_MEGAAPI) {
- SOURCES += src/megaapi.cpp src/megaapi_impl.cpp \
+ SOURCES += \
bindings/qt/QTMegaRequestListener.cpp \
bindings/qt/QTMegaTransferListener.cpp \
bindings/qt/QTMegaGlobalListener.cpp \
@@ -52,7 +52,6 @@ CONFIG(USE_MEGAAPI) {
- SOURCES += src/megaapi.cpp src/megaapi_impl.cpp
+ SOURCES -= src/megaapi.cpp src/megaapi_impl.cpp
CONFIG(qt) {
SOURCES += bindings/qt/QTMegaRequestListener.cpp \
@@ -67,7 +67,7 @@ CONFIG(USE_LIBWEBSOCKETS) {
}
# CONFIG += USE_LIBUV
CONFIG(USE_LIBUV) {
- SOURCES += src/mega_http_parser.cpp
+ SOURCES -= src/mega_http_parser.cpp
DEFINES += HAVE_LIBUV
INCLUDEPATH += $$MEGASDK_BASE_PATH/bindings/qt/3rdparty/include/libuv
win32 {
@@ -98,12 +97,6 @@ win32 {
}
@@ -197,7 +197,7 @@ win32 {
CONFIG += USE_CURL
CONFIG(USE_CURL) {
- SOURCES += src/wincurl/net.cpp \
+ SOURCES -= src/wincurl/net.cpp \
src/wincurl/fs.cpp \
src/wincurl/waiter.cpp
HEADERS += include/mega/wincurl/meganet.h
@@ -205,7 +205,7 @@ win32 {
LIBS += -llibcurl -lcares -llibeay32 -lssleay32
}
else {
- SOURCES += src/win32/net.cpp \
+ SOURCES -= src/win32/net.cpp \
src/win32/fs.cpp \
src/win32/waiter.cpp
HEADERS += include/mega/win32/meganet.h
@@ -218,7 +218,7 @@ win32 {
-unix {
unix {
-SOURCES += src/posix/net.cpp \
- src/posix/fs.cpp \
- src/posix/waiter.cpp
-}
-
HEADERS += include/mega.h \
include/mega/account.h \
include/mega/attrmap.h \
@@ -169,9 +162,6 @@ win32 {
+SOURCES -= src/posix/net.cpp \
src/posix/fs.cpp \
src/posix/waiter.cpp
}
@@ -293,7 +293,7 @@ win32 {
}
unix {
- !exists($$MEGASDK_BASE_PATH/include/mega/config.h) {
- error("Configuration file not found! Please re-run configure script located in the project's root directory!")
- }
+ exists($$MEGASDK_BASE_PATH/include/mega/config.h) {
error("Configuration file not found! Please re-run configure script located in the project's root directory!")
}
HEADERS += include/mega/posix/meganet.h \
include/mega/posix/megasys.h \
include/mega/posix/megafs.h \
@@ -231,6 +221,7 @@ win32 {
@@ -309,7 +309,7 @@ CONFIG(USE_PCRE) {
CONFIG(qt) {
DEFINES += USE_QT MEGA_QT_LOGGING
- SOURCES += src/gfx/qt.cpp src/thread/qtthread.cpp
+ SOURCES -= src/gfx/qt.cpp src/thread/qtthread.cpp
}
else {
DEFINES += USE_FREEIMAGE
@@ -385,7 +385,7 @@ win32 {
unix:!macx {
+ LIBS += -lmega
INCLUDEPATH += $$MEGASDK_BASE_PATH/include/mega/posix
LIBS += -lsqlite3 -lrt
- LIBS += -lsqlite3 -lrt
+ LIBS += -lmega -lsqlite3 -lrt
exists($$MEGASDK_BASE_PATH/bindings/qt/3rdparty/libs/libcurl.a) {
LIBS += $$MEGASDK_BASE_PATH/bindings/qt/3rdparty/libs/libcurl.a

12
srcpkgs/MEGAsdk/template
View File

@ -1,7 +1,7 @@
# Template file for 'MEGAsdk'
pkgname=MEGAsdk
version=3.3.1
revision=2
version=3.3.8
revision=1
wrksrc=sdk-${version}
build_style=gnu-configure
configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
@ -16,16 +16,20 @@ maintainer="John <johnz@posteo.net>"
license="2-clause-BSD"
homepage="https://mega.nz"
distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz"
checksum=da00cbff64eba5b83a98c78347f8def3350fcf2c74ba4d4f03e099e42a1566e6
checksum=a64bf54b335ebbfc0138f4d81f3106bc4f02e9c1c8f840cd90515a7b34c01cd4
replaces="libmega>=0"
build_options="libuv mediainfo"
case "$XBPS_TARGET_MACHINE" in
*-musl);;
*-musl) build_options_default="libuv";;
*) build_options_default="libuv mediainfo";;
esac
do_check() {
: #requires static gtest libs
}
pre_configure() {
./autogen.sh
}

4
srcpkgs/MEGAsync/template
View File

@ -1,6 +1,6 @@
# Template file for 'MEGAsync'
pkgname=MEGAsync
version=3.6.0.0
version=3.6.6.0
revision=1
wrksrc="${pkgname}-${version}_Linux"
build_wrksrc="src"
@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
license="custom"
homepage="https://mega.co.nz"
distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Linux.tar.gz"
checksum=4be2ff9e3c0beb7653e269e14802fc0cf82b58cd78b0dbbae469533635cd8ddc
checksum=377a0b77b2506ebe0052d6366c3b5b74c3012cb4938e4df5e4b003677073f5fa
restricted=yes
nocross=yes

1
srcpkgs/MEGAsync/update Normal file
View File

@ -0,0 +1 @@
pattern='/archive/(v?)?\K[\d\.]+(?=\_Linux\.tar\.gz")'