summaryrefslogtreecommitdiffstats
path: root/source/kde/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kde')
-rw-r--r--source/kde/kde/build/digikam2
-rw-r--r--source/kde/kde/build/ffmpegthumbs2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/patch/digikam.patch1
-rw-r--r--source/kde/kde/patch/digikam/ffmpeg5.patch13
5 files changed, 17 insertions, 3 deletions
diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/digikam
+++ b/source/kde/kde/build/digikam
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/build/ffmpegthumbs b/source/kde/kde/build/ffmpegthumbs
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/ffmpegthumbs
+++ b/source/kde/kde/build/ffmpegthumbs
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/digikam.patch b/source/kde/kde/patch/digikam.patch
new file mode 100644
index 000000000..89b423ada
--- /dev/null
+++ b/source/kde/kde/patch/digikam.patch
@@ -0,0 +1 @@
+cat $CWD/patch/digikam/ffmpeg5.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/digikam/ffmpeg5.patch b/source/kde/kde/patch/digikam/ffmpeg5.patch
new file mode 100644
index 000000000..cbdd368b3
--- /dev/null
+++ b/source/kde/kde/patch/digikam/ffmpeg5.patch
@@ -0,0 +1,13 @@
+diff --git a/core/libs/threadimageio/video/videodecoder_p.h b/core/libs/threadimageio/video/videodecoder_p.h
+index 251e092809..d82926b77e 100644
+--- a/core/libs/threadimageio/video/videodecoder_p.h
++++ b/core/libs/threadimageio/video/videodecoder_p.h
+@@ -56,7 +56,7 @@ public:
+ AVFormatContext* pFormatContext;
+ AVCodecContext* pVideoCodecContext;
+ AVCodecParameters* pVideoCodecParameters;
+- AVCodec* pVideoCodec;
++ const AVCodec* pVideoCodec;
+ AVStream* pVideoStream;
+ AVFrame* pFrame;
+ quint8* pFrameBuffer;