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

[Laurent Carlier]

    Date: Sunday, March 6, 2016 @ 09:45:30
  Author: lcarlier
Revision: 165195

upgpkg: performous 1.1-1

upstream update 1.1

Modified:
  performous/trunk/PKGBUILD
Deleted:
  performous/trunk/cast-basic_istream-to-bool.patch
  performous/trunk/performous-ffmpeg3.patch

----------------------------------+
 PKGBUILD                         |   21 +++++----------------
 cast-basic_istream-to-bool.patch |   26 --------------------------
 performous-ffmpeg3.patch         |   20 --------------------
 3 files changed, 5 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-06 04:43:30 UTC (rev 165194)
+++ PKGBUILD	2016-03-06 08:45:30 UTC (rev 165195)
@@ -3,29 +3,18 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
-pkgver=1.0
-pkgrel=10
+pkgver=1.1
+pkgrel=1
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
 license=('GPL')
-depends=('boost-libs' 'glew' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2')
+depends=('boost-libs' 'libepoxy' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2')
 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 performous-ffmpeg3.patch)
-md5sums=('cbeec2f0c0114cc499746c1e33f56055'
-         'c883cce82d0359c6b40ce38bd4ccf4bf'
-         'dbffea91ebe1a9041a52f9de62907934')
+source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz)
+md5sums=('cf31d0973cd88b3cd626d312d6d3f5b2')
 
-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() {
   cd performous-${pkgver}
 

Deleted: cast-basic_istream-to-bool.patch
===================================================================
--- cast-basic_istream-to-bool.patch	2016-03-06 04:43:30 UTC (rev 165194)
+++ cast-basic_istream-to-bool.patch	2016-03-06 08:45:30 UTC (rev 165195)
@@ -1,26 +0,0 @@
-From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
-From: Tobias Gruetzmacher <tobias-git at 23.gs>
-Date: Sun, 22 Mar 2015 18:43:11 +0100
-Subject: [PATCH] Cast basic_istream to bool.
-
-This shouldn't be necessary as far as I understand it (istream has an
-operator bool()), but clang 3.4 with libc++ insists that it can't cast
-basic_istream to bool. This may be a bug in libc++ or my bad
-understanding of C++ cast rules, but changing it doesn't hurt.
----
- game/songparser.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/game/songparser.hh b/game/songparser.hh
-index 5196c8e..21d7e16 100644
---- a/game/songparser.hh
-+++ b/game/songparser.hh
-@@ -33,7 +33,7 @@ class SongParser {
- 	Song& m_song;
- 	std::stringstream m_ss;
- 	unsigned int m_linenum;
--	bool getline(std::string& line) { ++m_linenum; return std::getline(m_ss, line);}
-+	bool getline(std::string& line) { ++m_linenum; return (bool) std::getline(m_ss, line);}
- 	bool m_relative;
- 	double m_gap;
- 	double m_bpm;

Deleted: performous-ffmpeg3.patch
===================================================================
--- performous-ffmpeg3.patch	2016-03-06 04:43:30 UTC (rev 165194)
+++ performous-ffmpeg3.patch	2016-03-06 08:45:30 UTC (rev 165195)
@@ -1,20 +0,0 @@
---- 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) :