[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/, games-arcade/performous/files/

[David Seifert]

commit: 727bfae309dc7696c314a86c5d478af8b136391e
Author: David Seifert  gentoo  org>
AuthorDate: Tue Apr 16 14:32:16 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Apr 16 14:32:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727bfae3

games-arcade/performous: Fix building against boost 1.70

Closes: https://bugs.gentoo.org/671594
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 .../files/performous-1.1-boost-1.70.patch  | 52 ++
 games-arcade/performous/performous-1.1-r1.ebuild   |  1 +
 2 files changed, 53 insertions(+)

diff --git a/games-arcade/performous/files/performous-1.1-boost-1.70.patch 
b/games-arcade/performous/files/performous-1.1-boost-1.70.patch
new file mode 100644
index 000..d868e127965
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-boost-1.70.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/671594
+
+--- a/game/audio.cc
 b/game/audio.cc
+@@ -77,7 +77,7 @@
+   static ptime getTime() { return microsec_clock::universal_time(); }
+   // Conversion helpers
+   static double getSeconds(time_duration t) { return 1e-6 * 
t.total_microseconds(); }
+-  static time_duration getDuration(double seconds) { return 
microseconds(1e6 * seconds); }
++  static time_duration getDuration(double seconds) { return 
microseconds(static_cast(1e6 * seconds)); }
+ 
+   mutable boost::mutex m_mutex;
+   ptime m_baseTime; ///< A reference time (corresponds to m_basePos)
+@@ -149,7 +149,7 @@
+   int64_t m_pos; ///< Current sample position
+   bool m_preview;
+   AudioClock m_clock;
+-  time_duration durationOf(int64_t samples) const { return 
microseconds(1e6 * samples / srate / 2.0); }
++  time_duration durationOf(int64_t samples) const { return 
microseconds(static_cast(1e6 * samples / srate / 2.0)); }
+ public:
+   bool suppressCenterChannel;
+   double fadeLevel;
+--- a/game/backgrounds.hh
 b/game/backgrounds.hh
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ /// songs class for songs screen
+--- a/game/songs.hh
 b/game/songs.hh
+@@ -6,6 +6,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/game/svg.cc
 b/game/svg.cc
+@@ -4,6 +4,7 @@
+ #include "configuration.hh"
+ #include "../common/image.hh"
+ 
++#include 
+ #include 
+ #include 
+ 

diff --git a/games-arcade/performous/performous-1.1-r1.ebuild 
b/games-arcade/performous/performous-1.1-r1.ebuild
index ed88a66edef..f40e3e183d1 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${P}-linguas.patch
"${FILESDIR}"/${P}-nomancompress.patch
"${FILESDIR}"/${P}-jpeg-9c.patch
+   "${FILESDIR}"/${P}-boost-1.70.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/, games-arcade/performous/files/

[David Seifert]

commit: cb0cf745e7d4eabbc169d4901811cc7cdd267f5f
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 11 18:57:39 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 11 18:58:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0cf745

games-arcade/performous: Fix building with media-libs/jpeg

Closes: https://bugs.gentoo.org/649280
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 games-arcade/performous/files/performous-1.1-jpeg-9c.patch | 11 +++
 games-arcade/performous/performous-1.1-r1.ebuild   |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch 
b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch
new file mode 100644
index 000..d878cec07f5
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch
@@ -0,0 +1,11 @@
+--- a/common/image.cc
 b/common/image.cc
+@@ -180,7 +180,7 @@
+   }
+   jpeg_create_decompress();
+   jpeg_mem_src(, data.data(), data.size());
+-  if (jpeg_read_header(, true) != JPEG_HEADER_OK) throw 
std::runtime_error("Cannot read header of " + filename.string());
++  if (jpeg_read_header(, TRUE) != JPEG_HEADER_OK) throw 
std::runtime_error("Cannot read header of " + filename.string());
+   jpeg_start_decompress();
+   bitmap.resize(cinfo.output_width, cinfo.output_height);
+   unsigned stride = (bitmap.width * 3 + 3) & ~3;  // Number of bytes per 
row (word-aligned)

diff --git a/games-arcade/performous/performous-1.1-r1.ebuild 
b/games-arcade/performous/performous-1.1-r1.ebuild
index 774e839768c..ed88a66edef 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-linguas.patch
"${FILESDIR}"/${P}-nomancompress.patch
+   "${FILESDIR}"/${P}-jpeg-9c.patch
 )
 
 src_prepare() {