aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJW(Shinichi Abe) <shin1.abe@nifty.com>2024-05-24 12:16:00 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-05-24 12:32:15 +0700
commit74f093024141f2423a4d0f89c8ddd73e3f8c0ff6 (patch)
treedc9e29c32188778f9315f03c7b1607dcd5ea5706
parent4b5484adfe002f5753fb22150fd5fc47d5029673 (diff)
network/MEGAcmd: Updated for version 1.7.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/MEGAcmd/MEGAcmd.SlackBuild13
-rw-r--r--network/MEGAcmd/MEGAcmd.info10
-rw-r--r--network/MEGAcmd/fix-ffmpeg-compile.patch29
-rw-r--r--network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch11
4 files changed, 24 insertions, 39 deletions
diff --git a/network/MEGAcmd/MEGAcmd.SlackBuild b/network/MEGAcmd/MEGAcmd.SlackBuild
index 2f36025842186..bda6fb6a1485e 100644
--- a/network/MEGAcmd/MEGAcmd.SlackBuild
+++ b/network/MEGAcmd/MEGAcmd.SlackBuild
@@ -26,8 +26,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=MEGAcmd
-VERSION=${VERSION:-1.6.3}
-SDK=${SDK:-4.17.1d}
+VERSION=${VERSION:-1.7.0}
+SDK=${SDK:-4.31.0b}
+FFMPEG4_PATCHREV=${FFMPEG4_PATCHREV:-1.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -75,10 +76,11 @@ rm -rf $PRGNAM-${VERSION}_Linux
tar xvf $CWD/$PRGNAM-${VERSION}_Linux.tar.?z
cd $PRGNAM-${VERSION}_Linux/sdk
tar --strip-components=1 -xvf $CWD/sdk-$SDK.tar.gz
-# Apply fix-ffmpeg-compile.patch ; Thanks to Arch linux.
-patch -p1 < $CWD/fix-ffmpeg-compile.patch
-
cd ../
+
+# Apply patch for FFmpeg4
+patch -p1 < $CWD/megacmd-${FFMPEG4_PATCHREV}_ffmpeg4.patch
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -94,6 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
+ --with-ffmpeg \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
diff --git a/network/MEGAcmd/MEGAcmd.info b/network/MEGAcmd/MEGAcmd.info
index 9e2d7a195d76d..f2ec7d336ecda 100644
--- a/network/MEGAcmd/MEGAcmd.info
+++ b/network/MEGAcmd/MEGAcmd.info
@@ -1,10 +1,10 @@
PRGNAM="MEGAcmd"
-VERSION="1.6.3"
+VERSION="1.7.0"
HOMEPAGE="https://github.com/meganz/MEGAcmd"
-DOWNLOAD="https://github.com/meganz/MEGAcmd/archive/1.6.3_Linux/MEGAcmd-1.6.3_Linux.tar.gz \
- https://github.com/meganz/sdk/archive/v4.17.1d/sdk-4.17.1d.tar.gz"
-MD5SUM="9d6d61f0dc029ccc5aceeb3fa643b1bd \
- 09e1926a06ab62ddef9b2dd3846c6ba7"
+DOWNLOAD="https://github.com/meganz/MEGAcmd/archive/1.7.0_Linux/MEGAcmd-1.7.0_Linux.tar.gz \
+ https://github.com/meganz/sdk/archive/v4.31.0b/sdk-4.31.0b.tar.gz"
+MD5SUM="9e9d2691cfc3b603e79675dfae5ca980 \
+ 30c597165d83ddf8c39352f276e43b6c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="FreeImage libmediainfo"
diff --git a/network/MEGAcmd/fix-ffmpeg-compile.patch b/network/MEGAcmd/fix-ffmpeg-compile.patch
deleted file mode 100644
index daa9fd72fe081..0000000000000
--- a/network/MEGAcmd/fix-ffmpeg-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/gfx/freeimage.cpp 2023-03-03 22:13:58.000000000 +0000
-+++ b/src/gfx/freeimage.cpp 2023-03-14 10:03:10.950216675 +0000
-@@ -212,7 +212,7 @@
- #ifdef AV_CODEC_CAP_TRUNCATED
- #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
- #else
--#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
-+#define CAP_TRUNCATED 0
- #endif
-
- const char *GfxProviderFreeImage::supportedformatsFfmpeg()
-@@ -313,7 +313,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;
-@@ -330,7 +330,6 @@
-
- // Force seeking to key frames
- formatContext->seek2any = false;
-- videoStream->skip_to_keyframe = true;
- if (decoder->capabilities & CAP_TRUNCATED)
- {
- codecContext->flags |= CAP_TRUNCATED;
-
diff --git a/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch b/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch
new file mode 100644
index 0000000000000..78caff0b98e4d
--- /dev/null
+++ b/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch
@@ -0,0 +1,11 @@
+--- a/sdk/src/gfx/freeimage.cpp 2024-05-23 06:07:49.544014882 +0900
++++ b/sdk/src/gfx/freeimage.cpp 2024-05-23 06:12:29.575018194 +0900
+@@ -212,7 +212,7 @@
+ #ifdef AV_CODEC_CAP_TRUNCATED
+ #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+ #else
+-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
++#define CAP_TRUNCATED 0
+ #endif
+
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()