summaryrefslogtreecommitdiff
path: root/media-sound/gmorgan
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/gmorgan')
-rw-r--r--media-sound/gmorgan/Manifest2
-rw-r--r--media-sound/gmorgan/files/gmorgan-0.79-clang16.patch182
-rw-r--r--media-sound/gmorgan/gmorgan-0.79-r3.ebuild46
3 files changed, 230 insertions, 0 deletions
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index f90d62ecf315..b9bfb7894f20 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,4 +1,5 @@
AUX gmorgan-0.79-clang.patch 519 BLAKE2B dbe18a3592fdcc0b2ec546f4bb36b2ed281c048c1eafce72c8206313def848d6eca2b67b4eac61e0f0ada0ca2799a9b05677bba294a19e4d6e95837ac7ee84f4 SHA512 27b9466083e97fa2db05b47d2dc56b24310bfbb6af3424ea2afcdd282c9652a64c2d538521c53727b95dcdadaf5b436b846ecd3f7c66fc83e7ef3b1d20b5da3b
+AUX gmorgan-0.79-clang16.patch 4334 BLAKE2B e3d57355e78f8c52218e93f45aabe0fbbbc2dda267a4ad83e3148ae251edb30e2cb08097c1bdf04a9575833d8de749b0e5c43347e898ed97b8ac21e75edbaaf3 SHA512 b504d1da30a76636404218d7b8090f24ab4967c4f6432a1f563296777eba782ebc33d2fbfcffa191347779e966b3bd7c04240e55837be18000b1fbb7ca359ef8
AUX gmorgan-0.79-gcc6.patch 1903 BLAKE2B 513f0f7e0097d2f6c3352557ca01afb0df0020d0c331defc0c1c7c3395f188f44a03c4e8198a23f7d826e449ae78605f33c6c063c8fd9d79be3da25d34dc2816 SHA512 64fe047175335d9c09de0e4a6ad9294e767500d1dd1835db1c1e434c91b28cf920d8cd7789af3c4aa92b90b9ac87e777184dbf7705872028b7a19a9ff4822eb7
AUX gmorgan-0.79-manpages.patch 1199 BLAKE2B 6989a057f92e75e5dc607e3483408446423b58939ca4ae883b539cc706f0e64e547224eb5cfff95c1c4498ae673ceeef13b29e5692c0aeeb339dbc9bfc745eef SHA512 0841c0e281374489682f7c585c84ae879348d0703199216e53a4a3babecd44d6d735318c24a1c72034c21f53272a79b0c26a628660783336515095b3c5c81895
AUX gmorgan-0.79-remove-dirs.patch 760 BLAKE2B 34b638a52d737ecc87219d59560449da339d5467ca6a1ba31551036610ff3fc62a7466ee33db6c073aaecc5e58646227a4e64f2c54044c44ac91ec96fde55148 SHA512 23300349241ea9dfa0b8a6ad9504a51c15ecf2a3dd23baed5a163888f9bb0208e96d728a41ad5f5388b6ffa5d4e691b7a7b6f92cd7f6a140d840393a473a231f
@@ -6,4 +7,5 @@ AUX gmorgan-0.79-remove-gettext-version-check.patch 947 BLAKE2B 61a1ca75ea7d3061
AUX gmorgan-0.79-remove-old-docs.patch 736 BLAKE2B 584fe41e8f2c227fed77da87699b799090a52415a1acf193446462cac103475a8fe58edc1837b15febba8fb0119991548562268329582743f79db48b6181994e SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108
DIST gmorgan-0.79.tar.gz 8055701 BLAKE2B d847fdf668e46b3e9c0a5d8b81b7680fac4c4d0236ab07fb2ffb1e093938dc2f8856ce384252841a31a531f285c85375c80ba7b4989b134028c4f92f6b706d0f SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0
EBUILD gmorgan-0.79-r2.ebuild 898 BLAKE2B f05ca8311a4b6278825fd72a0e56133a56b88145be299803933ae2b2e9aaabe053935909f665da3bd5b064f368262049786ec30006c1806f840140dbc3957d97 SHA512 907e646b2e5eaa72357bd2ae3c2599cb330ea20cc46480d5faaccd932ca2cf78a8361941880e5db204c0bf546afb515fb221ab6b3758ffce84445749d30a72c4
+EBUILD gmorgan-0.79-r3.ebuild 934 BLAKE2B 744fe876c84fe92ddd4afc629e9a40d2ec161d9bea37f9884174449faf32e16d7c3eaabd7f40d416152ccd767627d5b5d7ff90c12f9fb5963e0358734223590e SHA512 e7f1efed6274131f4dd3c2513fb499e5ecb6379998c0e56dcd9b97086e279fcf383efa2b92f61645f41a2df116d0c66a5b5db9e7abb928017a32cf2555893e96
MISC metadata.xml 337 BLAKE2B ea863d2c89c6aa3e4cb89f02a9b8809e333a4a56d8eca25489a19aad35bb7a77686a0c3b535e7a95fba43a12b83e01db16d315bc85c8ee278c784b352cc59160 SHA512 2a81a419410c2f0ad4ff4518f2f36325469918bb2854a1dcc976391742085959215ddc040afaa55c77fde5af6cd4d6dafb48fc55e09903f0554132f88a4b9478
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
new file mode 100644
index 000000000000..2571757244fb
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
@@ -0,0 +1,182 @@
+Bug: https://bugs.gentoo.org/896430
+--- a/src/GMorgan.h
++++ b/src/GMorgan.h
+@@ -41,7 +41,7 @@ using namespace std;
+ #define MAGIC_TRACK 0x4d54726b
+
+ extern int Pexitprogram, espera, programa, vum, vumvum, tum, cambialo;
+-extern int vavi, pr, pr1, count, ulcount, canaledit, notplaying;
++extern int vavi, pr, pr1, count_t, ulcount, canaledit, notplaying;
+ extern int veloplus[65];
+ extern const char *FilePreset;
+ extern const char *FileDrums;
+--- a/src/NotGenerated.cxx
++++ b/src/NotGenerated.cxx
+@@ -9105,7 +9105,7 @@ GMORGAN::cb_PtBro_i (Fl_Browser *, void *)
+ else
+ {
+ gmo->sposi = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ gmo->semi = 0;
+ gmo->ncompas = 0;
+@@ -24432,7 +24432,7 @@ GMORGAN::preparast ()
+ gmo->nfundi = 0;
+ gmo->ya = 0;
+ gmo->anticipa = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ ulcount = 0;
+ N1->value (0);
+@@ -24792,7 +24792,7 @@ GMORGAN::PutStyle (int i)
+ else
+ {
+ gmo->sposi = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ gmo->semi = 1;
+ gmo->ncompas = 0;
+@@ -26772,7 +26772,7 @@ GMORGAN::ActualizaEntrada ()
+ else
+ {
+ gmo->sposi = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ gmo->semi = 1;
+ gmo->ncompas = 0;
+--- a/src/Stk.cpp
++++ b/src/Stk.cpp
+@@ -123,7 +123,7 @@ void Stk :: setRawwavePath( std::string path )
+
+ void Stk :: swap16(unsigned char *ptr)
+ {
+- register unsigned char val;
++ unsigned char val;
+
+ // Swap 1st and 2nd bytes
+ val = *(ptr);
+@@ -133,7 +133,7 @@ void Stk :: swap16(unsigned char *ptr)
+
+ void Stk :: swap32(unsigned char *ptr)
+ {
+- register unsigned char val;
++ unsigned char val;
+
+ // Swap 1st and 4th bytes
+ val = *(ptr);
+@@ -149,7 +149,7 @@ void Stk :: swap32(unsigned char *ptr)
+
+ void Stk :: swap64(unsigned char *ptr)
+ {
+- register unsigned char val;
++ unsigned char val;
+
+ // Swap 1st and 8th bytes
+ val = *(ptr);
+--- a/src/gmorgan.C
++++ b/src/gmorgan.C
+@@ -88,7 +88,7 @@ int
+ splashcounter,
+ clicksplash;
+ int
+- count,
++ count_t,
+ ulcount,
+ ponfin;
+ int
+@@ -184,7 +184,7 @@ GMO::GMO ()
+ tick = 0;
+ negra = 0;
+ ncompas = 0;
+- count = 0;
++ count_t = 0;
+ queue_id = 0;
+ elbar = 1;
+ HMode = 0;
+@@ -608,7 +608,7 @@ GMO::GMO ()
+ if (strlen (temp) > 2)
+ for (i = 0; i <= (int) strlen (temp) - 2; i++)
+ HelpFilename[i] = temp[i];
+- cout << "helpfile: " << HelpFilename << endl;
++ std::cout << "helpfile: " << HelpFilename << endl;
+ bzero (temp, sizeof (temp));
+ fgets (temp, sizeof temp, fs);
+ if (strlen (temp) > 2)
+@@ -712,14 +712,14 @@ GMO::organo ()
+ {
+ semi = 1;
+ negra++;
+- count++;
+- if (count >= Rt[sp].blackn + 1)
++ count_t++;
++ if (count_t >= Rt[sp].blackn + 1)
+ {
+ elbar++;
+ if (elbar > Rt[sp].bars)
+ elbar = 1;
+ negra = 0;
+- count = 1;
++ count_t = 1;
+ ncompas++;
+ sprintf (elbart, "%d", ncompas + 1);
+ //
+@@ -1246,7 +1246,7 @@ GMO::GeneraChord ()
+
+ if (bplay)
+ {
+- switch (count)
++ switch (count_t)
+ {
+ case 1:
+ strcpy (elacorde, S[nb].ch1);
+--- a/src/gmorgan.MIDIExport.C
++++ b/src/gmorgan.MIDIExport.C
+@@ -306,18 +306,18 @@ GMO::generatracks ()
+ }
+ for (neg = 1; neg <= SNomi; neg++)
+ {
+- count = neg;
++ count_t = neg;
+ if (MTempo)
+ MiraCambioTempoM (tcompas, neg);
+ GeneraChord ();
+ for (sem = 1; sem <= 4; sem++)
+ {
+- if ((S[nb].ar8 == 1) && (count == SNomi) && (sem == 3))
++ if ((S[nb].ar8 == 1) && (count_t == SNomi) && (sem == 3))
+ {
+ anticipa = 1;
+ GeneraChord ();
+ }
+- if ((S[nb].ar16 == 1) && (count == SNomi) && (sem == 4))
++ if ((S[nb].ar16 == 1) && (count_t == SNomi) && (sem == 4))
+ {
+ anticipa = 1;
+ GeneraChord ();
+--- a/src/main.C
++++ b/src/main.C
+@@ -195,9 +195,9 @@ LastBar = 1;
+ }
+
+ if (vumvum != vum) gmoUI->VUI1->value(vum);
+- if ((gmo.stst) && (ulcount != count))
++ if ((gmo.stst) && (ulcount != count_t))
+ {
+- ulcount = count;
++ ulcount = count_t;
+ int rvtempo = gmoUI->CTEMPO->value();
+ if (gmo.bplay != 1)
+ {
+@@ -219,7 +219,7 @@ LastBar = 1;
+ gmoUI->LightIt(nbar);
+ }
+ if (nbar > 127) nbar = 127;
+- switch(count)
++ switch(count_t)
+ {
+ case 1:
+ gmoUI->N1->setonly();
diff --git a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
new file mode 100644
index 000000000000..a9adb56a1c6f
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Opensource software rhythm station"
+HOMEPAGE="https://gmorgan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ media-libs/alsa-lib
+ x11-libs/fltk:1"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-remove-gettext-version-check.patch
+ "${FILESDIR}"/${P}-manpages.patch
+ "${FILESDIR}"/${P}-remove-dirs.patch
+ "${FILESDIR}"/${P}-remove-old-docs.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
+ sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+ doman man/gmorgan.1
+}