Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/schismtracker/, media-sound/schismtracker/files/
Date: Fri, 02 Dec 2022 02:51:51
Message-Id: 1669949498.de022330aafb4ddd464e0cfb2c2ecfe200381b0f.sam@gentoo
1 commit: de022330aafb4ddd464e0cfb2c2ecfe200381b0f
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 2 01:41:43 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 2 02:51:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de022330
7
8 media-sound/schismtracker: add 20221201
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-sound/schismtracker/Manifest | 1 +
13 .../files/schismtracker-20221201-bashism.patch | 29 ++++++++++++
14 .../schismtracker/schismtracker-20221201.ebuild | 54 ++++++++++++++++++++++
15 3 files changed, 84 insertions(+)
16
17 diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
18 index c94e0db0b6e8..177e09ee1a24 100644
19 --- a/media-sound/schismtracker/Manifest
20 +++ b/media-sound/schismtracker/Manifest
21 @@ -1,2 +1,3 @@
22 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda
23 DIST schismtracker-20221020.tar.gz 1276386 BLAKE2B d498eba07d05729640eb78de3253a47aad9f09594ea4b45195a4f829b581ca293cef5f12ddcb8bdf7c9b2f01ff9b3e00c5e7c54a23a179d3af23567c233a96f5 SHA512 1653800b0967926c8edab96636fcad547d94f20b6bc06f27780c75d48d7944983ba36013c62bfc9c0f6fcf33e3e8f9fb4c70fff19fd2a56c672ecfc1ba2f2cd7
24 +DIST schismtracker-20221201.source.tar.gz 1633099 BLAKE2B 6f376323002f85031140be7d54b1ab8bd830f8654e90c07596c9a45ce2ce76dfda51f124ff01247c1a371269b2924470faab06d7692a76ced694fdf05937f384 SHA512 062dc54b541709be0a5c8b0c5edadc9710106154c15b2a40847998db33aaba7d07740cdd32da94f56725e66834221bc5470f9a111eb41a06fbfbd70fdc920113
25
26 diff --git a/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch
27 new file mode 100644
28 index 000000000000..64cad709efe0
29 --- /dev/null
30 +++ b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch
31 @@ -0,0 +1,29 @@
32 +https://github.com/schismtracker/schismtracker/pull/340
33 +
34 +From 5f2f594b6a4055318fa31d3c0cd6ecc8dc3666f7 Mon Sep 17 00:00:00 2001
35 +From: Sam James <sam@g.o>
36 +Date: Fri, 2 Dec 2022 01:39:06 +0000
37 +Subject: [PATCH] Fix bashism in configure.ac sdl2-config check
38 +MIME-Version: 1.0
39 +Content-Type: text/plain; charset=UTF-8
40 +Content-Transfer-Encoding: 8bit
41 +
42 +configure scripts need to be runnable with a POSIX-compliant /bin/sh.
43 +
44 +On many (but not all!) systems, /bin/sh is provided by Bash, so errors
45 +like this aren't spotted. Notably Debian defaults to /bin/sh provided
46 +by dash which doesn't tolerate such bashisms as '=='.
47 +
48 +This retains compatibility with bash.
49 +--- a/configure.ac
50 ++++ b/configure.ac
51 +@@ -63,7 +63,7 @@ AC_C_BIGENDIAN
52 + dnl Check for SDL libs
53 + AC_CHECK_TOOL([SDL_CONFIG], [sdl2-config])
54 + AC_SUBST(SDL_CONFIG)
55 +-if test "x$SDL_CONFIG" == "x"; then
56 ++if test "x$SDL_CONFIG" = "x"; then
57 + AC_MSG_ERROR([*** sdl2-config not found.])
58 + fi
59 + AS_VERSION_COMPARE([$($SDL_CONFIG --version)], [2.0.5], [AC_MSG_ERROR([*** SDL version >= 2.0.5 not found.])])
60 +
61
62 diff --git a/media-sound/schismtracker/schismtracker-20221201.ebuild b/media-sound/schismtracker/schismtracker-20221201.ebuild
63 new file mode 100644
64 index 000000000000..980ebc3426fa
65 --- /dev/null
66 +++ b/media-sound/schismtracker/schismtracker-20221201.ebuild
67 @@ -0,0 +1,54 @@
68 +# Copyright 1999-2022 Gentoo Authors
69 +# Distributed under the terms of the GNU General Public License v2
70 +
71 +EAPI=8
72 +
73 +inherit autotools desktop xdg
74 +
75 +DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
76 +HOMEPAGE="http://schismtracker.org/"
77 +SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz"
78 +S="${WORKDIR}"
79 +
80 +LICENSE="GPL-2 LGPL-2 public-domain"
81 +SLOT="0"
82 +KEYWORDS="~amd64 ~x86"
83 +
84 +RDEPEND="
85 + >=media-libs/libsdl2-2.0.5[X]
86 + x11-libs/libX11
87 + x11-libs/libXv
88 +"
89 +DEPEND="${RDEPEND}
90 + virtual/os-headers
91 + x11-base/xorg-proto
92 +"
93 +
94 +PATCHES=(
95 + "${FILESDIR}"/${PN}-20221201-bashism.patch
96 +)
97 +
98 +src_prepare() {
99 + default
100 +
101 + # Can drop this once bashism patch unnecessary
102 + eautoreconf
103 +
104 + # workaround for temporary files (missing directory). Fixes:
105 + # sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
106 + # /bin/sh: auto/default-font.c: No such file or directory
107 + mkdir auto || die
108 +
109 + # sys-devel/binutils[multitarget] provides ${CHOST}-windres
110 + # wine provides /usr/bin/windres
111 + # and schismtracker fails to use it properly:
112 + # sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
113 + [[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
114 +}
115 +
116 +src_install() {
117 + default
118 +
119 + domenu sys/fd.org/*.desktop
120 + doicon icons/schism{,-itf}-icon-128.png
121 +}