From 958e1f729da918df0d3a435745d914882c2786e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 1 Aug 2023 10:47:11 +0100 Subject: gentoo auto-resync : 01:08:2023 - 10:47:11 --- media-sound/Manifest.gz | Bin 57268 -> 57259 bytes media-sound/alsa-tools/Manifest | 2 +- media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild | 2 +- media-sound/alsa-utils/Manifest | 2 +- media-sound/alsa-utils/alsa-utils-1.2.9.ebuild | 2 +- media-sound/gmorgan/Manifest | 2 + .../gmorgan/files/gmorgan-0.79-clang16.patch | 182 +++++++ media-sound/gmorgan/gmorgan-0.79-r3.ebuild | 46 ++ media-sound/mp3blaster/Manifest | 2 + .../mp3blaster-3.2.6-drop-register-keyword.patch | 593 +++++++++++++++++++++ media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild | 66 +++ 11 files changed, 895 insertions(+), 4 deletions(-) create mode 100644 media-sound/gmorgan/files/gmorgan-0.79-clang16.patch create mode 100644 media-sound/gmorgan/gmorgan-0.79-r3.ebuild create mode 100644 media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch create mode 100644 media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 81ae1757f52e..3ef52b39b794 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index 52201d99d153..5e3cead6038d 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -1,6 +1,6 @@ AUX alsa-tools-1.2.5-hdspmixer-crash.patch 761 BLAKE2B a2290baa6b4436a2d1cfdfd12039b42ee83017a991b7f05bb8118e27942c7b60bdb0a5636a0859d035290472069a485c2c1d6d45491c9b560b56cd80c36a859e SHA512 220fc805687d04e43914ae13ebfd6f9cfcf4415f7e9a25b0f9d57ee399656a5cc0aa17d75b8e27ee634dd3d66e88bb93fe8caed84b37c0e90bb154f086b3b71f AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498 -EBUILD alsa-tools-1.2.5-r1.ebuild 3518 BLAKE2B 66e02a05dcdfc6362848b1ac57009584f9cc6b1530b218a61cb7135b110f4946d60cedeba77bbf4c761f67ebe1b24e580110c1ad6eadaf9426e53c3781783028 SHA512 2c24020837b362c271b1dae0c6e9e7e5b54426e60415ed8968f6c3101e239d8960906f041dd45b1a1e281254e0370f9190df2431769dacb4d7d08647204cad74 +EBUILD alsa-tools-1.2.5-r1.ebuild 3517 BLAKE2B e25d4ac488f7cc2b00c7e5fe560034de999678de12ef36ae2d78a67a9523ecc87121cc9301c8d69d7315e22f6ac87ce1f5d0c77b8aa343314e40f28d61e5d8e4 SHA512 6533d1abc1816e492c7bcf08b068f8ba5f6f79c876be5709abd15109269b327886cd264b1e954f4fbe8ec07db13243ea8a953b82d4a36ce170d23befad1bbe91 EBUILD alsa-tools-1.2.5.ebuild 3434 BLAKE2B a87004f9e64483af2ff4f5ce67d923f5e566d026d4bdb89a889eba0d31ecce97c51dd4f043aec4d24742a8c9565f98c22a95f7c00a74417400baaa210f8ec0e7 SHA512 68c2eeefaf39675582f76cc11f0d562481fa867235cc6a2917cf986a523b104495343ba26b2ff0563b5cdc86fd6b9b775eb6ae979ead469a2232105886be471b MISC metadata.xml 310 BLAKE2B 1e82b52e947ac2e811104c837f168f7020c2864c5ece3b1da5e06578a3e63b39b06bdb4993ac7d5cbd90d5e359df63c49aba4a4f309bf8f9c003190942b0d9b3 SHA512 45fc98227626d78099dfae8b44df697c436d1df13e61e6e05bbd29ec63218961aadc5124c813c6d076f29da6617f2c901b73ff8a021817973d13a809d0240f4d diff --git a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild index c205d3ebade2..c6b611df207f 100644 --- a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0.9" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86" IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 74d59fd0ef58..71022816736e 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -4,5 +4,5 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76 DIST alsa-utils-1.2.8.tar.bz2 1560162 BLAKE2B 4b9676957e775be51076b4798dfd384db4eea440c682899024034d3dd593ba24f1d42b8d742c312e041a37f0dbbc12b16635d79f6e6633a3459cc21f80739b5e SHA512 882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b DIST alsa-utils-1.2.9.tar.bz2 1598424 BLAKE2B 9d75f63c7ff8b0d7ee835a1ad8fc242dee9b59770b1ad0ff9cd233caf50ac844323fb2ebb8e649f03a0a30a161ec72cba472ac79e390c3f0eb6e2a184d8f576c SHA512 f46e13fd57ed05ee38d3fa655e57b14335ecf0664dbe03275808383d87d28df153a81151e2e9d8786625f09929c567c89e145508a706a70eeb91ac1b11fb2fd4 EBUILD alsa-utils-1.2.8-r2.ebuild 2496 BLAKE2B f897dbb5d0363e643efde8b228e205a7b57ef14498937e4f58bcd584f816b76ef974eac6bf8fc12ffa6af1e1c0446f1516b86a9074f9bd6c54ef49c04f06abb3 SHA512 06f9bca8bf127107fdebf1d044e88579d0bca24047fea0b1c1888e60981960ff0e0ed0bdb30ec08e4805c527bb696e53cf89f800fbe8daec1a34ef670cedd00d -EBUILD alsa-utils-1.2.9.ebuild 2500 BLAKE2B 12252fbca81abe7195a347b06f7f5223f8e9a134f6ed9b109929f6c9d3182889be3b6ae5f0efc8987825ef683ddb1a5b325f90f2d227d0f37287350dfc46e0a0 SHA512 d09d8f7919dda07ce3df441cfbd74a65a4c7eb1f71de57488a2d1852e8c95c5fa0579127c3d661cb867e53aaae29d3ada57325866ea9c5654982f6d942ce2251 +EBUILD alsa-utils-1.2.9.ebuild 2498 BLAKE2B 79275e2eac9579a9dd23ea7958c929062f72983ff7d013812c761f05d6f13d8bd4c6cedc74bd4d68477121f3a916ad6fac05cd29299b8129c7e2b7fc295633d6 SHA512 d4a0900d0da0e7e4b24cd0f52e89508d8d9a1824c26cfdd0d9c090fdeed599211ee9d769bf53c036ff573dd9216d8630080d2510785bc1d9085af725fabf7534 MISC metadata.xml 630 BLAKE2B 297896d48e1b947e3d8fdb0e8508846ac5f11740101a80d1d492e8fdd6bb042d629c654583d3262c00a0e33d31ecf3b6f4b3c07c73ede339b4ed168d4c5deae0 SHA512 1e26d146329b58c509ee8a9e6683bd0bc15651d942a7d400383106d3e61df0d3148322bedf0d10e445db74109ee1ee759310eb72c5e3fb1ae4ec258892d378b2 diff --git a/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild index b147c4b64d8c..1e272cf144e1 100644 --- a/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild +++ b/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0.9" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86" IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux" DEPEND=" 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 +} diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest index bf92616db48d..a3e02108c89d 100644 --- a/media-sound/mp3blaster/Manifest +++ b/media-sound/mp3blaster/Manifest @@ -1,5 +1,7 @@ AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4 +AUX mp3blaster-3.2.6-drop-register-keyword.patch 17322 BLAKE2B cd4d00de182047d4352f6ade4f611ced8126efd52749780cde30eeac73ebdab7e2ef65ddf5c7c8ec1febe449d9cc1c634ec3373161c891ab4f8c8cb7d11dfcd5 SHA512 642e77e3ab5c2e056d31fcaba441e7613a73fe78e473f9efde80fe632e8e3e19f4f6c2259cc6588423325d5bb1a624c416b724c92a0519918ceee2223639adc3 DIST mp3blaster-3.2.6.tar.gz 354019 BLAKE2B 7fcb9011c436015c2f81a1a28b19896dffdba578969edb8cc29ed20fef7f222be3c23a1409c5c0a4c2ecb5b10432178c5581837938ede23ee76fe3205eecbb51 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d EBUILD mp3blaster-3.2.6-r1.ebuild 1565 BLAKE2B ca920b6964b34fb1c37fb05ae497cbce9fe437a87a58c0e7f4464682758255528c80d46f9e1e5c957dcb23f7844d5dc1940d9b5201da5c34901973f9136b6a9d SHA512 ac10082ca77cb9f2f281e1bab6699d43354b6298f176ef4563cf45006d81217d450e7fa646742c2b099adfd2785534bf70d892950c00030cd90407457c8bd3b0 +EBUILD mp3blaster-3.2.6-r2.ebuild 1626 BLAKE2B c52e40ce5b8ff911d48b20fb3dbc28123c0b61c8404db52f1584c449c3859828c67d056f496236cfc15370c80264057de13ff26a7d68979c00e0e89201fd99d4 SHA512 c86a19233e959eaa0627af99a65dc4e2d791438556648e371a4a4df8c0e8bbbfb18da78dcac5eb22be3e06c25674fae3097e9e8c6a456ac8993aa492b1070367 MISC metadata.xml 433 BLAKE2B 4f113956ab8327011a21b00b5c05d1d1719ab58e9a39975e01cb4938bf95517614620c483f659e1ff83ed7ebf62d76c661cbff6f0e7a983159b2c91d72cd278b SHA512 a680b2e39fed703c6a78e2e043d57063a20e7beb17061f7220434ae6d04549ae2e4524be7e9056d24b141df45739856b8d74fd5169703b3252117ff7a74a073e diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch new file mode 100644 index 000000000000..9ef2dd6e3226 --- /dev/null +++ b/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch @@ -0,0 +1,593 @@ +Bug: https://bugs.gentoo.org/897790 +--- a/mpegsound/filter.cc ++++ b/mpegsound/filter.cc +@@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + + // compute new values via a fast cosine transform: + { +- register REAL *x=fraction; ++ REAL *x=fraction; + + p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28]; + p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24]; +@@ -59,7 +59,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf); + + { +- register REAL tmp; ++ REAL tmp; + + tmp=p6+p7; + OUT2(36)=-(p5+tmp); +@@ -84,7 +84,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + } + + { +- register REAL *x=fraction; ++ REAL *x=fraction; + + p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]); + p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]); +@@ -165,8 +165,8 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + inline void Mpegtoraw::generatesingle(void) + { + int i; +- register REAL r, *vp; +- register const REAL *dp; ++ REAL r, *vp; ++ const REAL *dp; + int raw; + + i=32; +@@ -251,8 +251,8 @@ inline void Mpegtoraw::generate(void) + { + int i; + REAL r1,r2; +- register REAL *vp1,*vp2; +- register const REAL *dp; ++ REAL *vp1,*vp2; ++ const REAL *dp; + int raw; + + dp=filter; +--- a/mpegsound/filter_2.cc ++++ b/mpegsound/filter_2.cc +@@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + + // compute new values via a fast cosine transform: + /* { +- register REAL *x=fraction; ++ REAL *x=fraction; + + p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28]; + p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24]; +@@ -41,7 +41,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + qe=hcos_32[6]*(p6-p9);qf=hcos_32[7]*(p7-p8); */ + + { +- register REAL *x=fraction; ++ REAL *x=fraction; + + q0=x[ 0]+x[15];q1=x[ 1]+x[14];q2=x[ 2]+x[13];q3=x[ 3]+x[12]; + q4=x[ 4]+x[11];q5=x[ 5]+x[10];q6=x[ 6]+x[ 9];q7=x[ 7]+x[ 8]; +@@ -70,7 +70,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf); + + { +- register REAL tmp; ++ REAL tmp; + + tmp=p6+p7; + OUT2(36)=-(p5+tmp); +@@ -95,7 +95,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + } + + { +- register REAL *x=fraction; ++ REAL *x=fraction; + + /* p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]); + p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]); +@@ -186,8 +186,8 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE]) + inline void Mpegtoraw::generatesingle_2(void) + { + int i; +- register REAL r, *vp; +- register const REAL *dp; ++ REAL r, *vp; ++ const REAL *dp; + int raw; + + i=32/2; +@@ -273,8 +273,8 @@ inline void Mpegtoraw::generate_2(void) + { + int i; + REAL r1,r2; +- register REAL *vp1,*vp2; +- register const REAL *dp; ++ REAL *vp1,*vp2; ++ const REAL *dp; + int raw; + + dp=filter; +--- a/mpegsound/mpeglayer1.cc ++++ b/mpegsound/mpeglayer1.cc +@@ -45,7 +45,7 @@ void Mpegtoraw::extractlayer1(void) + int bitalloc[MAXCHANNEL][MAXSUBBAND], + sample[MAXCHANNEL][MAXSUBBAND]; + +- register int i,j; ++ int i,j; + int s=stereobound,l; + + +--- a/mpegsound/mpeglayer2.cc ++++ b/mpegsound/mpeglayer2.cc +@@ -429,8 +429,8 @@ void Mpegtoraw::extractlayer2(void) + + // Bitalloc + { +- register int i; +- register const int *t=bitalloclengthtable[tableindex]; ++ int i; ++ const int *t=bitalloclengthtable[tableindex]; + + for(i=0;i>2][i]; ++ REAL t=scalefactor[LS][l>>2][i]; + fraction[LS][0][i]*=t; + fraction[LS][1][i]*=t; + fraction[LS][2][i]*=t; +@@ -720,7 +720,7 @@ void Mpegtoraw::extractlayer2(void) + fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i]; + } + +- register REAL t=scalefactor[RS][l>>2][i]; ++ REAL t=scalefactor[RS][l>>2][i]; + fraction[RS][0][i]*=t; + fraction[RS][1][i]*=t; + fraction[RS][2][i]*=t; +@@ -737,7 +737,7 @@ void Mpegtoraw::extractlayer2(void) + fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i]; + } + +- register REAL t=scalefactor[LS][l>>2][i]; ++ REAL t=scalefactor[LS][l>>2][i]; + fraction[LS][0][i]*=t; + fraction[LS][1][i]*=t; + fraction[LS][2][i]*=t; +--- a/mpegsound/mpeglayer3.cc ++++ b/mpegsound/mpeglayer3.cc +@@ -29,7 +29,7 @@ inline void Mpegbitwindow::wrap(void) + + if(p>=point) + { +- for(register int i=4;i>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; +- register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; ++// int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; ++ int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; + bitindex++; + return r; + }; + + inline int Mpegbitwindow::getbits9(int bits) + { +- register unsigned short a; ++ unsigned short a; + int offset=bitindex>>3; + + a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); +@@ -134,7 +134,7 @@ void Mpegtoraw::layer3initialize(void) + + // Calculate win + { +- register int i; ++ int i; + + for(i=0;i<18;i++) + win[0][i]=win[1][i]=0.5*sin(PI_72*(double)(2*i+1))/cos(PI_72*(double)(2*i+19)); +@@ -153,11 +153,11 @@ void Mpegtoraw::layer3initialize(void) + win[2][i]=0.5*sin(PI_24*(double)(2*i+1))/cos(PI_24*(double)(2*i+7)); + } + +- for(register int i=0;i<9;i++) ++ for(int i=0;i<9;i++) + cos_18[i]=cos(PI_18*double(i)); +- for(register int i=0;i<9;i++) ++ for(int i=0;i<9;i++) + hsec_36[i]=0.5/cos(PI_36*double(i*2+1)); +- for(register int i=0;i<3;i++) ++ for(int i=0;i<3;i++) + hsec_12[i]=0.5/cos(PI_12*double(i*2+1)); + + for(int i=0;i<40;i++) +@@ -365,7 +365,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr) + {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}}; + + layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); +- register layer3scalefactor *sf=(&scalefactors[ch]); ++ layer3scalefactor *sf=(&scalefactors[ch]); + int l0,l1; + + { +@@ -498,7 +498,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch) + + int sb[54]; + layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]); +- register layer3scalefactor *sf=(&scalefactors[ch]); ++ layer3scalefactor *sf=(&scalefactors[ch]); + + { + int blocktypenumber,sc; +@@ -660,7 +660,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y) + level>>=1; + if(!(level || ((unsigned)pointtreelen))) + { +- register int xx,yy; ++ int xx,yy; + + xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment + yy=(h->ylen<<1); +@@ -689,7 +689,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h, + { + if(h->val[point][0]==0) + { /*end of tree*/ +- register int t=h->val[point][1]; ++ int t=h->val[point][1]; + + if(t&8)*v=1-(wgetbit()<<1); else *v=0; + if(t&4)*w=1-(wgetbit()<<1); else *w=0; +@@ -761,7 +761,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT]) + for(i=0;is[cb+1]-sfBandIndex->s[cb])>>1; + +- for(register int k=0;k<3;k++) ++ for(int k=0;k<3;k++) + { +- register REAL factor; +- register int count=cb_width; ++ REAL factor; ++ int count=cb_width; + + factor=globalgain* + layer3twopow2_1(gi->subblock_gain[k],gi->scalefac_scale, +@@ -1249,7 +1249,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT]) + do{ + if(is_pos[i]==7) + { +- register REAL t=in[LS][0][i]; ++ REAL t=in[LS][0][i]; + in[LS][0][i]=(t+in[RS][0][i])*0.7071068f; + in[RS][0][i]=(t-in[RS][0][i])*0.7071068f; + } +@@ -1278,7 +1278,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT]) + { + int i=ARRAYSIZE-1; + do{ +- register REAL t=in[LS][0][i]; ++ REAL t=in[LS][0][i]; + + in[LS][0][i]=(t+in[RS][0][i])*0.7071068f; + in[RS][0][i]=(t-in[RS][0][i])*0.7071068f; +@@ -1400,7 +1400,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr, + REAL in[SBLIMIT][SSLIMIT], + REAL out[SBLIMIT][SSLIMIT]) + { +- register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); ++ layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); + + if(gi->generalflag) + { +@@ -1438,7 +1438,7 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) + MACRO0(v); } + + { +- register REAL *in = inbuf; ++ REAL *in = inbuf; + + in[17]+=in[16];in[16]+=in[15];in[15]+=in[14];in[14]+=in[13]; + in[13]+=in[12];in[12]+=in[11];in[11]+=in[10];in[10]+=in[ 9]; +@@ -1450,10 +1450,10 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) + in[ 9]+=in[ 7];in[7] +=in[ 5];in[ 5]+=in[ 3];in[ 3]+=in[ 1]; + + { +- register REAL *c = cos_18; +- register REAL *out2 = prevblk2; +- register REAL *out1 = prevblk1; +- register REAL *ts = out; ++ REAL *c = cos_18; ++ REAL *out2 = prevblk2; ++ REAL *out1 = prevblk1; ++ REAL *ts = out; + + REAL ta33,ta66,tb33,tb66; + +@@ -1513,7 +1513,7 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) + } + + +-static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,register REAL *out) ++static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) + { + #define DCT12_PART1 \ + in5=in[5*3]; \ +@@ -1547,7 +1547,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis + + { + REAL in0,in1,in2,in3,in4,in5; +- register REAL *pb1=prevblk1; ++ REAL *pb1=prevblk1; + out[SBLIMIT*0]=pb1[0];out[SBLIMIT*1]=pb1[1];out[SBLIMIT*2]=pb1[2]; + out[SBLIMIT*3]=pb1[3];out[SBLIMIT*4]=pb1[4];out[SBLIMIT*5]=pb1[5]; + +@@ -1556,7 +1556,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis + { + REAL tmp0,tmp1=(in0-in4); + { +- register REAL tmp2=(in1-in5)*hsec_12[1]; ++ REAL tmp2=(in1-in5)*hsec_12[1]; + tmp0=tmp1+tmp2; + tmp1-=tmp2; + } +@@ -1581,7 +1581,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis + in++; + { + REAL in0,in1,in2,in3,in4,in5; +- register REAL *pb2 = prevblk2; ++ REAL *pb2 = prevblk2; + + DCT12_PART1; + +@@ -1614,7 +1614,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis + in++; + { + REAL in0,in1,in2,in3,in4,in5; +- register REAL *pb2 = prevblk2; ++ REAL *pb2 = prevblk2; + pb2[12]=pb2[13]=pb2[14]=pb2[15]=pb2[16]=pb2[17]=0.0; + + DCT12_PART1; +@@ -1719,14 +1719,14 @@ void Mpegtoraw::extractlayer3(void) + + if(issync()) + { +- for(register int i=layer3slots;i>0;i--) // read main data. ++ for(int i=layer3slots;i>0;i--) // read main data. + { + bitwindow.putbyte(getbyte()); + } + } + else + { +- for(register int i=layer3slots;i>0;i--) // read main data. ++ for(int i=layer3slots;i>0;i--) // read main data. + { + bitwindow.putbyte(getbits8()); + } +@@ -1799,7 +1799,7 @@ void Mpegtoraw::extractlayer3(void) + layer3reorderandantialias(RS,gr,b2.lr[RS],b1.hin[RS]); + layer3hybrid (RS,gr,b1.hin[RS],b2.hout[RS]); + +- register int i=2*SSLIMIT*SBLIMIT-1; ++ int i=2*SSLIMIT*SBLIMIT-1; + + do{ + NEG(b2.hout[0][0][i ]);NEG(b2.hout[0][0][i- 2]); +@@ -1814,7 +1814,7 @@ void Mpegtoraw::extractlayer3(void) + } + else + { +- register int i=SSLIMIT*SBLIMIT-1; ++ int i=SSLIMIT*SBLIMIT-1; + do{ + NEG(b2.hout[0][0][i ]);NEG(b2.hout[0][0][i- 2]); + NEG(b2.hout[0][0][i- 4]);NEG(b2.hout[0][0][i- 6]); +@@ -1844,12 +1844,12 @@ void Mpegtoraw::extractlayer3_2(void) + + if(issync()) + { +- for(register int i=layer3slots;i>0;i--) // read main data. ++ for(int i=layer3slots;i>0;i--) // read main data. + bitwindow.putbyte(getbyte()); + } + else + { +- for(register int i=layer3slots;i>0;i--) // read main data. ++ for(int i=layer3slots;i>0;i--) // read main data. + bitwindow.putbyte(getbits8()); + } + bitwindow.wrap(); +@@ -1912,7 +1912,7 @@ void Mpegtoraw::extractlayer3_2(void) + layer3reorderandantialias(RS,0,b2.lr[RS],b1.hin[RS]); + layer3hybrid (RS,0,b1.hin[RS],b2.hout[RS]); + +- register int i=2*SSLIMIT*SBLIMIT-1; ++ int i=2*SSLIMIT*SBLIMIT-1; + do{ + NEG(b2.hout[0][0][i-16]);NEG(b2.hout[0][0][i-18]); + NEG(b2.hout[0][0][i-20]);NEG(b2.hout[0][0][i-22]); +@@ -1922,7 +1922,7 @@ void Mpegtoraw::extractlayer3_2(void) + } + else + { +- register int i=SSLIMIT*SBLIMIT-1; ++ int i=SSLIMIT*SBLIMIT-1; + do{ + NEG(b2.hout[0][0][i-16]);NEG(b2.hout[0][0][i-18]); + NEG(b2.hout[0][0][i-20]);NEG(b2.hout[0][0][i-22]); +--- a/mpegsound/mpegsound_locals.h ++++ b/mpegsound/mpegsound_locals.h +@@ -8,6 +8,8 @@ + #ifndef _L__SOUND_LOCALS__ + #define _L__SOUND_LOCALS__ + ++#include "mpegsound.h" ++ + extern void debug(const char*, ... ); + // Inline functions + inline int Mpegtoraw::getbyte(void) +@@ -20,7 +22,7 @@ inline int Mpegtoraw::getbyte(void) + + inline int Mpegtoraw::getbits9(int bits) + { +- register unsigned short a; ++ unsigned short a; + int offset=bitindex>>3; + + a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); +@@ -32,7 +34,7 @@ inline int Mpegtoraw::getbits9(int bits) + + inline int Mpegtoraw::getbits8(void) + { +- register unsigned short a; ++ unsigned short a; + int offset=bitindex>>3; + + a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); +@@ -44,7 +46,7 @@ inline int Mpegtoraw::getbits8(void) + + inline int Mpegtoraw::getbit(void) + { +- register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; ++ int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; + + bitindex++; + return r; +--- a/mpegsound/mpegtoraw.cc ++++ b/mpegsound/mpegtoraw.cc +@@ -779,8 +779,8 @@ inline void parseID3(Soundinputstream *fp,ID3 *data) + // Mpeg header class + bool Mpegtoraw::initialize(const char *filename) + { +- register int i; +- register REAL *s1,*s2; ++ int i; ++ REAL *s1,*s2; + REAL *s3,*s4; + static bool initialized=false; + +@@ -1153,7 +1153,7 @@ void Mpegtoraw::clearbuffer(void) + //header is not found at the exact location of the filepointer at call time. + bool Mpegtoraw::loadheader(bool lookahead) + { +- register int c; ++ int c; + bool flag; + int bytes_read = 0; + +--- a/mpegsound/rawplayer.cc ++++ b/mpegsound/rawplayer.cc +@@ -326,8 +326,8 @@ int Rawplayer::fix_samplesize(void *buffer, int size) + + if(forcetomono || forceto8) + { +- register unsigned char modify=0; +- register unsigned char *source,*dest; ++ unsigned char modify=0; ++ unsigned char *source,*dest; + int increment=0,c; + + source=dest=(unsigned char *)buffer; +@@ -381,8 +381,8 @@ bool Rawplayer::putblock(void *buffer,int size) + + if(forcetomono || forceto8) + { +- register unsigned char modify=0; +- register unsigned char *source,*dest; ++ unsigned char modify=0; ++ unsigned char *source,*dest; + int increment=0,c; + + source=dest=(unsigned char *)buffer; +@@ -408,7 +408,7 @@ bool Rawplayer::putblock(void *buffer,int size) + } + + #if defined(AUDIO_NONBLOCKING) || defined(NEWTHREAD) +- register ssize_t ++ ssize_t + wsize, + remainsize = modifiedsize; + char *wbuf = (char*)buffer; +--- a/src/splay_common.cc ++++ b/src/splay_common.cc +@@ -66,7 +66,7 @@ const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= + static bool argsflag=false; + void arglist(int argc,char *argv[],int start) + { +- register int i; ++ int i; + + argsflag=true; + for(i=start;(i