| 1 |
commit: 5673186acd87d77631b0b1b2ced9238491bedf18 |
| 2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
| 3 |
AuthorDate: Fri Mar 11 21:38:39 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 06:36:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5673186a |
| 7 |
|
| 8 |
games-arcade/oshu: Version bump, 2.0.2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/834370 |
| 11 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/24499 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
games-arcade/oshu/Manifest | 1 + |
| 16 |
.../oshu/files/oshu-2.0.2-ffmpeg4-compat.patch | 16 ++++++++++++++++ |
| 17 |
.../oshu/{oshu-9999.ebuild => oshu-2.0.2.ebuild} | 18 ++++++++++++++---- |
| 18 |
games-arcade/oshu/oshu-9999.ebuild | 18 +++++++++++++----- |
| 19 |
4 files changed, 44 insertions(+), 9 deletions(-) |
| 20 |
|
| 21 |
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest |
| 22 |
index ebf8762f324e..218a6c1c7a76 100644 |
| 23 |
--- a/games-arcade/oshu/Manifest |
| 24 |
+++ b/games-arcade/oshu/Manifest |
| 25 |
@@ -1,2 +1,3 @@ |
| 26 |
DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf |
| 27 |
+DIST oshu-2.0.2.tar.gz 146109 BLAKE2B 98dd49f972f1f1f820f654a2d358ceffdd2c54cd2daa0594914e6a1e29f1d1e757fe46d021afc75a33f4ef94bbb370213f20229843c173d7c55d876fe3db7e12 SHA512 e881e9429cebaf74337e55e7fa5445d992627d7616088f15abfafa2c125e1ff057a5b0f39ee4a1d1728c310728a8590e65286b9a0f81dca1f8963b2943fba596 |
| 28 |
DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618 |
| 29 |
|
| 30 |
diff --git a/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch |
| 31 |
new file mode 100644 |
| 32 |
index 000000000000..c16e61ce1288 |
| 33 |
--- /dev/null |
| 34 |
+++ b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch |
| 35 |
@@ -0,0 +1,16 @@ |
| 36 |
+diff --git a/./lib/audio/stream.cc.old b/./lib/audio/stream.cc |
| 37 |
+index 808851f..09eb4fb 100644 |
| 38 |
+--- a/./lib/audio/stream.cc.old |
| 39 |
++++ b/./lib/audio/stream.cc |
| 40 |
+@@ -193,7 +193,11 @@ static int open_demuxer(const char *url, oshu::stream *stream) |
| 41 |
+ stream->demuxer, |
| 42 |
+ AVMEDIA_TYPE_AUDIO, |
| 43 |
+ -1, -1, |
| 44 |
++#if LIBAVCODEC_VERSION_MAJOR < 59 |
| 45 |
++ &stream->codec, |
| 46 |
++#else |
| 47 |
+ (const AVCodec**)&stream->codec, |
| 48 |
++#endif |
| 49 |
+ 0 |
| 50 |
+ ); |
| 51 |
+ if (rc < 0 || stream->codec == NULL) { |
| 52 |
|
| 53 |
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-2.0.2.ebuild |
| 54 |
similarity index 78% |
| 55 |
copy from games-arcade/oshu/oshu-9999.ebuild |
| 56 |
copy to games-arcade/oshu/oshu-2.0.2.ebuild |
| 57 |
index 5ebae7bfdcd6..c1d02ab63c76 100644 |
| 58 |
--- a/games-arcade/oshu/oshu-9999.ebuild |
| 59 |
+++ b/games-arcade/oshu/oshu-2.0.2.ebuild |
| 60 |
@@ -1,7 +1,7 @@ |
| 61 |
-# Copyright 1999-2021 Gentoo Authors |
| 62 |
+# Copyright 1999-2022 Gentoo Authors |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
-EAPI=7 |
| 66 |
+EAPI=8 |
| 67 |
|
| 68 |
inherit cmake xdg |
| 69 |
|
| 70 |
@@ -32,6 +32,16 @@ RDEPEND=" |
| 71 |
|
| 72 |
DEPEND="${RDEPEND}" |
| 73 |
|
| 74 |
+PATCHES=( "${FILESDIR}/oshu-2.0.2-ffmpeg4-compat.patch" ) |
| 75 |
+ |
| 76 |
+src_unpack() { |
| 77 |
+ default |
| 78 |
+ |
| 79 |
+ if [[ ${PV} = *9999 ]]; then |
| 80 |
+ git-r3_src_unpack |
| 81 |
+ fi |
| 82 |
+} |
| 83 |
+ |
| 84 |
src_prepare() { |
| 85 |
if use osu-skin; then |
| 86 |
eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch" |
| 87 |
@@ -43,8 +53,8 @@ src_prepare() { |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
local mycmakeargs=( |
| 91 |
- '-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal') |
| 92 |
- '-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '') |
| 93 |
+ -DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal) |
| 94 |
+ -DOSHU_SKINS=minimal$(usev osu-skin ';osu') |
| 95 |
) |
| 96 |
|
| 97 |
cmake_src_configure |
| 98 |
|
| 99 |
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild |
| 100 |
index 5ebae7bfdcd6..cf543ede25bd 100644 |
| 101 |
--- a/games-arcade/oshu/oshu-9999.ebuild |
| 102 |
+++ b/games-arcade/oshu/oshu-9999.ebuild |
| 103 |
@@ -1,7 +1,7 @@ |
| 104 |
-# Copyright 1999-2021 Gentoo Authors |
| 105 |
+# Copyright 1999-2022 Gentoo Authors |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
-EAPI=7 |
| 109 |
+EAPI=8 |
| 110 |
|
| 111 |
inherit cmake xdg |
| 112 |
|
| 113 |
@@ -27,11 +27,19 @@ RDEPEND=" |
| 114 |
media-libs/sdl2-image |
| 115 |
x11-libs/cairo |
| 116 |
x11-libs/pango |
| 117 |
- media-video/ffmpeg:= |
| 118 |
+ >media-video/ffmpeg-5:= |
| 119 |
" |
| 120 |
|
| 121 |
DEPEND="${RDEPEND}" |
| 122 |
|
| 123 |
+src_unpack() { |
| 124 |
+ default |
| 125 |
+ |
| 126 |
+ if [[ ${PV} = *9999 ]]; then |
| 127 |
+ git-r3_src_unpack |
| 128 |
+ fi |
| 129 |
+} |
| 130 |
+ |
| 131 |
src_prepare() { |
| 132 |
if use osu-skin; then |
| 133 |
eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch" |
| 134 |
@@ -43,8 +51,8 @@ src_prepare() { |
| 135 |
|
| 136 |
src_configure() { |
| 137 |
local mycmakeargs=( |
| 138 |
- '-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal') |
| 139 |
- '-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '') |
| 140 |
+ -DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal) |
| 141 |
+ -DOSHU_SKINS=minimal$(usev osu-skin ';osu') |
| 142 |
) |
| 143 |
|
| 144 |
cmake_src_configure |
Archives