summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosip Ponjavic2022-02-20 12:01:20 +0100
committerJosip Ponjavic2022-02-20 12:01:20 +0100
commit5fda50bb6a9980a0e59916f323a3a3b8f432b0cd (patch)
treeb77c8aaa6893fc7fa11f5b333dbf9161dc2bd08a
parent4b4d232c9612ff7325fe0ddd6af02ba19fc28fea (diff)
downloadaur-5fda50bb6a9980a0e59916f323a3a3b8f432b0cd.tar.gz
upgpkg: 0.7.3.r43.gfd5868a-1 fix build for ffmpeg5
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--fix-ffmpeg5.patch12
3 files changed, 24 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 689fb5a0390d..85cfd1fc1a9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = haruna-git
pkgdesc = A Qt/QML video player built on top of libmpv
- pkgver = 0.7.3.r34.g034d88a
+ pkgver = 0.7.3.r43.gfd5868a
pkgrel = 1
url = https://invent.kde.org/multimedia/haruna
arch = x86_64
@@ -18,6 +18,8 @@ pkgbase = haruna-git
provides = haruna
conflicts = haruna
source = haruna::git+https://invent.kde.org/multimedia/haruna.git
+ source = fix-ffmpeg5.patch
sha256sums = SKIP
+ sha256sums = e9a63b260b5a0b037b6fbd4b4540771898e32c839e5a259af08fd19f9d5c8b82
pkgname = haruna-git
diff --git a/PKGBUILD b/PKGBUILD
index 0dac9efcd9e6..2b185bf17190 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor:
pkgname=haruna-git
-pkgver=0.7.3.r34.g034d88a
+pkgver=0.7.3.r43.gfd5868a
pkgrel=1
pkgdesc="A Qt/QML video player built on top of libmpv"
url="https://invent.kde.org/multimedia/haruna"
@@ -14,14 +14,20 @@ optdepends=('yt-dlp: for video-sharing websites playback'
'youtube-dl: for video-sharing websites playback')
provides=("${pkgname%-*}")
conflicts=("${pkgname%-*}")
-source=("${pkgname%-*}::git+${url}.git")
-sha256sums=('SKIP')
+source=("${pkgname%-*}::git+${url}.git" 'fix-ffmpeg5.patch')
+sha256sums=('SKIP'
+ 'e9a63b260b5a0b037b6fbd4b4540771898e32c839e5a259af08fd19f9d5c8b82')
pkgver() {
cd "${pkgname%-*}"
git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/v//g'
}
+prepare() {
+ cd "${pkgname%-*}"
+ patch -Np1 -i ../fix-ffmpeg5.patch
+}
+
build() {
cmake -B build -S "${pkgname%-*}" \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/fix-ffmpeg5.patch b/fix-ffmpeg5.patch
new file mode 100644
index 000000000000..7c76de973857
--- /dev/null
+++ b/fix-ffmpeg5.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ruN a/src/framedecoder.h b/src/framedecoder.h
+--- a/src/framedecoder.h 2022-02-20 11:54:23.310053258 +0100
++++ b/src/framedecoder.h 2022-02-20 11:54:57.699478126 +0100
+@@ -55,7 +55,7 @@
+ int m_VideoStream;
+ AVFormatContext* m_pFormatContext;
+ AVCodecContext* m_pVideoCodecContext;
+- AVCodec* m_pVideoCodec;
++ const AVCodec* m_pVideoCodec;
+ AVStream* m_pVideoStream;
+ AVFrame* m_pFrame;
+ quint8* m_pFrameBuffer;