diff options
| author | bartus | 2021-12-02 14:59:57 +0100 |
|---|---|---|
| committer | bartus | 2021-12-02 15:00:38 +0100 |
| commit | 1cf01297c2562361c57bcf60495be1bc4db52149 (patch) | |
| tree | edf3aec8f7939ae68e3a02f238a7019ae6333b64 | |
| parent | 4dcf89305acea64ab7c57e5d1dd6feab2757c084 (diff) | |
| download | aur-1cf01297c2562361c57bcf60495be1bc4db52149.tar.gz | |
Fix ffmpeg:4 patch
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | ffmpeg.patch | 12 |
3 files changed, 12 insertions, 11 deletions
@@ -22,6 +22,7 @@ pkgbase = megasync-nopdfium depends = libmediainfo depends = libraw depends = ffmpeg + depends = freeimage provides = megasync=4.6.1.0 conflicts = megasync source = git+https://github.com/meganz/MEGAsync.git#tag=v4.6.1.0_Win @@ -29,6 +30,6 @@ pkgbase = megasync-nopdfium source = ffmpeg.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = 7457fb9af5ddda96608fd9c7420b19e9e92febb8722a0d4d4ddb8b5b788b0d16 + sha256sums = 3a15322d39b7f69a21c866cd1965893c5c1b4285b1a079593a183aefcff0f8c2 pkgname = megasync-nopdfium @@ -20,7 +20,7 @@ url="https://github.com/meganz/MEGAsync" license=('custom:MEGA LIMITED CODE REVIEW LICENCE') depends=('c-ares' 'crypto++' 'libsodium' 'hicolor-icon-theme' 'libuv' 'qt5-base' 'qt5-svg' 'qt5-x11extras' 'libmediainfo' 'libraw' - 'ffmpeg') + 'ffmpeg' 'freeimage') makedepends=('qt5-tools' 'swig' 'doxygen' 'lsb-release' 'git') _extname="_Win" source=("git+https://github.com/meganz/MEGAsync.git#tag=v${pkgver}${_extname}" @@ -28,13 +28,13 @@ source=("git+https://github.com/meganz/MEGAsync.git#tag=v${pkgver}${_extname}" "ffmpeg.patch") sha256sums=('SKIP' 'SKIP' - '7457fb9af5ddda96608fd9c7420b19e9e92febb8722a0d4d4ddb8b5b788b0d16') + '3a15322d39b7f69a21c866cd1965893c5c1b4285b1a079593a183aefcff0f8c2') prepare() { cd "MEGAsync" git config submodule.src/MEGASync/mega.url "../meganz-sdk" git submodule update --init - git apply -v "$srcdir/ffmpeg.patch" + git -C src/MEGASync/mega apply -v "$srcdir/ffmpeg.patch" cd "src/MEGASync" sed -i '/DEFINES += REQUIRE_HAVE_PDFIUM/d' MEGASync.pro @@ -59,7 +59,7 @@ build() { --with-sqlite \ --with-cares \ --with-curl \ - --without-freeimage \ + --with-freeimage \ --with-libuv \ --disable-posix-threads \ --disable-examples \ diff --git a/ffmpeg.patch b/ffmpeg.patch index fe99662a353f..01e35b57c50f 100644 --- a/ffmpeg.patch +++ b/ffmpeg.patch @@ -1,12 +1,12 @@ -diff --git a/src/gfx/qt.cpp b/src/gfx/qt.cpp -index ceb33ce9f..2e6f0abe8 100644 ---- a/src/MEGASync/mega/src/gfx/qt.cpp -+++ b/src/MEGASync/mega/src/gfx/qt.cpp -@@ -1209,7 +1209,6 @@ QImageReader *GfxProcQT::readbitmapFfmpeg(int &w, int &h, int &orientation, QStr +diff --git a/src/gfx/freeimage.cpp b/src/gfx/freeimage.cpp +index 50271f9a9..e427b5e54 100644 +--- a/src/gfx/freeimage.cpp ++++ b/src/gfx/freeimage.cpp +@@ -253,7 +253,6 @@ bool GfxProcFreeImage::readbitmapFfmpeg(FileAccess* fa, const LocalPath& imagePa // Force seeking to key frames formatContext->seek2any = false; - videoStream->skip_to_keyframe = true; if (decoder->capabilities & CAP_TRUNCATED) { - codecContext.flags |= CAP_TRUNCATED; + codecContext->flags |= CAP_TRUNCATED; |