Browse Source

network/MEGAcmd: Adapt patch for ffmpeg 6.x.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
MEGAcmd
JW(Shinichi Abe) 1 year ago
committed by Matteo Bernardini
parent
commit
956bc696f8
  1. 6
      network/MEGAcmd/MEGAcmd.SlackBuild
  2. 11
      network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch
  3. 27
      network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch

6
network/MEGAcmd/MEGAcmd.SlackBuild

@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=MEGAcmd
VERSION=${VERSION:-1.7.0}
SDK=${SDK:-4.31.0b}
FFMPEG4_PATCHREV=${FFMPEG4_PATCHREV:-1.7.0}
FFMPEG6_PATCHREV=${FFMPEG6_PATCHREV:-1.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -78,8 +78,8 @@ cd $PRGNAM-${VERSION}_Linux/sdk
tar --strip-components=1 -xvf $CWD/sdk-$SDK.tar.gz
cd ../
# Apply patch for FFmpeg4
patch -p1 < $CWD/megacmd-${FFMPEG4_PATCHREV}_ffmpeg4.patch
# Apply patch for FFmpeg6
patch -p1 < $CWD/megacmd-${FFMPEG6_PATCHREV}_ffmpeg6.patch
chown -R root:root .
find -L . \

11
network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch

@ -1,11 +0,0 @@
--- 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()

27
network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch

@ -0,0 +1,27 @@
diff -Naur MEGAcmd-1.7.0_Linux.orig/sdk/src/gfx/freeimage.cpp MEGAcmd-1.7.0_Linux/sdk/src/gfx/freeimage.cpp
--- MEGAcmd-1.7.0_Linux.orig/sdk/src/gfx/freeimage.cpp 2024-05-17 16:19:43.000000000 +0200
+++ MEGAcmd-1.7.0_Linux/sdk/src/gfx/freeimage.cpp 2024-05-25 09:19:52.452609376 +0200
@@ -209,12 +209,6 @@
#ifdef HAVE_FFMPEG
-#ifdef AV_CODEC_CAP_TRUNCATED
-#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
-#else
-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
-#endif
-
const char *GfxProviderFreeImage::supportedformatsFfmpeg()
{
return ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3"
@@ -330,10 +324,6 @@
// Force seeking to key frames
formatContext->seek2any = false;
- if (decoder->capabilities & CAP_TRUNCATED)
- {
- codecContext->flags |= CAP_TRUNCATED;
- }
AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
Loading…
Cancel
Save