bump

4 files changed, 167 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f755284ca22..830cd6791654 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,51 +1,79 @@
 pkgbase = libmega-git
 	pkgdesc = Sync your files to your Mega account. (GIT Version)
-	pkgver = v3.6.6a.314.gd808462b0
+	pkgver = 4.19.0.73.g615a2eff3
 	pkgrel = 1
 	url = https://mega.co.nz/#sync
 	arch = x86_64
 	license = custom:MEGA
-	makedepends = qt5-svg
+	makedepends = git
+	makedepends = chrpath
+	makedepends = gcc-libs
+	makedepends = glibc
 	makedepends = c-ares
 	makedepends = libuv
 	makedepends = crypto++
 	makedepends = libsodium
-	makedepends = git
-	makedepends = qt5-tools
 	makedepends = cython
-	makedepends = python
+	makedepends = python-build
+	makedepends = python-wheel
+	makedepends = python-installer
 	makedepends = swig
 	makedepends = fuse2
 	makedepends = libraw
-	makedepends = ffmpeg
+	makedepends = ffmpeg4.4
 	makedepends = libmediainfo
 	makedepends = libuv
-	makedepends = chrpath
+	makedepends = bzip2
+	makedepends = sqlite
+	makedepends = readline
 	source = git+https://github.com/meganz/sdk.git
 	source = megasync.conf
 	source = megasyncd.service
+	source = esee
 	sha256sums = SKIP
 	sha256sums = a3d30b3e198c3c117b2dd3144acaeb66117ee013744d2a0f39e9d4624b979a22
 	sha256sums = 73600a6d5e7ddbb6d0a3eff22aa05cc22715c2b02be7e62d16c2c71ac17a5ad5
+	sha256sums = 66b5f481081157eee82653b3774d22edb5aa2007cf93142fd73cc0c4d577d59f
 
 pkgname = libmega-git
 	pkgdesc = MEGASync libs (GIT Version)
-	depends = c-ares
+	depends = gcc-libs
+	depends = glibc
 	depends = crypto++
 	depends = libsodium
-	depends = ffmpeg
 	depends = libraw
 	depends = libuv
 	depends = libmediainfo
+	depends = libzen
+	depends = zlib
+	depends = c-ares
+	depends = libcares.so
+	depends = openssl
+	depends = libssl.so
+	depends = libcrypto.so
+	depends = ffmpeg4.4
+	depends = libavcodec.so
+	depends = libavformat.so
+	depends = libavutil.so
+	depends = libswscale.so
 	depends = sqlite
-	optdepends = python-megasync-git: python bindings
-	optdepends = python2-megasync-git: python2 bindings
-	provides = libmega
+	depends = libsqlite3.so
+	depends = bzip2
+	depends = libbz2.so
+	depends = curl
+	depends = libcurl.so
+	depends = xz
+	depends = liblzma.so
+	provides = libmega=4.19.0.73.g615a2eff3
+	provides = libmega.so
 	conflicts = libmega
 
 pkgname = megasync-daemon-git
 	pkgdesc = MEGASync daemon client. (GIT Version)
-	depends = libmega-git
+	depends = libmega-git=4.19.0.73.g615a2eff3
+	depends = libmega.so
+	depends = readline
+	depends = libreadline.so
 	provides = megasync-daemon
 	conflicts = megasync-daemon
 	options = !emptydirs
@@ -59,16 +87,17 @@ pkgname = megasync-cli-git
 
 pkgname = python-megasync-git
 	pkgdesc = Python Bindings for MEGASync. (GIT Version)
-	depends = libmega-git
+	arch = any
+	depends = libmega-git=4.19.0.73.g615a2eff3
+	depends = libmega.so
 	depends = python
 	provides = python-megasync
 	conflicts = python-megasync
 
 pkgname = fuse-megasync-git
 	pkgdesc = MEGASync client based on FUSE (GIT Version)
-	depends = libmega-git
+	depends = libmega-git=4.19.0.73.g615a2eff3
+	depends = libmega.so
 	depends = fuse2
-	depends = gcc-libs
 	provides = fuse-megasync
 	conflicts = fuse-megasync
-
diff --git a/.gitignore b/.gitignore
index 3b6c7d2a25a8..18a11f3e0873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 !PKGBUILD
 !megasyncd.service
 !megasync.conf
