Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d1fb515a1e7a46793344d31775e7e9aab4b53ed
commit 8d1fb515a1e7a46793344d31775e7e9aab4b53ed Author: DeX77 <[email protected]> Date: Wed Feb 3 13:42:51 2016 +0100 performous-1.1-1-x86_64 * version bump / rebuild diff --git a/source/games-extra/performous/FrugalBuild b/source/games-extra/performous/FrugalBuild index c076de0..204c299 100644 --- a/source/games-extra/performous/FrugalBuild +++ b/source/games-extra/performous/FrugalBuild @@ -3,24 +3,21 @@ # Contributor: Priyank Gosalia <[email protected]> pkgname=performous -pkgver=1.0 -pkgrel=6 +pkgver=1.1 +pkgrel=1 url="http://performous.org/"; pkgdesc="Performous : The free Linux karaoke game" rodepends=('performous-songs') -depends=('gstreamer1' 'libboost' 'sdl2' 'freetype2' \ - 'pango' 'gdk-pixbuf2' 'librsvg' 'libsigc++2' \ - 'glibmm' 'libxml++' 'glew' 'ffmpeg' 'portaudio') -makedepends=('boost>=1.58.0' 'help2man' 'x11-protos') +depends=('libboost>=1.60.0' 'libepoxy>=1.3.1-3' 'sdl2>=2.0.4' 'librsvg>=2.40.13-1' \ + 'libxml++>=2.40.1-2' 'ffmpeg>=2.8.6' 'portaudio>=19_20140130') +makedepends=('boost>=1.60.0' 'help2man' 'x11-protos') _F_github_tag="Y" Finclude github cmake groups=('games-extra') archs=('i686' 'x86_64') -source=($source \ - cast-basic_istream-to-bool.patch) -sha1sums=('36d3e21eaea1da0fac49a9fa934d3eb164eb9e2f' \ - 'db2ea3faf47dbba21b6b2d0b4d6f0184fc2d7bf2') - -export CXXFLAGS="$CXXFLAGS -fpermissive -std=c++11" +source=("${source[@]}" \ + jpeg9.patch) +sha1sums=('7cf159a97bdb594c7167fc713cd055d7d7680c5c' \ + '29bb21cb3068a2343bd9c6ed6f2d1938c395af6a') # optimization OK diff --git a/source/games-extra/performous/cast-basic_istream-to-bool.patch b/source/games-extra/performous/cast-basic_istream-to-bool.patch deleted file mode 100644 index 9ca4fb3..0000000 --- a/source/games-extra/performous/cast-basic_istream-to-bool.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001 -From: Tobias Gruetzmacher <[email protected]> -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; diff --git a/source/games-extra/performous/jpeg9.patch b/source/games-extra/performous/jpeg9.patch new file mode 100644 index 0000000..1edfd75 --- /dev/null +++ b/source/games-extra/performous/jpeg9.patch @@ -0,0 +1,11 @@ +--- performous-1.1/common/image.cc 2016-01-23 11:40:01.000000000 +0100 ++++ performous-1.1.new/common/image.cc 2016-02-03 13:24:59.000000000 +0100 +@@ -180,7 +180,7 @@ + } + jpeg_create_decompress(&cinfo); + jpeg_mem_src(&cinfo, data.data(), data.size()); +- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string()); ++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string()); + jpeg_start_decompress(&cinfo); + bitmap.resize(cinfo.output_width, cinfo.output_height); + unsigned stride = (bitmap.width * 3 + 3) & ~3; // Number of bytes per row (word-aligned) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
