public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/schismtracker/, media-sound/schismtracker/files/
@ 2022-12-02  2:51 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2022-12-02  2:51 UTC (permalink / raw
  To: gentoo-commits

commit:     de022330aafb4ddd464e0cfb2c2ecfe200381b0f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 01:41:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 02:51:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de022330

media-sound/schismtracker: add 20221201

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/schismtracker/Manifest                 |  1 +
 .../files/schismtracker-20221201-bashism.patch     | 29 ++++++++++++
 .../schismtracker/schismtracker-20221201.ebuild    | 54 ++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index c94e0db0b6e8..177e09ee1a24 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,2 +1,3 @@
 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda
 DIST schismtracker-20221020.tar.gz 1276386 BLAKE2B d498eba07d05729640eb78de3253a47aad9f09594ea4b45195a4f829b581ca293cef5f12ddcb8bdf7c9b2f01ff9b3e00c5e7c54a23a179d3af23567c233a96f5 SHA512 1653800b0967926c8edab96636fcad547d94f20b6bc06f27780c75d48d7944983ba36013c62bfc9c0f6fcf33e3e8f9fb4c70fff19fd2a56c672ecfc1ba2f2cd7
+DIST schismtracker-20221201.source.tar.gz 1633099 BLAKE2B 6f376323002f85031140be7d54b1ab8bd830f8654e90c07596c9a45ce2ce76dfda51f124ff01247c1a371269b2924470faab06d7692a76ced694fdf05937f384 SHA512 062dc54b541709be0a5c8b0c5edadc9710106154c15b2a40847998db33aaba7d07740cdd32da94f56725e66834221bc5470f9a111eb41a06fbfbd70fdc920113

diff --git a/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch
new file mode 100644
index 000000000000..64cad709efe0
--- /dev/null
+++ b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch
@@ -0,0 +1,29 @@
+https://github.com/schismtracker/schismtracker/pull/340
+
+From 5f2f594b6a4055318fa31d3c0cd6ecc8dc3666f7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Dec 2022 01:39:06 +0000
+Subject: [PATCH] Fix bashism in configure.ac sdl2-config check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ AC_C_BIGENDIAN
+ dnl Check for SDL libs
+ AC_CHECK_TOOL([SDL_CONFIG], [sdl2-config])
+ AC_SUBST(SDL_CONFIG)
+-if test "x$SDL_CONFIG" == "x"; then
++if test "x$SDL_CONFIG" = "x"; then
+         AC_MSG_ERROR([*** sdl2-config not found.])
+ fi
+ AS_VERSION_COMPARE([$($SDL_CONFIG --version)], [2.0.5], [AC_MSG_ERROR([*** SDL version >= 2.0.5 not found.])])
+

diff --git a/media-sound/schismtracker/schismtracker-20221201.ebuild b/media-sound/schismtracker/schismtracker-20221201.ebuild
new file mode 100644
index 000000000000..980ebc3426fa
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20221201.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.5[X]
+	x11-libs/libX11
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20221201-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	# Can drop this once bashism patch unnecessary
+	eautoreconf
+
+	# workaround for temporary files (missing directory). Fixes:
+	# 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
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto || die
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-12-02  2:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-02  2:51 [gentoo-commits] repo/gentoo:master commit in: media-sound/schismtracker/, media-sound/schismtracker/files/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox