summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
-rw-r--r--fix-ffmpeg-compile.patch19
3 files changed, 31 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c35c5598839..78d39140d931 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = megacmd
pkgdesc = MEGA Command Line Interactive and Scriptable Application
pkgver = 1.5.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/meganz/MEGAcmd
arch = any
license = custom
@@ -21,7 +21,9 @@ pkgbase = megacmd
depends = libuv
source = megacmd-1.5.0.tar.gz::https://github.com/meganz/MEGAcmd/archive/1.5.0_Linux.tar.gz
source = mega-sdk-f6438d55fa6b1ef54eb2b8832a1da7502a56df13.tar.gz::https://github.com/meganz/sdk/archive/f6438d55fa6b1ef54eb2b8832a1da7502a56df13.tar.gz
+ source = fix-ffmpeg-compile.patch
sha512sums = 65a07becbcbca5b7dfe0916a92fd68522f640ae3b33b1564b954ff405b72bd4565e062e018c4c4cef6dc892f2850511d7d627c195d2b8fe39e50842f7e25b3eb
sha512sums = 8072885bf1f9b8e4de57eeac183ceaec3414289cbd7644fce64d270a98b23f2ff1825dcecb6ed50e1e8e88c92947c6128396bcf781ac72488c073ea1961ce4e9
+ sha512sums = 7ca79acfa969f0394c796ed99b77b954a620ea8cb989e921e7a539660a972124205cb2ddb1b21a8a191dd5ebc7000b61a78f37d59e5a3984662d2451edfd989a
pkgname = megacmd
diff --git a/PKGBUILD b/PKGBUILD
index 2038940a60e8..b3a2334d484b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=megacmd
pkgver=1.5.0
-pkgrel=1
+pkgrel=2
pkgdesc="MEGA Command Line Interactive and Scriptable Application"
url="https://github.com/meganz/MEGAcmd"
arch=('any')
@@ -14,24 +14,27 @@ makedepends=('git' 'autoconf')
_sdkhash="f6438d55fa6b1ef54eb2b8832a1da7502a56df13"
source=(
"${pkgname}-${pkgver}.tar.gz::https://github.com/meganz/MEGAcmd/archive/${pkgver}_Linux.tar.gz"
- "mega-sdk-${_sdkhash}.tar.gz::https://github.com/meganz/sdk/archive/${_sdkhash}.tar.gz")
+ "mega-sdk-${_sdkhash}.tar.gz::https://github.com/meganz/sdk/archive/${_sdkhash}.tar.gz"
+ "fix-ffmpeg-compile.patch")
sha512sums=('65a07becbcbca5b7dfe0916a92fd68522f640ae3b33b1564b954ff405b72bd4565e062e018c4c4cef6dc892f2850511d7d627c195d2b8fe39e50842f7e25b3eb'
- '8072885bf1f9b8e4de57eeac183ceaec3414289cbd7644fce64d270a98b23f2ff1825dcecb6ed50e1e8e88c92947c6128396bcf781ac72488c073ea1961ce4e9')
+ '8072885bf1f9b8e4de57eeac183ceaec3414289cbd7644fce64d270a98b23f2ff1825dcecb6ed50e1e8e88c92947c6128396bcf781ac72488c073ea1961ce4e9'
+ '7ca79acfa969f0394c796ed99b77b954a620ea8cb989e921e7a539660a972124205cb2ddb1b21a8a191dd5ebc7000b61a78f37d59e5a3984662d2451edfd989a')
prepare() {
cd "MEGAcmd-${pkgver}_Linux"
rm -r sdk
ln -sf "../sdk-${_sdkhash}" sdk
+
+ cd sdk
+ patch -Np1 < ../../fix-ffmpeg-compile.patch
}
build() {
cd "MEGAcmd-${pkgver}_Linux"
./autogen.sh
- ./configure \
- --prefix=/usr \
- --without-ffmpeg # disabled until #523 is fixed (-ffmpeg dep)
+ ./configure --prefix=/usr
make
}
diff --git a/fix-ffmpeg-compile.patch b/fix-ffmpeg-compile.patch
new file mode 100644
index 000000000000..73cf6937b016
--- /dev/null
+++ b/fix-ffmpeg-compile.patch
@@ -0,0 +1,19 @@
+--- a/src/gfx/freeimage.cpp 2022-04-06 14:51:14.977994044 +0100
++++ b/src/gfx/freeimage.cpp 2022-04-06 15:11:39.315991676 +0100
+@@ -236,7 +236,7 @@
+
+ // Find decoder for video stream
+ AVCodecID codecId = codecParm->codec_id;
+- AVCodec* decoder = avcodec_find_decoder(codecId);
++ auto decoder = avcodec_find_decoder(codecId);
+ if (!decoder)
+ {
+ LOG_warn << "Codec not found: " << codecId;
+@@ -253,7 +253,6 @@
+
+ // Force seeking to key frames
+ formatContext->seek2any = false;
+- videoStream->skip_to_keyframe = true;
+ if (decoder->capabilities & CAP_TRUNCATED)
+ {
+ codecContext->flags |= CAP_TRUNCATED;