git » amarok.git » commit 79b016d

Support for FFMPEG 5.0 and fixing bug in CMakeLists generating config.h file

author Fredy García
2022-03-08 19:55:34 UTC
committer Fredy García
2022-03-08 19:55:34 UTC
parent 10d706f0181446e17f5a9c1bd06eb9b6636507a0

Support for FFMPEG 5.0 and fixing bug in CMakeLists generating config.h file

.SRCINFO +3 -2
.gitignore +1 -0
PKGBUILD +12 -3

diff --git a/.SRCINFO b/.SRCINFO
index 10ae799..c6cb76b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amarok
 	pkgdesc = The powerful music player for KDE
 	pkgver = 2.9.71
-	pkgrel = 1
+	pkgrel = 2
 	url = http://amarok.kde.org/
 	arch = x86_64
 	license = FDL
@@ -30,7 +30,8 @@ pkgbase = amarok
 	optdepends = ifuse: support for Apple iPod Touch and iPhone
 	optdepends = loudmouth: backend needed by mp3tunes for syncing
 	source = https://download.kde.org/unstable/amarok/2.9.71/amarok-2.9.71.tar.xz
+	source = ffmpeg5_cmakelist_configure.patch::https://invent.kde.org/multimedia/amarok/-/merge_requests/45.diff
 	sha256sums = 6a404829d336f69415fb6bb4ea1d5566759fb95e3e84f904ee9ef82a7be4e84f
+	sha256sums = 77a1f8cbc7f786e5616fbb5922dcf193614dbdf2a1d3fa2b2196c3fdb2f0387b
 
 pkgname = amarok
-
diff --git a/.gitignore b/.gitignore
index 90e2042..34a9aa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ amarok-*.pkg.tar.zst
 amarok-*.pkg.tar.xz
 amarok-*.tar.gz
 amarok-*.tar.xz
+ffmpeg5_cmakelist_configure.patch
 amarok-*.log
 PKGBUILD-namcap.log
 amarok/
diff --git a/PKGBUILD b/PKGBUILD
index d637faa..d698de0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=amarok
 pkgver=2.9.71
-pkgrel=1
+pkgrel=2
 pkgdesc="The powerful music player for KDE"
 arch=("x86_64")
 url="http://${pkgname}.kde.org/"
@@ -17,12 +17,21 @@ optdepends=(
   "ifuse: support for Apple iPod Touch and iPhone"
   "loudmouth: backend needed by mp3tunes for syncing"
 )
-source=("https://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=("6a404829d336f69415fb6bb4ea1d5566759fb95e3e84f904ee9ef82a7be4e84f")
+source=(
+  "https://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+  "ffmpeg5_cmakelist_configure.patch::https://invent.kde.org/multimedia/amarok/-/merge_requests/45.diff"
+)
+sha256sums=(
+  "6a404829d336f69415fb6bb4ea1d5566759fb95e3e84f904ee9ef82a7be4e84f"
+  "77a1f8cbc7f786e5616fbb5922dcf193614dbdf2a1d3fa2b2196c3fdb2f0387b"
+)
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Patching to fix FFMPEG5 and CMakeLists bug with config.h definition position https://invent.kde.org/multimedia/amarok/-/merge_requests/45
+  patch -Np1 -i "${srcdir}/ffmpeg5_cmakelist_configure.patch"
+
   mkdir -p "${srcdir}/${pkgname}-${pkgver}/build"
 }