summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfenuks2022-05-02 11:53:36 +0200
committerfenuks2022-05-02 11:53:36 +0200
commit0f414d8f046743cd510863e8663e58c589451ac8 (patch)
treede2f71428e5d9d1f1a836a64cc9d742038307c40
parent9b9e3c97e448da54cd7828a5af84464543ea894f (diff)
downloadaur-0f414d8f046743cd510863e8663e58c589451ac8.tar.gz
Build package against ffmpeg4.4
Thanks to @rilian for reporting build failure.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 006de82ba6fc..9bbaebea6fb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vcmi-git
pkgdesc = Open-source engine for Heroes of Might and Magic III
- pkgver = r7890.9e3c4b69c
- pkgrel = 2
+ pkgver = r7924.6da233c38
+ pkgrel = 1
url = http://vcmi.eu
install = vcmi-git.install
arch = i686
@@ -15,7 +15,7 @@ pkgbase = vcmi-git
makedepends = cmake
makedepends = git
depends = boost-libs
- depends = ffmpeg
+ depends = ffmpeg4.4
depends = sdl2_image
depends = sdl2_mixer
depends = sdl2_ttf
diff --git a/PKGBUILD b/PKGBUILD
index 7b5b94e14791..200ab82288c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
# Contributor: Raziel23 <venom23 at runbox dot com>
pkgname=vcmi-git
-pkgver=r7890.9e3c4b69c
-pkgrel=2
+pkgver=r7924.6da233c38
+pkgrel=1
pkgdesc="Open-source engine for Heroes of Might and Magic III"
arch=('i686' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64')
url="http://vcmi.eu"
license=('GPL2')
-depends=('boost-libs' 'ffmpeg' 'sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'qt5-base' 'libxkbcommon-x11'
+depends=('boost-libs' 'ffmpeg4.4' 'sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'qt5-base' 'libxkbcommon-x11'
'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'tbb' 'fuzzylite'
'luajit')
makedepends=('boost' 'cmake' 'git')
@@ -36,7 +36,10 @@ build() {
-DCMAKE_SKIP_RPATH='FALSE' \
-DENABLE_TEST=OFF \
-DFORCE_BUNDLED_FL=OFF \
- -DCMAKE_BUILD_TYPE='RelWithDebInfo'
+ -DCMAKE_BUILD_TYPE='RelWithDebInfo' \
+ -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
+ -DFFmpeg_ROOT='/usr/lib/ffmpeg4.4/' \
+ -DCMAKE_CXX_FLAGS='-I/usr/include/ffmpeg4.4'
make
}