[arch-commits] Commit in performous/trunk (PKGBUILD performous-ffmpeg3.patch)

[Antonio Rojas]

    Date: Wednesday, February 17, 2016 @ 21:43:22
  Author: arojas
Revision: 162123

ffmpeg 3.0 rebuild

Added:
  performous/trunk/performous-ffmpeg3.patch
Modified:
  performous/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    9 ++++++---
 performous-ffmpeg3.patch |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-17 20:33:23 UTC (rev 162122)
+++ PKGBUILD	2016-02-17 20:43:22 UTC (rev 162123)
@@ -4,7 +4,7 @@
 
 pkgname=performous
 pkgver=1.0
-pkgrel=9
+pkgrel=10
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
@@ -13,14 +13,17 @@
 makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
 optdepends=('performous-freesongs: free songs for performous')
 source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz
-        cast-basic_istream-to-bool.patch)
+        cast-basic_istream-to-bool.patch performous-ffmpeg3.patch)
 md5sums=('cbeec2f0c0114cc499746c1e33f56055'
-         'c883cce82d0359c6b40ce38bd4ccf4bf')
+         'c883cce82d0359c6b40ce38bd4ccf4bf'
+         'dbffea91ebe1a9041a52f9de62907934')
 
 prepare() {
   cd performous-${pkgver}
 
  patch -Np1 -i ../cast-basic_istream-to-bool.patch
+# Fix build with ffmpeg 3.0
+  patch -p1 -i ../performous-ffmpeg3.patch
 }
 
 build() {

Added: performous-ffmpeg3.patch
===================================================================
--- performous-ffmpeg3.patch	                        (rev 0)
+++ performous-ffmpeg3.patch	2016-02-17 20:43:22 UTC (rev 162123)
@@ -0,0 +1,20 @@
+--- performous-1.0/game/ffmpeg.cc.orig	2016-02-17 20:37:00.157658695 +0000
++++ performous-1.0/game/ffmpeg.cc	2016-02-17 20:38:20.287291460 +0000
+@@ -116,7 +116,7 @@
+ 		height = cc->height;
+ 		m_swsContext = sws_getContext(
+ 		  cc->width, cc->height, cc->pix_fmt,
+-		  width, height, PIX_FMT_RGB24,
++		  width, height, AV_PIX_FMT_RGB24,
+ 		  SWS_POINT, nullptr, nullptr, nullptr);
+ 		break;
+ 	default:  // Should never be reached but avoids compile warnings
+@@ -187,7 +187,7 @@
+ 		if (packetSize < 0) throw std::logic_error("negative packet size?!");
+ 		if (m_quit || m_seekTarget == m_seekTarget) return;
+ 		if (packet.stream_index != m_streamId) return;
+-		boost::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), &av_free);
++		boost::shared_ptr<AVFrame> frame(av_frame_alloc(), &av_free);
+ 		int frameFinished = 0;
+ 		int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ?
+ 		  avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) :