+!esee
diff --git a/PKGBUILD b/PKGBUILD
index ec718db61d60..6f3dfd470637 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,75 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgbase=libmega-git
-pkgname=('libmega-git'
-         'megasync-daemon-git'
-         'megasync-cli-git'
-         'python-megasync-git'
-         'fuse-megasync-git'
-         )
-pkgver=v3.6.6a.314.gd808462b0
+pkgname=(
+  'libmega-git'
+  'megasync-daemon-git'
+  'megasync-cli-git'
+  'python-megasync-git'
+  'fuse-megasync-git'
+)
+pkgver=4.19.0.73.g615a2eff3
 pkgrel=1
 pkgdesc="Sync your files to your Mega account. (GIT Version)"
 arch=('x86_64')
 url='https://mega.co.nz/#sync'
 license=('custom:MEGA')
-source=('git+https://github.com/meganz/sdk.git'
-        'megasync.conf'
-        'megasyncd.service'
-        )
-makedepends=('qt5-svg'
-             'c-ares'
-             'libuv'
-             'crypto++'
-             'libsodium'
-             'git'
-             'qt5-tools'
-             'cython'
-             'python'
-             'swig'
-             'fuse2'
-             'libraw'
-             'ffmpeg'
-             'libmediainfo'
-             'libuv'
-             'chrpath'
-             )
-sha256sums=('SKIP'
-            'a3d30b3e198c3c117b2dd3144acaeb66117ee013744d2a0f39e9d4624b979a22'
-            '73600a6d5e7ddbb6d0a3eff22aa05cc22715c2b02be7e62d16c2c71ac17a5ad5'
-            )
+source=(
+  'git+https://github.com/meganz/sdk.git'
+  'megasync.conf'
+  'megasyncd.service'
+  'esee'
+)
+makedepends=(
+  'git'
+  'chrpath'
+  'gcc-libs'
+  'glibc'
+  'c-ares'
+  'libuv'
+  'crypto++'
+  'libsodium'
+  'cython'
+  'python-build'
+  'python-wheel'
+  'python-installer'
+  'swig'
+  'fuse2'
+  'libraw'
+  'ffmpeg4.4'
+  'libmediainfo'
+  'libuv'
+  'bzip2'
+  'sqlite'
+  'readline'
+)
+sha256sums=(
+  'SKIP'
+  'a3d30b3e198c3c117b2dd3144acaeb66117ee013744d2a0f39e9d4624b979a22'
+  '73600a6d5e7ddbb6d0a3eff22aa05cc22715c2b02be7e62d16c2c71ac17a5ad5'
+  '66b5f481081157eee82653b3774d22edb5aa2007cf93142fd73cc0c4d577d59f'
+)
 
 pkgver() {
   cd sdk
-  echo "$(git describe --long --tags | tr - .)"
+  echo "$(git describe --long --tags | tr - . | tr -d v)"
+}
+
+_prepare() {
+  sed -e 's|ffmpeg-mega|ffmpeg4.4|g' \
+      -e 's|FFMPEG_LIBS\=\[\"|&-L/usr/lib/ffmpeg4.4 |g' \
+      -e 's|FFMPEG_LIBS\=\"|&-L/usr/lib/ffmpeg4.4 |g' \
+      -i configure.ac
+  sed -e '359a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ INCLUDEPATH += /usr/include/ffmpeg4.4' \
+      -e's|LIBS += -lavcodec|LIBS += -L/usr/lib/ffmpeg4.4 -lavcodec|g' \
+      -i bindings/qt/sdk.pri
 }
 
 prepare() {
-  (git clone "${srcdir}/sdk" build; cd build; ./autogen.sh)
-  (git clone "${srcdir}/sdk" build-python; cd build-python; ./autogen.sh)
+  # FFmpeg4
+  (git clone "${srcdir}/sdk" build; cd build; _prepare; ./autogen.sh)
+  (git clone "${srcdir}/sdk" build-python; cd build-python; _prepare; ./autogen.sh)
+
 }
 
 build() {
@@ -72,26 +95,36 @@ build() {
   make
 
   cd bindings/python
-  python setup.py build
+  python -m build --wheel --no-isolation
 
 }
 
 package_libmega-git() {
   pkgdesc="MEGASync libs (GIT Version)"
   conflicts=('libmega')
-  provides=('libmega')
-  depends=('c-ares'
-           'crypto++'
-           'libsodium'
-           'ffmpeg'
-           'libraw'
-           'libuv'
-           'libmediainfo'
-           'sqlite'
-           )
-  optdepends=('python-megasync-git: python bindings'
-              'python2-megasync-git: python2 bindings'
-              )
+  provides=(
+    "libmega=${pkgver}"
+    'libmega.so'
+    )
+  depends=(
+    'gcc-libs'
+    'glibc'
+    'crypto++'
+    'libsodium'
+    'libraw'
+    'libuv'
+    'libmediainfo'
+    'libzen'
+    'zlib'
+    'c-ares' 'libcares.so'
+    'openssl' 'libssl.so' 'libcrypto.so'
+    'ffmpeg4.4' 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswscale.so'
+    'sqlite' 'libsqlite3.so'
+    'bzip2' 'libbz2.so'
+    'curl' 'libcurl.so'
+    'xz' 'liblzma.so'
+  )
+
   make -C build DESTDIR="${pkgdir}" install-data install-libLTLIBRARIES install-pkgconfigDATA
 
   install -Dm644 sdk/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -101,10 +134,10 @@ package_fuse-megasync-git() {
   pkgdesc="MEGASync client based on FUSE (GIT Version)"
   conflicts=('fuse-megasync')
   provides=('fuse-megasync')
-  depends=(libmega-git
-           'fuse2'
-           'gcc-libs'
-           )
+  depends=(
+    "libmega-git=${pkgver}" 'libmega.so'
+    'fuse2'
+  )
 
   make -C build DESTDIR="${pkgdir}" install-binPROGRAMS
   rm -fr "${pkgdir}/usr/bin/megacli"
@@ -117,13 +150,16 @@ package_megasync-daemon-git() {
   pkgdesc="MEGASync daemon client. (GIT Version)"
   conflicts=('megasync-daemon')
   provides=('megasync-daemon')
-  depends=('libmega-git')
+  depends=(
+    "libmega-git=${pkgver}" 'libmega.so'
+    'readline' 'libreadline.so'
+  )
   options=('!emptydirs')
   backup=('etc/conf.d/megasync.conf')
 
   make -C build DESTDIR="${pkgdir}" install-binPROGRAMS
-  rm -fr ${pkgdir}/usr/bin/megacli
-  rm -fr ${pkgdir}/usr/bin/megafuse
+  rm -fr "${pkgdir}/usr/bin/megacli"
+  rm -fr "${pkgdir}/usr/bin/megafuse"
 
   install -Dm644 "${srcdir}/megasyncd.service" "${pkgdir}/usr/lib/systemd/system/megasyncd.service"
   install -Dm600 "${srcdir}/megasync.conf" "${pkgdir}/etc/conf.d/megasync.conf"
@@ -140,28 +176,28 @@ package_megasync-cli-git() {
   depends=('libmega-git')
 
   make -C build DESTDIR="${pkgdir}" install-binPROGRAMS
-  rm -fr ${pkgdir}/usr/bin/megafuse
-  rm -fr ${pkgdir}/usr/bin/megasimplesync
+  rm -fr "${pkgdir}/usr/bin/megafuse"
+  rm -fr "${pkgdir}/usr/bin/megasimplesync"
 
   install -Dm644 sdk/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_python-megasync-git() {
   pkgdesc="Python Bindings for MEGASync. (GIT Version)"
+  arch=('any')
   conflicts=('python-megasync')
   provides=('python-megasync')
-  depends=('libmega-git'
-           'python'
-           )
-
-#   make -C build-python DESTDIR="${pkgdir}" install-pkgpythonPYTHON install-pkgpyexecLTLIBRARIES install-nodist_pkgpythonPYTHON
+  depends=(
+    "libmega-git=${pkgver}" 'libmega.so'
+    'python'
+  )
 
   cd build-python/bindings/python
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  python -m installer --destdir="${pkgdir}" dist/*.whl
 
   _sites_packages="$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")"
-  rm -fr ${pkgdir}${_sites_packages}/mega/libmega.so
-  chrpath -d ${pkgdir}${_sites_packages}/mega/_mega.so
+  rm -fr "${pkgdir}${_sites_packages}/mega/"{libmega,_mega}.so
+  ln -s /usr/lib/libmega.so "${pkgdir}${_sites_packages}/mega/_mega.so"
 
   install -Dm644 "${srcdir}/sdk/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
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) {
+