[arch-commits] Commit in performous/repos (3 files)

[Antonio Rojas]

    Date: Monday, June 6, 2022 @ 16:24:56
  Author: arojas
Revision: 1226806

archrelease: copy trunk to community-staging-x86_64

Added:
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
    (from rev 1226805, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/ffmpeg5.patch
    (from rev 1226805, performous/trunk/ffmpeg5.patch)

---------------+
 PKGBUILD      |   40 ++++++++++++++++++++++++++++++++++++++++
 ffmpeg5.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

Copied: performous/repos/community-staging-x86_64/PKGBUILD (from rev 1226805, performous/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2022-06-06 16:24:56 UTC (rev 1226806)
@@ -0,0 +1,40 @@
+# Maintainer : Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=performous
+pkgver=1.2.0
+pkgrel=1
+pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
+arch=('x86_64')
+url="https://performous.org/"
+license=('GPL')
+depends=('boost-libs' 'libepoxy' 'libxml++2.6' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2' 'aubio')
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa' 'git' 'glm')
+optdepends=('performous-freesongs: free songs for performous')
+source=($pkgname-$pkgver.tar.gz::https://github.com/performous/performous/archive/refs/tags/${pkgver}.tar.gz
+        ffmpeg5.patch)
+sha512sums=('a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56'
+            '4affb318c7fd6ac65ea4facfb2c5270ed6ec1816de69f1e77204c036cfb1c8cd548bb3e2e28bcd6169d531183fc8799669a86de95f4325e0b58254e596a0d5dc')
+
+prepare() {
+  cd performous-$pkgver
+  patch -p1 -i ../ffmpeg5.patch # Fix build with FFMpeg 5
+}
+
+build() {
+  cd performous-${pkgver}
+
+  mkdir -p build
+  cd build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None
+  make
+}
+
+package() {
+  cd performous-${pkgver}/build
+
+  make DESTDIR="$pkgdir" install
+}

Copied: performous/repos/community-staging-x86_64/ffmpeg5.patch (from rev 1226805, performous/trunk/ffmpeg5.patch)
===================================================================
--- community-staging-x86_64/ffmpeg5.patch	                        (rev 0)
+++ community-staging-x86_64/ffmpeg5.patch	2022-06-06 16:24:56 UTC (rev 1226806)
@@ -0,0 +1,31 @@
+From 80d5b08d34a97db16fe12f82e9060570087ef0f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Gonzalve?=
+ <sebastien.gonzalve at aliceadsl.fr>
+Date: Tue, 3 May 2022 20:26:25 +0200
+Subject: [PATCH] Fix ffmpeg compilation on FC36
+
+The new version stats:
+
+2021-04-27 - 46dac8cf3d - lavf 59.0.100 - avformat.h
+  av_find_best_stream now uses a const AVCodec ** parameter
+  for the returned decoder.
+
+So performous needs a patch to add const when needed.
+---
+ game/ffmpeg.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
+index 5005ed5aa..216ca6697 100644
+--- a/game/ffmpeg.cc
++++ b/game/ffmpeg.cc
+@@ -251,6 +251,9 @@ FFmpeg::FFmpeg(fs::path const& _filename, int mediaType) : m_filename(_filename)
+ 	if (err < 0) throw Error(*this, err);
+ 	m_formatContext->flags |= AVFMT_FLAG_GENPTS;
+ 	// Find a track and open the codec
++#if (LIBAVFORMAT_VERSION_INT) >= (AV_VERSION_INT(59, 0, 100))
++	const
++#endif
+ 	AVCodec* codec = nullptr;
+ 	m_streamId = av_find_best_stream(m_formatContext.get(), static_cast<AVMediaType>(mediaType), -1, -1, &codec, 0);
+ 	if (m_streamId < 0) throw Error(*this, m_streamId);