[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/files/, games-arcade/performous/
commit: 276a229fedf2b61918d6f0fcf5cacf42410bf2a2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 26 21:02:50 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 26 22:40:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276a229f
games-arcade/performous: drop 1.1-r3
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-arcade/performous/Manifest | 1 -
.../files/performous-1.1-boost-1.70.patch | 52 --
.../files/performous-1.1-boost-1.73.patch | 11 --
.../performous/files/performous-1.1-gentoo.patch | 12 ---
.../performous/files/performous-1.1-jpeg-9c.patch | 11 --
.../performous/files/performous-1.1-linguas.patch | 18
.../files/performous-1.1-nomancompress.patch | 59 ---
.../files/performous-1.1-pango-use-pkgconfig.patch | 113 -
games-arcade/performous/metadata.xml | 1 -
games-arcade/performous/performous-1.1-r3.ebuild | 110
10 files changed, 388 deletions(-)
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 8c04ee19ff94..63c87da2cfed 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,4 +1,3 @@
-DIST performous-1.1.tar.gz 3965473 BLAKE2B
021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2
SHA512
6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
DIST performous-1.2.0.tar.gz 7240476 BLAKE2B
c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f
SHA512
a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5f407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56
DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300
BLAKE2B
1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c
SHA512
6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089
DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B
39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84
SHA512
2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
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
deleted file mode 100644
index d868e1279659..
--- a/games-arcade/performous/files/performous-1.1-boost-1.70.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/files/performous-1.1-boost-1.73.patch
b/games-arcade/performous/files/performous-1.1-boost-1.73.patch
deleted file mode 100644
index 3d7147a5170f..
--- a/games-arcade/performous/files/performous-1.1-boost-1.73.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/game/surface.cc 2021-01-18 14:22:05.876604740 +0300
-+++ b/game/surface.cc 2021-01-18 14:23:08.908716258 +0300
-@@ -135,7 +135,7 @@
- bitmap.resize(1, 1);
- target->load(bitmap);
- // Ask the loader to retrieve the image
--
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/files/, games-arcade/performous/
commit: ab00e6f2f32285976c6e33aca91e0d8e224bfdae Author: Ionen Wolkens gentoo org> AuthorDate: Sat Jan 21 13:54:06 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jan 21 15:08:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab00e6f2 games-arcade/performous: add 1.2.0 While this has a new meson.build, not migrating to meson given support was short lived and master is cmake-only again. IUSE=tools dropped given upstream has removed them from source. Closes: https://bugs.gentoo.org/784287 Closes: https://bugs.gentoo.org/834371 Closes: https://bugs.gentoo.org/867949 Signed-off-by: Ionen Wolkens gentoo.org> games-arcade/performous/Manifest | 2 + .../files/performous-1.2.0-ffmpeg5.patch | 25 + games-arcade/performous/performous-1.2.0.ebuild| 102 + 3 files changed, 129 insertions(+) diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest index 2fef1e5036b7..8c04ee19ff94 100644 --- a/games-arcade/performous/Manifest +++ b/games-arcade/performous/Manifest @@ -1,4 +1,6 @@ DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1 +DIST performous-1.2.0.tar.gz 7240476 BLAKE2B c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f SHA512 a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5f407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56 +DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300 BLAKE2B 1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c SHA512 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8 diff --git a/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch b/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch new file mode 100644 index ..63f573d53ffe --- /dev/null +++ b/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/834371 +https://github.com/performous/performous/commit/c3c0d2b7172 +From: Sébastien Gonzalve +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. +--- 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(mediaType), -1, -1, , 0); + if (m_streamId < 0) throw Error(*this, m_streamId); diff --git a/games-arcade/performous/performous-1.2.0.ebuild b/games-arcade/performous/performous-1.2.0.ebuild new file mode 100644 index ..67c54ea34069 --- /dev/null +++ b/games-arcade/performous/performous-1.2.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +# CED is only used in 1.2.0 and can be dropped on bump, no LICENSE +# changes needed given Apache-2.0 is also used by installed fonts +HASH_CED=9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e + +DESCRIPTION="SingStar GPL clone"
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: c99ed88ac8e3ee71ad4e5334e41d5f4f866ed0f7
Author: David Seifert gentoo org>
AuthorDate: Sat Jul 30 09:47:53 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jul 30 09:47:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99ed88a
games-arcade/performous: remove threads(+) usedep from boost
Signed-off-by: David Seifert gentoo.org>
.../performous/{performous-1.1-r2.ebuild => performous-1.1-r3.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-arcade/performous/performous-1.1-r2.ebuild
b/games-arcade/performous/performous-1.1-r3.ebuild
similarity index 97%
rename from games-arcade/performous/performous-1.1-r2.ebuild
rename to games-arcade/performous/performous-1.1-r3.ebuild
index af1c5fefeb09..554820c1b01d 100644
--- a/games-arcade/performous/performous-1.1-r2.ebuild
+++ b/games-arcade/performous/performous-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,7 +27,7 @@ IUSE="midi songs tools webcam"
RDEPEND="
dev-cpp/glibmm:2
dev-cpp/libxmlpp:2.6
- dev-libs/boost[threads(+)]
+ dev-libs/boost:=
dev-libs/glib:2
dev-libs/libxml2:2
gnome-base/librsvg:2
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 12e095406704737ca69158782408019c6db43936
Author: David Seifert gentoo org>
AuthorDate: Sun Apr 26 10:34:38 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 26 10:34:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e09540
games-arcade/performous: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert gentoo.org>
.../performous/{performous-1.1-r1.ebuild => performous-1.1-r2.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild
b/games-arcade/performous/performous-1.1-r2.ebuild
similarity index 97%
rename from games-arcade/performous/performous-1.1-r1.ebuild
rename to games-arcade/performous/performous-1.1-r2.ebuild
index 7901eeb37e8..5e1eeb5741d 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -41,7 +41,7 @@ RDEPEND="
media-libs/libsdl2[joystick,video]
media-libs/portaudio
sys-libs/zlib
- virtual/ffmpeg
+ media-video/ffmpeg
virtual/glu
virtual/jpeg:0
virtual/libintl
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 0711e8bc41413e13064ad3f88df45d90675e6596
Author: Wim Muskee gmail com>
AuthorDate: Fri Dec 6 15:28:10 2019 +
Commit: David Seifert gentoo org>
CommitDate: Fri Dec 6 20:31:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0711e8bc
games-arcade/performous: fix MissingUnpackerDep
Closes: https://github.com/gentoo/gentoo/pull/13895
Signed-off-by: Wim Muskee gmail.com>
Signed-off-by: David Seifert gentoo.org>
games-arcade/performous/performous-1.1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild
b/games-arcade/performous/performous-1.1-r1.ebuild
index f40e3e183d1..7901eeb37e8 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -55,6 +55,7 @@ RDEPEND="
DEPEND="${RDEPEND}
sys-apps/help2man
sys-devel/gettext
+ songs? ( app-arch/unzip )
"
DOCS=( docs/{Authors,instruments}.txt )
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/, games-arcade/performous/files/
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/
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() {
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/files/, games-arcade/performous/
commit: 3b31f231bc73691c868586474451e167d25d072c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 14 18:20:30 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 14 18:35:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b31f231
games-arcade/performous: EAPI-6 bump, QA: don't compress man
Sort dependencies, drop superfluous overrides.
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/performous-1.1-nomancompress.patch | 59 ++
games-arcade/performous/performous-1.1-r1.ebuild | 58 +
2 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/games-arcade/performous/files/performous-1.1-nomancompress.patch
b/games-arcade/performous/files/performous-1.1-nomancompress.patch
new file mode 100644
index 000..fd21f9b7034
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-nomancompress.patch
@@ -0,0 +1,59 @@
+--- a/docs/man/CMakeLists.txt 2018-10-14 19:57:14.924572577 +0200
b/docs/man/CMakeLists.txt 2018-10-14 20:11:13.250717230 +0200
+@@ -1,14 +1,12 @@
+ find_program(HELP2MAN help2man DOC "Location of the help2man program")
+-find_program(GZIP gzip DOC "Location of the gzip program")
+ mark_as_advanced(HELP2MAN)
+-mark_as_advanced(GZIP)
+-if(HELP2MAN AND GZIP)
+- set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz)
++if(HELP2MAN)
++ set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6)
+ set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m)
+ set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous)
+ add_custom_command(
+ OUTPUT ${MANFILE}
+- COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N |
${GZIP} > ${MANFILE}
++ COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N >
${MANFILE}
+ MAIN_DEPENDENCY ${H2MFILE}
+ DEPENDS ${PERFORMOUS_EXEC}
+ COMMENT "Building Performous man page"
+@@ -17,13 +15,13 @@
+ add_custom_target(manpage ALL DEPENDS ${MANFILE})
+ iF (APPLE)
+ install(FILES ${MANFILE} DESTINATION Resources/man/man6)
+- else(APPLE)
++ else()
+ install(FILES ${MANFILE} DESTINATION share/man/man6)
+ endif()
+-else(HELP2MAN AND GZIP)
+- message("WARNING: One of the following is missing: help2man, gzip;
performous man page will not be generated")
+-endif(HELP2MAN AND GZIP)
+-if(ENABLE_TOOLS AND GZIP)
++else()
++ message("WARNING: help2man is missing; performous man page will not be
generated")
++endif()
++if(ENABLE_TOOLS)
+ set(TOOLS
+ "ss_pak_extract" "ss_extract" "ss_cover_conv"
+ "ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode"
+@@ -31,15 +29,7 @@
+ set(MAN_SECTION "1")
+ foreach(TOOL ${TOOLS})
+ set(TOOL_MANFILE
${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION})
+- set(TOOL_MANFILE_GZ
${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz)
+- add_custom_command(
+- OUTPUT ${TOOL_MANFILE_GZ}
+- COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ}
+- MAIN_DEPENDENCY ${TOOL_MANFILE}
+- COMMENT "Building ${TOOL} man page"
+- VERBATIM
+- )
+- add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS
${TOOL_MANFILE_GZ})
+- install(FILES ${TOOL_MANFILE_GZ} DESTINATION
share/man/man${MAN_SECTION})
+- endforeach(TOOL)
+-endif(ENABLE_TOOLS AND GZIP)
++ add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS
${TOOL_MANFILE})
++ install(FILES ${TOOL_MANFILE} DESTINATION
share/man/man${MAN_SECTION})
++ endforeach()
++endif()
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild
b/games-arcade/performous/performous-1.1-r1.ebuild
index 6b8850506d5..774e839768c 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext
FindJpeg FindPng FindTiff FindZ"
-
-inherit desktop cmake-utils epatch gnome2-utils
+inherit cmake-utils desktop gnome2-utils
MY_PN="Performous"
MY_P="${MY_PN}-${PV}"
@@ -13,8 +13,7 @@ SONGS_PN="ultrastar-songs"
DESCRIPTION="SingStar GPL clone"
HOMEPAGE="https://performous.org/;
-SRC_URI="
- https://github.com/performous/performous/archive/${PV}.tar.gz ->
${P}.tar.gz
+SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz ->
${P}.tar.gz
songs? (
mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: b533df790c156800b95641b95c311b868bc619c2 Author: Pacho Ramos gentoo org> AuthorDate: Mon Apr 23 18:20:27 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Mon Apr 23 19:17:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b533df79 games-arcade/performous: Fix tools USE description (#600728) Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-arcade/performous/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml index c8eefd0a890..2ee1cd7690b 100644 --- a/games-arcade/performous/metadata.xml +++ b/games-arcade/performous/metadata.xml @@ -11,7 +11,7 @@ Enable MIDI I/O support Install a few demo songs - Install tools + Enable building of song extraction utilities for SingStar and Guitar Hero Enable Webcam support
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 70f2ce2b6c0ae353823adb46c5f884e4876e2b6f
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 23 18:19:30 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 23 19:17:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f2ce2b
games-arcade/performous: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-arcade/performous/performous-1.1-r1.ebuild | 118 +++
1 file changed, 118 insertions(+)
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild
b/games-arcade/performous/performous-1.1-r1.ebuild
new file mode 100644
index 000..6b8850506d5
--- /dev/null
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext
FindJpeg FindPng FindTiff FindZ"
+
+inherit desktop cmake-utils epatch gnome2-utils
+
+MY_PN="Performous"
+MY_P="${MY_PN}-${PV}"
+SONGS_PN="ultrastar-songs"
+
+DESCRIPTION="SingStar GPL clone"
+HOMEPAGE="https://performous.org/;
+SRC_URI="
+ https://github.com/performous/performous/archive/${PV}.tar.gz ->
${P}.tar.gz
+ songs? (
+ mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
+ mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
+ mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
+ mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
+ )
+"
+
+LICENSE="
+ GPL-2
+ songs? (
+ CC-BY-NC-SA-2.5
+ CC-BY-NC-ND-2.5
+ )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="midi songs tools webcam"
+
+RDEPEND="
+ dev-cpp/glibmm:2
+ dev-cpp/libxmlpp:2.6
+ media-libs/portaudio
+ dev-libs/boost[threads(+)]
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ gnome-base/librsvg:2
+ media-gfx/imagemagick:0=
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ media-libs/libsdl2[joystick,video]
+ virtual/ffmpeg
+ virtual/opengl
+ virtual/glu
+ sys-libs/zlib
+ virtual/libintl
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/pango
+ media-libs/libepoxy
+ midi? ( media-libs/portmidi )
+ webcam? ( media-libs/opencv )
+"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-devel/gettext
+"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ epatch \
+ "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-linguas.patch
+ sed -i \
+ -e "s:@GENTOO_BINDIR@:/usr/bin:" \
+ -e '/ Z /s/ Z/ ZLIB/g' \
+ -e 's/Z_FOUND/ZLIB_FOUND/g' \
+ -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
+ -e 's/Jpeg/JPEG/' \
+ -e 's/Png/PNG/' \
+ {game,tools}/CMakeLists.txt || die
+
+ strip-linguas -u lang
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable tools TOOLS)
+ $(cmake-utils_use_enable webcam WEBCAM)
+ $(cmake-utils_use_enable midi MIDI)
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ -DSHARE_INSTALL="/usr/share/${PN}"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use songs ; then
+ insinto "/usr/share/${PN}"
+ doins -r "${WORKDIR}/songs"
+ fi
+ dodoc docs/{Authors,instruments}.txt
+ newicon -s scalable data/themes/default/icon.svg ${PN}.svg
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 9557bf30c094ebd0d4788c25332c19f0e489ce2a
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 23 18:20:48 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 23 19:17:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9557bf30
games-arcade/performous: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-arcade/performous/performous-1.1.ebuild | 113 --
1 file changed, 113 deletions(-)
diff --git a/games-arcade/performous/performous-1.1.ebuild
b/games-arcade/performous/performous-1.1.ebuild
deleted file mode 100644
index e7eefe5ef0a..000
--- a/games-arcade/performous/performous-1.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext
FindJpeg FindPng FindTiff FindZ"
-inherit eutils cmake-utils gnome2-utils games
-
-MY_PN=Performous
-MY_P=${MY_PN}-${PV}
-SONGS_PN=ultrastar-songs
-
-DESCRIPTION="SingStar GPL clone"
-HOMEPAGE="https://performous.org/;
-SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz ->
${P}.tar.gz
- songs? (
- mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
- mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
- mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
- mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
- )"
-
-LICENSE="GPL-2
- songs? (
- CC-BY-NC-SA-2.5
- CC-BY-NC-ND-2.5
- )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="midi songs tools webcam"
-
-RDEPEND="dev-cpp/glibmm:2
- dev-cpp/libxmlpp:2.6
- media-libs/portaudio
- dev-libs/boost[threads(+)]
- dev-libs/glib:2
- dev-libs/libxml2
- gnome-base/librsvg
- media-gfx/imagemagick
- virtual/jpeg:0
- media-libs/libpng:0
- media-libs/libsdl2[joystick,video]
- virtual/ffmpeg
- virtual/opengl
- virtual/glu
- sys-libs/zlib
- virtual/libintl
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/pango
- media-libs/libepoxy
- midi? ( media-libs/portmidi )
- webcam? ( media-libs/opencv )"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- sys-devel/gettext"
-
-src_prepare() {
- cmake-utils_src_prepare
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-linguas.patch
- sed -i \
- -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
- -e '/ Z /s/ Z/ ZLIB/g' \
- -e 's/Z_FOUND/ZLIB_FOUND/g' \
- -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
- -e 's/Jpeg/JPEG/' \
- -e 's/Png/PNG/' \
- {game,tools}/CMakeLists.txt || die
-
- strip-linguas -u lang
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_enable tools TOOLS)
- $(cmake-utils_use_enable webcam WEBCAM)
- $(cmake-utils_use_enable midi MIDI)
- -DCMAKE_VERBOSE_MAKEFILE=TRUE
- -DSHARE_INSTALL="${GAMES_DATADIR}"/${PN}
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- if use songs ; then
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${WORKDIR}/songs"
- fi
- dodoc docs/{Authors,instruments}.txt
- newicon -s scalable data/themes/default/icon.svg ${PN}.svg
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/files/
commit: 95a62dfec9987024ca64e7066baa38be4f62c30d
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Fri Nov 25 16:20:30 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Nov 25 19:21:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a62dfe
games-arcade/performous: remove unused patches
.../performous/files/performous-1.0-gcc52.patch | 11 ---
.../performous/files/performous-1.0-gentoo.patch | 12
.../performous/files/performous-1.0-include.patch | 10 --
.../performous/files/performous-1.0-libav.patch | 19 ---
.../performous/files/performous-1.0-linguas.patch | 18 --
5 files changed, 70 deletions(-)
diff --git a/games-arcade/performous/files/performous-1.0-gcc52.patch
b/games-arcade/performous/files/performous-1.0-gcc52.patch
deleted file mode 100644
index dc3eb6b..
--- a/games-arcade/performous/files/performous-1.0-gcc52.patch
+++ /dev/null
@@ -1,11 +0,0 @@
game/songparser.hh.old 2016-04-19 21:57:29.594132735 +0200
-+++ game/songparser.hh 2016-04-19 21:57:55.736682808 +0200
-@@ -33,7 +33,7 @@
- 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
!std::getline(m_ss, line).fail();}
- bool m_relative;
- double m_gap;
- double m_bpm;
diff --git a/games-arcade/performous/files/performous-1.0-gentoo.patch
b/games-arcade/performous/files/performous-1.0-gentoo.patch
deleted file mode 100644
index a73663a..
--- a/games-arcade/performous/files/performous-1.0-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru performous-1.0.orig/game/CMakeLists.txt
performous-1.0/game/CMakeLists.txt
performous-1.0.orig/game/CMakeLists.txt2014-10-28 19:11:45.0
-0400
-+++ performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400
-@@ -141,7 +141,7 @@
- set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin
subfolder.
- set(SUBSYSTEM_WIN32 WIN32)
- else()
-- set(BIN_INSTALL bin)
-+ set(BIN_INSTALL @GENTOO_BINDIR@)
- endif()
-
- # Build main executable
diff --git a/games-arcade/performous/files/performous-1.0-include.patch
b/games-arcade/performous/files/performous-1.0-include.patch
deleted file mode 100644
index ba67018..
--- a/games-arcade/performous/files/performous-1.0-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
performous-1.0/game/song.hh.orig 2015-03-31 13:56:13.546360617 -0400
-+++ performous-1.0/game/song.hh2015-03-31 13:56:23.609025021 -0400
-@@ -3,6 +3,7 @@
- #include "i18n.hh"
- #include "notes.hh"
- #include "util.hh"
-+#include "fs.hh"
- #include
- #include
- #include
diff --git a/games-arcade/performous/files/performous-1.0-libav.patch
b/games-arcade/performous/files/performous-1.0-libav.patch
deleted file mode 100644
index e3f3661..
--- a/games-arcade/performous/files/performous-1.0-libav.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake
Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake
Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake 2012-05-16
13:44:26.112930173 +0200
-+++ Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake 2012-05-16
13:56:10.229914635 +0200
-@@ -25,9 +25,15 @@
- if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h")
- set(AVUtil_INCLUDE "${suffix}avutil.h")
- endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h")
-+ if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h")
-+set(AVUtilMath_INCLUDE "${suffix}mathematics.h")
-+ endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h")
- endif(NOT AVUtil_INCLUDE)
- endforeach(suffix)
-
-+ if(NOT AVUtilMath_INCLUDE)
-+message(FATAL_ERROR "Found mathematics.h include dir, but not the header
file. Perhaps you need to clear CMake cache?")
-+ endif(NOT AVUtilMath_INCLUDE)
- if(NOT AVUtil_INCLUDE)
- message(FATAL_ERROR "Found avutil.h include dir, but not the header file.
Perhaps you need to clear CMake cache?")
- endif(NOT AVUtil_INCLUDE)
diff --git a/games-arcade/performous/files/performous-1.0-linguas.patch
b/games-arcade/performous/files/performous-1.0-linguas.patch
deleted file mode 100644
index f8f1349..
--- a/games-arcade/performous/files/performous-1.0-linguas.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru performous-1.0.orig/lang/CMakeLists.txt
performous-1.0/lang/CMakeLists.txt
performous-1.0.orig/lang/CMakeLists.txt2014-10-28 19:11:45.0
-0400
-+++ performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500
-@@ -9,5 +9,13 @@
- file(MAKE_DIRECTORY "${mobuild}")
- add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v
"${pofile}" -o
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 1f3b565c6a4ecc2421dea6eec1fa328fae4da743 Author: Pacho Ramos gentoo org> AuthorDate: Wed Oct 12 18:51:47 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Oct 12 18:54:57 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3b565c games-arcade/performous: Set proper libxmlpp slot Package-Manager: portage-2.3.1 games-arcade/performous/performous-1.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-arcade/performous/performous-1.1.ebuild b/games-arcade/performous/performous-1.1.ebuild index ff56b5d..c7646e5 100644 --- a/games-arcade/performous/performous-1.1.ebuild +++ b/games-arcade/performous/performous-1.1.ebuild @@ -30,8 +30,8 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="midi songs tools webcam" -RDEPEND="dev-cpp/glibmm - dev-cpp/libxmlpp +RDEPEND="dev-cpp/glibmm:2 + dev-cpp/libxmlpp:2.6 media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib:2
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: a42683f0a173821c1094c835ed2ecc12e5563aa8
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Oct 12 18:51:07 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Oct 12 18:54:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a42683f0
games-arcade/performous: Drop old
Package-Manager: portage-2.3.1
games-arcade/performous/Manifest | 1 -
games-arcade/performous/performous-1.0.ebuild | 116 --
2 files changed, 117 deletions(-)
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index c8c1d6a..2776d42 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,4 +1,3 @@
-DIST performous-1.0.tar.gz 3950246 SHA256
da9f39d281dbfe0849897dc98dc72cfc5a54be53f67c29b6430e57aefcc86b50 SHA512
9cdc6ad71248fede7df6fdc8ea4aca70a9c79be40e1d8c07c425f4a0e0c6e352233aee2ddeb586dcc6a7ea567b3e399aad9c5840475d8ce91c3ec7d4ec1eb30b
WHIRLPOOL
2b9dbf8cec9e09bbff6a9490cbeb3fc04e88776c57fe80b9da04b91cdc2ac8ed9e129746e2adb4866ee52edb819229c6f52c45d2e301718a7c4e106ba27f14f1
DIST performous-1.1.tar.gz 3965473 SHA256
17d47da4092ffa0dc2087f69b8b9d4f920aa7d16ee80020bb5445f95d22b6a71 SHA512
6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
WHIRLPOOL
9f82629afbe1146aaa8aed635214266f28c76d9ba1d1a7ecf9be2d0ff8684a11630ff4a32bf5cf852c353e894cd0a738f8d19ffbcd2a176104ca7f911c18da55
DIST ultrastar-songs-jc-1.zip 242698201 SHA256
b3a6f980926c4f1ce40bc763a406040855600ad005f4daa54e0ac324ce99a9ba SHA512
2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
WHIRLPOOL
13bd3761b80b2a9491c6dbe2e535dbdc1e0f53b51d5070a0caf776da94c45c62a5a6980b4d95f629e0cfe5d6ef985428e5dcf6d4ba2f0931e6ea1d39d7f6674c
DIST ultrastar-songs-libre-3.zip 5289866 SHA256
739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489 SHA512
820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
WHIRLPOOL
48d48e82ec8bd02376b3def5a3f215331c49853cf00439686cd577ebd51321e4a4e8b213d40356a46e2a2bd2a1bf6c1cb07b09195209833f4eb004166937bfe5
diff --git a/games-arcade/performous/performous-1.0.ebuild
b/games-arcade/performous/performous-1.0.ebuild
deleted file mode 100644
index cc918d1..
--- a/games-arcade/performous/performous-1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext
FindJpeg FindPng FindTiff FindZ"
-inherit eutils cmake-utils gnome2-utils games
-
-MY_PN=Performous
-MY_P=${MY_PN}-${PV}
-SONGS_PN=ultrastar-songs
-
-DESCRIPTION="SingStar GPL clone"
-HOMEPAGE="https://sourceforge.net/projects/performous/;
-SRC_URI="https://github.com/performous/performous/archive/1.0.tar.gz ->
${P}.tar.gz
- songs? (
- mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
- mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
- mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
- mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
- )"
-
-LICENSE="GPL-2
- songs? (
- CC-BY-NC-SA-2.5
- CC-BY-NC-ND-2.5
- )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="midi songs tools webcam"
-
-RDEPEND="dev-cpp/glibmm
- dev-cpp/libxmlpp
- media-libs/portaudio
- dev-libs/boost[threads(+)]
- dev-libs/glib:2
- dev-libs/libxml2
- gnome-base/librsvg
- media-gfx/imagemagick
- virtual/jpeg:0
- media-libs/libpng:0
- media-libs/libsdl2[joystick,video]
- virtual/ffmpeg
- virtual/opengl
- virtual/glu
- sys-libs/zlib
- virtual/libintl
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/pango
- media-libs/glew
- midi? ( media-libs/portmidi )
- webcam? ( media-libs/opencv )"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- sys-devel/gettext"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-libav.patch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-linguas.patch \
- "${FILESDIR}"/${P}-gcc52.patch \
- "${FILESDIR}"/${P}-include.patch
- sed -i \
- -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
- -e '/ Z /s/ Z / ZLIB /' \
- -e 's/Z_FOUND/ZLIB_FOUND/g' \
- -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
- -e 's/Jpeg/JPEG/' \
- -e 's/Png/PNG/' \
- {game,tools}/CMakeLists.txt || die
-
- strip-linguas -u lang
-}
-
-src_configure() {
- local mycmakeargs=(
-
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 4d97a02d6ecbe8f1cc4184d678b719e181197a71 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Jun 6 14:30:47 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Jun 6 14:30:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d97a02d games-arcade/performous: amd64 stable wrt bug #584872 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> games-arcade/performous/performous-1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-arcade/performous/performous-1.1.ebuild b/games-arcade/performous/performous-1.1.ebuild index 1fcd585..681763c 100644 --- a/games-arcade/performous/performous-1.1.ebuild +++ b/games-arcade/performous/performous-1.1.ebuild @@ -27,7 +27,7 @@ LICENSE="GPL-2 CC-BY-NC-ND-2.5 )" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="midi songs tools webcam" RDEPEND="dev-cpp/glibmm
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/
commit: 00742e7a818d804bf14f461481b5b42e0e515f94
Author: Michael Sterrett gentoo org>
AuthorDate: Mon May 16 15:53:41 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Mon May 16 15:54:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00742e7a
games-arcade/performous: fix building with USE=tools by further commiting to
use the system-cmake-find-zlib module
Package-Manager: portage-2.2.28
games-arcade/performous/performous-1.0.ebuild | 4 +++-
games-arcade/performous/performous-1.1.ebuild | 6 --
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/games-arcade/performous/performous-1.0.ebuild
b/games-arcade/performous/performous-1.0.ebuild
index 9fa6cdf..fbdaa56 100644
--- a/games-arcade/performous/performous-1.0.ebuild
+++ b/games-arcade/performous/performous-1.0.ebuild
@@ -66,9 +66,11 @@ src_prepare() {
sed -i \
-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
-e '/ Z /s/ Z / ZLIB /' \
+ -e 's/Z_FOUND/ZLIB_FOUND/g' \
+ -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
-e 's/Jpeg/JPEG/' \
-e 's/Png/PNG/' \
- game/CMakeLists.txt || die
+ {game,tools}/CMakeLists.txt || die
strip-linguas -u lang
}
diff --git a/games-arcade/performous/performous-1.1.ebuild
b/games-arcade/performous/performous-1.1.ebuild
index 9d54a66..1fcd585 100644
--- a/games-arcade/performous/performous-1.1.ebuild
+++ b/games-arcade/performous/performous-1.1.ebuild
@@ -63,10 +63,12 @@ src_prepare() {
"${FILESDIR}"/${P}-linguas.patch
sed -i \
-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
- -e '/ Z /s/ Z / ZLIB /' \
+ -e '/ Z /s/ Z/ ZLIB/g' \
+ -e 's/Z_FOUND/ZLIB_FOUND/g' \
+ -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
-e 's/Jpeg/JPEG/' \
-e 's/Png/PNG/' \
- game/CMakeLists.txt || die
+ {game,tools}/CMakeLists.txt || die
strip-linguas -u lang
}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/files/, games-arcade/performous/
commit: 8336778e344e678f3ccca4a444abe3ce398ab491
Author: Tupone Alfredo gentoo org>
AuthorDate: Fri Apr 22 19:07:26 2016 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Apr 22 19:07:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8336778e
games-arcade/performous: Fix gcc-5 build. Bug #570572
Package-Manager: portage-2.2.26
games-arcade/performous/files/performous-1.0-gcc52.patch | 11 +++
games-arcade/performous/performous-1.0.ebuild| 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/games-arcade/performous/files/performous-1.0-gcc52.patch
b/games-arcade/performous/files/performous-1.0-gcc52.patch
new file mode 100644
index 000..dc3eb6b
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.0-gcc52.patch
@@ -0,0 +1,11 @@
+--- game/songparser.hh.old 2016-04-19 21:57:29.594132735 +0200
game/songparser.hh 2016-04-19 21:57:55.736682808 +0200
+@@ -33,7 +33,7 @@
+ 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
!std::getline(m_ss, line).fail();}
+ bool m_relative;
+ double m_gap;
+ double m_bpm;
diff --git a/games-arcade/performous/performous-1.0.ebuild
b/games-arcade/performous/performous-1.0.ebuild
index ab277f8..9fa6cdf 100644
--- a/games-arcade/performous/performous-1.0.ebuild
+++ b/games-arcade/performous/performous-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -61,6 +61,7 @@ src_prepare() {
"${FILESDIR}"/${P}-libav.patch \
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-linguas.patch \
+ "${FILESDIR}"/${P}-gcc52.patch \
"${FILESDIR}"/${P}-include.patch
sed -i \
-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/files/, games-arcade/performous/
commit: 827062b5582fbd93848545197aecce6efdc68e22
Author: Michael Sterrett gentoo org>
AuthorDate: Sun Apr 17 23:27:21 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Sun Apr 17 23:27:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827062b5
games-arcade/performous: version bump
Package-Manager: portage-2.2.26
games-arcade/performous/Manifest | 1 +
.../performous/files/performous-1.1-gentoo.patch | 12 +++
.../performous/files/performous-1.1-linguas.patch | 18
games-arcade/performous/performous-1.1.ebuild | 112 +
4 files changed, 143 insertions(+)
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 8d5f72d..c8c1d6a 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,4 +1,5 @@
DIST performous-1.0.tar.gz 3950246 SHA256
da9f39d281dbfe0849897dc98dc72cfc5a54be53f67c29b6430e57aefcc86b50 SHA512
9cdc6ad71248fede7df6fdc8ea4aca70a9c79be40e1d8c07c425f4a0e0c6e352233aee2ddeb586dcc6a7ea567b3e399aad9c5840475d8ce91c3ec7d4ec1eb30b
WHIRLPOOL
2b9dbf8cec9e09bbff6a9490cbeb3fc04e88776c57fe80b9da04b91cdc2ac8ed9e129746e2adb4866ee52edb819229c6f52c45d2e301718a7c4e106ba27f14f1
+DIST performous-1.1.tar.gz 3965473 SHA256
17d47da4092ffa0dc2087f69b8b9d4f920aa7d16ee80020bb5445f95d22b6a71 SHA512
6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
WHIRLPOOL
9f82629afbe1146aaa8aed635214266f28c76d9ba1d1a7ecf9be2d0ff8684a11630ff4a32bf5cf852c353e894cd0a738f8d19ffbcd2a176104ca7f911c18da55
DIST ultrastar-songs-jc-1.zip 242698201 SHA256
b3a6f980926c4f1ce40bc763a406040855600ad005f4daa54e0ac324ce99a9ba SHA512
2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
WHIRLPOOL
13bd3761b80b2a9491c6dbe2e535dbdc1e0f53b51d5070a0caf776da94c45c62a5a6980b4d95f629e0cfe5d6ef985428e5dcf6d4ba2f0931e6ea1d39d7f6674c
DIST ultrastar-songs-libre-3.zip 5289866 SHA256
739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489 SHA512
820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
WHIRLPOOL
48d48e82ec8bd02376b3def5a3f215331c49853cf00439686cd577ebd51321e4a4e8b213d40356a46e2a2bd2a1bf6c1cb07b09195209833f4eb004166937bfe5
DIST ultrastar-songs-restricted-3.zip 10242651 SHA256
e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82 SHA512
70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
WHIRLPOOL
cb83550395bbbadb45ad982fd4586a4dca49ae96bbe7adfab1b925301fa69eb5581c24f0c5c8d3593851a80b3e86137eea7658753f720ad76bae6e5809c2feba
diff --git a/games-arcade/performous/files/performous-1.1-gentoo.patch
b/games-arcade/performous/files/performous-1.1-gentoo.patch
new file mode 100644
index 000..a73663a
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ru performous-1.0.orig/game/CMakeLists.txt
performous-1.0/game/CMakeLists.txt
+--- performous-1.0.orig/game/CMakeLists.txt2014-10-28 19:11:45.0
-0400
performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400
+@@ -141,7 +141,7 @@
+ set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin
subfolder.
+ set(SUBSYSTEM_WIN32 WIN32)
+ else()
+- set(BIN_INSTALL bin)
++ set(BIN_INSTALL @GENTOO_BINDIR@)
+ endif()
+
+ # Build main executable
diff --git a/games-arcade/performous/files/performous-1.1-linguas.patch
b/games-arcade/performous/files/performous-1.1-linguas.patch
new file mode 100644
index 000..f8f1349
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-linguas.patch
@@ -0,0 +1,18 @@
+diff -ru performous-1.0.orig/lang/CMakeLists.txt
performous-1.0/lang/CMakeLists.txt
+--- performous-1.0.orig/lang/CMakeLists.txt2014-10-28 19:11:45.0
-0400
performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500
+@@ -9,5 +9,13 @@
+ file(MAKE_DIRECTORY "${mobuild}")
+ add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v
"${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building
${language} locale" VERBATIM)
+ add_custom_target("locale_${language}" ALL DEPENDS "${mofile}") # Make
sure the mofiles are always built
+- install(FILES "${mofile}" DESTINATION
"${LOCALE_DIR}/${language}/LC_MESSAGES")
+ endforeach(language)
++foreach(language $ENV{LINGUAS})
++ set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
++ if (EXISTS ${pofile})
++ set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
++ install(FILES ${mofile} DESTINATION
++{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
++ endif()
++endforeach(language)
++
diff --git
