ffmpeg6

4 files changed, 41 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20697cd474fd..a41384646602 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,7 @@ pkgbase = megasync-git
 	makedepends = xz
 	makedepends = sqlite
 	makedepends = systemd-libs
-	makedepends = ffmpeg4.4
+	makedepends = ffmpeg
 	depends = gcc-libs
 	depends = glibc
 	depends = qt5-base
@@ -40,11 +40,13 @@ pkgbase = megasync-git
 	source = mega.svg
 	source = esee
 	source = https://patch-diff.githubusercontent.com/raw/meganz/sdk/pull/2614.diff
+	source = ffmpeg6.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = c0abfeafb541509923c85d253f6f64dae8a49e9ae4b067f5c0c484ff1d924403
 	sha256sums = 66b5f481081157eee82653b3774d22edb5aa2007cf93142fd73cc0c4d577d59f
 	sha256sums = aeb5145225d0ebaa4595a99d81e55d1f71bc6e7f1242785f541a3122cba6c217
+	sha256sums = a5f1d784a0a548965c939a74da101ff436796490a7d3f4efbaa8c22d639ab8fc
 
 pkgname = megasync-git
 	depends = gcc-libs
@@ -79,7 +81,7 @@ pkgname = megasync-git
 	depends = libsqlite3.so
 	depends = systemd-libs
 	depends = libudev.so
-	depends = ffmpeg4.4
+	depends = ffmpeg
 	depends = libavcodec.so
 	depends = libavformat.so
 	depends = libavutil.so
diff --git a/.gitignore b/.gitignore
index 8524dfd8f7de..1301b7d2b138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 !megasync-git.install
 !mega.svg
 !esee
+!ffmpeg6.diff
diff --git a/PKGBUILD b/PKGBUILD
index 02d7adff7626..feb7fd67a0dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -42,7 +42,7 @@ makedepends=(
   'xz'
   'sqlite'
   'systemd-libs'
-  'ffmpeg4.4'
+  'ffmpeg'
 )
 source=(
   'git+https://github.com/meganz/MEGAsync.git'
@@ -50,6 +50,7 @@ source=(
   'mega.svg'
   'esee'
   'https://patch-diff.githubusercontent.com/raw/meganz/sdk/pull/2614.diff'
+  'ffmpeg6.diff'
 )
 sha256sums=(
   'SKIP'
@@ -57,6 +58,7 @@ sha256sums=(
   'c0abfeafb541509923c85d253f6f64dae8a49e9ae4b067f5c0c484ff1d924403'
   '66b5f481081157eee82653b3774d22edb5aa2007cf93142fd73cc0c4d577d59f'
   'aeb5145225d0ebaa4595a99d81e55d1f71bc6e7f1242785f541a3122cba6c217'
+  'a5f1d784a0a548965c939a74da101ff436796490a7d3f4efbaa8c22d639ab8fc'
 )
 options=('debug')
 
@@ -71,17 +73,9 @@ prepare() {
   git -c protocol.file.allow=always submodule update --init \
     src/MEGASync/mega
 
-  # FFmpeg4
+  # FFmpeg6
   patch -d src/MEGASync/mega -p1 -i "${srcdir}/2614.diff"
-  sed -e 's|ffmpeg-mega|ffmpeg4.4|g' \
-      -i src/MEGASync/mega/configure.ac \
-      -i src/MEGASync/MEGASync.pro
-  sed -e 's|FFMPEG_LIBS\=\[\"|&-L/usr/lib/ffmpeg4.4 |g' \
-      -e 's|FFMPEG_LIBS\=\"|&-L/usr/lib/ffmpeg4.4 |g' \
-      -i src/MEGASync/mega/configure.ac
-  sed -e '359a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ INCLUDEPATH += /usr/include/ffmpeg4.4' \
-      -e's|LIBS += -lavcodec|LIBS += -L/usr/lib/ffmpeg4.4 -lavcodec|g' \
-      -i src/MEGASync/mega/bindings/qt/sdk.pri
+  patch -d src/MEGASync/mega -p1 -i "${srcdir}/ffmpeg6.diff"
 
   # Disable PDFium
   patch -p1 -i "${srcdir}/esee"
@@ -89,15 +83,12 @@ prepare() {
 
 build() {
 
-  export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
-
   cd "${srcdir}/MEGAsync/src/MEGASync/mega"
   ./autogen.sh
   ./configure \
     --prefix=/usr \
     --without-freeimage \
-    --disable-examples \
-    --with-ffmpeg \
+    --disable-examples
 
   cd "${srcdir}/MEGAsync/src/MEGASync"
   lrelease-qt5 MEGASync.pro
@@ -116,7 +107,7 @@ package() {
     'xz' 'liblzma.so'
     'sqlite' 'libsqlite3.so'
     'systemd-libs' 'libudev.so'
-    'ffmpeg4.4' 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswresample.so' 'libswscale.so'
+    'ffmpeg' 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswresample.so' 'libswscale.so'
   )
   install -Dm755 MEGAsync/src/MEGASync/megasync "${pkgdir}/usr/bin/megasync"
   install -Dm644 MEGAsync/src/MEGASync/platform/linux/data/megasync.desktop "${pkgdir}/usr/share/applications/megasync.desktop"
diff --git a/ffmpeg6.diff b/ffmpeg6.diff
new file mode 100644
index 000000000000..d20ebd534571
--- /dev/null
+++ b/ffmpeg6.diff
@@ -0,0 +1,29 @@
+--- a/src/gfx/freeimage.cpp
++++ b/src/gfx/freeimage.cpp
+@@ -209,11 +209,13 @@ bool GfxProviderFreeImage::readbitmapFre
+
+ #ifdef HAVE_FFMPEG
+
++#if LIBAVCODEC_VERSION_MAJOR < 60
+ #ifdef AV_CODEC_CAP_TRUNCATED
+ #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+ #else
+ #define CAP_TRUNCATED CODEC_CAP_TRUNCATED
+ #endif
++#endif
+
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()
+ {
+@@ -331,10 +333,12 @@ bool GfxProviderFreeImage::readbitmapFfm
+
+     // Force seeking to key frames
+     formatContext->seek2any = false;
++#if LIBAVCODEC_VERSION_MAJOR < 60
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext->flags |= CAP_TRUNCATED;
+     }
++#endif
+
+     AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
+     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format