summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO62
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD112
-rw-r--r--esee18
4 files changed, 161 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 13e4ca1d8519..c049c16fdbfd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,87 @@
pkgbase = megasync-git
pkgdesc = MEGASync Desktop App. (GIT Version)
- pkgver = 4.6.2.0.6.g29453fdca
+ pkgver = 4.9.3.0.7.gc422ca213
pkgrel = 1
url = https://mega.co.nz/#sync
arch = x86_64
license = custom:MEGA
makedepends = git
makedepends = qt5-tools
+ makedepends = bzip2
+ makedepends = c-ares
+ makedepends = openssl
+ makedepends = libglvnd
+ makedepends = curl
+ makedepends = xz
+ makedepends = sqlite
+ makedepends = systemd-libs
+ makedepends = ffmpeg4.4
+ depends = gcc-libs
+ depends = glibc
+ depends = qt5-base
depends = qt5-svg
depends = qt5-x11extras
- depends = c-ares
depends = libuv
depends = crypto++
depends = libsodium
+ depends = ffmpeg4.4
depends = freeimage
depends = libmediainfo
depends = libraw
+ depends = libxcb
+ depends = libzen
+ depends = zlib
provides = megasync
conflicts = megasync
conflicts = megatools
+ options = debug
source = git+https://github.com/meganz/MEGAsync.git
source = git+https://github.com/meganz/sdk.git
source = mega.svg
+ source = esee
+ source = https://patch-diff.githubusercontent.com/raw/meganz/sdk/pull/2614.diff
sha256sums = SKIP
sha256sums = SKIP
sha256sums = c0abfeafb541509923c85d253f6f64dae8a49e9ae4b067f5c0c484ff1d924403
+ sha256sums = 66b5f481081157eee82653b3774d22edb5aa2007cf93142fd73cc0c4d577d59f
+ sha256sums = aeb5145225d0ebaa4595a99d81e55d1f71bc6e7f1242785f541a3122cba6c217
pkgname = megasync-git
+ depends = gcc-libs
+ depends = glibc
+ depends = qt5-base
+ depends = qt5-svg
+ depends = qt5-x11extras
+ depends = libuv
+ depends = crypto++
+ depends = libsodium
+ depends = ffmpeg4.4
+ depends = freeimage
+ depends = libmediainfo
+ depends = libraw
+ depends = libxcb
+ depends = libzen
+ depends = zlib
+ depends = bzip2
+ depends = libbz2.so
+ depends = c-ares
+ depends = libcares.so
+ depends = openssl
+ depends = libcrypto.so
+ depends = libssl.so
+ depends = libglvnd
+ depends = libGL.so
+ depends = libcurl
+ depends = libcurl.so
+ depends = xz
+ depends = liblzma.so
+ depends = sqlite
+ depends = libsqlite3.so
+ depends = systemd-libs
+ depends = libudev.so
+ depends = ffmpeg4.4
+ depends = libavcodec.so
+ depends = libavformat.so
+ depends = libavutil.so
+ depends = libswresample.so
+ depends = libswscale.so
diff --git a/.gitignore b/.gitignore
index d987188fba12..8524dfd8f7de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
!PKGBUILD
!megasync-git.install
!mega.svg
+!esee
diff --git a/PKGBUILD b/PKGBUILD
index aed3ba836bb2..beaf22916ac8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,62 @@
# Contributor: Alfonso Saavedra "Son Link" <sonlink.dourden@gmail.com>
pkgname=megasync-git
-pkgver=4.6.2.0.6.g29453fdca
+pkgver=4.9.3.0.7.gc422ca213
pkgrel=1
pkgdesc="MEGASync Desktop App. (GIT Version)"
arch=('x86_64')
url='https://mega.co.nz/#sync'
license=('custom:MEGA')
-conflicts=('megasync'
- 'megatools'
- )
+conflicts=(
+ 'megasync'
+ 'megatools'
+)
provides=('megasync')
-depends=('qt5-svg'
- 'qt5-x11extras'
- 'c-ares'
- 'libuv'
- 'crypto++'
- 'libsodium'
-# 'ffmpeg'
- 'freeimage'
- 'libmediainfo'
- 'libraw'
- )
-makedepends=('git'
- 'qt5-tools'
- )
-source=('git+https://github.com/meganz/MEGAsync.git'
- 'git+https://github.com/meganz/sdk.git'
- 'mega.svg'
- )
-sha256sums=('SKIP'
- 'SKIP'
- 'c0abfeafb541509923c85d253f6f64dae8a49e9ae4b067f5c0c484ff1d924403'
- )
+depends=(
+ 'gcc-libs'
+ 'glibc'
+ 'qt5-base'
+ 'qt5-svg'
+ 'qt5-x11extras'
+ 'libuv'
+ 'crypto++'
+ 'libsodium'
+ 'ffmpeg4.4'
+ 'freeimage'
+ 'libmediainfo'
+ 'libraw'
+ 'libxcb'
+ 'libzen'
+ 'zlib'
+)
+makedepends=(
+ 'git'
+ 'qt5-tools'
+ 'bzip2'
+ 'c-ares'
+ 'openssl'
+ 'libglvnd'
+ 'curl'
+ 'xz'
+ 'sqlite'
+ 'systemd-libs'
+ 'ffmpeg4.4'
+)
+source=(
+ 'git+https://github.com/meganz/MEGAsync.git'
+ 'git+https://github.com/meganz/sdk.git'
+ 'mega.svg'
+ 'esee'
+ 'https://patch-diff.githubusercontent.com/raw/meganz/sdk/pull/2614.diff'
+)
+sha256sums=(
+ 'SKIP'
+ 'SKIP'
+ 'c0abfeafb541509923c85d253f6f64dae8a49e9ae4b067f5c0c484ff1d924403'
+ '66b5f481081157eee82653b3774d22edb5aa2007cf93142fd73cc0c4d577d59f'
+ 'aeb5145225d0ebaa4595a99d81e55d1f71bc6e7f1242785f541a3122cba6c217'
+)
+options=('debug')
pkgver() {
cd MEGAsync
@@ -44,20 +68,37 @@ pkgver() {
prepare() {
cd MEGAsync
git config submodule.src/MEGASync/mega.url "${srcdir}/sdk"
- git submodule update --init
+ git -c protocol.file.allow=always submodule update --init \
+ src/MEGASync/mega
+
+ # FFmpeg4
+ patch -d src/MEGASync/mega -p1 -i "${srcdir}/2614.diff"
+ sed -e 's|ffmpeg-mega|ffmpeg4.4|g' \
+ -i src/MEGASync/mega/configure.ac \
+ -i src/MEGASync/MEGASync.pro
+ sed -e 's|FFMPEG_LIBS\=\[\"|&-L/usr/lib/ffmpeg4.4 |g' \
+ -e 's|FFMPEG_LIBS\=\"|&-L/usr/lib/ffmpeg4.4 |g' \
+ -i src/MEGASync/mega/configure.ac
+ sed -e '359a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ INCLUDEPATH += /usr/include/ffmpeg4.4' \
+ -e's|LIBS += -lavcodec|LIBS += -L/usr/lib/ffmpeg4.4 -lavcodec|g' \
+ -i src/MEGASync/mega/bindings/qt/sdk.pri
+
+ # Disable PDFium
+ patch -p1 -i "${srcdir}/esee"
- # disabled until sdk#2576 is fixed (-ffmpeg dep)
- sed -e '85s|^|&#|g' -e '100s|^|&#|g' -e '104s|^|&#|g' -e '205s|^|&#|g' -i src/MEGASync/MEGASync.pro
}
build() {
+
+ export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
+
cd "${srcdir}/MEGAsync/src/MEGASync/mega"
./autogen.sh
./configure \
--prefix=/usr \
--without-freeimage \
--disable-examples \
- --without-ffmpeg # disabled until sdk#2576 is fixed (-ffmpeg dep)
+ --with-ffmpeg \
cd "${srcdir}/MEGAsync/src/MEGASync"
lrelease-qt5 MEGASync.pro
@@ -67,6 +108,17 @@ build() {
}
package() {
+ depends+=(
+ 'bzip2' 'libbz2.so'
+ 'c-ares' 'libcares.so'
+ 'openssl' 'libcrypto.so' 'libssl.so'
+ 'libglvnd' 'libGL.so'
+ 'libcurl' 'libcurl.so'
+ 'xz' 'liblzma.so'
+ 'sqlite' 'libsqlite3.so'
+ 'systemd-libs' 'libudev.so'
+ 'ffmpeg4.4' 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswresample.so' 'libswscale.so'
+ )
install -Dm755 MEGAsync/src/MEGASync/megasync "${pkgdir}/usr/bin/megasync"
install -Dm644 MEGAsync/src/MEGASync/platform/linux/data/megasync.desktop "${pkgdir}/usr/share/applications/megasync.desktop"
# not works in wayland, so launch in xwayland
diff --git a/esee b/esee
new file mode 100644
index 000000000000..9481d51eb7a0
--- /dev/null
+++ b/esee
@@ -0,0 +1,18 @@
+diff --git a/src/MEGASync/MEGASync.pro b/src/MEGASync/MEGASync.pro
+index 50b7c20d1..47b15f019 100644
+--- a/src/MEGASync/MEGASync.pro
++++ b/src/MEGASync/MEGASync.pro
+@@ -87,9 +87,9 @@ else:win32 {
+ CONFIG += USE_PDFIUM
+ DEFINES += NOMINMAX
+ }
+-else:contains(BUILD_ARCH, x86_64) { #Notice this might not work for clang!
+-CONFIG += USE_PDFIUM
+-}
++# else:contains(BUILD_ARCH, x86_64) { #Notice this might not work for clang!
++# CONFIG += USE_PDFIUM
++# }
+
+ unix:!macx {
+ exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg)|packagesExist(libavcodec) {
+