diff options
Diffstat (limited to 'media-sound')
397 files changed, 9063 insertions, 4613 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex f60e48233a1f..210b9b699527 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest index e64cc13889f9..031766a2947e 100644 --- a/media-sound/a2jmidid/Manifest +++ b/media-sound/a2jmidid/Manifest @@ -1,4 +1,4 @@ DIST a2jmidid-9.tar.gz 47925 BLAKE2B ad079e76a54f56ee8f82150c306f91aead52f86632978ea6f3376a0bf163744379210b34701b39da4ee14fc4d8a1c6be82d1052abeb8ccf79410bc242d174d62 SHA512 5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c -EBUILD a2jmidid-9.ebuild 721 BLAKE2B df5f2785de192c4e35f2ede9ac66579ab9c7c331b72e738e4979ec595ed4f6bb568dde84e0bb05ec8a3a3f9601c4731161f88580c40a12e0653897ce3930ac40 SHA512 e260ffc7b9a2570fb5f6903d516ea5056c3165c9e28ca479111add14c0a957fe9ec6038df8aea62ca796033b360bd13f3a2fef97ed1883d25766afdde46b4f2c +EBUILD a2jmidid-9.ebuild 726 BLAKE2B 8df6a6897e2e92626e2b23f9ae76012b4830857dbd48f2612acb90abbeb665cb0dc7ef5c8c8d02d7b3a602f732d94d3cca2a14028ab0453463037e87e1efd03b SHA512 3a27404d187163998bd58840ec30937054e912f0a02c5b512e704787fd30a7368d40ae00dac5a06182363d21e0943e3db74629bd8252962ec02b23c501109062 EBUILD a2jmidid-9999.ebuild 696 BLAKE2B dd6e045e6c9e3de4077fc5b460d327b690e144e5d34690bccb8371b87ba82ae76cc5801eb9198e9881c3c1d6f3e1a640fc29f6755b029c503cdf21b955ae51c1 SHA512 3a8bb0cf20126b77dca5accc82540e43e5bc5e4a4c930e7b7efe48bba59b7cc92664ad468ceb3c8bf0afd0851098819da6c7ca6a6cdb8a813f3da7cc413fdc03 MISC metadata.xml 369 BLAKE2B bd88b29130a3c698de0abb7984ebcc130c84c55de1e53c69a74279874a350d10651d9a312dfcc76de17e64e5af43f79b31a663247430cbc60ee87def0845fcd9 SHA512 7d8b83bedfbc2cf55cbab1475e7e04c835ef5a49e7500de000a032cc256551a26a73aa6a3a3989dabd4e7f69a4d4a1ac4bbd2d806d5b3d22cdb230793ff91096 diff --git a/media-sound/a2jmidid/a2jmidid-9.ebuild b/media-sound/a2jmidid/a2jmidid-9.ebuild index 24f6219b7f58..62228ef8c0d6 100644 --- a/media-sound/a2jmidid/a2jmidid-9.ebuild +++ b/media-sound/a2jmidid/a2jmidid-9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxaudio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm x86" IUSE="dbus" BDEPEND=" diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest index baadec002990..8c657b6599fd 100644 --- a/media-sound/abcmidi/Manifest +++ b/media-sound/abcmidi/Manifest @@ -1,4 +1,7 @@ AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213 +AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8073c4493ea41eaf833fcf2f4616a6a828afc03e116de6c1807ee2436c9f385bf39527406e93c628b07dda2c16b3f5d51a0be SHA512 33c72c178812f527b7c2ce27635368a8f6531369025d36ab4d760f8ee19391027029de0b3d8698454b5eb35a1227b5d6efc1602fc5d5b6f58967ecf89579aada DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de -EBUILD abcmidi-2020.01.22.ebuild 793 BLAKE2B f0c9abd3f726827008b247db49e3abd8502afd77e94dfd777e6dd88d26a21b66c63d6ddb82d6645a444072e2ef527c73b17c14e88a98492f9f8934ee69dc7887 SHA512 6f6d59511723bfebc2b35b47824a7a0334faca92800b68d4f0b8f800552d9432aa213c3f77422aecbed0185f1440371fe9b2ca15db0d1eb537ada8de6378e32b +DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969 +EBUILD abcmidi-2020.01.22.ebuild 838 BLAKE2B 4c11e7de7d64eff9946d897263a483cac920d23fb60d9c03e02205403d696e59a89faa412146c1feb5c978a543b9efd2a2ce710026797ee7d19a2eb0a4e33a36 SHA512 2180b9e9a9e4954d70521303e35c2c8cba39989e92164660ce206802c7731e95e2b3ced6a5d785c66ae8315b47a8a9d6fb7dc8f446f2e573995566cab31c2b15 +EBUILD abcmidi-2020.06.07.ebuild 676 BLAKE2B 8f4a55416063df0b72cf37ef4ce66325801481eaaf1563a7c65da2b5e16b65f06d8bbdf10353eb9530a17beb1b40b1dec657857bb0487af7cf2be7b4ebf59161 SHA512 a2f3af1a21ae8dd2bc1713d2d840ffd56b8cd948fa68702a7c7c93b25f748c17666ef618be8cc9abc4eba36971411ed9a6c4b404676f02b4e08807a488ce5bae MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a diff --git a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild index 2dfe422dfb9d..a88113b01904 100644 --- a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild +++ b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild @@ -6,6 +6,7 @@ EAPI=7 inherit autotools MY_P="abcMIDI-${PV}" + DESCRIPTION="Programs for processing ABC music notation files" HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html" SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip" @@ -13,14 +14,17 @@ SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S=${WORKDIR}/${PN} +PATCHES=( + "${FILESDIR}"/${PN}-2016.05.05-docs.patch + "${FILESDIR}"/${PN}-2016.05.05-fno-common.patch +) + src_prepare() { - local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch ) default rm configure Makefile || die @@ -33,8 +37,7 @@ src_install() { default dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt} - if use examples ; then - docinto examples - dodoc samples/*.abc - fi + docinto examples + dodoc samples/*.abc + docompress -x /usr/share/doc/${PF}/examples } diff --git a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild b/media-sound/abcmidi/abcmidi-2020.06.07.ebuild new file mode 100644 index 000000000000..cec3c72c3b03 --- /dev/null +++ b/media-sound/abcmidi/abcmidi-2020.06.07.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_P="abcMIDI-${PV}" +DESCRIPTION="Programs for processing ABC music notation files" +HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html" +SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DEPEND="app-arch/unzip" + +S=${WORKDIR}/${PN} + +src_prepare() { + default + sed -i "s:-O2::" configure.ac || die + sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die + eautoreconf +} + +src_install() { + default + + if use examples ; then + docinto examples + dodoc samples/*.abc + fi +} diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch new file mode 100644 index 000000000000..e8ed8bec37ee --- /dev/null +++ b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch @@ -0,0 +1,23 @@ +--- a/drawtune.c ++++ b/drawtune.c +@@ -75,7 +75,8 @@ + int rootstem;
+ int fontsize, fontnum;
+ int donemeter;
+-int ingrace, inchord;
++extern int ingrace;
++int inchord;
+ int chordcount;
+ struct feature* chordhead;
+
+--- a/toabc.c ++++ b/toabc.c +@@ -85,7 +85,7 @@ + int new_key_number; /* used for gchord transposition */
+ int oldtable[7], newtable[7]; /* for handling transposition */
+ int inchord; /* are we in a chord [ ] ? */
+-int ingrace; /* are we in a grace note set { } ? */
++extern int ingrace; /* are we in a grace note set { } ? */
+ int chordcount; /* number of notes or rests in current chord */
+ int inlinefield; /* boolean - are we in [<field>: ] ? */
+ int cleanup; /* boolean to indicate -u option (update notation) */
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest index 3ab284d3bb5d..46883886ed2d 100644 --- a/media-sound/aeolus/Manifest +++ b/media-sound/aeolus/Manifest @@ -1,4 +1,4 @@ -AUX aeolus-0.9.7-fix-Makefile.patch 1102 BLAKE2B 9e8daec4fde583e3605ac9159bcd9e101f33b2fcb766f696a167ddef65e933d70ea1d93fd15f663f92b8861d529b3668c4673ffffbea7d713d96ab8bb282c89b SHA512 87c70d21dc104b64cbd7f52e73425de6d2a0671936e14afe21a28f9af8f5d9c1e9dc8164db1e702a78c335ce00097b0edd3b2626e54b68914c4baa562963c370 -DIST aeolus-0.9.7.tar.bz2 66532 BLAKE2B 611d48724b0b85afb8b82e5c2c9590a1da5d22154a5f8c228bdc4f83490113115132c08b79d07d0a5b9a2c66e0b5f9776504a3e919f00f75202ec43d0c7da193 SHA512 ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2 -EBUILD aeolus-0.9.7.ebuild 1264 BLAKE2B de204bfc1e48679936e5d5877814d4fcea91b9fedddc0e64981f740c79007304c30711b19d2b6104da60c21530ddaedea7eb05f621e22f18a7dbe92746b11b9f SHA512 a6608a62e95fdcc73e5adcf375711e16637b49decdc49a4b241d6ba85933804ce8c819623c5e9d5836b3c216f505019b741c479701890b18aa05e6b91ae3a3b0 +AUX aeolus-0.9.9-fix-Makefile.patch 612 BLAKE2B d036968f8cefc735d993f4d4a5cb8f177cd026b72cac830c505880e9b09351100705668084b937603a6ef4dd85a39137284fc7f01cfdd7db948c33a733a134ce SHA512 1847ab48321d1d478ec4842fc96f09dcea57799c630f7b49edac0297d7a5c7c21fcd699d3a001801d319e9a4520ad1c6f79494a2dbc91f7ba9a34a38cdcfe01f +DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2 +EBUILD aeolus-0.9.9.ebuild 1264 BLAKE2B 6c8dde9dd876c2ffdc210eae1c87ac724bc48c3809f618b0af71c9a2b25185ecdd7e840420af434e23ba9fc4f61730d4b85aac1f74c7c394f08147da50325f02 SHA512 a1602519c246877ca23a3eca28db3f1ee24e3f14fc1ec819bfa6a2c79bc75e888df30bbcc1b116b09e910589ce6e7ecd0895b8b59c59bf3e3c7ba64a853fedb0 MISC metadata.xml 826 BLAKE2B 4862927f235f598d16eed170670412d275420eda966c7ae740cdc2c30201a277b8c46b9a67978ab32d28b8486dbcaa896a88eb2ab68b4ec3b442aa031fdc525e SHA512 2b7e3f8ca98741ea01169a8c901b75509be285edbefec13eec449cb59fb0548158aed46054aac2a9095098e123a6cced745bc74b07b105ad9909a66de4a05368 diff --git a/media-sound/aeolus/aeolus-0.9.7.ebuild b/media-sound/aeolus/aeolus-0.9.9.ebuild index d67d9e69d32f..4d71f3088f41 100644 --- a/media-sound/aeolus/aeolus-0.9.7.ebuild +++ b/media-sound/aeolus/aeolus-0.9.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch b/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch deleted file mode 100644 index 07619475eca1..000000000000 --- a/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/source/Makefile b/source/Makefile -index f9e75bd..8390bd2 100644 ---- a/source/Makefile -+++ b/source/Makefile -@@ -24,7 +24,7 @@ LIBDIR ?= $(PREFIX)/lib$(SUFFIX) - - VERSION = 0.9.7 - CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\" --CXXFLAGS += -O2 -Wall -+CXXFLAGS += -Wall - CXXFLAGS += -march=native - - -@@ -45,7 +45,7 @@ $(AEOLUS_O): - XIFACE_O = styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o \ - midimatrix.o multislider.o functionwin.o xiface.o addsynth.o - aeolus_x11.so: CPPFLAGS += -D_REENTRANT --aeolus_x11.so: CPPFLAGS += $(shell pkgconf --cflags freetype2) -+aeolus_x11.so: CPPFLAGS += $(shell pkg-config --cflags freetype2) - aeolus_x11.so: CXXFLAGS += -shared -fPIC - aeolus_x11.so: LDFLAGS += -shared - aeolus_x11.so: LDLIBS += -lclthreads -lclxclient -lpthread -lXft -lX11 -@@ -74,7 +74,7 @@ install: aeolus aeolus_x11.so aeolus_txt.so - install -m 755 aeolus $(DESTDIR)$(BINDIR) - install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR) - install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR) -- ldconfig $(PREFIX)/$(LIBDIR) -+ true $(PREFIX)/$(LIBDIR) - - - clean: diff --git a/media-sound/aeolus/files/aeolus-0.9.9-fix-Makefile.patch b/media-sound/aeolus/files/aeolus-0.9.9-fix-Makefile.patch new file mode 100644 index 000000000000..0c6e6d49130a --- /dev/null +++ b/media-sound/aeolus/files/aeolus-0.9.9-fix-Makefile.patch @@ -0,0 +1,22 @@ +diff --git a/source/Makefile b/source/Makefile +index 756c603..4275ca2 100644 +--- a/source/Makefile ++++ b/source/Makefile +@@ -25,7 +25,7 @@ LIBDIR ?= $(PREFIX)/lib$(SUFFIX) + + VERSION = 0.9.9 + CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\" +-CXXFLAGS += -O2 -Wall ++CXXFLAGS += -Wall + CXXFLAGS += -march=native + + +@@ -75,7 +75,7 @@ install: aeolus aeolus_x11.so aeolus_txt.so + install -m 755 aeolus $(DESTDIR)$(BINDIR) + install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR) + install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR) +- ldconfig $(PREFIX)/$(LIBDIR) ++ true $(PREFIX)/$(LIBDIR) + + + clean: diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest index 0323684c7fe7..453133c9ee95 100644 --- a/media-sound/apetag/Manifest +++ b/media-sound/apetag/Manifest @@ -1,3 +1,5 @@ +AUX apetag-1.12-py3.patch 3784 BLAKE2B 039a42333dd48c0b2f3562411a53be1c793b5c19b9c9afc711e16a4b8a959fdc7a2fa8564c71eb99be403d596700a98e28529a39a45bffbd3315f42571085255 SHA512 325defd7e7114406185af0547d2d53cbf7a92a365016d9e7a08d12dec14fb5b364ac1051c86db67ce2e37066db83b9a7c9995cd7a6e1fd3b1b04a39d22651f8e DIST apetag.1.12.tar.gz 29942 BLAKE2B 866f0ed90b9bcdbed3c0a35729327058806478d1c17a7f88528809b1480a2a55f4665ce809737010cc3b642b6ed99ec22db84b7b6ec4b14f73974274f3e31bc5 SHA512 615c495721c6d46e6ce4546ede218efaac1f3fda91dcd9b8da2b8f7c79cc0f5fbee7dd5bc433c0b125973a816980abb8677f16d4000e5e71699524baddd16887 EBUILD apetag-1.12-r2.ebuild 984 BLAKE2B 3aa9e1aace83ecb791d364bf015cc92195eb17a193c2910c40594557b0093cc0a94dadb378ab5abc7ed995e93006a63d173101144928e95d48564eddf3f55287 SHA512 c9b821fd2e66627a6133ab39ddb21fca70d3711061984d6d80df34c7aa1a0407e0d7f969879a88b4a087626341b70eb9bb8a902da8d7e921326187a5fe3a21c2 +EBUILD apetag-1.12-r3.ebuild 1046 BLAKE2B b534684c1a95c1ca2f5037e9c71813a6599dd474f37efa6cab9bc142cfb6982b5f66e8d952316806b328e806b5537f4dba550fdad20b2dd1e09de79747005d0b SHA512 171d86ee6b0f25a1d7ba3be3c08be8e858a27a09f04dd8ed3b867381bc26309899829af50c546fca14bd96fdbb25d96d67e06b62e27a4ee9d26a7d5669652d07 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/media-sound/apetag/apetag-1.12-r3.ebuild b/media-sound/apetag/apetag-1.12-r3.ebuild new file mode 100644 index 000000000000..c485ce960902 --- /dev/null +++ b/media-sound/apetag/apetag-1.12-r3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-single-r1 toolchain-funcs + +DESCRIPTION="Command-line ape 2.0 tagger" +HOMEPAGE="http://muth.org/Robert/Apetag/" +SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${PN^} + +DOCS=( 00readme ) + +PATCHES=( + "${FILESDIR}/${P}-py3.patch" +) + +src_prepare() { + default + sed -i \ + -e 's:CXXDEBUG:LDFLAGS:' \ + Makefile || die + python_fix_shebang *.py +} + +src_compile() { + tc-export CXX + emake \ + CXXFLAGS="${CXXFLAGS} -Wall -pedantic" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin ${PN} + + python_moduleinto /usr/lib/apetag + python_domodule *.py + + fperms +x /usr/lib/apetag/{rmid3tag,tagdir}.py + dosym ../lib/apetag/rmid3tag.py /usr/bin/rmid3tag.py + dosym ../lib/apetag/tagdir.py /usr/bin/tagdir.py + + einstalldocs +} diff --git a/media-sound/apetag/files/apetag-1.12-py3.patch b/media-sound/apetag/files/apetag-1.12-py3.patch new file mode 100644 index 000000000000..c91f5c1a37a0 --- /dev/null +++ b/media-sound/apetag/files/apetag-1.12-py3.patch @@ -0,0 +1,112 @@ +diff --git a/cddb.py b/cddb.py +index f30b3b7..c9cb6dd 100755 +--- a/cddb.py ++++ b/cddb.py +@@ -131,7 +131,7 @@ class Toc: + track = int(match.group(1)) + self._trackext[track] = self._trackext[track] + match.group(2) + continue +- raise SyntaxError, "BAD LINE:" + line ++ raise SyntaxError("BAD LINE:" + line) + + components = self._disctitle.split("/", 1) + self._discartist = components[0].strip() +@@ -160,18 +160,18 @@ class Toc: + return len(self._tracktitle) + + def dump(self): +- print "DISCID: " + self._discid +- print "DISCTITLE: " + self._disctitle +- print "DISKEXT: " + self._discext +- print "TRACK TITLES" ++ print("DISCID: " + self._discid) ++ print("DISCTITLE: " + self._disctitle) ++ print("DISKEXT: " + self._discext) ++ print("TRACK TITLES") + for k in range(len(self._tracktitle)): +- print "%2d:" % k, self._tracktitle[k] +- print "TRACK EXTS" ++ print("%2d:" % k, self._tracktitle[k]) ++ print("TRACK EXTS") + for k in range(len(self._trackext)): +- print "%2d:" % k, self._trackext[k] +- print "TRACK TIMES" ++ print("%2d:" % k, self._trackext[k]) ++ print("TRACK TIMES") + for k in range(len(self._tracktimes)): +- print "%2d:" % k, self._tracktimes[k] ++ print("%2d:" % k, self._tracktimes[k]) + return + + # ====================================================================== +diff --git a/rmid3tag.py b/rmid3tag.py +index 36abe7f..e218638 100755 +--- a/rmid3tag.py ++++ b/rmid3tag.py +@@ -32,7 +32,7 @@ import logging + + # ====================================================================== + def usage(): +- print USAGE ++ print(USAGE) + return -1 + + # ====================================================================== +@@ -44,7 +44,7 @@ def process_file(name): + pos = inp.tell() + tag = inp.read(3) + if tag == "TAG": +- print name + ": found id3v1 tag - truncating at 0x%08x" % pos ++ print(name + ": found id3v1 tag - truncating at 0x%08x" % pos) + inp.truncate(pos) + else: + logging.warning(name + ": no id3v1 tag found\n") +diff --git a/tagdir.py b/tagdir.py +index 87223ef..f45aa9a 100755 +--- a/tagdir.py ++++ b/tagdir.py +@@ -188,7 +188,7 @@ def tag_files(files, toc, cmdpattern, test, verbose): + + realcmd = [tok % args for tok in cmdpattern] + if verbose: +- print realcmd ++ print(realcmd) + if not test: + ret = os.spawnvp(os.P_WAIT, realcmd[0], realcmd) + if ret: +@@ -201,7 +201,7 @@ def mode_dump(files): + perform read test and all (toc) files and dump their content + """ + for i in files: +- print "TOC: ", i ++ print("TOC: ", i) + if not os.access(i, os.R_OK): + logging.warning("cannot open " + i) + continue +@@ -218,7 +218,7 @@ def mode_toc(tocpath, test, check, verbose): + """ + try: + toc = cddb.Toc(tocpath) +- except Exception, ex: ++ except Exception as ex: + logging.error("cannot open toc file at %s %s", + os.path.abspath(tocpath), str(ex)) + return -1 +@@ -261,7 +261,7 @@ def main(argv): + try: + opts, args = getopt.getopt(argv, "t:m:v") + except getopt.error: +- print USAGE ++ print(USAGE) + return -1 + + mode = "tag" +@@ -276,7 +276,7 @@ def main(argv): + verbose = 1 + else: + logging.error("bad option: >" + opt + "<") +- print USAGE ++ print(USAGE) + return -1 + if mode == "dump": + return mode_dump(args) diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest index 96772ec558e6..5375ec1e930a 100644 --- a/media-sound/aqualung/Manifest +++ b/media-sound/aqualung/Manifest @@ -1,4 +1,7 @@ +AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611b37ef8b3447cb5d14636ef52208ddca09d94411071a20191b6177821c1ec6219893ebae7c66f343f1c1e32 SHA512 12a1740a7ebfa2c80d77a61fe23eead25ef3cb882caab9f2a13f56d4c06e6e9651fad8cbf5a6b755a9c0685de1b1f66f74e75458dca45ff61c816d54e90765e6 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985 +AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a EBUILD aqualung-1.0-r3.ebuild 2422 BLAKE2B 8fcce45ccc5062d388cd9c65d544e3baab1ec5a474b4fac3a4655cb0586b60458260c3d43083a0da855e18ea1ea10db39f2eb8533dbe73c4c7ce72d516ae84f4 SHA512 0ddbbefa25223761470a898eca0a08bafa6398ad467e681618d91b0886643d97aa6001596f4dff2942e2182b6dac2020a1e36d9e32b52b60ebb0de225f38059b +EBUILD aqualung-1.0-r5.ebuild 2511 BLAKE2B 470acd081320c361daf5f6739382dc4b9948a9da20984fe5b050c756ed828c67f2545d703c98154b5f2df12f9c333d90b096640dd7e46c5eb5aa099f9be56daa SHA512 c054fa841cccf8fa9f4ca38ae0fca2c016c56fd59fc12c15c8178ac75c0873c045def0b21731bbad244ba30ef22dde2179ee0a6abf33cf21ce867715118dfebb MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566 diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild new file mode 100644 index 000000000000..42fab45987b9 --- /dev/null +++ b/media-sound/aqualung/aqualung-1.0-r5.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop xdg + +MY_PV=${PV/_/-} + +DESCRIPTION="Music player for a wide range of formats designed for gapless playback" +HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung" +SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate + lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray + vorbis wavpack" + +BDEPEND=" + virtual/pkgconfig + sys-devel/gettext +" +RDEPEND=" + app-arch/bzip2 + dev-libs/libxml2 + sys-libs/zlib + x11-libs/gtk+:2 + alsa? ( media-libs/alsa-lib ) + cdda? ( dev-libs/libcdio-paranoia ) + cddb? ( media-libs/libcddb ) + ffmpeg? ( media-video/ffmpeg:0= ) + flac? ( media-libs/flac ) + ifp? ( media-libs/libifp ) + jack? ( virtual/jack ) + ladspa? ( media-libs/liblrdf ) + lame? ( media-sound/lame ) + libsamplerate? ( media-libs/libsamplerate ) + lua? ( dev-lang/lua:0= ) + mac? ( media-sound/mac ) + modplug? ( media-libs/libmodplug ) + mp3? ( media-libs/libmad ) + musepack? ( >=media-sound/musepack-tools-444 ) + pulseaudio? ( media-sound/pulseaudio ) + sndfile? ( media-libs/libsndfile ) + speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) + wavpack? ( media-sound/wavpack ) +" +DEPEND=" + ${RDEPEND} +" + +S=${WORKDIR}/${PN}-${MY_PV} + +PATCHES=( + "${FILESDIR}/${P}-ffmpeg3.patch" + "${FILESDIR}/${P}-gcc10.patch" + "${FILESDIR}/${P}-ar.patch" +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + --disable-rpath \ + --enable-loop \ + --enable-nls \ + --enable-transcoding \ + $(use_enable debug) \ + $(use_enable podcast) \ + $(use_enable systray) \ + $(use_enable jack jack-mgmt) \ + $(use_with alsa) \ + $(use_with cdda) \ + $(use_with cddb) \ + $(use_with ffmpeg lavc) \ + $(use_with flac) \ + $(use_with ifp) \ + $(use_with jack) \ + $(use_with ladspa) \ + $(use_with lame) \ + $(use_with libsamplerate src) \ + $(use_with lua) \ + $(use_with mac) \ + $(use_with modplug mod) \ + $(use_with mp3 mpeg) \ + $(use_with musepack mpc) \ + $(use_with oss) \ + $(use_with pulseaudio pulse) \ + $(use_with sndfile) \ + $(use_with speex) \ + $(use_with vorbis vorbis) \ + $(use_with vorbis vorbisenc) \ + $(use_with wavpack) +} + +src_install() { + default + + newicon src/img/icon_64.png aqualung.png + make_desktop_entry aqualung Aqualung +} diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch new file mode 100644 index 000000000000..3df4d75eaf1b --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.0-ar.patch @@ -0,0 +1,17 @@ +diff -Naur aqualung-1.0_orig/configure.ac aqualung-1.0/configure.ac +--- aqualung-1.0_orig/configure.ac 2020-08-05 20:00:50.758797358 +0200 ++++ aqualung-1.0/configure.ac 2020-08-05 20:01:33.198796503 +0200 +@@ -25,11 +25,12 @@ + + + # Checks for programs. ++AC_USE_SYSTEM_EXTENSIONS + AC_PROG_CC + AC_PROG_RANLIB + AC_PROG_CXX + AM_PROG_CC_C_O +-AC_USE_SYSTEM_EXTENSIONS ++AM_PROG_AR + m4_ifndef([AM_GNU_GETTEXT], + [m4_fatal([GNU gettext is required to prepare the Aqualung build])]) + AM_GNU_GETTEXT([external]) diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch new file mode 100644 index 000000000000..620bcb873d95 --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch @@ -0,0 +1,69 @@ +From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001 +From: Adam Sampson <ats@offog.org> +Date: Sat, 18 Jul 2020 17:02:32 +0100 +Subject: [PATCH 1/2] Remove unused variable. + +This causes a duplicate symbol error with GCC 10 (-fno-common by +default), but it's not used anyway. +--- + src/playlist.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/playlist.c b/src/playlist.c +index 35483d1..96fac75 100644 +--- a/src/playlist.c ++++ b/src/playlist.c +@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver; + GtkWidget * plist__export; + #endif /* HAVE_TRANSCODING */ + +-gchar command[RB_CONTROL_SIZE]; +- + GtkTreeIter * fileinfo_iter = NULL; + + int playlist_dirty; + +From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001 +From: Adam Sampson <ats@offog.org> +Date: Sat, 18 Jul 2020 17:06:41 +0100 +Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag. + +This causes a duplicate symbol error with GCC 10 (-fno-common by +default), because there's also a global timeout_tag in main.c. + +Also correct the type to guint rather than gint. +--- + src/ports.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ports.c b/src/ports.c +index f17a5ab..f4de59d 100644 +--- a/src/ports.c ++++ b/src/ports.c +@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R; + int n_clients; + GtkListStore * store_out_nb[MAX_JACK_CLIENTS]; + +-gint timeout_tag; ++guint ports_timeout_tag; + + int out_selector = 0; + +@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) { + fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res); + } + g_free(str); +- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1)); ++ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1)); + } + } + +@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) { + fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res); + } + g_free(str); +- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2); ++ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2); + } + } + diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index 2dbc422e835d..ee7399ec51d6 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,7 +1,5 @@ -AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580 -DIST Ardour-6.0.0.tar.bz2 10999598 BLAKE2B d403a76bb95a7c8dc411b45b54d9b1afb64ab0ba104c283c6890ec5bb152c9f67b825222460bb7b29a28724e7581023e5d3c7ce3b7ff9c88f3d584fab8cb03f7 SHA512 42cd5ea69200aefc60fc93ca7347f08fc511a9821a03023c4362d626f0957570ba0a7b174af67016f7fa27a29eed3c932d502e090d780125c63b5690faa642a3 -DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d -EBUILD ardour-5.12.ebuild 3827 BLAKE2B 7f80117bd65829746161d7bc06397e3356213a03d180218a1d0791bd2d7a7054455d2eaa12e57d3d6a2fc49f6cc49e30f2729fa88da8047c9bf189afd228ef80 SHA512 1fcd75469e64d3b55d34198ca430d966f24fbc00a0f2f17ddbafd156100b16e576760f9630921b2f6747d92257737f8fc5acaa2c78865e86f82fa864cd422535 -EBUILD ardour-6.0.ebuild 4264 BLAKE2B 1e95704755c6e2f4f90745380eef759d9c010b00088ea6dcd4f9ef21d23c08882b4b2ba4defa4c86571714326d71395d43aecf2709746e072d8717a42bd5bf59 SHA512 aa51000af3536c25a38effdd439fe9967737a1bc9eb4f8c1e391196d519676f457dcba01f495298a8bd7feb5c7c17321dafed4444cfe1b0fb72009cc64ea9a33 -EBUILD ardour-9999.ebuild 4264 BLAKE2B 1e95704755c6e2f4f90745380eef759d9c010b00088ea6dcd4f9ef21d23c08882b4b2ba4defa4c86571714326d71395d43aecf2709746e072d8717a42bd5bf59 SHA512 aa51000af3536c25a38effdd439fe9967737a1bc9eb4f8c1e391196d519676f457dcba01f495298a8bd7feb5c7c17321dafed4444cfe1b0fb72009cc64ea9a33 +AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051bde2e1c77035e6c1295ec44fa7483e2a1cb0a92cfd7d26ebb7df9919390e462a50e269a38174d6ff54c6c5e358eb51 SHA512 98b3d10d6b7ee371ce2b32c2ec730555739188b555f273198b6e096972d58f37d49d205e6de97299b8cfcaa8ad5c27d461207fa6ea02999dc0ddc7e375c5fd9e +DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8 +EBUILD ardour-6.2-r1.ebuild 4159 BLAKE2B d4be7982a9335ef22798d0368c87706723159be068f900ccf1559bd61d5c2aa2234024d7035618462d805b489354575be14e4162ea7bcd270e2413b5c11e512b SHA512 c88db3ea4f1904e84a1a4e221c3f987419287e6bb64e7ef849669afbb6bb1d7a1177051eb73358f5eaae164b77c988def9c79b07735fe7aeccdd3fa7f04d3923 +EBUILD ardour-9999.ebuild 4103 BLAKE2B 8f9d9dd9726c416cfeca182d72fdf3de6d666e7954c887b451d6b0436224ea6caa5dccd04aaf753c1d25e2ff188017b9c61b22d5603a1dbd79a2d48ce1967e8e SHA512 9ff953c51285b0f978fd9b885a39de70a8758807bf22bb62e37853c6ffe0ced0fde17e7849b9e9b24fc4acf30de507e76a9b8cedb7c9404215d4f2096434d047 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild deleted file mode 100644 index e29d333138f4..000000000000 --- a/media-sound/ardour/ardour-5.12.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -#EPYTHON='python2.7' -inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="http://ardour.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://gentoo/${P}.tar.bz2" - S="${WORKDIR}/Ardour-${PV}.0" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" - -RDEPEND=" - >=dev-cpp/glibmm-2.32.0 - >=dev-cpp/gtkmm-2.16:2.4 - >=dev-cpp/libgnomecanvasmm-2.26:2.6 - dev-libs/boost:= - >=dev-libs/glib-2.10.1:2 - dev-libs/libsigc++:2 - >=dev-libs/libxml2-2.6:2 - dev-libs/libxslt - >=gnome-base/libgnomecanvas-2 - media-libs/alsa-lib - media-libs/aubio - media-libs/flac - media-libs/freetype:2 - media-libs/libart_lgpl - media-libs/liblo - >=media-libs/liblrdf-0.4.0-r20 - >=media-libs/libsamplerate-0.1 - >=media-libs/libsndfile-1.0.18 - >=media-libs/libsoundtouch-1.6.0 - media-libs/raptor:2 - >=media-libs/rubberband-1.6.0 - >=media-libs/taglib-1.7 - media-libs/vamp-plugin-sdk - net-misc/curl - sys-libs/readline:0= - sci-libs/fftw:3.0[threads] - virtual/libusb:1 - x11-libs/cairo - >=x11-libs/gtk+-2.8.1:2 - x11-libs/pango - jack? ( virtual/jack ) - media-libs/lilv - media-libs/sratom - dev-libs/sord - >=media-libs/suil-0.6.10 - >=media-libs/lv2-1.4.0" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - jack? ( virtual/jack ) - sys-devel/gettext - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -pkg_setup() { - if has_version \>=dev-libs/libsigc++-2.6 ; then - append-cxxflags -std=c++11 - fi - python-any-r1_pkg_setup -} - -src_prepare() { - eapply_user - if ! [[ ${PV} == *9999* ]]; then - eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch - touch "${S}/libs/ardour/revision.cc" - fi - sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die - MARCH=$(get-flag march) - OPTFLAGS="" - if use cpu_flags_x86_sse; then - if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then - elog "You enabled sse but use an march that does not support sse!" - elog "We add -msse to the flags now, but please consider switching your march in make.conf!" - fi - OPTFLAGS="sse" - fi - if use cpu_flags_x86_mmx; then - if [[ ${MARCH} == "i486" ]]; then - elog "You enabled mmx with i486 set as march! You have been warned!" - fi - OPTFLAGS="${OPTFLAGS} mmx" - fi - if use cpu_flags_x86_3dnow; then - OPTFLAGS="${OPTFLAGS} 3dnow" - fi - sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \ - -i "${S}"/wscript || die - sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die - append-flags "-lboost_system" - python_fix_shebang "${S}"/wscript - python_fix_shebang "${S}"/waf -} - -src_configure() { - tc-export CC CXX - mkdir -p "${D}" - waf-utils_src_configure \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ - --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --nls \ - --optimize -} - -src_install() { - waf-utils_src_install - mv ${PN}.1 ${PN}${SLOT}.1 - doman ${PN}${SLOT}.1 - newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png - make_desktop_entry ardour5 ardour5 ardour5 AudioVideo -} - -pkg_postinst() { - elog "Please do _not_ report problems with the package to ${PN} upstream." - elog "If you think you've found a bug, check the upstream binary package" - elog "before you report anything to upstream." -} diff --git a/media-sound/ardour/ardour-6.0.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild index 304e08fcb604..9935afaf3d5d 100644 --- a/media-sound/ardour/ardour-6.0.ebuild +++ b/media-sound/ardour/ardour-6.2-r1.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE='threads(+)' -#EPYTHON='python2.7' PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh" inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils @@ -16,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else KEYWORDS="~amd64 ~x86" - SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2" + SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" S="${WORKDIR}/Ardour-${PV}.0" fi @@ -70,6 +69,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen[dot] )" +PATCHES=( + "${FILESDIR}/${P}-fix-no-nls.patch" +) + pkg_setup() { if has_version \>=dev-libs/libsigc++-2.6 ; then append-cxxflags -std=c++11 @@ -78,7 +81,7 @@ pkg_setup() { } src_prepare() { - eapply_user + default sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die MARCH=$(get-flag march) OPTFLAGS="" @@ -114,15 +117,14 @@ src_configure() { tc-export CC CXX mkdir -p "${D}" waf-utils_src_configure \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ - $( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \ - $( use nls && echo "--nls" ) || echo --no-nls \ --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --optimize + --configdir=/etc \ + --optimize \ + $(usex doc "--docs" '') \ + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ + $(usex phonehome "--phone-home" "--no-phone-home") \ + $(usex nls "--nls" "--no-nls") #not possible right now --use-external-libs } src_compile() { diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index 304e08fcb604..43c1789b324f 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE='threads(+)' -#EPYTHON='python2.7' PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh" inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils @@ -114,15 +113,14 @@ src_configure() { tc-export CC CXX mkdir -p "${D}" waf-utils_src_configure \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ - $( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \ - $( use nls && echo "--nls" ) || echo --no-nls \ --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --optimize + --configdir=/etc \ + --optimize \ + $(usex doc "--docs" '') \ + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ + $(usex phonehome "--phone-home" "--no-phone-home") \ + $(usex nls "--nls" "--no-nls") #not possible right now --use-external-libs } src_compile() { diff --git a/media-sound/ardour/files/ardour-4.x-revision-naming.patch b/media-sound/ardour/files/ardour-4.x-revision-naming.patch deleted file mode 100644 index d558f4792a84..000000000000 --- a/media-sound/ardour/files/ardour-4.x-revision-naming.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ardour-4.2/wscript -+++ ardour-4.2/wscript -@@ -162,7 +162,7 @@ - if os.path.isdir (os.path.join(os.getcwd(), '.git')): - rev = fetch_git_revision () - else: -- rev = fetch_tarball_revision () -+ rev = os.environ['PV'] - - # - # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit -@@ -238,16 +238,16 @@ - return version - - def create_stored_revision(): -- rev = "" -- if os.path.exists('.git'): -- rev = fetch_git_revision(); -- print("Git version: " + rev + "\n") -- elif os.path.exists('libs/ardour/revision.cc'): -- print("Using packaged revision") -- return -- else: -- print("Missing libs/ardour/revision.cc. Blame the packager.") -- sys.exit(-1) -+ rev = os.environ['PV'] + "-gentoo" -+# if os.path.exists('.git'): -+# rev = fetch_git_revision(); -+# print("Git version: " + rev + "\n") -+# elif os.path.exists('libs/ardour/revision.cc'): -+# print("Using packaged revision") -+# return -+# else: -+# print("Missing libs/ardour/revision.cc. Blame the packager.") -+# sys.exit(-1) - - try: - # diff --git a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch new file mode 100644 index 000000000000..cc03d0baff50 --- /dev/null +++ b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch @@ -0,0 +1,474 @@ +From fcd347fe0c11e8e04aebc086da328921f54b947f Mon Sep 17 00:00:00 2001 +From: Robin Gareus <robin@gareus.org> +Date: Wed, 19 Aug 2020 17:39:32 +0200 +Subject: [PATCH 1/2] Fix --no-nls, i18n include order in libs -- #8361 + +Ardour's "pbd/i18n.h" needs to be included last, +after any include that may indirectly pull in getext or libintl. + +For that reason "pbd/i18n.h" must not be used in header files either. +--- + libs/ardour/ardour/disk_reader.h | 7 +------ + libs/ardour/ardour/disk_writer.h | 4 +--- + libs/ardour/ardour/transport_master.h | 3 +-- + libs/ardour/disk_reader.cc | 6 ++++++ + libs/ardour/disk_writer.cc | 6 ++++++ + libs/ardour/port.cc | 3 ++- + libs/ardour/port_engine_shared.cc | 3 ++- + libs/ardour/region.cc | 3 ++- + libs/ardour/transport_fsm.cc | 3 ++- + libs/ardour/transport_master.cc | 2 +- + libs/surfaces/contourdesign/button_config_widget.cc | 3 ++- + libs/surfaces/contourdesign/contourdesign_gui.cc | 4 ++-- + libs/surfaces/contourdesign/jump_distance_widget.cc | 2 +- + .../surfaces/generic_midi/generic_midi_control_protocol.cc | 3 ++- + 14 files changed, 31 insertions(+), 21 deletions(-) + +diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h +index 724c091b3..d9773bbeb 100644 +--- a/libs/ardour/ardour/disk_reader.h ++++ b/libs/ardour/ardour/disk_reader.h +@@ -22,8 +22,6 @@ + + #include <boost/optional.hpp> + +-#include "pbd/i18n.h" +- + #include "evoral/Curve.h" + + #include "ardour/disk_io.h" +@@ -46,10 +44,7 @@ public: + + bool set_name (std::string const& str); + +- std::string display_name () const +- { +- return std::string (_("player")); +- } ++ std::string display_name () const; + + static samplecnt_t chunk_samples () + { +diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h +index 2bd753a00..511b6bc4f 100644 +--- a/libs/ardour/ardour/disk_writer.h ++++ b/libs/ardour/ardour/disk_writer.h +@@ -23,8 +23,6 @@ + #include <list> + #include <vector> + +-#include "pbd/i18n.h" +- + #include "ardour/disk_io.h" + #include "ardour/midi_buffer.h" + +@@ -42,7 +40,7 @@ public: + ~DiskWriter (); + + bool set_name (std::string const& str); +- std::string display_name () const { return std::string (_ ("recorder")); } ++ std::string display_name () const; + + bool recordable () const { return _flags & Recordable; } + +diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h +index d6b554ef8..af98c0b3a 100644 +--- a/libs/ardour/ardour/transport_master.h ++++ b/libs/ardour/ardour/transport_master.h +@@ -29,7 +29,6 @@ + + #include <ltc.h> + +-#include "pbd/i18n.h" + #include "pbd/properties.h" + #include "pbd/signals.h" + #include "pbd/statefuldestructible.h" +@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime { + + do { + if (tries == 10) { +- std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl; ++ std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl; + Glib::usleep (20); + tries = 0; + } +diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc +index 252a84a65..5fa694485 100644 +--- a/libs/ardour/disk_reader.cc ++++ b/libs/ardour/disk_reader.cc +@@ -76,6 +76,12 @@ DiskReader::~DiskReader () + DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this)); + } + ++std::string ++DiskReader::display_name () const ++{ ++ return std::string (_("player")); ++} ++ + void + DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize) + { +diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc +index aee4f9301..34aa3f1e9 100644 +--- a/libs/ardour/disk_writer.cc ++++ b/libs/ardour/disk_writer.cc +@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples () + return 65536; + } + ++std::string ++DiskWriter::display_name () const ++{ ++ return std::string (_ ("recorder")); ++} ++ + void + DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize) + { +diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc +index 9bc318a14..8be47efbd 100644 +--- a/libs/ardour/port.cc ++++ b/libs/ardour/port.cc +@@ -26,7 +26,6 @@ + #include "pbd/compose.h" + #include "pbd/error.h" + #include "pbd/failed_constructor.h" +-#include "pbd/i18n.h" + + #include "ardour/audioengine.h" + #include "ardour/debug.h" +@@ -34,6 +33,8 @@ + #include "ardour/port_engine.h" + #include "ardour/rc_configuration.h" + ++#include "pbd/i18n.h" ++ + using namespace std; + using namespace ARDOUR; + using namespace PBD; +diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc +index f8ab0e204..ad32762f0 100644 +--- a/libs/ardour/port_engine_shared.cc ++++ b/libs/ardour/port_engine_shared.cc +@@ -21,10 +21,11 @@ + #include <regex.h> + + #include "pbd/error.h" +-#include "pbd/i18n.h" + + #include "ardour/port_engine_shared.h" + ++#include "pbd/i18n.h" ++ + using namespace ARDOUR; + + BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags) +diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc +index cb42f1d2c..ab6042af3 100644 +--- a/libs/ardour/region.cc ++++ b/libs/ardour/region.cc +@@ -30,7 +30,6 @@ + + #include <glibmm/threads.h> + +-#include "pbd/i18n.h" + #include "pbd/types_convert.h" + #include "pbd/xml++.h" + +@@ -47,6 +46,8 @@ + #include "ardour/transient_detector.h" + #include "ardour/types_convert.h" + ++#include "pbd/i18n.h" ++ + using namespace std; + using namespace ARDOUR; + using namespace PBD; +diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc +index 484106785..59de3d1de 100644 +--- a/libs/ardour/transport_fsm.cc ++++ b/libs/ardour/transport_fsm.cc +@@ -22,7 +22,6 @@ + #include <boost/none.hpp> + + #include "pbd/error.h" +-#include "pbd/i18n.h" + #include "pbd/pthread_utils.h" + #include "pbd/stacktrace.h" + +@@ -31,6 +30,8 @@ + #include "ardour/session.h" + #include "ardour/transport_fsm.h" + ++#include "pbd/i18n.h" ++ + using namespace ARDOUR; + using namespace PBD; + +diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc +index ea56a860b..e76fd5eb6 100644 +--- a/libs/ardour/transport_master.cc ++++ b/libs/ardour/transport_master.cc +@@ -21,7 +21,6 @@ + + #include "pbd/boost_debug.h" + #include "pbd/debug.h" +-#include "pbd/i18n.h" + + #include "ardour/audioengine.h" + #include "ardour/debug.h" +@@ -32,6 +31,7 @@ + #include "ardour/types_convert.h" + #include "ardour/utils.h" + ++#include "pbd/i18n.h" + + namespace ARDOUR { + namespace Properties { +diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc +index 785c8c6b1..f46f80f12 100644 +--- a/libs/surfaces/contourdesign/button_config_widget.cc ++++ b/libs/surfaces/contourdesign/button_config_widget.cc +@@ -24,12 +24,13 @@ + #include "gtkmm2ext/actions.h" + #include "gtkmm2ext/action_model.h" + +-#include "pbd/i18n.h" + #include "pbd/strsplit.h" + #include "pbd/signals.h" + + #include "button_config_widget.h" + ++#include "pbd/i18n.h" ++ + using namespace std; + using namespace Gtk; + using namespace ArdourSurface; +diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc +index 3d061b060..ed58c787d 100644 +--- a/libs/surfaces/contourdesign/contourdesign_gui.cc ++++ b/libs/surfaces/contourdesign/contourdesign_gui.cc +@@ -37,12 +37,12 @@ + + #include "widgets/ardour_button.h" + +-#include "pbd/i18n.h" +- + #include "contourdesign.h" + #include "jump_distance_widget.h" + #include "button_config_widget.h" + ++#include "pbd/i18n.h" ++ + using namespace ArdourSurface; + + class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList +diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc +index 8469658a1..dacc3a752 100644 +--- a/libs/surfaces/contourdesign/jump_distance_widget.cc ++++ b/libs/surfaces/contourdesign/jump_distance_widget.cc +@@ -21,10 +21,10 @@ + #include <gtkmm/spinbutton.h> + + #include "gtkmm2ext/utils.h" +-#include "pbd/i18n.h" + + #include "jump_distance_widget.h" + ++#include "pbd/i18n.h" + + using namespace std; + using namespace Gtk; +diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +index c5ba0b794..31e5383dc 100644 +--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc ++++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +@@ -41,7 +41,6 @@ + #include "pbd/error.h" + #include "pbd/failed_constructor.h" + #include "pbd/file_utils.h" +-#include "pbd/i18n.h" + #include "pbd/strsplit.h" + #include "pbd/types_convert.h" + #include "pbd/xml++.h" +@@ -66,6 +65,8 @@ + + #include "pbd/abstract_ui.cc" // instantiate template + ++#include "pbd/i18n.h" ++ + using namespace ARDOUR; + using namespace PBD; + using namespace Glib; +-- +2.28.0 + + +From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001 +From: Robin Gareus <robin@gareus.org> +Date: Wed, 19 Aug 2020 17:40:02 +0200 +Subject: [PATCH 2/2] Fix --no-nls, i18n include order in UI -- #8361 + +--- + gtk2_ardour/ardour_ui_access_web.cc | 3 ++- + gtk2_ardour/ardour_ui_dependents.cc | 3 ++- + gtk2_ardour/pt_import_selector.cc | 3 ++- + gtk2_ardour/startup_fsm.cc | 3 ++- + gtk2_ardour/template_dialog.cc | 4 ++-- + gtk2_ardour/transport_control.cc | 4 ++-- + session_utils/fix_bbtppq.cc | 3 ++- + 7 files changed, 14 insertions(+), 9 deletions(-) + +diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc +index 7986e2ca3..781b65262 100644 +--- a/gtk2_ardour/ardour_ui_access_web.cc ++++ b/gtk2_ardour/ardour_ui_access_web.cc +@@ -36,12 +36,13 @@ + #include "gtk2ardour-version.h" + #endif + +-#include "pbd/i18n.h" + #include "pbd/openuri.h" + + #include "ardour_message.h" + #include "ardour_ui.h" + ++#include "pbd/i18n.h" ++ + using namespace ARDOUR; + using namespace PBD; + using namespace Gtk; +diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc +index d28ae7c14..24810d3e7 100644 +--- a/gtk2_ardour/ardour_ui_dependents.cc ++++ b/gtk2_ardour/ardour_ui_dependents.cc +@@ -33,7 +33,6 @@ + #include <cstdio> + + #include "pbd/error.h" +-#include "pbd/i18n.h" + + #include "ardour/session.h" + #include "ardour/lv2_plugin.h" +@@ -62,6 +61,8 @@ + #include <gdk/gdkx.h> + #endif + ++#include "pbd/i18n.h" ++ + using namespace Gtk; + using namespace PBD; + +diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc +index da65bcb72..318da1e35 100644 +--- a/gtk2_ardour/pt_import_selector.cc ++++ b/gtk2_ardour/pt_import_selector.cc +@@ -22,7 +22,6 @@ + #include <iostream> + + #include "pbd/gstdio_compat.h" +-#include "pbd/i18n.h" + #include "pbd/file_utils.h" + + #include "ptformat/ptformat.h" +@@ -33,6 +32,8 @@ + + #include "pt_import_selector.h" + ++#include "pbd/i18n.h" ++ + using namespace Gtk; + using namespace ARDOUR; + using namespace PBD; +diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc +index c52b0ecea..dfdd01ce4 100644 +--- a/gtk2_ardour/startup_fsm.cc ++++ b/gtk2_ardour/startup_fsm.cc +@@ -26,7 +26,6 @@ + #include "pbd/basename.h" + #include "pbd/file_archive.h" + #include "pbd/file_utils.h" +-#include "pbd/i18n.h" + + #include "ardour/audioengine.h" + #include "ardour/filename_extensions.h" +@@ -58,6 +57,8 @@ + #include "gtk2ardour-version.h" + #endif + ++#include "pbd/i18n.h" ++ + using namespace ARDOUR; + using namespace Gtk; + using namespace Gtkmm2ext; +diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc +index e0c5590ee..c9c37d00e 100644 +--- a/gtk2_ardour/template_dialog.cc ++++ b/gtk2_ardour/template_dialog.cc +@@ -40,7 +40,6 @@ + #include "pbd/error.h" + #include "pbd/file_archive.h" + #include "pbd/file_utils.h" +-#include "pbd/i18n.h" + #include "pbd/xml++.h" + + #include "gtkmm2ext/gui_thread.h" +@@ -52,9 +51,10 @@ + #include "ardour/template_utils.h" + + #include "progress_reporter.h" +- + #include "template_dialog.h" + ++#include "pbd/i18n.h" ++ + using namespace std; + using namespace Gtk; + using namespace PBD; +diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc +index a7be5903d..0828febb6 100644 +--- a/gtk2_ardour/transport_control.cc ++++ b/gtk2_ardour/transport_control.cc +@@ -16,8 +16,6 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include "pbd/i18n.h" +- + #include "ardour/location.h" + #include "ardour/session.h" + +@@ -25,6 +23,8 @@ + #include "ardour_ui.h" + #include "transport_control.h" + ++#include "pbd/i18n.h" ++ + using namespace Gtk; + + TransportControlProvider::TransportControlProvider () +diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc +index e3767c8cd..81b148bcc 100644 +--- a/session_utils/fix_bbtppq.cc ++++ b/session_utils/fix_bbtppq.cc +@@ -25,7 +25,6 @@ + #include <glibmm.h> + + #include "pbd/file_utils.h" +-#include "pbd/i18n.h" + #include "pbd/stateful.h" + + #include "ardour/region_factory.h" +@@ -44,6 +43,8 @@ + + #include "common.h" + ++#include "pbd/i18n.h" ++ + using namespace std; + using namespace ARDOUR; + using namespace SessionUtils; +-- +2.28.0 + diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest index cd4fabb9933f..f8652db780ff 100644 --- a/media-sound/audacious/Manifest +++ b/media-sound/audacious/Manifest @@ -1,9 +1,7 @@ DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43 -DIST audacious-4.0.3.tar.bz2 577512 BLAKE2B 55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18 SHA512 e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd -DIST audacious-4.0.4.tar.bz2 577440 BLAKE2B a51766ea61e91244eda39f77710f5489641d7e8a12332eb2e5b254b2dbc5360196beba040fa453fbb992d8815cd002604fd542d88f53dec3651645cc5e697dcc SHA512 76bafb2cece861b58650e52cc8c338a0645387e43b7d3548b23528024195605c11789479d8fb2ae25d5986cd5ccb03182eb2427c9ba394d4fd6611f06359f94d +DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B a65810baf0f733327a3e37e6efd2af3d35245b1e99936a4cd39d8068e0df06779ab3c08e839e4b3586f70bec2d16a605c62328f863f747247181851ac7c151c2 SHA512 4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 EBUILD audacious-3.10.1-r1.ebuild 1696 BLAKE2B 09463aa9d83d1d610ea48321f81783dc2127d3be5b8d4574cc96d7edaebbbe8b88cf025aa4a8606cb2c6a4ce6745a59bc0f787203c66f07735dfd5732152aa5a SHA512 f31880f63020fb113020bf60a59f187117d1f60e545102da755615419affbd5599ce97c856e80541b1db67346855081ee0ec220584effa252d5f534534fe98aa -EBUILD audacious-4.0.3.ebuild 1766 BLAKE2B 4977dcdedca220fd9de9760af086e9195aa4fdd9bb7fc3547b529cdb569b73fc5c9fc5b0ffaccfd4d3e725f82d602f4e161d85c41996ba1103272cad2771714d SHA512 1f983f029630e6da151a176ee69968983e5abd6c9cb7164c783c1296353c7d633aab4f09410751a9dc7d3276128606c06b57f7198693039b9cdfe217aaa424e4 -EBUILD audacious-4.0.4.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6 +EBUILD audacious-4.0.5.ebuild 1766 BLAKE2B 4977dcdedca220fd9de9760af086e9195aa4fdd9bb7fc3547b529cdb569b73fc5c9fc5b0ffaccfd4d3e725f82d602f4e161d85c41996ba1103272cad2771714d SHA512 1f983f029630e6da151a176ee69968983e5abd6c9cb7164c783c1296353c7d633aab4f09410751a9dc7d3276128606c06b57f7198693039b9cdfe217aaa424e4 EBUILD audacious-9999.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6 MISC metadata.xml 367 BLAKE2B 3178261eacb8e350e8930e69bc03206952775a7cf98bc2da66d6b28413940bb00c2c485302637a70fdd4591ee0cc324d0c92934f403b844928bc2a5c17e98da8 SHA512 557d6cef39796075cf75208ef91e02ed32e6906929fa4f4408798e4a56ced6e472069aedcdda7c2276d89c2732d7c2832b79f514bd77b7147b25487e3f217b87 diff --git a/media-sound/audacious/audacious-4.0.4.ebuild b/media-sound/audacious/audacious-4.0.4.ebuild deleted file mode 100644 index 13924b39fcb0..000000000000 --- a/media-sound/audacious/audacious-4.0.4.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${P/_/-}" - -if [[ ${PV} == *9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git" -else - SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi -inherit xdg - -DESCRIPTION="Lightweight and versatile audio player" -HOMEPAGE="https://audacious-media-player.org/" -SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -IUSE="nls" - -BDEPEND=" - virtual/pkgconfig - nls? ( dev-util/intltool ) -" -DEPEND=" - >=dev-libs/dbus-glib-0.60 - >=dev-libs/glib-2.28 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - >=x11-libs/cairo-1.2.6 - >=x11-libs/pango-1.8.0 - virtual/freedesktop-icon-theme -" -RDEPEND="${DEPEND}" -PDEPEND="~media-plugins/audacious-plugins-${PV}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - [[ ${PV} == *9999 ]] && git-r3_src_unpack -} - -src_prepare() { - default - if ! use nls; then - sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698 - fi - [[ ${PV} == *9999 ]] && eautoreconf -} - -src_configure() { - # D-Bus is a mandatory dependency, remote control, - # session management and some plugins depend on this. - # Building without D-Bus is *unsupported* and a USE-flag - # will not be added due to the bug reports that will result. - # Bugs #197894, #199069, #207330, #208606 - local myeconfargs=( - --disable-valgrind - --disable-gtk - --enable-dbus - --enable-qt - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Gentoo_ice skin installation; bug #109772 - insinto /usr/share/audacious/Skins/gentoo_ice - doins -r "${WORKDIR}"/gentoo_ice/. - docinto gentoo_ice - dodoc "${WORKDIR}"/README -} diff --git a/media-sound/audacious/audacious-4.0.3.ebuild b/media-sound/audacious/audacious-4.0.5.ebuild index 98cdf80db1ab..98cdf80db1ab 100644 --- a/media-sound/audacious/audacious-4.0.3.ebuild +++ b/media-sound/audacious/audacious-4.0.5.ebuild diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest index 9ed0e456eee4..815143f6da6f 100644 --- a/media-sound/audacity/Manifest +++ b/media-sound/audacity/Manifest @@ -1,17 +1,19 @@ AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a -AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fcd9b9104ad5e5a0a5ebe5b744cbc9cd9f2e267e591c822781acf601c355665a0bdb95ee94a758eac72fe4d74b6f9f72cb48b40c7f0cd0a2ac SHA512 d2fcf0c57a7c9a13a15daf6c901430e114193c0cdf395fbacaaf10be6717a6c74dcb1284ede3d12eca1c418f2948483f84fc75c78e80176531c3adbfbbeeae31 -AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2 AUX audacity-2.3.3-fno-common.patch 2232 BLAKE2B eeaa5452a3da08bb4ba22965ad9a3ce77b838e9177d4cc53c630865bd91dfd1d348dcd4128b20f875e9a50d9ec19fb6e371cf28bf059072437480f71c7225f1a SHA512 3f534101b6194b4f557b88cdf96ae91cc3e2c86ef387ba5ccc33aa192212074eb018de9dd2d459518133baf9f46c1c8d499d74ae00b593a26b904ac3d288a700 -DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0 +AUX audacity-2.4.2-add-missing-include-portaudio.patch 346 BLAKE2B 51b3a09a2ed616364f7ded02663bd0a527a12d088e514fa494f7324756263cd73713a50391f3895366c3d92d491ef56d21ee380bf9c640228d5ab680328f37a8 SHA512 ccc7ebfc6453ef02b2ef4e546d8c96d45fb5ccd46a088225dc241371745bd8f39dd63b0044bfba24f1eeec70affcac29a4499f0d15a16fb4dd99eb87980fc4fa +AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83ec310d7609b6989749f42b3b6304feb9d62c02436b0c4d62116b145d44d1a0ddeaf38c86794ef449393c998f5b5a062e408ed3f SHA512 d19082009dc915b28f02e3451f06e5041b68159af138ecad10641f3c59526b4ab2873e6e676b87dff0e54320b48a6254a0da434566855605ca81b747a732e952 +AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a1632c6a963ee11a1893064c41c9d8093adf081bc3fd6a2e2dcc909573bd22d1d21e8cb58c8bbf9e464058780cfce839d6c06 SHA512 a2cdabecf53c03b77434ddbdbfb7606eb52f8e52b67d62bd206799eb0e9399345967106d7644784de338ef68d3e87c26952c491e775b1a323e1e2a91e41fe200 +AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef +DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86 -DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4 +DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b -EBUILD audacity-2.3.2.ebuild 3254 BLAKE2B 7ee66453862ceb01265f240daad2eb197f0cc9ec1d6f138e79ab377c318c958c67eb9cb5c2cc46d0d92797d833f13c9b15e53599018d0171021288bab5976e0f SHA512 856e6846a7339ac05e9437953456702bc4505aa6826be9a231e4b3ad9ab045ce5a3ef5c16473195d02988dd20fd3d348a9be3c9f643fc41dc3f20a1c923e1bd6 EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b -MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae +EBUILD audacity-2.4.2-r1.ebuild 3699 BLAKE2B b71220e00f54cc2c1b9c020d58d0e5949e528f35cbd489b948890a49dcac75c6ea10b23111898ebb1e7601580c42a119f90fab1b0f269aab3a13db4b87061521 SHA512 07205d550c94a73ad406af1f6cd3751f9cb4b9c2f90f6c1b5a0615572ac7dbecbc11d439ca23fbb6f6ad66e595b55710536bff86b39da2f625becac2c10b5082 +MISC metadata.xml 1343 BLAKE2B 5bd530b1826b79a7b2ed54ebe055f752b8cdeb0d4e837d184deefb4ce8a2395e243d690bb0775d4e022d990533b55c9c6d7fed1c60c213e09fe351e161530b36 SHA512 ff75ba648bbbcff37e9529b8b52a1c6b86aadc8b650d6e121e1e5296514f1adeee0b52e37856c466c1c88baf7fcfcc3db6bcb935100e8a623dfd8926e697c6e5 diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild deleted file mode 100644 index a3ac1df60e7e..000000000000 --- a/media-sound/audacity/audacity-2.3.2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic wxwidgets xdg - -MY_P="Audacity-${PV}" -DOC_PV="${PV}" -DESCRIPTION="Free crossplatform audio editor" -HOMEPAGE="https://web.audacityteam.org/" -# wget doesn't seem to work on FossHub links, so we mirror -SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz - doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" -IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame - +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst" - -RESTRICT="test" - -RDEPEND=">=app-arch/zip-2.3 - dev-libs/expat - >=media-libs/libsndfile-1.0.0 - >=media-libs/portaudio-19.06.00-r2[alsa?] - <media-libs/portaudio-20 - media-libs/soxr - x11-libs/wxGTK:3.0[X] - alsa? ( media-libs/alsa-lib ) - ffmpeg? ( >=media-video/ffmpeg-1.2:= ) - flac? ( >=media-libs/flac-1.3.1[cxx] ) - id3tag? ( media-libs/libid3tag ) - jack? ( virtual/jack ) - lame? ( >=media-sound/lame-3.70 ) - lv2? ( - media-libs/lilv - media-libs/lv2 - media-libs/suil - ) - mad? ( >=media-libs/libmad-0.14.2b ) - sbsms? ( media-libs/libsbsms ) - soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) - twolame? ( media-sound/twolame ) - vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) - vorbis? ( >=media-libs/libvorbis-1.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${PN}-${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch - "${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch -) - -src_prepare() { - default - - use midi || sed -i \ - -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \ - src/Experimental.h || die -} - -src_configure() { - local WX_GTK_VER="3.0" - setup-wxwidgets - append-cxxflags -std=gnu++14 - - # * always use system libraries if possible - # * options listed in the order that configure --help lists them - local myeconfargs=( - --disable-dynamic-loading - --enable-nyquist=local - --enable-unicode - --with-expat - --with-lib-preference=system - --with-libsndfile - --with-libsoxr - --with-mod-script-pipe - --with-mod-nyq-bench - --with-portaudio - --with-widgetextra=local - --with-wx-version=${WX_GTK_VER} - $(use_enable cpu_flags_x86_sse sse) - $(use_enable ladspa) - $(use_enable nls) - $(use_enable vst) - $(use_with ffmpeg) - $(use_with flac libflac) - $(use_with id3tag libid3tag) - $(use_with lame) - $(use_with lv2) - $(use_with mad libmad) - $(use_with midi portmidi local) - $(use_with midi "" local) - $(use_with portmixer) - $(use_with sbsms) - $(use_with soundtouch) - $(use_with twolame libtwolame) - $(use_with vamp libvamp) - $(use_with vorbis libvorbis) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - # Remove bad doc install - rm -r "${ED}"/usr/share/doc || die - - # Install our docs - einstalldocs - - if use doc ; then - docinto html - dodoc -r "${WORKDIR}"/help/manual/{m,man,manual} - dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html} - dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual - fi -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild new file mode 100644 index 000000000000..e6c8898ad225 --- /dev/null +++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0-gtk3" + +inherit cmake flag-o-matic wxwidgets xdg + +MY_P="Audacity-${PV}" +DOC_PV="${PV}" +DESCRIPTION="Free crossplatform audio editor" +HOMEPAGE="https://web.audacityteam.org/" +# wget doesn't seem to work on FossHub links, so we mirror +SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz + doc? ( https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )" +S="${WORKDIR}/${PN}-${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~mips ~x86" +IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss + portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst" + +RESTRICT="test" + +RDEPEND="dev-libs/expat + media-libs/libsndfile + media-libs/libsoundtouch + media-libs/portaudio[alsa?] + media-libs/soxr + >=media-sound/lame-3.100-r3 + x11-libs/wxGTK:${WX_GTK_VER}[X] + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( media-video/ffmpeg:= ) + flac? ( media-libs/flac[cxx] ) + id3tag? ( media-libs/libid3tag ) + jack? ( virtual/jack ) + lv2? ( + dev-libs/serd + dev-libs/sord + >=media-libs/lilv-0.24.6-r2 + media-libs/lv2 + media-libs/sratom + media-libs/suil + ) + mad? ( >=media-libs/libmad-0.15.1b ) + ogg? ( media-libs/libogg ) + portmidi? ( media-libs/portmidi ) + sbsms? ( media-libs/libsbsms ) + twolame? ( media-sound/twolame ) + vamp? ( media-libs/vamp-plugin-sdk ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip + sys-devel/gettext + virtual/pkgconfig +" + +REQUIRED_USE="portmidi? ( portsmf )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch + "${FILESDIR}/${P}-fix-vertical-track-resizing.patch" + "${FILESDIR}/${P}-fix-gettimeofday.patch" + "${FILESDIR}/${P}-fix-metainfo.patch" + "${FILESDIR}/${P}-add-missing-include-portaudio.patch" +) + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + setup-wxwidgets + append-cxxflags -std=gnu++14 + + # * always use system libraries if possible + # * options listed in the order that cmake-gui lists them + local mycmakeargs=( +# --disable-dynamic-loading + -Daudacity_lib_preference=system + -Daudacity_use_expat=system + -Daudacity_use_ffmpeg=$(usex ffmpeg loaded off) + -Daudacity_use_flac=$(usex flac system off) + -Daudacity_use_id3tag=$(usex id3tag system off) + -Daudacity_use_ladspa=$(usex ladspa) + -Daudacity_use_lame=system + -Daudacity_use_lv2=$(usex lv2 system off) + -Daudacity_use_mad=$(usex mad system off) + -Daudacity_use_midi=$(usex portmidi system off) + -Daudacity_use_nyquist=local + -Daudacity_use_ogg=$(usex ogg system off) + -Daudacity_use_pa_alsa=$(usex alsa) + -Daudacity_use_pa_jack=$(usex jack linked off) + -Daudacity_use_pa_oss=$(usex oss) + #-Daudacity_use_pch leaving it to the default behavior + -Daudacity_use_portaudio=local # only 'local' option is present + -Daudacity_use_portmixer=$(usex portmixer local off) + -Daudacity_use_portsmf=$(usex portsmf local off) + -Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration? + -Daudacity_use_sndfile=system + -Daudacity_use_soundtouch=system + -Daudacity_use_soxr=system + -Daudacity_use_twolame=$(usex twolame system off) + -Daudacity_use_vamp=$(usex vamp system off) + -Daudacity_use_vorbis=$(usex vorbis system off) + -Daudacity_use_vst=$(usex vst) + -Daudacity_use_wxwidgets=system + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # Remove bad doc install + rm -r "${ED}"/usr/share/doc || die + + if use doc ; then + docinto html + dodoc -r "${WORKDIR}"/help/manual/{m,man,manual} + dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html} + dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual + fi +} diff --git a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch deleted file mode 100644 index d4ec1a7320f6..000000000000 --- a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urpN a/src/Track.h b/src/Track.h ---- a/src/Track.h 2019-05-04 13:38:57.000000000 +0300 -+++ b/src/Track.h 2019-08-27 19:32:36.937551831 +0300 -@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector - - using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >; - --#if defined(USE_MIDI) --class NoteTrack; --#endif -- - class TrackList; - - using ListOfTracks = std::list< std::shared_ptr< Track > >; -@@ -74,9 +70,7 @@ enum class TrackKind - { - None, - Wave, --#if defined(USE_MIDI) - Note, --#endif - Label, - Time, - Audio, -diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp ---- a/src/menus/FileMenus.cpp 2019-05-04 13:38:57.000000000 +0300 -+++ b/src/menus/FileMenus.cpp 2019-08-27 19:32:36.939551720 +0300 -@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI( - } - #endif - --#ifdef USE_MIDI -- - // Menu handler functions - - struct Handler : CommandHandlerObject { -@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext - } - } - -+#ifdef USE_MIDI - void OnImportMIDI(const CommandContext &context) - { - auto &project = context.project; -@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext & - if (!fileName.empty()) - DoImportMIDI(&project, fileName); - } --#endif -+#endif // USE_MIDI - - void OnImportRaw(const CommandContext &context) - { -diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp ---- a/src/tracks/ui/TimeShiftHandle.cpp 2019-05-04 13:38:57.000000000 +0300 -+++ b/src/tracks/ui/TimeShiftHandle.cpp 2019-08-27 19:32:36.940551665 +0300 -@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click - ok = false; - else - captureClips = true; -- }, - #ifdef USE_MIDI -+ }, - [&](NoteTrack *) { - captureClips = true; -- } - #endif -+ } - ); - - if ( ! ok ) diff --git a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch deleted file mode 100644 index fa785fdd6c5e..000000000000 --- a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001 -From: Antonio Ospite <ao2@ao2.it> -Date: Tue, 7 Nov 2017 13:06:33 +0100 -Subject: [PATCH] Fix building against the system portaudio library - -Building against the system portaudio results in this error: - -./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime' -audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*, -unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)': -./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime' -collect2: error: ld returned 1 exit status -Makefile:2349: recipe for target 'audacity' failed -make[3]: *** [audacity] Error 1 - -This is because PaUtil_GetTime is declared as a C symbol in pa_util.h -but is resolved as a C++ symbol at link time. - -Audacity fixes this in the local tree with this change: -https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7 - -However this is not general enough for the portaudio debian package. - -Since PaUtil_GetTime() is the only function causing problems, just copy -over the code where it's used. ---- - src/AudioIO.cpp | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - ---- a/src/AudioIO.cpp -+++ b/src/AudioIO.cpp -@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe - #define ROUND(x) (int) ((x)+0.5) - //#include <string.h> - #include "../lib-src/portmidi/pm_common/portmidi.h" -- #include "../lib-src/portaudio-v19/src/common/pa_util.h" - #include "NoteTrack.h" -+ -+PaTime PaUtil_GetTime( void ) -+{ -+#ifdef HAVE_MACH_ABSOLUTE_TIME -+ return mach_absolute_time() * machSecondsConversionScaler_; -+#elif defined(HAVE_CLOCK_GETTIME) -+ struct timespec tp; -+ clock_gettime(CLOCK_REALTIME, &tp); -+ return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9); -+#else -+ struct timeval tv; -+ gettimeofday( &tv, NULL ); -+ return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec; -+#endif -+} -+ - #endif - - #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT diff --git a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch new file mode 100644 index 000000000000..7b845bc31817 --- /dev/null +++ b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch @@ -0,0 +1,11 @@ +diff -Naur a/src/AudioIOBase.cpp b/src/AudioIOBase.cpp +--- a/src/AudioIOBase.cpp 2020-06-19 15:16:47.000000000 +0000 ++++ b/src/AudioIOBase.cpp 2020-08-04 19:43:27.985734707 +0000 +@@ -21,6 +21,7 @@ + #include "prefs/RecordingPrefs.h" + #include "widgets/MeterPanelBase.h" + ++#include "portaudio.h" + #if USE_PORTMIXER + #include "portmixer.h" + #endif diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch new file mode 100644 index 000000000000..0e6e3e5d8cb1 --- /dev/null +++ b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch @@ -0,0 +1,12 @@ +diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp +index 0187e39..28a5348 100644 +--- a/src/AudioIO.cpp ++++ b/src/AudioIO.cpp +@@ -427,6 +427,7 @@ time warp info and AudioIOListener and whether the playback is looped. + #include <math.h> + #include <stdlib.h> + #include <algorithm> ++#include <sys/time.h> + + #ifdef __WXMSW__ + #include <malloc.h> diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch new file mode 100644 index 000000000000..09b9fd0e868b --- /dev/null +++ b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch @@ -0,0 +1,12 @@ +diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt +index 43a7714..0e8a3d8 100755 +--- a/help/CMakeLists.txt ++++ b/help/CMakeLists.txt +@@ -40,6 +40,6 @@ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" ) + install( FILES "${_SRCDIR}/audacity.1" + DESTINATION "${_MANDIR}/man1" ) + install( FILES "${_SRCDIR}/audacity.appdata.xml" +- DESTINATION "${_DATADIR}/appdata" ) ++ DESTINATION "${_DATADIR}/metainfo" ) + endif() + diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch new file mode 100644 index 000000000000..71160b4365eb --- /dev/null +++ b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch @@ -0,0 +1,14 @@ +--- a/src/menus/ViewMenus.cpp 2020-05-27 17:49:20.645538517 +0500 ++++ b/src/menus/ViewMenus.cpp 2020-05-27 17:49:26.844538493 +0500 +@@ -4,10 +4,10 @@ + #include "../CommonCommandFlags.h" + #include "../Menus.h" + #include "../Prefs.h" ++#include "../ProjectWindow.h" + #include "../Project.h" + #include "../ProjectHistory.h" + #include "../ProjectSettings.h" +-#include "../ProjectWindow.h" + #include "../Track.h" + #include "../TrackInfo.h" + #include "../TrackPanel.h" diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml index b7c2db3a2bd7..7f3a6ec835ae 100644 --- a/media-sound/audacity/metadata.xml +++ b/media-sound/audacity/metadata.xml @@ -14,7 +14,9 @@ <flag name="id3tag">Enables ID3 tagging with id3tag library</flag> <flag name="lv2">Add support for Ladspa V2</flag> <flag name="midi">Enables MIDI support</flag> + <flag name="portmidi">Enable support for MIDI via media-libs/portmidi</flag> <flag name="portmixer">Enable the internal portmixer feature</flag> + <flag name="portsmf">Enable support for Portable Standard Midi File Library</flag> <flag name="sbsms">Enables sbsms library support for slower, more accurate pitch and tempo changing</flag> <flag name="soundtouch">Enables soundtouch library support for pitch and diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest index ca6bc9fccbaf..07b689da15dd 100644 --- a/media-sound/aumix/Manifest +++ b/media-sound/aumix/Manifest @@ -1,5 +1,6 @@ +AUX aumix-2.9.1-fno-common.patch 5798 BLAKE2B 1d3c6bf6b501b3daf4b96e1b2093b9a3d94553b4fd43fc3d02136450e805b75a8c8bc82e7ce0222179bae54126aa4e3cb148f784590de818f0593ceebf74638d SHA512 248ed0bceb2b1030930c89a1d6eace9c43338be80dae5d023bcb131a1666be21984fa2bd814945f8e5683d6e31eeb10bc2cddc6820385ce44e3ae32fdb8da3e9 AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d -EBUILD aumix-2.9.1.ebuild 996 BLAKE2B 4e003f44ceaae4db2b78ed579934ca12cff1118ee493a110a3172d1de18cde8301dc9357eba7ebb04d3f97fe66684e25149d8b8650c7ef00ff8ebcf95a8eb3fe SHA512 1b8764df079db8e0cc7761b7fdcb600a28ef0eee22cafcc35b895574b5677f9c5874f767d9398ffd1d3a43e7a1438149a66d6ce5ac7eb4b3dd18cb94a360c0e6 +EBUILD aumix-2.9.1.ebuild 1033 BLAKE2B 018bf631c1a68ddd3561cb9e65ec2b8198f08c4bed769b7254d5c859f7567db2aad38b85c587635aab852586657bd02832730453edfc31e7b38da8d1290bbbd3 SHA512 30da0c21889ce0a30e6ec950dc3d6a2d7c936d238981c002fef4b36fc182088d65641e7b357716d9792c757ce9289087c6e37dadaf4192cf96589418dc7120cc MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild index 2b8a55174718..76cdbdadc38d 100644 --- a/media-sound/aumix/aumix-2.9.1.ebuild +++ b/media-sound/aumix/aumix-2.9.1.ebuild @@ -25,7 +25,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-tinfo.patch" #578722 + "${FILESDIR}"/${P}-tinfo.patch #578722 + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { diff --git a/media-sound/aumix/files/aumix-2.9.1-fno-common.patch b/media-sound/aumix/files/aumix-2.9.1-fno-common.patch new file mode 100644 index 000000000000..f021cbda4d6c --- /dev/null +++ b/media-sound/aumix/files/aumix-2.9.1-fno-common.patch @@ -0,0 +1,132 @@ +--- a/src/common.h ++++ b/src/common.h +@@ -129,8 +129,8 @@ + extern int ReadRecSrc(void); + extern int WriteRecSrc(void); + int ReadWriteMixer(int device, char *rw, int *left, int *right, char *rp); +-int ourlevel[SOUND_MIXER_NRDEVICES]; +-int our_recplay[SOUND_MIXER_NRDEVICES]; /* Store record/play settings for updates. */ ++extern int ourlevel[SOUND_MIXER_NRDEVICES]; ++extern int our_recplay[SOUND_MIXER_NRDEVICES]; /* Store record/play settings for updates. */ + int LoadSettings(void); + int SaveSettings(void); + int dummy_ioctl(int fd, unsigned long req, int *arg); +--- a/src/curses.c ++++ b/src/curses.c +@@ -27,8 +27,9 @@ + #include "mouse.h" + + unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo, *lang; +-int current_dev, level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved; ++int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved; + int in_keysbox = FALSE; ++int (*Wgetch) (WINDOW * win); + static int cursor_x, cursor_y; /* keep track of cursor position */ + + void InitScreenCurses(void) +--- a/src/curses.h ++++ b/src/curses.h +@@ -88,8 +88,8 @@ + }; + #define ARROW_WIDTH 1 /* width of selection arrow */ + #define R_P_WIDTH 1 /* width of record/play indicator */ +-int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode; +-int (*Wgetch) (WINDOW * win); ++extern int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode; ++extern int (*Wgetch) (WINDOW * win); + #define Getch() (*Wgetch)(stdscr) + void WakeUpCurses(void); + void InitScreenCurses(void); +--- a/src/gtk.c ++++ b/src/gtk.c +@@ -45,6 +45,24 @@ + #include "interactive.h" + #include <signal.h> /* SIGALRM */ + ++GdkBitmap *rmask; ++GdkBitmap *pmask; ++GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES]; ++GdkPixmap *record_pixmap; ++GdkPixmap *play_pixmap; ++GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES]; ++GtkAdjustment *balance[SOUND_MIXER_NRDEVICES]; ++GtkWidget *baltracks[SOUND_MIXER_NRDEVICES]; ++GtkWidget *channellabel[SOUND_MIXER_NRDEVICES]; ++GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES]; ++GtkWidget *levels[SOUND_MIXER_NRDEVICES]; ++GtkWidget *maintable; ++gint balcallback[SOUND_MIXER_NRDEVICES]; ++gint lvlcallback[SOUND_MIXER_NRDEVICES]; ++gint rpcallback[SOUND_MIXER_NRDEVICES]; ++gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES]; ++GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance; ++ + void SaveSettingsGTK(void) + { + (void) SaveSettings(); +--- a/src/gtk.h ++++ b/src/gtk.h +@@ -7,23 +7,23 @@ + #include <sys/mman.h> + #include <gtk/gtk.h> + +-GdkBitmap *rmask; +-GdkBitmap *pmask; +-GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES]; +-GdkPixmap *record_pixmap; +-GdkPixmap *play_pixmap; +-GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES]; +-GtkAdjustment *balance[SOUND_MIXER_NRDEVICES]; +-GtkWidget *baltracks[SOUND_MIXER_NRDEVICES]; +-GtkWidget *channellabel[SOUND_MIXER_NRDEVICES]; +-GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES]; +-GtkWidget *levels[SOUND_MIXER_NRDEVICES]; +-GtkWidget *maintable; +-gint balcallback[SOUND_MIXER_NRDEVICES]; +-gint lvlcallback[SOUND_MIXER_NRDEVICES]; +-gint rpcallback[SOUND_MIXER_NRDEVICES]; +-gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES]; +-GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance; ++extern GdkBitmap *rmask; ++extern GdkBitmap *pmask; ++extern GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES]; ++extern GdkPixmap *record_pixmap; ++extern GdkPixmap *play_pixmap; ++extern GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES]; ++extern GtkAdjustment *balance[SOUND_MIXER_NRDEVICES]; ++extern GtkWidget *baltracks[SOUND_MIXER_NRDEVICES]; ++extern GtkWidget *channellabel[SOUND_MIXER_NRDEVICES]; ++extern GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES]; ++extern GtkWidget *levels[SOUND_MIXER_NRDEVICES]; ++extern GtkWidget *maintable; ++extern gint balcallback[SOUND_MIXER_NRDEVICES]; ++extern gint lvlcallback[SOUND_MIXER_NRDEVICES]; ++extern gint rpcallback[SOUND_MIXER_NRDEVICES]; ++extern gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES]; ++extern GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance; + void WakeUpGTK(void); + void HideShowBalancesGTK(void); + void HideShowNumbersGTK(void); +--- a/src/interactive.c ++++ b/src/interactive.c +@@ -28,6 +28,9 @@ + #include "gtk.h" + #endif /* HAVE_GTK */ + ++int ourlevel[SOUND_MIXER_NRDEVICES]; ++int our_recplay[SOUND_MIXER_NRDEVICES]; ++ + void AumixSignalHandler(int signal_number) + { + /* Handle SIGALRM. */ +--- a/src/interactive.h ++++ b/src/interactive.h +@@ -7,7 +7,7 @@ + #define MUTE_ONLY 2 + #define REFRESH_PERIOD 1 /* number of seconds between updates */ + +-unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo; ++extern unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo; + void AumixSignalHandler(int signal_number); + void InitScreen(void); + void KeysBox(void); diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest index aaf0991da444..0d7b8ddc425e 100644 --- a/media-sound/bluez-alsa/Manifest +++ b/media-sound/bluez-alsa/Manifest @@ -1,8 +1,8 @@ AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406 -AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d +AUX bluealsa-init.d 365 BLAKE2B e94570ce6b6e25b0c9e2d2aec573c1b4a698d94117825b3708c1e046808787f97f2ef0d5bb0b1aa87910bbc33bbd9b997b6c30b90940d40fa9acd3e31505848d SHA512 b8d6b81e6ea0480975685396a3fbc349d6da7dc5a5c386271b1facdfc91ed0c2ffa79e1f78b54b530b28d413ff786ad1578ab504875905499dc5f8f075641f4d AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889 AUX bluez-alsa-2.1.0-gcc10.patch 4802 BLAKE2B f57c2920deaec93bf57e56440c20f01a23e58300e062f9d8f83b56719cbc8620dfac8e1420639db7cabc589a231e9f33ff6f2de6e8ad7ba9b2d9b2c18fa35b32 SHA512 e26c4cf6b4184c99ba85f9640f5f5db38ae66999560147af91aff1d9aebb10ef534dd631f8a8421164431401ee2a35da529c298deff6b955bd6747fc7a9f5605 DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584 -EBUILD bluez-alsa-2.1.0.ebuild 1930 BLAKE2B 32a79bd8fbdc218bc2e968d77b1fbc9ef79a97aaf67b377687202d43150f6ac61419cf4507175627b90d519af028dbcfa1c50bf582764fc3d98af63b5ac22424 SHA512 740f21e0a17acc513cfe776361808782d047399219bab175a8aeeae5a6aa71d99ab31a74d173ca40c37a744b1c175afec6c6585f28b7e5b5b0b379c70eaf8057 -EBUILD bluez-alsa-9999.ebuild 1877 BLAKE2B f499f35e7e189820ea2554c576ea2ebae05c5fadf7386d76e4abbbbb2ffa057544cc6b12af313ae3ec48331d4bcdc98d087adc93323dd7adccc5cd64b59bb57e SHA512 a1e2c29746fdc1701b8ae6d7c0384466fd21a44e052d08e8be46b9d93de2eeaee71fb931babc1ef472e4480fbd6e6bea82fe46c7787c7bc7f472d84bbacae479 +EBUILD bluez-alsa-2.1.0-r1.ebuild 2105 BLAKE2B 6afd74d6e52478e52201bebf5b9a9991d8106488f090049361771824912f475f02653b8b8e56718a559fcd0135a1a0191d0bfe86bb66a40684f0c1ef138a478f SHA512 0e822dc45450a35fad11568875d45908e0db49bdf9fa21fe205481cbd1189902d900e808a6ede91b56ab7f5fb6c3e7a138fb9cde2b15e1e43fa1636c2aa98362 +EBUILD bluez-alsa-9999.ebuild 2052 BLAKE2B 11d92d789735a86e632958151f86da7dbf1636eb445739313abbb2917be6c356e4f86b09be23203e0b5322d31f08c88db4ed3ef408500d646c558efde6d96a4a SHA512 918776dc7e26d5bbef9863c5345e05701b5b2f7d400980a7b7a90cbc117800a9dc4209f394bf5c10d6a00ef06f4942f9982693905cadf7a0de6e4e0a349d9ae5 MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054 diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild index c0b3a72b1abb..f654ac56596f 100644 --- a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild +++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild @@ -37,7 +37,8 @@ RDEPEND=" ldac? ( >=media-libs/libldac-2.0.0 ) upower? ( sys-power/upower ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( dev-libs/check )" BDEPEND="virtual/pkgconfig" PATCHES=( @@ -71,6 +72,10 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/bluealsa-init.d bluealsa newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa systemd_dounit "${FILESDIR}"/bluealsa.service + + # Add config file to alsa datadir as well to preserve changes in /etc + insinto "/usr/share/alsa/alsa.conf.d/" + doins "src/asound/20-bluealsa.conf" } pkg_postinst() { diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild index fc03fb3b79e0..35b7533e4c48 100644 --- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild +++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild @@ -37,7 +37,8 @@ RDEPEND=" ldac? ( >=media-libs/libldac-2.0.0 ) upower? ( sys-power/upower ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( dev-libs/check )" BDEPEND="virtual/pkgconfig" src_prepare() { @@ -67,6 +68,10 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/bluealsa-init.d bluealsa newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa systemd_dounit "${FILESDIR}"/bluealsa.service + + # Add config file to alsa datadir as well to preserve changes in /etc + insinto "/usr/share/alsa/alsa.conf.d/" + doins "src/asound/20-bluealsa.conf" } pkg_postinst() { diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d index 9b6a3178b63a..087b35386eb6 100644 --- a/media-sound/bluez-alsa/files/bluealsa-init.d +++ b/media-sound/bluez-alsa/files/bluealsa-init.d @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 pidfile="/var/run/bluealsa.pid" diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest index 6266fd6218f1..e4baa614fc97 100644 --- a/media-sound/cadence/Manifest +++ b/media-sound/cadence/Manifest @@ -1,5 +1,5 @@ -AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239 -DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1 -EBUILD cadence-0.9.0-r4.ebuild 2172 BLAKE2B 9844a157a8db4819bf551493b44f2ec59e26f724543571821919e40fe25ceb556e35d80513bd93f03de50e1292ce4f68066ccd80590edc03eaaf0de2aefce83a SHA512 bfcfe9642a2ce8988f6526bbbcc846c7ff504853e2c7d6245db87f6337ef8d8e98999c9462183ec8d5418aa186a774ba19c2e872418619b92eb725bed7b28b8d -EBUILD cadence-9999.ebuild 2059 BLAKE2B 59983428d4250e0fb040b5585b89c5521637f23402fe0b4eadb698de4fc9f90dc62da70ccdba73e3da8c0ad45e7038916c0d48baec9bda758652d4fdc7a05f72 SHA512 f7de8366a38f7e2c832202821a3bae0b43d7172be33de87cfb870e214e9f5fb89af5386002f56501c545477573b4734ef0cbb4b2927af7c1423c127ece7de9f0 +AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713 +DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219 +EBUILD cadence-0.9.1.ebuild 2410 BLAKE2B 2d1e0b36ea3d2ba7b040e940a9a9e7ac5849d9b2362fd3dc87647073ae919f41784a889d00165d94f5bbc69a855d09d6d3741aeb0f50f0ebb80ca4d1669ecab2 SHA512 7ed6d65a4437d3620e39f0c6377c0ff1ec6eb2181a812697522a8a5e662ef9d55276dcce6c2aa2447bb6e670ce8ec4373c2846e645616ccb9c555e7393788f4c +EBUILD cadence-9999.ebuild 2356 BLAKE2B 3e3422570afd70a1e8aa59ddf546aa2e1395a78009372e53c585f6979d82d051ca67fd4f35989b2a3140cb6ca317eb59476e2f8d5f6418d71419a4368ca10887 SHA512 b83ae35507c4f57faf60fb88364e33cc7fc96e7bf4951964c2a6afb80111178fa0633939d99acebcb2f336cf25520af52d788cb06eac3e616c38a20b913a1e53 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c diff --git a/media-sound/cadence/cadence-0.9.0-r4.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild index 08953c0b0c7f..6185958b360d 100644 --- a/media-sound/cadence/cadence-0.9.0-r4.ebuild +++ b/media-sound/cadence/cadence-0.9.1.ebuild @@ -3,13 +3,22 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit python-single-r1 xdg desktop DESCRIPTION="Collection of tools useful for audio production" -HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence" -SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64" +HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/falkTX/Cadence.git" + KEYWORDS="amd64" +else + SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64" + S="${WORKDIR}/Cadence-${PV}" +fi + LICENSE="GPL-2" SLOT="0" @@ -17,7 +26,6 @@ IUSE="a2jmidid -pulseaudio opengl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet CDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -32,9 +40,9 @@ CDEPEND=" RDEPEND="${CDEPEND}" DEPEND="${CDEPEND}" -S="${WORKDIR}/Cadence-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fix-qt5.15.patch +) src_prepare() { sed -i -e "s/python3/${EPYTHON}/" \ @@ -53,7 +61,7 @@ src_prepare() { } src_compile() { - myemakeargs=(PREFIX="/usr" + myemakeargs=(PREFIX="${EPREFIX}/usr" SKIP_STRIPPING=true ) @@ -61,17 +69,22 @@ src_compile() { } src_install() { - emake PREFIX="/usr" DESTDIR="${D}" install + emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install + + python_fix_shebang "${ED}" # Clean up stuff that shouldn't be installed - rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject - rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop - rm -rf "${D}"/usr/share/applications/*.desktop + rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject + rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop + rm -rf "${ED}"/usr/share/applications/*.desktop if use !pulseaudio; then - rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback} - rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback} + rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback} + rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback} fi + # Depend on ladish which is not in the tree + rm -rf "${ED}"/usr/bin/claudia{,-launcher} + rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/ # Replace desktop entries with QA issues with these make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt" diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild index 1059f334e102..b0f1b5c66689 100644 --- a/media-sound/cadence/cadence-9999.ebuild +++ b/media-sound/cadence/cadence-9999.ebuild @@ -3,13 +3,22 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit git-r3 python-single-r1 xdg desktop +PYTHON_COMPAT=( python3_{6,7,8,9} ) +inherit python-single-r1 xdg desktop DESCRIPTION="Collection of tools useful for audio production" -HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence" -EGIT_REPO_URI="https://github.com/falkTX/Cadence.git" -KEYWORDS="" +HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/falkTX/Cadence.git" + KEYWORDS="" +else + SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/Cadence-${PV}" +fi + LICENSE="GPL-2" SLOT="0" @@ -17,7 +26,6 @@ IUSE="a2jmidid -pulseaudio opengl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet CDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -30,7 +38,7 @@ CDEPEND=" pulseaudio? ( media-sound/pulseaudio[jack] ) " RDEPEND="${CDEPEND}" -DEPEND="${RDEPEND}" +DEPEND="${CDEPEND}" src_prepare() { sed -i -e "s/python3/${EPYTHON}/" \ @@ -49,7 +57,7 @@ src_prepare() { } src_compile() { - myemakeargs=(PREFIX="/usr" + myemakeargs=(PREFIX="${EPREFIX}/usr" SKIP_STRIPPING=true ) @@ -57,17 +65,22 @@ src_compile() { } src_install() { - emake PREFIX="/usr" DESTDIR="${D}" install + emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install + + python_fix_shebang "${ED}" # Clean up stuff that shouldn't be installed - rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject - rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop - rm -rf "${D}"/usr/share/applications/*.desktop + rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject + rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop + rm -rf "${ED}"/usr/share/applications/*.desktop if use !pulseaudio; then - rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback} - rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback} + rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback} + rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback} fi + # Depend on ladish which is not in the tree + rm -rf "${ED}"/usr/bin/claudia{,-launcher} + rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/ # Replace desktop entries with QA issues with these make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt" diff --git a/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch new file mode 100644 index 000000000000..b9c52167e375 --- /dev/null +++ b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch @@ -0,0 +1,34 @@ +From c167f35fbb76c4246c730b29262a59da73010412 Mon Sep 17 00:00:00 2001 +From: Alex Tsitsimpis <alex.tsitsimpis@gmail.com> +Date: Thu, 4 Jun 2020 12:49:40 +0300 +Subject: [PATCH] Fix build with Qt 5.15+ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building with Qt 5.15 failed with the following error: + +../widgets/pixmapdial.cpp:231:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined + 231 | QPainterPath ballPath; + | ^~~~~~~~ +../widgets/pixmapdial.cpp:278:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined + 278 | QPainterPath ballPath; + | ^~~~~~~~ + +Signed-off-by: Alex Tsitsimpis <alex.tsitsimpis@gmail.com> +--- + c++/widgets/pixmapdial.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/c++/widgets/pixmapdial.cpp b/c++/widgets/pixmapdial.cpp +index 37dcffd..0b5e0f5 100644 +--- a/c++/widgets/pixmapdial.cpp ++++ b/c++/widgets/pixmapdial.cpp +@@ -22,6 +22,7 @@ + #include <QtCore/QTimer> + #include <QtGui/QPainter> + #include <QtGui/QPaintEvent> ++#include <QtGui/QPainterPath> + + PixmapDial::PixmapDial(QWidget* parent) + : QDial(parent), diff --git a/media-sound/cadence/files/cadence-add-skip-stripping.patch b/media-sound/cadence/files/cadence-add-skip-stripping.patch deleted file mode 100644 index eacf0c9a431d..000000000000 --- a/media-sound/cadence/files/cadence-add-skip-stripping.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/c++/Makefile.mk b/c++/Makefile.mk -index ec92861..8e9998f 100644 ---- a/c++/Makefile.mk -+++ b/c++/Makefile.mk -@@ -7,7 +7,6 @@ - AR ?= ar - CC ?= gcc - CXX ?= g++ --STRIP ?= strip - WINDRES ?= windres - - HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core) -@@ -22,7 +21,6 @@ DEBUG ?= false - ifeq ($(DEBUG),true) - BASE_FLAGS = -O0 -g -Wall -Wextra - BASE_FLAGS += -DDEBUG --STRIP = true # FIXME - else - BASE_FLAGS = -O3 -ffast-math -mtune=generic -msse -mfpmath=sse -Wall -Wextra - BASE_FLAGS += -DNDEBUG -@@ -38,6 +36,10 @@ ifneq ($(DEBUG),true) - BUILD_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT - endif - -+ifneq ($(SKIP_STRIPPING), true) -+LINK_FLAGS += -Wl,--strip-all -+endif -+ - # -------------------------------------------------------------- - - # Currently broken -diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile -index 004076d..bfe3230 100644 ---- a/c++/jackmeter/Makefile -+++ b/c++/jackmeter/Makefile -@@ -31,10 +31,10 @@ OBJS = \ - all: cadence-jackmeter - - cadence-jackmeter: $(FILES) $(OBJS) -- $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@ -+ $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ - - cadence-jackmeter.exe: $(FILES) $(OBJS) icon.o -- $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@ -+ $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ - - # -------------------------------------------------------------- - -diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile -index 662a7af..b4aac04 100644 ---- a/c++/xycontroller/Makefile -+++ b/c++/xycontroller/Makefile -@@ -35,10 +35,10 @@ OBJS = xycontroller.o \ - all: cadence-xycontroller - - cadence-xycontroller: $(FILES) $(OBJS) -- $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@ -+ $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ - - cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o -- $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@ -+ $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ - - # -------------------------------------------------------------- - diff --git a/media-sound/cdstatus/Manifest b/media-sound/cdstatus/Manifest index a98dbe1acab9..451d5d472651 100644 --- a/media-sound/cdstatus/Manifest +++ b/media-sound/cdstatus/Manifest @@ -1,3 +1,5 @@ +AUX cdstatus-0.97.03-fno-common.patch 1943 BLAKE2B 21e563a4c1e3b7ba2a9af165879b4ba388f4de77423dc9c0921ce8fd6f00af5eb82b3a08846acca1620f842d4af50508ac9b0f12f798db23440de1bdd51b64d2 SHA512 475d2c1be54bdc78ee08c228313be4af4636d867ac56b533bf62b59a6a7193f3556962dd77e60d36ee2fa5aae6d85351dc5b17be291bd0ebfd4323ba6e61fb71 +AUX cdstatus-0.97.03-respect-user-CFLAGS.patch 276 BLAKE2B 8fdbaaf08ae8559c4a77bfe183a483c11e38f3f45c5ac7eec81981fe5de01a2539aa7926833b5ce5a9d4307668d8eba3c52ef21edc3017e19c2b89f24448a061 SHA512 03a43a04eb7a88e8ff5d386f3a65ea2a70df8bc46cbd84d57eb3df532ded8687c100d529315e895022a8021cff8bc9a47bf24a67bee5372369adc1ae0c71284a DIST cdstatus-0.97.03.tar.gz 115982 BLAKE2B 85c8f7383ec985896704b1fb4d77f6c7c2c1f8b84ae8914f675980f11cc558ed63b592d974387c5bc579ea2a0a6481e0a8b01ae46aac9a96ed3558e9f26a225a SHA512 d9819bfd40360b8796810d38b2c9f75c87a1256adc289d261e0cf56557170492eabc7fb0c4f7ee91c6303f24867ff4540962556edfdd8cf46b02df0236037177 -EBUILD cdstatus-0.97.03.ebuild 483 BLAKE2B ea1395e7d68a30ebfa5a85f52611dbb40a7f2693c55bf8ed2c4744881d6765d3a1b9df46a0dbb84c45985a98d5cbeb5d1dd92aec53b759c3f5cc448c77dd4c1e SHA512 5de9368aedb85cafbafefa1261b4e6cab8b604f486557fc7f60fca30d74769db3eff2ad2e69a8e28e2d91a4e42bab48d438e10b7b7bba1566616dd5d67b23617 +EBUILD cdstatus-0.97.03.ebuild 589 BLAKE2B bf31b41be734cc9a48d70df6c22fbdda225f9693877053abb1dcd6050e796ec53d40f9662b0b4e72c419132b98b9f762065b991cbfdad8448b8ed9758f549670 SHA512 e1ef7ccc12bb23d43a38c688f23a9ba8ed6bea16069fd72b63ae9845951413de660a4e700663780efab79a802356996e2b65247f556af60e3d4d018901cac745 MISC metadata.xml 331 BLAKE2B 5dcc2ceb66c009d882b35cca299c673cf3c74bc04bc2f1c8154fbc471324625436cc36a92703da315811b8082b4fb7e0c6f90a623845df2d42b2bb0394be23c7 SHA512 9f671ef16e9fc4800e4f4d1c003679332b467654a860ce36558c671208077e325116b8f9355c6888c38cedfc95a7ee226b720c8bf4ef9a8287facb21ab6ac5aa diff --git a/media-sound/cdstatus/cdstatus-0.97.03.ebuild b/media-sound/cdstatus/cdstatus-0.97.03.ebuild index e4ae820f71f7..5d7d361d54a8 100644 --- a/media-sound/cdstatus/cdstatus-0.97.03.ebuild +++ b/media-sound/cdstatus/cdstatus-0.97.03.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,11 @@ SRC_URI="mirror://sourceforge/cdstatus/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ppc64 x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-0.97.03-respect-user-CFLAGS.patch + "${FILESDIR}"/${PN}-0.97.03-fno-common.patch +) pkg_postinst() { elog "Copy cdstatus.cfg from /usr/share/cdstatus.cfg" diff --git a/media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch b/media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch new file mode 100644 index 000000000000..588a0e333848 --- /dev/null +++ b/media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch @@ -0,0 +1,73 @@ +--- a/src/cdstatus_cddb.c ++++ b/src/cdstatus_cddb.c +@@ -31,6 +31,12 @@ + #define DIE_CLEAN if(buffer) { free(buffer); } if(scratchbuffer) { free(scratchbuffer); } exit(EXIT_FAILURE); + #endif + ++char album_name[256]; ++int album_year; ++char artist_name[256]; ++char album_genre[128]; ++track_listing trackinfo[100]; ++unsigned int cddb_tracks; + + /** The system-provided error return code for system calls */ + extern int errno; +--- a/src/cdstatus_cddb.h ++++ b/src/cdstatus_cddb.h +@@ -24,21 +24,21 @@ + + /* Exported Globals (I hate globals, need to find another way to do this... */ + /** Holds album name for cd */ +-char album_name[256]; ++extern char album_name[256]; + + /** Holds album year for cd */ +-int album_year; ++extern int album_year; + + /** Holds artist name for cd */ +-char artist_name[256]; ++extern char artist_name[256]; + + /** Holds album genre for cd */ +-char album_genre[128]; ++extern char album_genre[128]; + + /** Holds cddb info for each track */ +-track_listing trackinfo[100]; ++extern track_listing trackinfo[100]; + + /** Number of tracks for which we have info */ +-unsigned int cddb_tracks; ++extern unsigned int cddb_tracks; + + #endif +--- a/src/cdstatus_output.c ++++ b/src/cdstatus_output.c +@@ -4,6 +4,10 @@ + + #include "cdstatus_output.h" + ++enum OUTPUT_PRIORITY current_priority; ++ ++char output_buffer[OUTPUT_BUFFSIZE]; ++ + void conditional_puts(enum OUTPUT_PRIORITY pri, const char * message) + { + if(pri >= current_priority) +--- a/src/cdstatus_output.h ++++ b/src/cdstatus_output.h +@@ -3,10 +3,10 @@ + #define CDSTATUS_OUTPUT_H + + enum OUTPUT_PRIORITY { VERBOSE_DEBUG, DEBUG, NORMAL, WARNING, CRITICAL }; +-enum OUTPUT_PRIORITY current_priority; ++extern enum OUTPUT_PRIORITY current_priority; + + #define OUTPUT_BUFFSIZE 512 +-char output_buffer[OUTPUT_BUFFSIZE]; ++extern char output_buffer[OUTPUT_BUFFSIZE]; + + void conditional_puts(enum OUTPUT_PRIORITY, const char *); + void conditional_perror(enum OUTPUT_PRIORITY, const char *); diff --git a/media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch b/media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch new file mode 100644 index 000000000000..d8fdb62d479f --- /dev/null +++ b/media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -154,7 +154,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = -O2 -funroll-loops -finline-functions ++AM_CFLAGS = + cdstatus_SOURCES = \ + args.h \ + basic_info.c \ diff --git a/media-sound/chordii/Manifest b/media-sound/chordii/Manifest index d30ccb92943c..96fe74330bce 100644 --- a/media-sound/chordii/Manifest +++ b/media-sound/chordii/Manifest @@ -1,7 +1,5 @@ -DIST chordii-4.5.1.tar.gz 156976 BLAKE2B adfffe19518b890c5c573a8450f8dc95ec66398da7b8dd1c01ef48e551fce85baf66b05fbd15c257c573e9545becde251314fc8023089a443c522455a3ee1ebd SHA512 92996893417cfecb3cc18db283f2f608721172540f1fbb9ea300a0235fa99228a89d2c65417e8ddee91453d4bc12190d1504039e9689ed28ca863546fa938088 +AUX chordii-4.5.3-fno-common.patch 604 BLAKE2B abc805abde8831fd1e3fc2690bdd5c7b06f4f38a9f74c65f34b97aad42e21e12914178a3606e5337d9f7423f76a4913fac3703105945ba42244d6684404140d2 SHA512 c69a725d74294f2c6b316b61557a3e2e6963dc4d801d5c7f04cb565be7da6c0d2d2aac821f5bc40b62b17b036902f99ad06d368639b70e32337c78f9c2233af7 DIST chordii-4.5.3.tar.gz 172983 BLAKE2B 70fc30ab00afca4d17e1948cfdc5fbb696e479f7510a832d42d9d60844fc435ada7da528cae02a02fab237c3410828ac72b05fb21a3ff787ca1b3baea38b9de6 SHA512 d877400e4b55cf7a4f9fd17a17d829fc9189ce1e79775ca67c94fbe9047c36bf5efbd947501814c797e54bed74d4abbc62c8609f75a79e14e9aed219cb7d9772 DIST user_guide-4.5.3.pdf 495972 BLAKE2B 2295305815432df57c77182b17e90699a9cb47878362d70eb8f7e97d16eb150467ee4f7244771bb61407b64421be618de8fc78c7f638420d629fa53d81f1e135 SHA512 0fa8ca45c8911368db82cd16ede757205d3ce776b2a21762644133867f47109a482fe3064506123c984317b02af8ec88a2ee81109c0ab86940499eeb35dd3bd1 -DIST user_guide-4.5.pdf 389353 BLAKE2B 4343e2be8e74bc1315705308367705e540d9e0f5a7751e247ceb1bfa342fc4f937a9aa61e2746d831aacf7bb3846e6e1fe144819df1e9857db85c8b510bfd0af SHA512 9ad15cf89ae6790f59d4a224367d1b5d8ffb0aec04f217875d9f31477751046e22ab7f90f798ce2347d7dc781bcdf1665323cd315ad1148d600d5e5bf27ee096 -EBUILD chordii-4.5.1.ebuild 565 BLAKE2B 2b0111549fd2c46c47b8cf25f0308697fdfdcacea474132594f8a7c94659b1bda0b0a2debd3ea7d1216a0db67d1cfaf5aeea8791b9660106f432da425f2d32aa SHA512 e54efa186886373a4d8f61f333d3a40981fe7890a0c8b0efc8fe8d2f2cfd40f2c5ab1c444992b330745ba615faa4fc740c3a079f2d2e006a8ed09f72f3c67c1e -EBUILD chordii-4.5.3.ebuild 569 BLAKE2B a0ec7b12e3de8734e171a6c199a75af7ae95044d1fdbf96749e8ee2211b40a31a0497113130c598052f311f9f88c3718a90c80e525fab46ce7567a17be58c53a SHA512 ac8438d90b8cbf9f7a3c1660b641981fd03ea90bf6b8be0b264fc1a6881c352c831cf3eb5eff1bdb53f3221be5db9a7d0b1668d7062e97ff463dd2390c4dbd9a +EBUILD chordii-4.5.3.ebuild 567 BLAKE2B a1ee7309a850cb12c82195bcc5a3642637a584f930bfbca1003f9b356b62223de82b9fe40f0ad2db36db1ab5069df0baa3acec351a5452215e1c8fb1af55492d SHA512 680bf5052ba3dac06e03dffdec700841e452354ea4c20ed173853d791d3ff62ebf1a682eb3c31c50386da6cd1e7f27c05f540483be14d772f3dc0822e8957cf7 MISC metadata.xml 1257 BLAKE2B a8a0bce702420c732f9e7f947292fcfbec131781537cdb091ea35a7f5a4c33526765cd2dc2750e28878da92ad968492e988aad332c7829f1d1190fe53d851526 SHA512 2761d63f4130afd75abb5717c1ab8571d2018cfc21b7635cc7b68f078992cc4bf6c13fed317f87c0bc9430c4370763d823c9f3248abef08e8a5f1c66aa76b160 diff --git a/media-sound/chordii/chordii-4.5.1.ebuild b/media-sound/chordii/chordii-4.5.1.ebuild deleted file mode 100644 index 303f9e0f67d4..000000000000 --- a/media-sound/chordii/chordii-4.5.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="A guitar music typesetter" -HOMEPAGE="http://chordii.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - doc? ( mirror://sourceforge/${PN}/user_guide-4.5.pdf )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples" - -src_install() { - default - - use doc && dodoc "${DISTDIR}"/user_guide-4.5.pdf - - if use examples ; then - docinto examples - dodoc examples/* - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/media-sound/chordii/chordii-4.5.3.ebuild b/media-sound/chordii/chordii-4.5.3.ebuild index 605ec52c35a4..1b9c9f3d7f9b 100644 --- a/media-sound/chordii/chordii-4.5.3.ebuild +++ b/media-sound/chordii/chordii-4.5.3.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="A guitar music typesetter" HOMEPAGE="http://chordii.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.gz doc? ( mirror://sourceforge/${PN}/user_guide-${PV}.pdf )" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc examples" +IUSE="doc" + +PATCHES=( "${FILESDIR}"/${PN}-4.5.3-fno-common.patch ) src_install() { default - use doc && dodoc "${DISTDIR}"/user_guide-${PV}.pdf + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples - if use examples ; then - docinto examples - dodoc examples/* - docompress -x /usr/share/doc/${PF}/examples - fi + use doc && dodoc "${DISTDIR}"/user_guide-${PV}.pdf } diff --git a/media-sound/chordii/files/chordii-4.5.3-fno-common.patch b/media-sound/chordii/files/chordii-4.5.3-fno-common.patch new file mode 100644 index 000000000000..914a532252cd --- /dev/null +++ b/media-sound/chordii/files/chordii-4.5.3-fno-common.patch @@ -0,0 +1,31 @@ +--- a/src/chordii.c ++++ b/src/chordii.c +@@ -19,6 +19,8 @@ + + static FILE *source_fd; + ++struct kcs dummy_kcs; ++ + char + text_line[MAXLINE], /* Lyrics Buffer */ + chord[MAXTOKEN], /* Buffer for the name of the chord */ +--- a/src/chordii.h ++++ b/src/chordii.h +@@ -67,7 +67,7 @@ + #define CHORD_EASY 0 + #define CHORD_HARD 1 + +-struct kcs { ++extern struct kcs { + struct kcs *next; + char chord_name[CHORD_NAME_SZ]; + int displ; +@@ -76,7 +76,7 @@ + int difficult; + } dummy_kcs; + +-struct chord_struct { ++typedef struct chord_struct { + struct chord_struct *next; + struct kcs *chord; + } dummy_chord_struct; diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest index fd5867cded77..b75e818e91ff 100644 --- a/media-sound/chuck/Manifest +++ b/media-sound/chuck/Manifest @@ -1,5 +1,7 @@ AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0 AUX chuck-1.4.0.0-makefile.patch 929 BLAKE2B 1bb70bc169faf5138b3e0d4b60c60366bc6e60a366f2eee3d18c3093b5f2d99e821e0fc948b6a79205500884b8babd12a6676d31c65435f37bf73dedbf5aec74 SHA512 4ceda974263f3a043f187f7d95aae7a16fc65936c7a687f6fa0003a51493caa6eebc8e932075a274373fd319a1c0fb329e1764fc756c4b1691c1dfd8443be836 DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1 +DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202 EBUILD chuck-1.4.0.0.ebuild 1865 BLAKE2B 4a083c5e4faf4b8130d33207188984123a72308367c55a08ff8dd3d922d3936b4357bb0198c58fe38189b54d5ecc0d8efc4c396c30f508b97cb82c7760001d95 SHA512 f7b47dad21f650d22db788e9016207ce77623b1a3a6dd1a11be8acf7b35d65fd54122bea2a08b8f6052a8d3fe1cc2160a9b2b96a7010f5687c5309ad72fcdb6b +EBUILD chuck-1.4.0.1.ebuild 1865 BLAKE2B 3f23893fdd7b75ce1ec7b0fa564e8458ebce4d0b57611e00b9cfd9a37f812687397f8a7eacc1fba74379bfb0e5a2d17d273d2cffc94a02000e5ef24a23c3f92e SHA512 540b2e1faa688eb089666eb2cf79a9bd762b4c165526da7388a5fcc25f1e56ea178044e3831d2d21a5fd3136c53d5a5c146978aec78b72a24b2f2ba5035c6f80 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0 diff --git a/media-sound/chuck/chuck-1.4.0.1.ebuild b/media-sound/chuck/chuck-1.4.0.1.ebuild new file mode 100644 index 000000000000..81fd7cd02477 --- /dev/null +++ b/media-sound/chuck/chuck-1.4.0.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language" +HOMEPAGE="http://chuck.cs.princeton.edu/" +SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa jack examples" +REQUIRED_USE="|| ( alsa jack )" + +RDEPEND="app-eselect/eselect-chuck + media-libs/libsndfile + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack )" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch + "${FILESDIR}"/${PN}-1.4.0.0-makefile.patch +) + +compile_backend() { + backend=$1 + pushd "${S}/src" &>/dev/null || die + einfo "Compiling against ${backend}" + emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend} + mv chuck{,-${backend}} || die + emake clean + popd &>/dev/null || die +} + +src_compile() { + # when compile with athlon or athlon-xp flags + # chuck crashes on removing a shred with a double free or corruption + # it happens in Chuck_VM_Stack::shutdown() on the line + # SAFE_DELETE_ARRAY( stack ); + replace-cpu-flags athlon athlon-xp i686 + + use jack && compile_backend jack + use alsa && compile_backend alsa +} + +src_install() { + use jack && dobin src/chuck-jack + use alsa && dobin src/chuck-alsa + + dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS + if use examples; then + docinto /usr/share/doc/${PF}/ + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Chuck now can use multiple audio engines, so you can specify" + elog "the preferred audio engine with chuck-{jack,alsa}" + elog "Or you can use 'eselect chuck' to set the audio engine" + fi + eselect chuck update --if-unset +} diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest index f48933056c91..7cab1667a53e 100644 --- a/media-sound/cmus/Manifest +++ b/media-sound/cmus/Manifest @@ -2,6 +2,6 @@ AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc -EBUILD cmus-2.8.0.ebuild 3797 BLAKE2B ceb65b1db920063aa000f09acbea20ef10df4817676dc045f860a964ba89439ca36dc290f8777c4c363f610b78470f5361bd2012bec818537dc5e3f9d574e6b2 SHA512 b78e94a29ee065dafd77b75a93d21b7d9396af53bb5f1e80c13ca205d9ae7d7c90d66b2d91c26f4e166d0d894507c1fc710d3d22b54cac71a8fbd7aee3d13c80 -EBUILD cmus-9999.ebuild 3678 BLAKE2B eed67a9821d2b4f2480c8f9601e5e33688a1b96d7f559f69a7d1c5632256f644250db70342588500e3956bae13767638f2e6a987a53010fe7df19014e2ae9c41 SHA512 2eadb49f7ac4c459219c38702fee9ec00dffe5e044aaa4c15645f462b1b4552e4dbd539dc84a2ca5ad50d38e1ae4041b4ef7356163e83c6beb8c4791ea8fce70 +EBUILD cmus-2.8.0.ebuild 3784 BLAKE2B edbbfe140b7c6adce8ae96a5e6d53db118ca7492f37388201fff09cfe0fd0acd56ec6e8adc90b3455a722c731dd0e7b301a4f975be60168928fbd427fb7f0620 SHA512 2357fdfe2a83b2f70bbfcb1debdd3ded1de6e4d0bafd28f414e241a54ff9dda3661c2c775c11bf76b05b129cb2b3d3cc72a6d17e1777dffcd22b6a47c59a5202 +EBUILD cmus-9999.ebuild 3665 BLAKE2B 89772a1e4c3881e11d82700c5b5db08f50dad18e45a9e1f3107b6b56ea76cef167313dc3b16175bdd50574725d5c902d5b0ea28f0cb61bca14da5096261eaa6e SHA512 0de2bc5ccd53eebba4576a7679a40f8afba4089768663477a6f5448fb2efd3cfb208c94fdbbe776c6273b93f2b87d9325f22f7e32dc5d5f6bdb33b638b870ade MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962 diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild index f16a68ffb6de..1cc9fb01d880 100644 --- a/media-sound/cmus/cmus-2.8.0.ebuild +++ b/media-sound/cmus/cmus-2.8.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" + KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Ncurses based music player with plugin support for many formats" diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild index cc2f6aee263b..dc3b1a64b34e 100644 --- a/media-sound/cmus/cmus-9999.ebuild +++ b/media-sound/cmus/cmus-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Ncurses based music player with plugin support for many formats" diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest index 80fc9649576f..e1254ee4058c 100644 --- a/media-sound/coquillo/Manifest +++ b/media-sound/coquillo/Manifest @@ -1,3 +1,3 @@ -DIST coquillo-2.0.0.tar.gz 76090 BLAKE2B 3c59c251b9658d32c07f136c9af16434d1f6c0e334fea0e1b645770ed5c31392faf0a8aa3529d460d3744e7949c549860a2818af6b12c573ebdafc3b78f01d01 SHA512 8432601a0b68e94f5e2a6b1e2bae0410fb4a6db5d0dc7140683c8e1f49df924f10ce97f36efe229785796cb34441ac7d3883865210067f031622db5359598765 -EBUILD coquillo-2.0.0.ebuild 739 BLAKE2B e2a623bbeca098192dcef7f6b49d903fbb7d85cd0d94f91ad2f7bb308caab10fbe7c4a6da528b8c06cd02c591f5934c233a05579f48675c3838b658fb8771449 SHA512 2b73794fe396abb7f01d0acf47fc9db31d953de8be67666c734bc4493aa7a2aa03810f73524b52d0aca75d05569f1a8bfa6487c3e032d6e0212dde0740f8d5fa +DIST coquillo-2.0.1.tar.gz 76376 BLAKE2B a2f4742eefb8e09203106aa57257ebed343371c3276cab5b49f277d8f9ffd0f5aa242ac9337341dfdb798213604790c3891b403cfe8589902956b365c0ddde2c SHA512 6aeeca674180038089d3f1104cfe9d8d662ed88a6168b20c18932c4329ccfa895508c2e593cab274b51251e2b6b45ca5482c2385ce0e0ddc2b5b1859ee8a3eb5 +EBUILD coquillo-2.0.1.ebuild 739 BLAKE2B e2a623bbeca098192dcef7f6b49d903fbb7d85cd0d94f91ad2f7bb308caab10fbe7c4a6da528b8c06cd02c591f5934c233a05579f48675c3838b658fb8771449 SHA512 2b73794fe396abb7f01d0acf47fc9db31d953de8be67666c734bc4493aa7a2aa03810f73524b52d0aca75d05569f1a8bfa6487c3e032d6e0212dde0740f8d5fa MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/media-sound/coquillo/coquillo-2.0.0.ebuild b/media-sound/coquillo/coquillo-2.0.1.ebuild index bf07ce9d9997..bf07ce9d9997 100644 --- a/media-sound/coquillo/coquillo-2.0.0.ebuild +++ b/media-sound/coquillo/coquillo-2.0.1.ebuild diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest index 1bb2fb771617..4e6b590ab5f1 100644 --- a/media-sound/csound/Manifest +++ b/media-sound/csound/Manifest @@ -1,12 +1,13 @@ AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a +AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153cec7d3f5923d14319eea02ad69d75277aaa75a06ad02bd23d2d24a9913f7bb9719456ef98c487e93091b841278 SHA512 2e71e5c46b78e8867257ee86e70072f3c2e7f6021e67d0a3381cbc8226cb7deb023b8ffc1d047628ec527da6fc383a55ce310402c5ecc2696ff36250ecf7081d AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1 -DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab SHA512 87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5 -DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82 SHA512 30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1 SHA512 638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35 SHA512 55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d -DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566 SHA512 b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40 +DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946 +DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0 DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251 SHA512 21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8 -EBUILD csound-6.13.0.ebuild 7310 BLAKE2B 95ff707d04e049346933503d1a4a1556b7a91ef0a9f8c3633989288249d5427d429ea7c79b6e4f741f8bd6ed97915c07bdcafe9c4994646a908acfe5c15ea67a SHA512 91da3b9efc6695c23bf2c4376baa91e317aa9ee129d3587643c80201c919a9b8f70dd031cea6e690fe62f13788c1981c3a0419a799277aa8373012a7bf921683 -EBUILD csound-6.14.0.ebuild 7350 BLAKE2B 320d965e7133965d0283cda1e9fae24a265c33837cd0299408e1a7a5f26dac1c6005a15aca2a13330f77ae61a8a9a5229dee60e6ffddc44f37dc1c551896e0fa SHA512 bf57349c2a62598a03098bf0e33d89dfb320cbab3adbfd8aec623b8c26df50b84c96aa69f2a255654a2f52c771a31ba4c744c00d6fa46e42accf0f52562b6a0c -EBUILD csound-9999.ebuild 7350 BLAKE2B 320d965e7133965d0283cda1e9fae24a265c33837cd0299408e1a7a5f26dac1c6005a15aca2a13330f77ae61a8a9a5229dee60e6ffddc44f37dc1c551896e0fa SHA512 bf57349c2a62598a03098bf0e33d89dfb320cbab3adbfd8aec623b8c26df50b84c96aa69f2a255654a2f52c771a31ba4c744c00d6fa46e42accf0f52562b6a0c +DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308 +EBUILD csound-6.14.0.ebuild 7348 BLAKE2B ce6e6ceaaece2796ce8ae758bc6638baf18df4429a04c6af949c42ddecb311166ae2fa004488ce8f0b1d46ce32e0ebbea9c351c6dbc22dbc8cab13ba5caca54f SHA512 f794e00b7b63ac98c98a49f1a88912c7a7ebd740b8d9d51f02c92060dbb0192d36f69a4aef1494a22dc8f72975273eb626ed68ff62600ef71a0eaa1dd9726302 +EBUILD csound-6.15.0.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1 +EBUILD csound-9999.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52 diff --git a/media-sound/csound/csound-6.14.0.ebuild b/media-sound/csound/csound-6.14.0.ebuild index f9db4411fa0f..389c8227528a 100644 --- a/media-sound/csound/csound-6.14.0.ebuild +++ b/media-sound/csound/csound-6.14.0.ebuild @@ -20,7 +20,7 @@ else https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip )" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Sound design and signal processing system for composition and performance" diff --git a/media-sound/csound/csound-6.13.0.ebuild b/media-sound/csound/csound-6.15.0.ebuild index e7d1d96b3f99..b52669444ab9 100644 --- a/media-sound/csound/csound-6.13.0.ebuild +++ b/media-sound/csound/csound-6.15.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # As upstream (and we aswell) are not allowed to redistribute scansyn, @@ -7,7 +7,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit cmake python-single-r1 toolchain-funcs if [[ ${PV} == "9999" ]]; then @@ -29,9 +29,8 @@ HOMEPAGE="https://csound.github.io/" LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )" SLOT="0" # java doesn't work atm as it needs to have some variables specified to work, see src_configure -# mp3 doesnt work as media-sound/lame does not install cmake file IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples -fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio +fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket" @@ -57,7 +56,6 @@ BDEPEND=" # https://github.com/csound/csound/issues/920 # currently not used deps due to some issues # java? ( virtual/jdk:* ) -# mp3? ( media-sound/lame ) CDEPEND=" dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 @@ -80,6 +78,7 @@ CDEPEND=" luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) + mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) @@ -103,7 +102,8 @@ fi RESTRICT="test" PATCHES=( - "${FILESDIR}/${P}-xdg-open.patch" + "${FILESDIR}/${PN}-6.13.0-xdg-open.patch" + "${FILESDIR}/${PN}-6.15.0-lame.patch" ) pkg_setup() { @@ -125,6 +125,7 @@ src_configure() { -DBUILD_BELA=OFF -DBUILD_BUCHLA_OPCODES=ON -DBUILD_CHUA_OPCODES=$(usex chua) + -DBUILD_COUNTER_OPCODES=ON -DBUILD_CSBEATS=$(usex beats) -DBUILD_CUDA_OPCODES=OFF -DBUILD_CXX_INTERFACE=$(usex cxx) @@ -136,10 +137,12 @@ src_configure() { -DBUILD_FRAMEBUFFER_OPCODES=ON -DBUILD_HDF5_OPCODES=$(usex hdf5) -DBUILD_IMAGE_OPCODES=$(usex image) + -DBUILD_INSTALLER=OFF -DBUILD_JACK_OPCODES=$(usex jack) -DBUILD_JAVA_INTERFACE=OFF -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear) -DBUILD_LUA_INTERFACE=$(usex lua) + -DBUILD_MP3OUT_OPCODE=$(usex mp3) -DBUILD_MULTI_CORE=$(usex threads) -DBUILD_OPENCL_OPCODES=OFF -DBUILD_OSC_OPCODES=$(usex osc) @@ -153,9 +156,9 @@ src_configure() { -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148 -DBUILD_SELECT_OPCODE=ON -DBUILD_SERIAL_OPCODES=ON + -DBUILD_SHARED_LIBS=ON -DBUILD_STACK_OPCODES=ON - -DBUILD_STATIC_LIBRARY=$(usex static-libs) - -DBUILD_STATIC_LIBRARY=$(usex test) + -DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test)) -DBUILD_STK_OPCODES=$(usex stk) -DBUILD_TESTS=$(usex test) -DBUILD_UTILITIES=$(usex utils) @@ -166,22 +169,23 @@ src_configure() { -DBUILD_WINSOUND=OFF -DFAIL_MISSING=ON - -DNEED_PORTTIME=OFF -DNEW_PARSER_DEBUG=$(usex debug) + -DREQUIRE_PTHREADS=$(usex threads) -DUSE_ALSA=$(usex alsa) - #-DUSE_ATOMIC_BUILTIN=ON + -DUSE_ATOMIC_BUILTIN=ON -DUSE_AUDIOUNIT=OFF # Apple specific - #-DUSE_COMPILER_OPTIMIZATIONS=ON + -DUSE_COMPILER_OPTIMIZATIONS=ON -DUSE_COREMIDI=OFF # Apple specific -DUSE_CURL=$(usex curl) -DUSE_DOUBLE=$(usex double-precision) -DUSE_FLTK=$(usex fltk) -DUSE_GETTEXT=$(usex nls) -DUSE_GIT_COMMIT=ON - _DUSE_IPMIDI=ON - -DUSE_LRINT=ON + -DUSE_IPMIDI=ON -DUSE_JACK=$(usex jack) + -DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF") + -DUSE_LRINT=ON -DUSE_PORTAUDIO=$(usex portaudio) -DUSE_PORTMIDI=$(usex portmidi) -DUSE_PULSEAUDIO=$(usex pulseaudio) @@ -219,11 +223,6 @@ src_configure() { -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)" ) - # this is needed, otherwise it sets LIBRARY INSTALL DIR: lib - [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=( - -DUSE_LIB64=ON - ) - cmake_src_configure } diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild index f9db4411fa0f..b52669444ab9 100644 --- a/media-sound/csound/csound-9999.ebuild +++ b/media-sound/csound/csound-9999.ebuild @@ -7,7 +7,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit cmake python-single-r1 toolchain-funcs if [[ ${PV} == "9999" ]]; then @@ -29,9 +29,8 @@ HOMEPAGE="https://csound.github.io/" LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )" SLOT="0" # java doesn't work atm as it needs to have some variables specified to work, see src_configure -# mp3 doesnt work as media-sound/lame does not install cmake file IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples -fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio +fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket" @@ -57,7 +56,6 @@ BDEPEND=" # https://github.com/csound/csound/issues/920 # currently not used deps due to some issues # java? ( virtual/jdk:* ) -# mp3? ( media-sound/lame ) CDEPEND=" dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 @@ -80,6 +78,7 @@ CDEPEND=" luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) + mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) @@ -104,6 +103,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-6.13.0-xdg-open.patch" + "${FILESDIR}/${PN}-6.15.0-lame.patch" ) pkg_setup() { @@ -125,6 +125,7 @@ src_configure() { -DBUILD_BELA=OFF -DBUILD_BUCHLA_OPCODES=ON -DBUILD_CHUA_OPCODES=$(usex chua) + -DBUILD_COUNTER_OPCODES=ON -DBUILD_CSBEATS=$(usex beats) -DBUILD_CUDA_OPCODES=OFF -DBUILD_CXX_INTERFACE=$(usex cxx) @@ -141,7 +142,7 @@ src_configure() { -DBUILD_JAVA_INTERFACE=OFF -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear) -DBUILD_LUA_INTERFACE=$(usex lua) - -DBUILD_MP3OUT_OPCODE=OFF + -DBUILD_MP3OUT_OPCODE=$(usex mp3) -DBUILD_MULTI_CORE=$(usex threads) -DBUILD_OPENCL_OPCODES=OFF -DBUILD_OSC_OPCODES=$(usex osc) @@ -155,6 +156,7 @@ src_configure() { -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148 -DBUILD_SELECT_OPCODE=ON -DBUILD_SERIAL_OPCODES=ON + -DBUILD_SHARED_LIBS=ON -DBUILD_STACK_OPCODES=ON -DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test)) -DBUILD_STK_OPCODES=$(usex stk) @@ -167,21 +169,22 @@ src_configure() { -DBUILD_WINSOUND=OFF -DFAIL_MISSING=ON - -DNEED_PORTTIME=OFF -DNEW_PARSER_DEBUG=$(usex debug) + -DREQUIRE_PTHREADS=$(usex threads) -DUSE_ALSA=$(usex alsa) - #-DUSE_ATOMIC_BUILTIN=ON + -DUSE_ATOMIC_BUILTIN=ON -DUSE_AUDIOUNIT=OFF # Apple specific - #-DUSE_COMPILER_OPTIMIZATIONS=ON + -DUSE_COMPILER_OPTIMIZATIONS=ON -DUSE_COREMIDI=OFF # Apple specific -DUSE_CURL=$(usex curl) -DUSE_DOUBLE=$(usex double-precision) -DUSE_FLTK=$(usex fltk) -DUSE_GETTEXT=$(usex nls) -DUSE_GIT_COMMIT=ON - _DUSE_IPMIDI=ON + -DUSE_IPMIDI=ON -DUSE_JACK=$(usex jack) + -DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF") -DUSE_LRINT=ON -DUSE_PORTAUDIO=$(usex portaudio) -DUSE_PORTMIDI=$(usex portmidi) @@ -220,11 +223,6 @@ src_configure() { -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)" ) - # this is needed, otherwise it sets LIBRARY INSTALL DIR: lib - [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=( - -DUSE_LIB64=ON - ) - cmake_src_configure } diff --git a/media-sound/csound/files/csound-6.15.0-lame.patch b/media-sound/csound/files/csound-6.15.0-lame.patch new file mode 100644 index 000000000000..800ec4fd0f46 --- /dev/null +++ b/media-sound/csound/files/csound-6.15.0-lame.patch @@ -0,0 +1,26 @@ +diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt +index af39138..ec48294 100644 +--- a/Opcodes/CMakeLists.txt ++++ b/Opcodes/CMakeLists.txt +@@ -41,7 +41,7 @@ check_include_file(wiiuse.h WIIUSE_H) + find_library(WIIUSE_LIB wiiuse) + check_include_file(p5glove.h P5GLOVE_H) + find_library(P5GLOVE_LIB p5glove) +-check_include_file(lame.h LAME_HEADER) ++check_include_file(lame/lame.h LAME_HEADER) + find_library(LAME_LIB mp3lame) + + ## OPCODE LIBS WITH NO EXTERNAL DEPENDENCIES ## +diff --git a/Opcodes/lame.c b/Opcodes/lame.c +index a951f47..0c1c3e6 100644 +--- a/Opcodes/lame.c ++++ b/Opcodes/lame.c +@@ -22,7 +22,7 @@ + */ + + #include "csdl.h" +-#include "lame.h" ++#include "lame/lame.h" + + typedef struct _mp3out { + OPDS h; diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest index df28655ea0ac..cf5abf17ffdb 100644 --- a/media-sound/cvoicecontrol/Manifest +++ b/media-sound/cvoicecontrol/Manifest @@ -1,5 +1,6 @@ -AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53 +AUX cvoicecontrol-0.9_alpha-automake.patch 1547 BLAKE2B 3353ad34c10078f49eecb4fa3e4e8e56db7fde7219219744aa97f0dea7ba6db1ed8ce1500e0431568c194c6e558799e6342cc19ed63e865d021d00c9ac19a124 SHA512 04dc49ca1d4643d06eb9dd08f591f363bd451883944beeacf2070904a70335ee40a5fde96d88187f12fbce29529aac3f69b41c2401a8188be03337f4ce55209b +AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 5403 BLAKE2B b9f010f8f005ab8a872dae734972ab5eb42e734a92b05ed3d5d467fb4695dd1db0e021e83042c813f379642bf7cc69fb51b753af1d51daeba47399d1e1a5b9d2 SHA512 89b9d6dcbddb2f67fe9fc8d19b64ccdc182898728819bda7c02960fe2f4f452169cc74ed7cab916bb07a616954cd60f7c28c8e1ea54cd883677a3b74881752a1 AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187 -EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 838 BLAKE2B ba19c65df0d3a7e4fb74a2d9467ec94a258d10b8d147d8c6d01ae491737ffce61a26fd78ff2c2b1a1f7a6d068a322a00896bdb4b6728d9fd7de978eb3208e46d SHA512 69b890eb0a16ddf8737e39d9fa1e419eaeab3ededb6bcd71e689fa964ac859e27037831bc7bba738783cdd4241f77a1efa9a9ead1b8d29b8f5f23a7e753fa18d +EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 701 BLAKE2B a64013c1868acbbc04a2ab27adae52667d7289858b9455f7114b4de477b32c31829fddcc8efa201e5a08c7be60ce1eaa667d874ead813ad108750035259070d3 SHA512 edfaf8639f867abe24ad810879248a2c6ebddd3ac5b8f50a6a57e9e9512e5479c1644f7e345c057e6f9dddeed2e7d764816bf9502a279ccd7bcedd67b301a674 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild index 0b0363c94bcb..a1d1238c92c2 100644 --- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild +++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild @@ -14,27 +14,20 @@ SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/${P}-gentoo-2.patch" - "${FILESDIR}/${P}-tinfo.patch" #647166 + "${FILESDIR}"/${P}-gentoo-2.patch + "${FILESDIR}"/${P}-tinfo.patch #64716 + # Handle documentation with HTML_DOCS instead + "${FILESDIR}"/${P}-automake.patch ) src_prepare() { default - # Handle documentation with dohtml instead. - sed \ - -e "s:SUBDIRS = docs:#SUBDIRS = docs:" \ - -i cvoicecontrol/Makefile.am || die - - eautoreconf #647166 - - sed \ - -e "s/install-data-am: install-data-local/install-data-am:/" \ - -i Makefile.in || die + mv configure.{in,ac} || die + eautoreconf } src_install() { diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch new file mode 100644 index 000000000000..e2d73cbc9846 --- /dev/null +++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch @@ -0,0 +1,33 @@ +--- a/cvoicecontrol/Makefile.am ++++ b/cvoicecontrol/Makefile.am +@@ -11,7 +11,7 @@ + model_editor_SOURCES = audio.c configuration.c keypressed.c mixer.c model.c ncurses_tools.c preprocess.c realfftf.c model_editor.c + model_editor_LDADD = -lm ${LIBNCURSES} + +-SUBDIRS = docs ++#SUBDIRS = docs + + EXTRA_DIST = audio.c audio.h bb_queue.c bb_queue.h configuration.c configuration.h keypressed.c keypressed.h microphone_config.c microphone_config.h mixer.c mixer.h model.c model.h model_editor.c model_editor.h ncurses_tools.c ncurses_tools.h preprocess.c preprocess.h queue.h realfftf.c realfftf.h score.c score.h semaphore.c semaphore.h cvoicecontrol.c cvoicecontrol.h + +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,19 +8,3 @@ + + ####### kdevelop will overwrite this part!!! (end)############ + AUTOMAKE_OPTIONS = foreign +- +-install-data-local: +- $(mkinstalldirs) $(prefix)/share/doc/cvoicecontrol +- $(INSTALL_DATA) AUTHORS $(prefix)/share/doc/cvoicecontrol/AUTHORS +- $(INSTALL_DATA) FAQ $(prefix)/share/doc/cvoicecontrol/FAQ +- $(INSTALL_DATA) BUGS $(prefix)/share/doc/cvoicecontrol/BUGS +- $(INSTALL_DATA) README $(prefix)/share/doc/cvoicecontrol/README +- $(INSTALL_DATA) COPYING $(prefix)/share/doc/cvoicecontrol/COPYING +- +-uninstall-local: +- -rm -f $(prefix)/share/doc/cvoicecontrol/AUTHORS +- -rm -f $(prefix)/share/doc/cvoicecontrol/FAQ +- -rm -f $(prefix)/share/doc/cvoicecontrol/BUGS +- -rm -f $(prefix)/share/doc/cvoicecontrol/README +- -rm -f $(prefix)/share/doc/cvoicecontrol/COPYING +- rmdir $(prefix)/share/doc/cvoicecontrol diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch index 7e1ae985b18d..2316e92ba96c 100644 --- a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch +++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch @@ -1,6 +1,40 @@ -diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c ---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c 2002-09-05 19:09:06.000000000 +0300 -+++ cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c 2007-07-29 23:35:33.000000000 +0300 +--- a/cvoicecontrol/audio.c ++++ b/cvoicecontrol/audio.c +@@ -32,6 +32,10 @@ + + int is_open = 0; + ++int fd_audio; ++char *dev_audio; ++signed short rec_level, stop_level, silence_level; ++ + /******************************************************************************** + * set name of audio device + ********************************************************************************/ +--- a/cvoicecontrol/audio.h ++++ b/cvoicecontrol/audio.h +@@ -31,8 +31,8 @@ + #define CONSECUTIVE_SPEECH_BLOCKS_THRESHOLD 3 + #define CONSECUTIVE_NONSPEECH_BLOCKS_THRESHOLD 5 + +-int fd_audio; +-char *dev_audio; ++extern int fd_audio; ++extern char *dev_audio; + + /******************************************************************************** + * For now, microphone input level is used to start and stop recording +@@ -43,7 +43,7 @@ + * silence_level average micro level of silence + ********************************************************************************/ + +-signed short rec_level, stop_level, silence_level; ++extern signed short rec_level, stop_level, silence_level; + + typedef struct + { +--- a/cvoicecontrol/cvoicecontrol.c ++++ b/cvoicecontrol/cvoicecontrol.c @@ -38,6 +38,8 @@ #include<sys/select.h> #endif @@ -10,9 +44,62 @@ diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol #include "cvoicecontrol.h" #include "model.h" -diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c ---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c 2000-02-19 14:08:47.000000000 +0200 -+++ cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c 2007-07-29 23:36:08.000000000 +0300 +@@ -53,6 +55,10 @@ + #include "mixer.h" + #include "preprocess.h" + ++int adjust_window_width; ++int sloppy_corner; ++float float_max; ++ + Model *model; /***** speaker model */ + + Queue queue1; /***** thread-safe queue used to hand data from 'recording' to 'preprocessing' */ +@@ -341,7 +347,7 @@ + * calculate euklidian distance of two feature vectors + ********************************************************************************/ + +-inline float euklid_distance(float *a, float *b) ++float euklid_distance(float *a, float *b) + { + float result = 0; /***** resulting distance */ + int i; +--- a/cvoicecontrol/cvoicecontrol.h ++++ b/cvoicecontrol/cvoicecontrol.h +@@ -66,7 +66,7 @@ + * + * Legend: w = adjust_window_width + */ +-int adjust_window_width; ++extern int adjust_window_width; + + /* + * strictly speaking, time-alignment in the DTW matrix starts +@@ -87,19 +87,19 @@ + * + * Legend: x = distance value, o = (infinity) + */ +-int sloppy_corner; ++extern int sloppy_corner; + + /***** + time alignment scores must stay below this value + otherwise the according samples are ignored in + the further evaluation process + *****/ +-float score_threshold; ++extern float score_threshold; + + /***** + a (very high) float value that is considered "infinity" + *****/ +-float float_max; ++extern float float_max; + + /***** these macros are used in the DTW warping function + to calculate the maximum/minimum of two or three +--- a/cvoicecontrol/microphone_config.c ++++ b/cvoicecontrol/microphone_config.c @@ -1099,8 +1099,6 @@ free(command); } @@ -22,9 +109,84 @@ diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecon } else /***** couldn't retrieve home directory -> store results in /tmp/ */ { -diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c ---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c 2000-02-12 18:05:24.000000000 +0200 -+++ cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c 2007-07-29 23:34:38.000000000 +0300 +--- a/cvoicecontrol/mixer.c ++++ b/cvoicecontrol/mixer.c +@@ -30,6 +30,9 @@ + + char *dev_mixer = NULL; + ++int mic_level; ++int igain_level; ++ + /******************************************************************************** + * set mixer device name + ********************************************************************************/ +--- a/cvoicecontrol/mixer.h ++++ b/cvoicecontrol/mixer.h +@@ -37,7 +37,7 @@ + #define MIXER_ERR -1 + #define MIXER_OK 1 + +-int mic_level; +-int igain_level; ++extern int mic_level; ++extern int igain_level; + + #endif +--- a/cvoicecontrol/preprocess.c ++++ b/cvoicecontrol/preprocess.c +@@ -23,6 +23,13 @@ + + int i,j; /***** counter variables */ + ++int filter_banks[17]; ++float power_spec[POWER_SPEC_SIZE]; ++float hamming_window[HAMMING_SIZE]; ++int do_mean_sub; ++float channel_mean[FEAT_VEC_SIZE]; ++float score_threshold; ++ + /******************************************************************************** + * initialize preprocessing s tuff + ********************************************************************************/ +--- a/cvoicecontrol/preprocess.h ++++ b/cvoicecontrol/preprocess.h +@@ -51,12 +51,12 @@ + /***** + used for reduction of short-time spectrum to mel scale coefficients + *****/ +-int filter_banks[17]; ++extern int filter_banks[17]; + + /***** + contains the power spectrum + *****/ +-float power_spec[POWER_SPEC_SIZE]; ++extern float power_spec[POWER_SPEC_SIZE]; + + /******************************************************************************** + * Hamming window width = 16ms ! (256 Frames) +@@ -68,15 +68,15 @@ + * to reduce the number of artefacts in the power spectrum + ********************************************************************************/ + +-float hamming_window[HAMMING_SIZE]; ++extern float hamming_window[HAMMING_SIZE]; + + /***** + The characteristics of the recording channel + This is substracted from each feature vector to reduce + channel effects + *****/ +-int do_mean_sub; +-float channel_mean[FEAT_VEC_SIZE]; ++extern int do_mean_sub; ++extern float channel_mean[FEAT_VEC_SIZE]; + + + int initPreprocess(); +--- a/cvoicecontrol/semaphore.c ++++ b/cvoicecontrol/semaphore.c @@ -26,6 +26,7 @@ ****************************************************************************/ diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest index 8d5101665fda..13e62833f156 100644 --- a/media-sound/darkice/Manifest +++ b/media-sound/darkice/Manifest @@ -1,6 +1,8 @@ AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc15dd3bfc322ff08d7eaf4d3405dfce796c0a5f7757f9658ff992d208b12bf0e1b7fa31d1763d75f4d2e24b079 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326 DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674 +DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754 -EBUILD darkice-1.3.ebuild 1258 BLAKE2B f45e5570b5b9fc147617602ff2fbccb43a672b813e48c7ca0a5d79e29d8ff4282e3ae8ac7dbe1da76719044ec2e9e474d0d955e50e9c36d05100cdc7a2c0872c SHA512 9af70f5938cda673d468edc24c5968b047e6b8d30134bb5a60c7ed32e080ce0553c5594d61b06a435b0838691afd8c26f8a7f04d000ab50eb411fcda551b36f8 +EBUILD darkice-1.3.ebuild 1257 BLAKE2B 027117e47505abf7c0433953abe71c25f1d2abe658501ee972f414bc9d80348e6b6e7c96e7d2a7f3d7149671db440db9146c320491ec25c7fc04393849b79e93 SHA512 0ea41c7ccb8ad071207fd1fc064abdb09f0ca4f2050e6807ee749fca0dae9ed302d0e7583776131fc2aa62003094877ad3868d024882ccf938f45c9dc2c2e883 +EBUILD darkice-1.4.ebuild 1277 BLAKE2B d5106bb22bd49f0561ffcac079d1ceafc96ece74ef2d96d9d7828d834e46df9bb54faa5677933a6e4baf9806d04079cf936aedc33fec236c4b217a26ab5db5c4 SHA512 bc8061f7ff7545b317af30ad76bd7910d4ed00a730adf1a8cb3cd7b77e4aa4b1908203b77a58be4266a478b7ba596c6fb1ee1aefe9abaad3bacf7b8dd2e39c20 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3 diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild index aba277257e7b..7965e18aaba3 100644 --- a/media-sound/darkice/darkice-1.3.ebuild +++ b/media-sound/darkice/darkice-1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc sparc ~x86" IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis" RDEPEND="aac? ( media-libs/faac ) diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild new file mode 100644 index 000000000000..0c54f4f70ac0 --- /dev/null +++ b/media-sound/darkice/darkice-1.4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A live audio streamer" +HOMEPAGE="http://www.darkice.org/" +SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis" + +RDEPEND="aac? ( media-libs/faac ) + aacplus? ( media-libs/libaacplus ) + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack ) + libsamplerate? ( media-libs/libsamplerate ) + mp3? ( media-sound/lame ) + opus? ( media-libs/opus ) + pulseaudio? ( media-sound/pulseaudio ) + twolame? ( media-sound/twolame ) + vorbis? ( media-libs/libvorbis )" +DEPEND="${RDEPEND}" + +REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis ) + || ( alsa jack pulseaudio )" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO ) + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_with aac faac) + $(use_with aacplus) + $(use_with alsa) + $(use_with jack) + $(use_with libsamplerate samplerate) + $(use_with mp3 lame) + $(use_with opus) + $(use_with pulseaudio) + $(use_with twolame) + $(use_with vorbis) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + einstalldocs +} diff --git a/media-sound/darksnow/Manifest b/media-sound/darksnow/Manifest index 2cf9ab4bf3cc..b126ac4033d0 100644 --- a/media-sound/darksnow/Manifest +++ b/media-sound/darksnow/Manifest @@ -1,4 +1,5 @@ AUX darksnow-0.7.1-Makefile.patch 2081 BLAKE2B 5564965d0458cd330295b34b202dc532acbf3fc50eabdca285bda04ec1facdb4710e295e7b853dfbba89cde110c740cf9f37fd85f8d50f2c50115f0b6a604e08 SHA512 6d9d9ae3922278e9aaa11452550302f31f6060ca9141266f4253784556deba9eeb1880401579b5c220051221458e0b359b208994fde57f7ba4a62404f0ce20b1 +AUX darksnow-0.7.1-fno-common.patch 9078 BLAKE2B 14dc4dccbaf81ea341b812f3787afab4f5fee2c204e77b0657740dd75dbc2ece780549b45d74ccd05b89d24524f229160362a97c6e6c0f3e7b49e2f2a5b038d8 SHA512 712bdc6397e922af0cce14279af67fcfe1b9ed2d2524f4b0ba6892df502c8d887ef50e91f1f09b79dfb124cc470ec96ed3788e420ea4c39f66b044da906094be DIST darksnow-0.7.1.tar.gz 78928 BLAKE2B cae99522f8ae32bbd2c05c73b70896e71b5805fd6bb4054be0e498af1a502e7039a46223aa03bd781cab082e63f4705d2fae688c6f8a698dbfc8fced056e2684 SHA512 0ea1ff9f085127185d47169df358d2940fa9e52c52408bbaaefdf517402ddcb37b2df8b8c65bb22c3493820b47a3b4a2571cc819e81c70718684e8c3c3fe77ae -EBUILD darksnow-0.7.1.ebuild 806 BLAKE2B 4377923c776ec96a76e25b2652428b73a7f930369a6a029cf268fd594d6ff4648ece77d927a4834289363b2731c80ce75ac31b46ab3cf7bf212f1d55050242b7 SHA512 3fcd31dd1b0d26a39dbe0fbdbe28902970d0f2b5de6183815c1c5476f1c206eb34c41b0aaa8f7e6db1bf8ce791e66a0355e12309458f81592f626238c3cfa62f +EBUILD darksnow-0.7.1.ebuild 767 BLAKE2B e7c9be347f216a3c0f416860e57deb05dd4099db2315574daa10824414e658f36a79698b3fda76d815a7bb226f5322fe0c9a4c774b25c62c67536fe7a76514c5 SHA512 a92ea936952b287eed75aa24c050c0886102817efa000b50b0604e587b81a2530ed47776dbb4b1e6f754d1e8f1204953b42a7f1c7659fefb4e513c94ab3bc0a5 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/darksnow/darksnow-0.7.1.ebuild b/media-sound/darksnow/darksnow-0.7.1.ebuild index 351b2bdbed15..1a877cebfda6 100644 --- a/media-sound/darksnow/darksnow-0.7.1.ebuild +++ b/media-sound/darksnow/darksnow-0.7.1.ebuild @@ -1,39 +1,37 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools eutils gnome2-utils +inherit autotools desktop xdg DESCRIPTION="Streaming GTK+ Front-End based on Darkice Ice Streamer" HOMEPAGE="http://darksnow.radiolivre.org" SRC_URI="http://darksnow.radiolivre.org/pacotes/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" PDEPEND=">=media-sound/darkice-1.2" RDEPEND=">=x11-libs/gtk+-2.14.0:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch + default + mv configure.{in,ac} || die eautoreconf } src_install() { - emake DESTDIR="${D}" install + default dodoc documentation/{CHANGES,CREDITS,README*} - make_desktop_entry ${PN} "DarkSnow" ${PN} -} - -pkg_postinst() { - gnome2_icon_cache_update -} -pkg_postrm() { - gnome2_icon_cache_update + make_desktop_entry ${PN} "DarkSnow" ${PN} } diff --git a/media-sound/darksnow/files/darksnow-0.7.1-fno-common.patch b/media-sound/darksnow/files/darksnow-0.7.1-fno-common.patch new file mode 100644 index 000000000000..5073237e5596 --- /dev/null +++ b/media-sound/darksnow/files/darksnow-0.7.1-fno-common.patch @@ -0,0 +1,350 @@ +--- a/darksnow.c ++++ b/darksnow.c +@@ -33,6 +33,118 @@ + + #ifndef __GLOBAL_H__ + #include "global.h" ++ ++void *shared_area; ++ ++int pid; ++ ++int darkice_fd; ++ ++char home[64]; ++char darksnow_cfg[64]; ++char darkice_cfg[64]; ++char darksnow_temp[64]; ++char show_detail; ++ ++GtkWidget *window; ++GtkWidget *button_start; ++GtkWidget *button_stop; ++GtkWidget *button_detail; ++GtkWidget *label_status; ++GtkWidget *table; ++ ++GtkWidget *dialog_about; ++ ++GtkWidget *dialog_darkdep; ++GtkWidget *label_darkdep; ++GtkWidget *button_darkdep; ++ ++GtkWidget *dialog_darkkill; ++GtkWidget *label_darkkill; ++GtkWidget *button_yes_darkkill; ++GtkWidget *button_no_darkkill; ++GtkWidget *button_cancel_darkkill; ++ ++GtkWidget *menu_bar; ++GtkWidget *menu_file; ++GtkWidget *menu_item_file; ++GtkWidget *menu_item_open; ++GtkWidget *menu_item_save; ++GtkWidget *menu_item_quit_nd; ++GtkWidget *menu_item_quit; ++GtkWidget *menu_help; ++GtkWidget *menu_item_help; ++GtkWidget *menu_item_about; ++GtkWidget *vbox; ++ ++GtkWidget *file_open; ++GtkWidget *file_save; ++GtkWidget *file_localdump; ++ ++GtkWidget *notebook; ++GtkWidget *label_notebook_server; ++GtkWidget *table_server; ++GtkWidget *label_notebook_audio; ++GtkWidget *table_audio; ++GtkWidget *label_notebook_description; ++GtkWidget *table_description; ++ ++GtkWidget *button_localdump; ++GtkWidget *entry_localdump; ++GtkWidget *checkbutton_adddate; ++GtkWidget *label_remotedump; ++GtkWidget *entry_remotedump; ++ ++GtkWidget *label_server; ++GtkWidget *entry_server; ++GtkWidget *label_port; ++GtkWidget *entry_port; ++GtkWidget *label_mountpoint; ++GtkWidget *entry_mountpoint; ++GtkWidget *label_pass; ++GtkWidget *entry_pass; ++GtkWidget *label_radioname; ++GtkWidget *entry_radioname; ++GtkWidget *label_description; ++GtkWidget *entry_description; ++GtkWidget *label_url; ++GtkWidget *entry_url; ++GtkWidget *label_genre; ++GtkWidget *entry_genre; ++ ++GtkWidget *label_icecast; ++GtkWidget *combo_icecast; ++GtkWidget *label_format; ++GtkWidget *combo_format; ++GtkWidget *label_bitrate; ++GtkWidget *combo_bitrate; ++GtkWidget *label_bitratemode; ++GtkWidget *combo_bitratemode; ++GtkWidget *label_samplerate; ++GtkWidget *combo_samplerate; ++GtkWidget *label_quality; ++GtkWidget *combo_quality; ++GtkWidget *label_bitspersample; ++GtkWidget *combo_bitspersample; ++GtkWidget *label_channel; ++GtkWidget *combo_channel; ++GtkWidget *label_buffersize; ++GtkWidget *combo_buffersize; ++GtkWidget *label_device; ++GtkWidget *combo_device; ++GtkWidget *label_public; ++GtkWidget *combo_public; ++GtkWidget *label_verbosity; ++GtkWidget *combo_verbosity; ++ ++GtkWidget *text; ++GtkTextBuffer *buffer; ++GtkTextTagTable *tag_table; ++GtkTextTag *tag; ++ ++GtkWidget *scroll_text; ++ ++GtkTooltip *tooltip; + #endif + + /* some defines */ +--- a/global.h ++++ b/global.h +@@ -24,131 +24,131 @@ + #endif + + /* shared area */ +-void *shared_area; ++extern void *shared_area; + + /* darkice execution child process pid */ +-int pid; ++extern int pid; + + /* file descriptor used by darkice output pipe */ +-int darkice_fd; ++extern int darkice_fd; + + /* the user home */ +-char home[64]; +-char darksnow_cfg[64]; +-char darkice_cfg[64]; +-char darksnow_temp[64]; +-char show_detail; ++extern char home[64]; ++extern char darksnow_cfg[64]; ++extern char darkice_cfg[64]; ++extern char darksnow_temp[64]; ++extern char show_detail; + + /* main window Widgets */ +-GtkWidget *window; +-GtkWidget *button_start; +-GtkWidget *button_stop; +-GtkWidget *button_detail; +-GtkWidget *label_status; +-GtkWidget *table; ++extern GtkWidget *window; ++extern GtkWidget *button_start; ++extern GtkWidget *button_stop; ++extern GtkWidget *button_detail; ++extern GtkWidget *label_status; ++extern GtkWidget *table; + + /* About Dialog box */ +-GtkWidget *dialog_about; ++extern GtkWidget *dialog_about; + + /* darkice not found dialog box */ +-GtkWidget *dialog_darkdep; +-GtkWidget *label_darkdep; +-GtkWidget *button_darkdep; ++extern GtkWidget *dialog_darkdep; ++extern GtkWidget *label_darkdep; ++extern GtkWidget *button_darkdep; + + /* "kill darkice?" dialog box */ +-GtkWidget *dialog_darkkill; +-GtkWidget *label_darkkill; +-GtkWidget *button_yes_darkkill; +-GtkWidget *button_no_darkkill; +-GtkWidget *button_cancel_darkkill; ++extern GtkWidget *dialog_darkkill; ++extern GtkWidget *label_darkkill; ++extern GtkWidget *button_yes_darkkill; ++extern GtkWidget *button_no_darkkill; ++extern GtkWidget *button_cancel_darkkill; + + /* menu stuff */ +-GtkWidget *menu_bar; +-GtkWidget *menu_file; +-GtkWidget *menu_item_file; +-GtkWidget *menu_item_open; +-GtkWidget *menu_item_save; +-GtkWidget *menu_item_quit_nd; +-GtkWidget *menu_item_quit; +-GtkWidget *menu_help; +-GtkWidget *menu_item_help; +-GtkWidget *menu_item_about; +-GtkWidget *vbox; ++extern GtkWidget *menu_bar; ++extern GtkWidget *menu_file; ++extern GtkWidget *menu_item_file; ++extern GtkWidget *menu_item_open; ++extern GtkWidget *menu_item_save; ++extern GtkWidget *menu_item_quit_nd; ++extern GtkWidget *menu_item_quit; ++extern GtkWidget *menu_help; ++extern GtkWidget *menu_item_help; ++extern GtkWidget *menu_item_about; ++extern GtkWidget *vbox; + + /* open and save file selectors */ +-GtkWidget *file_open; +-GtkWidget *file_save; +-GtkWidget *file_localdump; ++extern GtkWidget *file_open; ++extern GtkWidget *file_save; ++extern GtkWidget *file_localdump; + + /* notebook stuff */ +-GtkWidget *notebook; +-GtkWidget *label_notebook_server; +-GtkWidget *table_server; +-GtkWidget *label_notebook_audio; +-GtkWidget *table_audio; +-GtkWidget *label_notebook_description; +-GtkWidget *table_description; ++extern GtkWidget *notebook; ++extern GtkWidget *label_notebook_server; ++extern GtkWidget *table_server; ++extern GtkWidget *label_notebook_audio; ++extern GtkWidget *table_audio; ++extern GtkWidget *label_notebook_description; ++extern GtkWidget *table_description; + + /* darksnow configuration stuff - button + entry */ + +-GtkWidget *button_localdump; +-GtkWidget *entry_localdump; +-GtkWidget *checkbutton_adddate; +-GtkWidget *label_remotedump; +-GtkWidget *entry_remotedump; ++extern GtkWidget *button_localdump; ++extern GtkWidget *entry_localdump; ++extern GtkWidget *checkbutton_adddate; ++extern GtkWidget *label_remotedump; ++extern GtkWidget *entry_remotedump; + + /* darksnow configuration stuff - label + entry */ +-GtkWidget *label_server; +-GtkWidget *entry_server; +-GtkWidget *label_port; +-GtkWidget *entry_port; +-GtkWidget *label_mountpoint; +-GtkWidget *entry_mountpoint; +-GtkWidget *label_pass; +-GtkWidget *entry_pass; +-GtkWidget *label_radioname; +-GtkWidget *entry_radioname; +-GtkWidget *label_description; +-GtkWidget *entry_description; +-GtkWidget *label_url; +-GtkWidget *entry_url; +-GtkWidget *label_genre; +-GtkWidget *entry_genre; ++extern GtkWidget *label_server; ++extern GtkWidget *entry_server; ++extern GtkWidget *label_port; ++extern GtkWidget *entry_port; ++extern GtkWidget *label_mountpoint; ++extern GtkWidget *entry_mountpoint; ++extern GtkWidget *label_pass; ++extern GtkWidget *entry_pass; ++extern GtkWidget *label_radioname; ++extern GtkWidget *entry_radioname; ++extern GtkWidget *label_description; ++extern GtkWidget *entry_description; ++extern GtkWidget *label_url; ++extern GtkWidget *entry_url; ++extern GtkWidget *label_genre; ++extern GtkWidget *entry_genre; + + /* darksnow configuration stuff - label + combo box */ +-GtkWidget *label_icecast; +-GtkWidget *combo_icecast; +-GtkWidget *label_format; +-GtkWidget *combo_format; +-GtkWidget *label_bitrate; +-GtkWidget *combo_bitrate; +-GtkWidget *label_bitratemode; +-GtkWidget *combo_bitratemode; +-GtkWidget *label_samplerate; +-GtkWidget *combo_samplerate; +-GtkWidget *label_quality; +-GtkWidget *combo_quality; +-GtkWidget *label_bitspersample; +-GtkWidget *combo_bitspersample; +-GtkWidget *label_channel; +-GtkWidget *combo_channel; +-GtkWidget *label_buffersize; +-GtkWidget *combo_buffersize; +-GtkWidget *label_device; +-GtkWidget *combo_device; +-GtkWidget *label_public; +-GtkWidget *combo_public; +-GtkWidget *label_verbosity; +-GtkWidget *combo_verbosity; ++extern GtkWidget *label_icecast; ++extern GtkWidget *combo_icecast; ++extern GtkWidget *label_format; ++extern GtkWidget *combo_format; ++extern GtkWidget *label_bitrate; ++extern GtkWidget *combo_bitrate; ++extern GtkWidget *label_bitratemode; ++extern GtkWidget *combo_bitratemode; ++extern GtkWidget *label_samplerate; ++extern GtkWidget *combo_samplerate; ++extern GtkWidget *label_quality; ++extern GtkWidget *combo_quality; ++extern GtkWidget *label_bitspersample; ++extern GtkWidget *combo_bitspersample; ++extern GtkWidget *label_channel; ++extern GtkWidget *combo_channel; ++extern GtkWidget *label_buffersize; ++extern GtkWidget *combo_buffersize; ++extern GtkWidget *label_device; ++extern GtkWidget *combo_device; ++extern GtkWidget *label_public; ++extern GtkWidget *combo_public; ++extern GtkWidget *label_verbosity; ++extern GtkWidget *combo_verbosity; + + /* text view stuff */ +-GtkWidget *text; +-GtkTextBuffer *buffer; +-GtkTextTagTable *tag_table; +-GtkTextTag *tag; ++extern GtkWidget *text; ++extern GtkTextBuffer *buffer; ++extern GtkTextTagTable *tag_table; ++extern GtkTextTag *tag; + + /* text view has to scroll */ +-GtkWidget *scroll_text; ++extern GtkWidget *scroll_text; + + /* The GTK ToolTips */ +-GtkTooltip *tooltip; ++extern GtkTooltip *tooltip; diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest index 5d021eae2030..6dcdbb3f77e0 100644 --- a/media-sound/din/Manifest +++ b/media-sound/din/Manifest @@ -1,5 +1,5 @@ AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f -AUX din-44.0.2-makefile.patch 590 BLAKE2B 6fedfe655ae6a977da3b94d4e7ec9863ea679860a23f6bc7dacfc7e9099a63c9cf0f7b264e13544ea13b2ec491a0b561fe757dc67f40ac373fecda6c3a76ff2a SHA512 30ac7595fe33a8ce3b32df857f610719ff55fa97a8f3fbb90cffa17cdbddcdf4f90e282ec1e5619440301ac34c0474c28ec891a71c169772d9d0fe6bf36e6e74 -DIST din-44.0.2.tar.gz 3652445 BLAKE2B 2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c SHA512 a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8 -EBUILD din-44.0.2.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510 +AUX din-47.1-makefile.patch 588 BLAKE2B 5afba801148decc167b4d7bf50ce1b0e770f37d6f85806b151a35958b43749ce7f7a3fd70fbd5028e2d301737011bdcf2fa9f58c7c91ef34f7859bb4071ec1d3 SHA512 d19c72a72b2e3d081e12eb46114a3176b4ea497687df1d017e8c4ba8f1a7a049df169384f4345b45d97688544c7dace2ccc339aa9f64d65ae90657d73a271fdd +DIST din-47.1.tar.gz 3667502 BLAKE2B 21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786 SHA512 883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17 +EBUILD din-47.1.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 diff --git a/media-sound/din/din-44.0.2.ebuild b/media-sound/din/din-47.1.ebuild index a67d55f2e191..a67d55f2e191 100644 --- a/media-sound/din/din-44.0.2.ebuild +++ b/media-sound/din/din-47.1.ebuild diff --git a/media-sound/din/files/din-44.0.2-makefile.patch b/media-sound/din/files/din-47.1-makefile.patch index c8f60c2210ec..62e7229f0f50 100644 --- a/media-sound/din/files/din-44.0.2-makefile.patch +++ b/media-sound/din/files/din-47.1-makefile.patch @@ -1,11 +1,11 @@ diff --git a/src/Makefile.am b/src/Makefile.am -index 0e614a4..f9699d0 100644 +index b24e856..a624610 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ --AM_CXXFLAGS = -I ../include -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" +-AM_CXXFLAGS = -I ../include -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" -LIBS += -ltcl8.6 -lSDL -lGL -lpthread -lasound -+AM_CXXFLAGS = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" ++AM_CXXFLAGS = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" +LIBS += -ltcl -lSDL -lGL -lpthread -lasound AM_CFLAGS = -I ../include diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest index 960f2f04272a..be8422386f61 100644 --- a/media-sound/dir2ogg/Manifest +++ b/media-sound/dir2ogg/Manifest @@ -1,5 +1,3 @@ -DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17a6038fc676557c8b15bed3662f851b87414b9318be154cdadd450001ea45bd8ed6103cffb2ee183511fe617 SHA512 bd76ba168b6e5305e4e5cfd87333200ec72a1d6e7055e966e1544abc842b39743b479b80c63382e10e85eebad92e97ec33e6fe52b0ace2df024ed50468e3946e DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054 -EBUILD dir2ogg-0.12-r1.ebuild 1203 BLAKE2B c9bb4c7f19debf5df3596a25a2e1ddee88953e4da4922602479974bc8cb9b9dd98b08316d6977c0109353f3cd095cdb05b6135700cd6557079a33e97930975b1 SHA512 d74ec08611f7f191bc23d1ecb7888cba382452f021a8cd82e09ce9e851faecbec4b74e708700f917efe6c13f743726fcd15e353dfddcc101014cfe4cb4febc31 -EBUILD dir2ogg-0.13-r1.ebuild 1212 BLAKE2B cdde97feefa67efc9b7eaee724d3671cb378c24db63fa5b68180042d8f873127ad9182921f8d6b50a7a7e7d659fb65d0653541e282f1f444c1cfa7d3e7a9ebb6 SHA512 adfb89aeee4d5e14ed92b30f70077ff12a78aa09a2cd2b69727473ca0248a85503ac9408b918115ef80fda98e013ea5e13e8c6a6cbec058579e415cb877bbaa8 -MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074 +EBUILD dir2ogg-0.13-r1.ebuild 1209 BLAKE2B e89ad722fbc7be69163d5a400715d46b29fae90fa6022a290e028fe97146c49a6c30cba94eeaf89b2c474231d1ac045bc9a9c6e1c25b104409f6a7a9d88bb0c7 SHA512 46a038499ea2b8cd1d863a4956a9074390787de35c5f9679840c8752beca84f80477ef69a3ea76ded2767f9d09836fc50473ec66ffa583737d5cd99d2e799bb1 +MISC metadata.xml 445 BLAKE2B 4c9df40d55c76b73a306d4545da2f0f9a96eec30eb595f7c3646473ea19d487d3e493f9993a201a49710e6b636a58a7689d32a0bf8d0c9b3e305b3084fbc3438 SHA512 4f334533b08adb0b5e100b7facd73dc45e358f4d22739b26e897ff8fd899f07dba1f1d2b27acf3443b72c0306b644334ea392edc5fb2139252cccf253aa28f9c diff --git a/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild deleted file mode 100644 index a25556207b96..000000000000 --- a/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -MY_PR=$(ver_cut 1-2) -DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format" -HOMEPAGE="https://jak-linux.org/projects/dir2ogg/" -SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" -IUSE="aac flac mac mp3 musepack wavpack wma" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - >=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}] - ') - media-sound/vorbis-tools[ogg123] - aac? ( || ( - media-libs/faad2 - media-video/mplayer ) ) - flac? ( || ( - media-libs/flac - media-video/mplayer ) ) - mac? ( || ( - media-sound/mac - media-video/mplayer ) ) - mp3? ( || ( - media-sound/mpg123 - media-sound/lame - media-video/mplayer - media-sound/mpg321 ) ) - musepack? ( || ( - >=media-sound/musepack-tools-444 - media-video/mplayer ) ) - wavpack? ( || ( - media-sound/wavpack - media-video/mplayer ) ) - wma? ( media-video/mplayer )" - -src_install() { - python_doscript dir2ogg - doman dir2ogg.1 - einstalldocs -} diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild index 2ebce1e4d05d..d20c747e08d1 100644 --- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild +++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc sparc x86" IUSE="aac flac mac mp3 musepack wavpack wma" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/media-sound/dir2ogg/metadata.xml b/media-sound/dir2ogg/metadata.xml index 46aecfa8ee87..c64e4b75686a 100644 --- a/media-sound/dir2ogg/metadata.xml +++ b/media-sound/dir2ogg/metadata.xml @@ -5,6 +5,7 @@ <email>sound@gentoo.org</email> <name>Gentoo Sound project</name> </maintainer> + <stabilize-allarches/> <use> <flag name="mac">Add support for decoding Monkey's Audio files</flag> <flag name="wma">Add support for wma files through mplayer</flag> diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest index 0e58e6d7d911..8bcdcb0345e7 100644 --- a/media-sound/ecasound/Manifest +++ b/media-sound/ecasound/Manifest @@ -1,7 +1,10 @@ AUX ecasound-2.8.1-ldflags.patch 2560 BLAKE2B 04c7c17b44385839a3b9dd5da0bad9306fd2e3029f74772be1d7792255cbfac36e8618c2b2880a45d72b1d57ea69040f1081f7a078a231efe285abef5cdbb3c0 SHA512 b5ecf1fc1de2e9f3087b2994f93841592e381bb38edfea33344e171cccdb9cdd70c010c2194e65eb6ef34d11b76f0a709efd175b44c7da65ff36bfeabf3d2c29 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54 +AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033 +DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140 EBUILD ecasound-2.6.0-r1.ebuild 1727 BLAKE2B cb86bb09597a3acc6a6417234ff3acd299eb009ca00c57d0b8dbf617a6460d741df22d2f6ba9b8522ebe083ad6b5eb392f30f2bef0a8d5e6c00dbbd34f86e92d SHA512 decedce6d807ca441b8e70f0e5f24f0f60af1ecf66fc5883866fb2fb167b7e4d044d174d05f26c5abb4ce3e1ff8ba9a105a56be58099ac8f9af66483d92eeb2e EBUILD ecasound-2.9.1-r1.ebuild 2353 BLAKE2B d62833522dd8205e39637639dd10264b335a04cb506e3d5aaa0e0796be89e505dd2ea742d260868319f6c0d72a04a5d2fc469e8a61088cbd5409a1ef6719bcc9 SHA512 bac3979385c2a41d64ead2b62f317a262d03945bc68d7b082e2d8bd5d0a4826eb68a756c819eddd8b04d27cd2a64030adf5ac65c0743499e70ed36cf065e0fbc +EBUILD ecasound-2.9.3.ebuild 2362 BLAKE2B eb2e89aa65b5b1ccd19a282657d66fdd6d410c04a8d1d1321533e9c72466df6e0894637849d21a45abe496c1d21482aae69ab70d3e039bdcc649aab21bee8d2d SHA512 8be6f0280687934b1efbf85d9ecf69508a0e9fef09120db9af29f52a2d262eb2fff210ed6aa22d2cb4e1b42a7230b566171f501a72e7bd676922d31fd7f71fab MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c diff --git a/media-sound/ecasound/ecasound-2.9.3.ebuild b/media-sound/ecasound/ecasound-2.9.3.ebuild new file mode 100644 index 000000000000..1187b27286c8 --- /dev/null +++ b/media-sound/ecasound/ecasound-2.9.3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit autotools eutils python-single-r1 + +DESCRIPTION="a package for multitrack audio processing" +HOMEPAGE="https://ecasound.seul.org/ecasound/" +SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss +python ruby sndfile static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( lv2 ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="sys-libs/readline:0= + alsa? ( media-libs/alsa-lib:= ) + audiofile? ( media-libs/audiofile:= ) + jack? ( virtual/jack:= ) + libsamplerate? ( media-libs/libsamplerate:= ) + lv2? ( >=media-libs/lilv-0.5.0:= ) + media-libs/ladspa-sdk + mikmod? ( media-libs/libmikmod:0= ) + ncurses? ( sys-libs/ncurses:0= ) + oil? ( dev-libs/liboil:= ) + osc? ( media-libs/liblo:= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( dev-lang/ruby:* ) + sndfile? ( media-libs/libsndfile:= )" +DEPEND="${RDEPEND} + virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${PN}-2.9.1-tinfo.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + +# if use python ; then +# sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \ +# pyecasound/Makefile.am || die "sed failed" +# fi + + eautoreconf +} + +src_configure() { + local pyconf=() + + if use python ; then + pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" ) + fi + + econf \ + --disable-arts \ + --enable-shared \ + --enable-sys-readline \ + --with-largefile \ + $(use_enable alsa) \ + $(use_enable audiofile) \ + $(use_enable debug) \ + $(use_enable jack) \ + $(use_enable libsamplerate) \ + $(use_enable lv2 liblilv) \ + $(use_enable ncurses) \ + $(use_enable oil liboil) \ + $(use_enable osc liblo) \ + $(use_enable oss) \ + $(use_enable python pyecasound) \ + $(use_enable ruby rubyecasound) \ + $(use_enable sndfile) \ + $(use_enable static-libs static) \ + "${pyconf[@]}" +} + +src_install() { + default + use python && python_optimize + + if use doc ; then + dodoc Documentation/*.html + dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt + fi + + find "${ED}" -name "*.la" -delete +} diff --git a/media-sound/ecasound/files/ecasound-2.9.3-ldflags.patch b/media-sound/ecasound/files/ecasound-2.9.3-ldflags.patch new file mode 100644 index 000000000000..86011507fd7b --- /dev/null +++ b/media-sound/ecasound/files/ecasound-2.9.3-ldflags.patch @@ -0,0 +1,61 @@ +diff --git a/kvutils/Makefile.am b/kvutils/Makefile.am +index ed2bc03..f12a01a 100644 +--- a/kvutils/Makefile.am ++++ b/kvutils/Makefile.am +@@ -56,13 +56,12 @@ kvutil_headers = kvu_dbc.h \ + kvu_value_queue.h + + libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers) +-libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static ++libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ + + libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES) + libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS) + + libkvutils_tester_SOURCES = libkvutils_tester.cpp +-libkvutils_tester_LDFLAGS = -static + libkvutils_tester_LDADD = $(lib_LTLIBRARIES) + + noinst_HEADERS = $(kvutil_headers) +diff --git a/libecasound/Makefile.am b/libecasound/Makefile.am +index 87203cf..dca62bc 100644 +--- a/libecasound/Makefile.am ++++ b/libecasound/Makefile.am +@@ -368,7 +368,7 @@ libecasound_tester_src = \ + + libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src) + libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src) +-libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static ++libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) + libecasound_la_LIBADD = $(eca_libadd) + libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS) + libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD) +diff --git a/libecasound/plugins/Makefile.am b/libecasound/plugins/Makefile.am +index 4ea5a92..80a3093 100644 +--- a/libecasound/plugins/Makefile.am ++++ b/libecasound/plugins/Makefile.am +@@ -105,7 +105,7 @@ plugin_all_sources = $(all_af_src) \ + libecasound_plugins_la_SOURCES = audioio_dummy.cpp $(plugin_cond_sources) + EXTRA_libecasound_plugins_la_SOURCES = $(plugin_all_sources) + libecasound_plugins_la_LIBADD = $(ECA_S_EXTRA_LIBS) +-libecasound_plugins_la_LDFLAGS = -static ++libecasound_plugins_la_LDFLAGS = + + libecasound_plugins_debug_la_SOURCES = $(libecasound_plugins_la_SOURCES) + EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES) +diff --git a/libecasoundc/Makefile.am b/libecasoundc/Makefile.am +index 74ba20c..0f4527e 100644 +--- a/libecasoundc/Makefile.am ++++ b/libecasoundc/Makefile.am +@@ -14,9 +14,9 @@ AUTOMAKE_OPTIONS = foreign + # !!! + # remember to update eca-version.cpp + if ECA_AM_DEBUG_MODE +-eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static ++eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ + else +-eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static ++eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ + endif + + AM_CPPFLAGS = -I$(srcdir) diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest index 11b97a36cfca..db242b36ced8 100644 --- a/media-sound/elisa/Manifest +++ b/media-sound/elisa/Manifest @@ -1,5 +1,5 @@ -DIST elisa-19.12.3.tar.xz 1388096 BLAKE2B fc522daa74d1517f878b23d8162a21bd22cddb17d7f4f6917b8668d444685996dae9861263289086e093a88bb5526c7dc70ee031bd342705fc6305ec0e8cd84e SHA512 6eb2292e9f50139956ab77f85f566692b0223487d6e365f223d72ccfad7d9029b64dcd75d36f6888d011850eebea240e50b60e5895d9b92cff6886c51b3e1b94 -DIST elisa-20.04.2.tar.xz 1407692 BLAKE2B 78fa7737cd9a122db8f9477dde8af90fbe7e6de172fc77c60fa4d107b4956ab8584d04ac207fec1f97606e9f7d84fe0f5c4f388fb8b35810882c5f33241d35f1 SHA512 827330fc7df00975d85050ffc9cfffac2db4e8a3d63c33cf6b7e68a4a2a2bcf9cb905a68823dc952fcfe6ed51ae5cebfdc92ccb68f2d8e0934e4c094fb6c9d5c -EBUILD elisa-19.12.3.ebuild 1623 BLAKE2B 4b86451aec4bc1d4b89eee833888e10bfe61c29853abbaab9b59464d1a5ac12ef542312ff16a8a36ac42c09974392d163e54b63bdc5dcff218264af880238af5 SHA512 6fa420a0eaf783a60c27f18d39c3b2f9732a221a161cd620096672c2937aa0b88c530a02bf5f3d12081c2668673fda527856d3f6d9412e811b6d6176055d16f1 -EBUILD elisa-20.04.2.ebuild 1679 BLAKE2B b3e1d82d62156ca8e2dabc9bcbb1ddd86ddcb6e3e1eb46c32eb75b4f0d9ce385da0dde2db6968966d25e11f8db12a9801c471135aeb73ac37340ce8fd351aebe SHA512 fa158a9ee72efc082b9a37e952a95082612a8685a6ab3b835d5ced43033d0112604ebe0abbfc8050e19d5f56475e96c9a2cad246aa9aae917ee6cee8d52807d0 +DIST elisa-20.04.3.tar.xz 1409336 BLAKE2B a1432294cb46562145ecb6f41b07a8a1ae352abffd40253670ef17b79e27b221b2589bf14934a7ce4e0001f90e84a0889a1b0c4dd069101e2e614f1fc51a20cc SHA512 00afa92eaab736f5f38759a3076b9f579ee3f5fce84404042a73e11cdfe0e004b32a83f9e542ca6d0a962d66bcb3fcce9d12fc5dbdd8f937d9d4cea9321687b4 +DIST elisa-20.08.0.tar.xz 1634132 BLAKE2B bd2286863376e9a376d160663a54b49f1c66bcc4078d9fef3da6672352e45c82bb173e86e04410eb8866f949bf754c14377de1e705c80c56591f6515c1cf5874 SHA512 e4f7352c00199ba0780199a5c7f72ea4f7954bae575dc6fce9786f8957053b34d08877a82c3888495ad4915668c494ddd1388e8fd4173f5e805e229ae7541d62 +EBUILD elisa-20.04.3.ebuild 1677 BLAKE2B 416386698e6beed682083a764e8e93c42ba8f8cefe726009f4772e179dff413a6e9b79b431391216bda5821b7ab42cb3ddde7fc0cd02d4d61fdde66e8214bcc6 SHA512 0e2c57bafd58f7d15a8aa48feb1aff042390a7fb62a6b0704aea1db3fd2e39f4c9852eb3992d391a6562bc824f94db9a41bf06542856c6ea551a3fef18cdadfc +EBUILD elisa-20.08.0.ebuild 1689 BLAKE2B 610f4e537a77f4a57bc182e0be48fb730ddc2327e3e8dc5d7907f62507ecb3228411d7efc73ef69081935ff1c453ee36282147287c5164c546df8ee2649bf337 SHA512 4c045967e2dccd96f2fca0ff2cc104daecfc8ffe988167fe7a86912e33216696c9c796069c2fee71a59bea0e5c1eb5933990485fc8d6cf3a67d5f56a7d3f5519 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca diff --git a/media-sound/elisa/elisa-20.04.2.ebuild b/media-sound/elisa/elisa-20.04.3.ebuild index 20074d13c643..4f1b4d807e97 100644 --- a/media-sound/elisa/elisa-20.04.2.ebuild +++ b/media-sound/elisa/elisa-20.04.3.ebuild @@ -7,7 +7,7 @@ ECM_HANDBOOK="optional" ECM_TEST="forceoptional" KDE_RELEASE_SERVICE="true" KFMIN=5.70.0 -QTMIN=5.14.1 +QTMIN=5.14.2 inherit ecm kde.org DESCRIPTION="Simple music player by KDE" @@ -16,8 +16,8 @@ https://community.kde.org/Elisa" LICENSE="LGPL-3+" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="mpris semantic-desktop vlc" +KEYWORDS="amd64 arm64 x86" +IUSE="mpris semantic-desktop +vlc" BDEPEND="sys-devel/gettext" DEPEND=" diff --git a/media-sound/elisa/elisa-19.12.3.ebuild b/media-sound/elisa/elisa-20.08.0.ebuild index 93681e6bd3ce..a3e77d8776db 100644 --- a/media-sound/elisa/elisa-19.12.3.ebuild +++ b/media-sound/elisa/elisa-20.08.0.ebuild @@ -6,26 +6,26 @@ EAPI=7 ECM_HANDBOOK="optional" ECM_TEST="forceoptional" KDE_RELEASE_SERVICE="true" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.72.0 +QTMIN=5.14.2 inherit ecm kde.org DESCRIPTION="Simple music player by KDE" -HOMEPAGE="https://community.kde.org/Elisa" +HOMEPAGE="https://kde.org/applications/multimedia/org.kde.elisa +https://community.kde.org/Elisa" LICENSE="LGPL-3+" SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="mpris semantic-desktop vlc" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="mpris semantic-desktop +vlc" BDEPEND="sys-devel/gettext" DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtmultimedia-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -47,6 +47,7 @@ DEPEND=" " RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 " diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest index 9497afd31422..90113595206b 100644 --- a/media-sound/exaile/Manifest +++ b/media-sound/exaile/Manifest @@ -1,3 +1,5 @@ -DIST exaile-4.0.0.tar.gz 3635774 BLAKE2B 91a5a0a4b8f3c55ec1c8f6487f30bbc8193b1e8b861bbc4bf3cba18dcef91c8a58c937e7a581378eec9da518565826c35e55b7ab157b7ee4634d36cd71a85c4e SHA512 50ab8ec7a65dc431f2bc71a302d21e59ac3d5939b89a90ec161527e1d5c0b80b8c396f8f323b2959e0b807f577e021863fe423bf26a8f7165a6dd112afca6e45 -EBUILD exaile-4.0.0-r1.ebuild 1880 BLAKE2B 7c2b3908f0947aad72d08e22e4410361ed36c0a1e42c33ee0a2df0699da9d74321098227386625bf5786e907a9027bace5561f090eab36e03dd4dea6a14aa6a7 SHA512 4306843e4c831ea0a6c7b97c0b2fc17362d484128e9c3427c755c576e3905b33535e42247513f3c3f4b74f11812f86875aaf21857dab99f0970d09e467f885d8 +AUX exaile-4.1.0_alpha1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e +DIST exaile-4.1.0alpha1.tar.gz 3605803 BLAKE2B ea4862581aa4d95c1944967e1d30979284538353e7d95ef345e6dddf1702be98e4c7c21918bf9a8cb277f339c812fd6671d84e695d6e5b179a2f65358e0e75f0 SHA512 56e73f7cc4d250fbc30870170b50f65f0f99d27e97a8f28dd043af9eb93c919a8de3ed790cbd6c441133232afb3c405fa830cb62c8c33bb0a6e4d97b79d5b54d +EBUILD exaile-4.1.0_alpha1.ebuild 1746 BLAKE2B 830f140637ac433e019a056f81e1053034db892996ba97997819c1afec6f186d1a26035a36dafb9b5854a30d079b9ed1f38ffe6fba401cbacb36ceb0ee5c27b0 SHA512 e023668c90a03a6da18900f37a13b47a8e0ef0bbbbc6fe0fc77b33227252172183c441f9c220f0d6230a7a01463687872ece5a680edd15bf3c8c30e348cbc04f +EBUILD exaile-9999.ebuild 1760 BLAKE2B 96ca041dfa3a821d602433d6e1841b8aabd673e0ceaf7874e29165f6c63c0b9cf0ef6af45c0b309f09a8b8349e07b9a1a2f30411de08c7d45515d2a4918acf9e SHA512 47044feb4ac0940aca5e2747261e0c1fdd024e578c00ccd5ae97e1245108a6e8e53aafc91a780a5d8479e09e47d526ee5a17d4b683fbf8da358fa667b0b55f11 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942 diff --git a/media-sound/exaile/exaile-4.0.0-r1.ebuild b/media-sound/exaile/exaile-4.1.0_alpha1.ebuild index 0b906b58ea75..ea8a80d4a9e1 100644 --- a/media-sound/exaile/exaile-4.0.0-r1.ebuild +++ b/media-sound/exaile/exaile-4.1.0_alpha1.ebuild @@ -3,33 +3,37 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -inherit python-single-r1 xdg-utils +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-single-r1 xdg -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/exaile/exaile.git" else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${PN}-${PV/_/}" + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${PV/_/-}" fi DESCRIPTION="GTK+ based media player aiming to be similar to Amarok" HOMEPAGE="https://www.exaile.org/" - LICENSE="GPL-2 GPL-3" SLOT="0" -IUSE="cddb libnotify nls scrobbler" +# IUSE+=cddb if have dev-python/cddb-py +IUSE="libnotify nls scrobbler" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +BDEPEND=" + nls? ( + dev-util/intltool + sys-devel/gettext + ) +" RDEPEND="${PYTHON_DEPS} >=media-libs/gst-plugins-base-1.6:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-meta:1.0 >=x11-libs/gtk+-3.10:3[introspection] - cddb? ( dev-python/cddb-py ) libnotify? ( >=x11-libs/libnotify-0.7[introspection] ) $(python_gen_cond_dep ' dev-python/bsddb3[${PYTHON_MULTI_USEDEP}] @@ -41,15 +45,13 @@ RDEPEND="${PYTHON_DEPS} scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] ) ') " -BDEPEND=" - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" RESTRICT="test" #315589 +PATCHES=( + "${FILESDIR}/${P}-metainfo.patch" +) + pkg_setup() { python-single-r1_pkg_setup } @@ -68,13 +70,3 @@ src_install() { python_optimize "${D}/usr/$(get_libdir)/${PN}" python_optimize "${D}/usr/share/${PN}" } - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild new file mode 100644 index 000000000000..48f583a4ba0a --- /dev/null +++ b/media-sound/exaile/exaile-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-single-r1 xdg + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/exaile/exaile.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${PV/_/-}" +fi + +DESCRIPTION="GTK+ based media player aiming to be similar to Amarok" +HOMEPAGE="https://www.exaile.org/" +LICENSE="GPL-2 GPL-3" +SLOT="0" +# IUSE+=cddb if have dev-python/cddb-py +IUSE="libnotify nls scrobbler" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + nls? ( + dev-util/intltool + sys-devel/gettext + ) +" +RDEPEND="${PYTHON_DEPS} + >=media-libs/gst-plugins-base-1.6:1.0 + >=media-libs/gst-plugins-good-1.4:1.0 + media-plugins/gst-plugins-meta:1.0 + >=x11-libs/gtk+-3.10:3[introspection] + libnotify? ( >=x11-libs/libnotify-0.7[introspection] ) + $(python_gen_cond_dep ' + dev-python/bsddb3[${PYTHON_MULTI_USEDEP}] + dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] + dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}] + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}] + >=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}] + scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] ) + ') +" + +RESTRICT="test" #315589 + +PATCHES=( + "${FILESDIR}/${PN}-4.1.0_alpha1-metainfo.patch" +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_compile() { + use nls && emake locale +} + +src_install() { + emake \ + PREFIX=/usr \ + LIBINSTALLDIR=/usr/$(get_libdir) \ + DESTDIR="${D}" \ + install$(use nls || echo _no_locale) + + python_optimize "${D}/usr/$(get_libdir)/${PN}" + python_optimize "${D}/usr/share/${PN}" +} diff --git a/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch b/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch new file mode 100644 index 000000000000..11e80706bd8e --- /dev/null +++ b/media-sound/exaile/files/exaile-4.1.0_alpha1-metainfo.patch @@ -0,0 +1,29 @@ +--- exaile-4.1.0-alpha1_orig/Makefile 2020-03-09 01:54:13.000000000 +0100
++++ exaile-4.1.0-alpha1/Makefile 2020-08-03 10:14:23.498153577 +0200
+@@ -81,7 +81,7 @@
+ install -d -m 755 $(EXAILESHAREDIR)/data/ui/preferences/widgets
+ install -d -m 755 $(EXAILESHAREDIR)/data/ui/widgets
+ install -d -m 755 $(DESTDIR)$(DATADIR)/pixmaps
+- install -d -m 755 $(DESTDIR)$(DATADIR)/appdata
++ install -d -m 755 $(DESTDIR)$(DATADIR)/metainfo
+ install -d -m 755 $(DESTDIR)$(DATADIR)/applications
+ install -d -m 755 $(DESTDIR)$(DATADIR)/dbus-1/services
+ install -d -m 755 $(EXAILEMANDIR)/man1
+@@ -96,7 +96,7 @@
+ rm -rf $(EXAILECONFDIR)
+ rm -f $(DESTDIR)$(DATADIR)/applications/exaile.desktop
+ rm -f $(DESTDIR)$(DATADIR)/pixmaps/exaile.png
+- rm -f $(DESTDIR)$(DATADIR)/appdata/exaile.appdata.xml
++ rm -f $(DESTDIR)$(DATADIR)/metainfo/exaile.metainfo.xml
+ rm -f $(DESTDIR)$(DATADIR)/dbus-1/services/org.exaile.Exaile.service
+ rm -f $(EXAILEMANDIR)/man1/exaile.1.gz
+ rm -f $(DESTDIR)$(BASHCOMPDIR)/exaile
+@@ -154,7 +154,7 @@
+ install -m 644 data/exaile.desktop \
+ $(DESTDIR)$(DATADIR)/applications/
+ install -m 644 data/exaile.appdata.xml \
+- $(DESTDIR)$(DATADIR)/appdata/
++ $(DESTDIR)$(DATADIR)/metainfo/exaile.metainfo.xml
+ -install -m 644 build/exaile.1.gz $(EXAILEMANDIR)/man1/
+ -install -m 644 build/exaile.bash-completion $(DESTDIR)$(BASHCOMPDIR)/exaile
+ -install -m 644 build/exaile.fish-completion $(DESTDIR)$(FISHCOMPDIR)/exaile.fish
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest index ea7fcd268b4e..da8c422a48bd 100644 --- a/media-sound/fluidsynth/Manifest +++ b/media-sound/fluidsynth/Manifest @@ -1,3 +1,3 @@ DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d -EBUILD fluidsynth-2.1.0.ebuild 3302 BLAKE2B fa194d9fdcd665e8cece17ed158039ff23be2214efd83e4812f7ad4db985e80c00028e993d62a3128520deac63877e4186953df9417ea2b46053331277cd2280 SHA512 e6a7e8af213573b351c3a2c388d00dcb23879990bf6c3773286f7311e10d2b67c96e9ea7e1343e19da24f62d4a4fe4a38ef209cdd061e064592b7c56520d3bf9 +EBUILD fluidsynth-2.1.0.ebuild 3304 BLAKE2B 8ec259e373d03e5fe66892dec0b0c5d97a8454007fce7d5c9b3b4099829d4dc38ce3c943e85e8b54d2aed26a2d0d90c5ef380a9bd163772eb3d3e60fa01efec6 SHA512 9ef42039f11d1262ad04428cf5aa9ecd4727822c63e1e10e5e72293a873e1b260012348b15a2b6c4e955e1e98c0423b103a8792c0e46f706aa0dcb09097dcfa1 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild index a01ed47a190c..32c05e73684b 100644 --- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild +++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1+" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86" IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads" BDEPEND=" @@ -27,8 +27,8 @@ DEPEND=" dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) ladspa? ( - media-libs/ladspa-cmt[${MULTILIB_USEDEP}] media-libs/ladspa-sdk[${MULTILIB_USEDEP}] + media-plugins/cmt-plugins[${MULTILIB_USEDEP}] ) portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest index 2134e52e43f6..842b06ccede4 100644 --- a/media-sound/gimmix/Manifest +++ b/media-sound/gimmix/Manifest @@ -1,6 +1,7 @@ AUX gimmix-0.5.7.1-curl-headers.patch 655 BLAKE2B 77cea14b06d3e36933510e7e32a75fe2a5485fd2a21e4326f968027b6eee8951e2412330168149416b4f7caa7f504f8e2fb5bc1cb8a3cf72a07ab588272a17ef SHA512 9b0665e8de4670b2dc58940215b883549bddd6d7abd26f604f334034d604689063b3347ba81651b804a430b31ff235c9b65c33ee0d3115c4e2fba2d48d3c56bb AUX gimmix-0.5.7.2-QA-desktop-file.patch 231 BLAKE2B 62bb0bd4df813f3f438383ff1e2c046735c868ddc4ea0312c6b3786b918ce42e1062c71d43acd8ba71cf9c4094d8f6d947dc39e003adf854633e0e7987369b24 SHA512 0e0da637d78afb03a3511b1ea4d25c8fb1a6f234ea516ee1eed71d58960e7ac04c042ff9a368463fc1556df85cf6b19d97af30d274ea799600b94805528379ef +AUX gimmix-0.5.7.2-fno-common.patch 368 BLAKE2B 6e6729946326f1eece90dca1ab147c0f44ffc0effabb0ede4e1c964542ab769f7223d82a20f71abd0d92f03c0308ad7bc242348833fba69ded96e385bfaeb31d SHA512 0aeb4d06b5efe63cee3cc687ffdb78d988a9eb044aba881b283f1dc3b76f84dfbcd7f223bc1b59b827e06f4748fd1a03420230b20ce55e4bf8d6ba13a84b2398 AUX gimmix-0.5.7.2-format-security.patch 285 BLAKE2B 4399e9fc6b570ecaa11443dddf7605644ce98cf67f5649ad89384dd1d763b20e2e345ca50ef9405b49fef2f55affa983aa854abff699487f6fa319d64511836d SHA512 a5dcc28dfd454377eaae36ff904260b942dd1174c8af55f63739a9565efdd03b4e848ac297b45d5de167cd51e737e8cb5034178c9831d8b8f120af0b59cc82af DIST gimmix-0.5.7.2.tar.bz2 497249 BLAKE2B 06397e0bb13d8844c033bf1f17c7014be67783bb3b690bed387c84a7ddb6b58bb54ecdb45bcb57667a3d93947810b0e6797866ff1bb9f4b38a83574088ee826c SHA512 1e2df9bb4ad8286d6a03d6ab41a231f1a994df5eb4e0190ace83bc5683c69c9a6ff8fae1da473be2c0c050461c9a24e2fc1e111027ea7ce21a7c12472a761b21 -EBUILD gimmix-0.5.7.2-r1.ebuild 948 BLAKE2B d7277f961bec8cef6d17a0234a0398f1beb3b9117393e6d66f3150780720ec1b9c1ef299f3f77e0bb4862f5f4164f3e28f0cd43347cfc6efca61a77789a1ce1f SHA512 859ca3b1dab09181bd37a29fadbf7f0d91355fa03abbdf5b8e20f2e6030392941375b4445c3fb68a184b6efcc5d1bf5bde2b074311e872d9f899f3c501a5b0c0 +EBUILD gimmix-0.5.7.2-r1.ebuild 1003 BLAKE2B a0d7b6db2e931f09e17c450751016a9babcc5a13e747e332ff28cc8485c9a3cfa3d91342d6414c507a1476355ca796e8c6ffad85aca7c1ed2f2d5ddd39b94dfa SHA512 59e11347e1692aa0dabad6395f15e2ca6d172c9134fa3e57b4e5536ef629603705d1667542ccdb8a1531bd25fc818bbdf55be5f094f62b27059fd9ad6cce1e7f MISC metadata.xml 447 BLAKE2B e925d9268e0b7dfbd8592fcd83f5ff2f7ab86eafd625831592c14b1772f343bfb8d1eab4f711e2b1090c053e92e968e9f35bc6ecab046fb2f2df148129b1b0f0 SHA512 f186c67facf87d3e06be7d5bd5b42bf144a5cc6e9f3826d870dc11814a0547ccc366a87610f92966e6c8858d7987d450dc07a89ada961212d3f05aaeade14c57 diff --git a/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch b/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch new file mode 100644 index 000000000000..f9987181bb1b --- /dev/null +++ b/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/gimmix-playlist.c ++++ b/src/gimmix-playlist.c +@@ -60,7 +60,7 @@ + static gchar *invalid_dir_error = "You have specified an invalid music directory. Do you want to specify the correct music directory now ?"; + + GtkWidget *search_combo; +-GtkWidget *search_entry; ++extern GtkWidget *search_entry; + GtkWidget *search_box; + + static GtkWidget *gimmix_statusbar; diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild index 7d875e3d3fd6..94b5fc0b68b1 100644 --- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild +++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,8 +34,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch - "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${PN}-0.5.7.2-format-security.patch "${FILESDIR}"/${PN}-0.5.7.2-QA-desktop-file.patch + "${FILESDIR}"/${PN}-0.5.7.2-fno-common.patch ) src_prepare() { diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest index 1a0db2847e00..89393ce6517b 100644 --- a/media-sound/gmtp/Manifest +++ b/media-sound/gmtp/Manifest @@ -1,5 +1,4 @@ -DIST gmtp-1.3.10.tar.gz 496912 BLAKE2B 52c31e74dca1a29c2a5627fa977ea040973ba2db5ce31dd123f88289e1a8197a51086e08ab5bdd029ea153388d5216a5483300c505ee06467f8b20b91446f798 SHA512 e2f5b8231e409d9ef6e512cb37199ce7771b87f61cb5bf29a86be0e3fdda22688005ae5b22f004f91a69df2f682c9eb0f1b7613e4f1a8dd3cc6fb0edb6e29fcd +AUX gmtp-1.3.11-fno-common.patch 11945 BLAKE2B 7a8f75b3780f9e8f4dfd0e9c5be29f21f261b4baf95a9a543db9c73d3bebdff485734eb009e4a4edd1079e4f6410051d0b3f651d9996b788a108f44257e4b915 SHA512 0350366fe1abf48f0929351c12b2d891fcf874df29d327f8b8926538efd8263b402371f11ecc77c4a23d6cf12bf6ce7a3bfecdb518115fe48304028d30fe4870 DIST gmtp-1.3.11.tar.gz 498198 BLAKE2B 870f27712425328febcda0899b821bc5c8324c07bca50d7bf9f2bd78849e1f73968da4f5c2860e154d19c16ea184cd6a1715f198347356734dd815d7d2aca780 SHA512 af6e56136c227818aab19f9eb0a0ad9f1356b24e8a8aa44d600326d632bfcb0dc2794a7c28809f2de2016a52045c1cc5c2bdae0391a0a970ea04e947f920bc95 -EBUILD gmtp-1.3.10.ebuild 755 BLAKE2B 102b02335f00209a31ba0a24cd83e94b509fa3b42a14598b44b3ad5b3d8c36f1791991bf5ac0dd736197f9c1c7a77d71e2fae1b8624ada936291641c0e3d705d SHA512 85d109eaeea3fdf24d83f87c451d3a9c8e970d131f6affc63f2f7b274aa6de036fbfe13e32e06f8f37d7b4bfac79c1b2db1f255d6fd02d54defae7a9f126c2f1 -EBUILD gmtp-1.3.11.ebuild 755 BLAKE2B f149ed4df2b8571f5e0e207ef3e57b3e9ab6f3f4fd05f0c7ad9134dc37a7fed75f462590f0e7befa229a1bd76813c53fb7e0920b982a05f313f4df5ac07ffe97 SHA512 6b9e78190a737b7635c4163d3c7667b53c9e6559dba2724fad1c88eae83c414b284c78795621ad77bd2f496a9095122b9be9164d709fc100e9429508db618c01 +EBUILD gmtp-1.3.11.ebuild 814 BLAKE2B c9efebe5fe60f5df2d621ddd63ba14a3a3108e55c6bb8fae8081f0f44359a8206436209c82cd4180ab02e7db2ffb5d11acc8a196bff76fc5571b618b3befe365 SHA512 e05e336ead2b83b5efcd4d94facbe6be61e79629552a0fac6355610c97db42d79c0d404f4da20b823a259baa4dacd73cff14ef1d9deccf1eb78330a7d760250d MISC metadata.xml 506 BLAKE2B 84107fa98c343254e61b433946b77be39abb9975736672bad91c9b61831f073aa3402046b946fa56dcab49413d4937480f36586ddcd9dfe8ecae23c09a0ae306 SHA512 ad86ce322da7b9459e597a94d03de3e3ec81d072646bf9fa98a4ad31e904f584c6a70cb82aaf7ec00feeca503818452109fc80cb9eebdff781b701ada830dac5 diff --git a/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch b/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch new file mode 100644 index 000000000000..e75d8130dc23 --- /dev/null +++ b/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch @@ -0,0 +1,375 @@ +--- a/src/dnd.h ++++ b/src/dnd.h +@@ -35,7 +35,7 @@ + }; + + /* Drag data format listing for gtk_drag_dest_set() */ +- GtkTargetEntry _gmtp_drop_types[3]; ++ extern GtkTargetEntry _gmtp_drop_types[3]; + + #define gmtp_drag_dest_set(widget) gtk_drag_dest_set(widget, \ + GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, \ +--- a/src/interface.h ++++ b/src/interface.h +@@ -108,12 +108,12 @@ + }; + + // Main Window widgets +- GtkListStore *fileList; +- GtkTreeStore *folderList; +- GtkTreeSelection *fileSelection; +- GtkTreeSelection *folderSelection; +- gulong folderSelectHandler; +- gulong fileSelectHandler; ++ extern GtkListStore *fileList; ++ extern GtkTreeStore *folderList; ++ extern GtkTreeSelection *fileSelection; ++ extern GtkTreeSelection *folderSelection; ++ extern gulong folderSelectHandler; ++ extern gulong fileSelectHandler; + + + /** +@@ -252,22 +252,22 @@ + void __fileMove(GtkTreeRowReference *Row); + + // Flags for overwriting files of host PC and device. +- gint fileoverwriteop; ++ extern gint fileoverwriteop; + // Flag to allow overwrite of files on device. +- gint deviceoverwriteop; ++ extern gint deviceoverwriteop; + + // Find options and variables. +- gboolean inFindMode; +- GSList *searchList; ++ extern gboolean inFindMode; ++ extern GSList *searchList; + + /** + * Destroys a file listing object. + * @param file - pointer to the FileListStruc object. + */ + void g_free_search(FileListStruc *file); +- GtkWidget *FindToolbar_entry_FindText; +- GtkWidget *FindToolbar_checkbutton_FindFiles; +- GtkWidget *FindToolbar_checkbutton_TrackInformation; ++ extern GtkWidget *FindToolbar_entry_FindText; ++ extern GtkWidget *FindToolbar_checkbutton_FindFiles; ++ extern GtkWidget *FindToolbar_checkbutton_TrackInformation; + + /** + * Add an individual file to the device. +@@ -329,77 +329,77 @@ + int32_t displayAddTrackPlaylistDialog(gboolean showNew /* = TRUE */); + + // Widget for find toolbar +- GtkWidget *findToolbar; ++ extern GtkWidget *findToolbar; + + // Parent container for the main toolbar. +- GtkWidget *handlebox1; +- GtkWidget *toolbarMain; ++ extern GtkWidget *handlebox1; ++ extern GtkWidget *toolbarMain; + + // Widgets for menu items; +- GtkWidget *fileConnect; +- GtkWidget *fileAdd; +- GtkWidget *fileDownload; +- GtkWidget *fileRemove; +- GtkWidget *fileRename; +- GtkWidget *fileMove; +- GtkWidget *fileNewFolder; +- GtkWidget *fileRemoveFolder; +- GtkWidget *fileRescan; +- GtkWidget *editDeviceName; +- GtkWidget *editFormatDevice; +- GtkWidget *editAddAlbumArt; +- GtkWidget *editFind; +- GtkWidget *editSelectAll; +- GtkWidget *contextMenu; +- GtkWidget *contextMenuColumn; +- GtkWidget *contestMenuFolder; +- GtkWidget* cfileAdd; +- GtkWidget* cfileNewFolder; +- GtkWidget *toolbuttonAddFile; ++ extern GtkWidget *fileConnect; ++ extern GtkWidget *fileAdd; ++ extern GtkWidget *fileDownload; ++ extern GtkWidget *fileRemove; ++ extern GtkWidget *fileRename; ++ extern GtkWidget *fileMove; ++ extern GtkWidget *fileNewFolder; ++ extern GtkWidget *fileRemoveFolder; ++ extern GtkWidget *fileRescan; ++ extern GtkWidget *editDeviceName; ++ extern GtkWidget *editFormatDevice; ++ extern GtkWidget *editAddAlbumArt; ++ extern GtkWidget *editFind; ++ extern GtkWidget *editSelectAll; ++ extern GtkWidget *contextMenu; ++ extern GtkWidget *contextMenuColumn; ++ extern GtkWidget *contestMenuFolder; ++ extern GtkWidget* cfileAdd; ++ extern GtkWidget* cfileNewFolder; ++ extern GtkWidget *toolbuttonAddFile; + #if HAVE_GTK3 == 0 +- GtkTooltips *tooltipsToolbar; ++ extern GtkTooltips *tooltipsToolbar; + #endif + + // Columns in main file view; +- GtkTreeViewColumn *column_Size; +- GtkTreeViewColumn *column_Type; +- GtkTreeViewColumn *column_Track_Number; +- GtkTreeViewColumn *column_Title; +- GtkTreeViewColumn *column_Artist; +- GtkTreeViewColumn *column_Album; +- GtkTreeViewColumn *column_Year; +- GtkTreeViewColumn *column_Genre; +- GtkTreeViewColumn *column_Duration; +- GtkTreeViewColumn *column_Location; ++ extern GtkTreeViewColumn *column_Size; ++ extern GtkTreeViewColumn *column_Type; ++ extern GtkTreeViewColumn *column_Track_Number; ++ extern GtkTreeViewColumn *column_Title; ++ extern GtkTreeViewColumn *column_Artist; ++ extern GtkTreeViewColumn *column_Album; ++ extern GtkTreeViewColumn *column_Year; ++ extern GtkTreeViewColumn *column_Genre; ++ extern GtkTreeViewColumn *column_Duration; ++ extern GtkTreeViewColumn *column_Location; + + // Main menu widgets +- GtkWidget *menu_view_filesize; +- GtkWidget *menu_view_filetype; +- GtkWidget *menu_view_track_number; +- GtkWidget *menu_view_title; +- GtkWidget *menu_view_artist; +- GtkWidget *menu_view_album; +- GtkWidget *menu_view_year; +- GtkWidget *menu_view_genre; +- GtkWidget *menu_view_duration; +- GtkWidget *menu_view_folders; +- GtkWidget *menu_view_toolbar; ++ extern GtkWidget *menu_view_filesize; ++ extern GtkWidget *menu_view_filetype; ++ extern GtkWidget *menu_view_track_number; ++ extern GtkWidget *menu_view_title; ++ extern GtkWidget *menu_view_artist; ++ extern GtkWidget *menu_view_album; ++ extern GtkWidget *menu_view_year; ++ extern GtkWidget *menu_view_genre; ++ extern GtkWidget *menu_view_duration; ++ extern GtkWidget *menu_view_folders; ++ extern GtkWidget *menu_view_toolbar; + + // Column view context menu; +- GtkWidget* cViewSize; +- GtkWidget* cViewType; +- GtkWidget* cViewTrackName; +- GtkWidget* cViewTrackNumber; +- GtkWidget* cViewArtist; +- GtkWidget* cViewAlbum; +- GtkWidget* cViewYear; +- GtkWidget* cViewGenre; +- GtkWidget* cViewDuration; ++ extern GtkWidget* cViewSize; ++ extern GtkWidget* cViewType; ++ extern GtkWidget* cViewTrackName; ++ extern GtkWidget* cViewTrackNumber; ++ extern GtkWidget* cViewArtist; ++ extern GtkWidget* cViewAlbum; ++ extern GtkWidget* cViewYear; ++ extern GtkWidget* cViewGenre; ++ extern GtkWidget* cViewDuration; + + // Combobox used in AddTrackPlaylist feature. +- GtkWidget *combobox_AddTrackPlaylist; ++ extern GtkWidget *combobox_AddTrackPlaylist; + +- int64_t fileMoveTargetFolder; ++ extern int64_t fileMoveTargetFolder; + + #ifdef __cplusplus + } +--- a/src/main.c ++++ b/src/main.c +@@ -26,7 +26,6 @@ + #include "mtp.h" + + // Global Widgets needed by various functions. +-GtkWidget *windowMain; + GtkWidget *windowStatusBar; + GtkWidget *toolbuttonConnect; + GtkWidget *treeviewFiles; +--- a/src/main.h ++++ b/src/main.h +@@ -68,46 +68,46 @@ + } Device_Struct; + + // Main Window Widgets. +- GtkWidget *windowMain; +- GtkWidget *scrolledwindowMain; ++ extern GtkWidget *windowMain; ++ extern GtkWidget *scrolledwindowMain; + +- GtkWidget *windowStatusBar; +- GtkWidget *toolbuttonConnect; +- GtkWidget *treeviewFiles; +- GtkWidget *treeviewFolders; ++ extern GtkWidget *windowStatusBar; ++ extern GtkWidget *toolbuttonConnect; ++ extern GtkWidget *treeviewFiles; ++ extern GtkWidget *treeviewFolders; + // Folder view; +- GtkWidget *scrolledwindowFolders; +- GtkTreeSelection *folderSelection; ++ extern GtkWidget *scrolledwindowFolders; ++ extern GtkTreeSelection *folderSelection; + + // Device information struct +- Device_Struct DeviceMgr; ++ extern Device_Struct DeviceMgr; + + // File/Folder/Track/Playlist pointers +- LIBMTP_file_t *deviceFiles; +- LIBMTP_folder_t *deviceFolders; +- LIBMTP_track_t *deviceTracks; +- LIBMTP_playlist_t *devicePlayLists; +- uint32_t currentFolderID; // This is the ID of the current folder.... +- int32_t addTrackPlaylistID; ++ extern LIBMTP_file_t *deviceFiles; ++ extern LIBMTP_folder_t *deviceFolders; ++ extern LIBMTP_track_t *deviceTracks; ++ extern LIBMTP_playlist_t *devicePlayLists; ++ extern uint32_t currentFolderID; // This is the ID of the current folder.... ++ extern int32_t addTrackPlaylistID; + +- GQueue *stackFolderIDs; +- GQueue *stackFolderNames; ++ extern GQueue *stackFolderIDs; ++ extern GQueue *stackFolderNames; + + // Icon file locations. +- gchar *file_logo_png; +- gchar *file_icon48_png; +- gchar *file_icon16_png; +- gchar *file_about_png; +- gchar *file_format_png; ++ extern gchar *file_logo_png; ++ extern gchar *file_icon48_png; ++ extern gchar *file_icon16_png; ++ extern gchar *file_about_png; ++ extern gchar *file_format_png; + // File view Icons +- gchar *file_audio_png; +- gchar *file_video_png; +- gchar *file_playlist_png; +- gchar *file_album_png; +- gchar *file_textfile_png; +- gchar *file_generic_png; +- gchar *file_folder_png; +- gchar *file_image_png; ++ extern gchar *file_audio_png; ++ extern gchar *file_video_png; ++ extern gchar *file_playlist_png; ++ extern gchar *file_album_png; ++ extern gchar *file_textfile_png; ++ extern gchar *file_generic_png; ++ extern gchar *file_folder_png; ++ extern gchar *file_image_png; + + /** + * setFilePaths - set paths for image used within gMTP +--- a/src/mtp.h ++++ b/src/mtp.h +@@ -42,7 +42,7 @@ + + #define MTP_DEVICE_SINGLE_STORAGE -1 + +- gboolean AlbumErrorIgnore; ++ extern gboolean AlbumErrorIgnore; + + typedef struct { + gchar* file_extension; +--- a/src/preferences.h ++++ b/src/preferences.h +@@ -28,22 +28,22 @@ + #include <gtk/gtk.h> + + // Main preferences dialog if present. +- GtkWidget *windowPrefsDialog; ++ extern GtkWidget *windowPrefsDialog; + + // Widgets for preferences buttons; +- GtkWidget *comboboxToolbarStyle; +- GtkWidget *checkbuttonDeviceConnect; +- GtkWidget *entryDownloadPath; +- GtkWidget *entryUploadPath; +- GtkWidget *checkbuttonDownloadPath; +- GtkWidget *checkbuttonConfirmFileOp; +- GtkWidget *checkbuttonConfirmOverWriteFileOp; +- GtkWidget *checkbuttonAutoAddTrackPlaylist; +- GtkWidget *checkbuttonIgnorePathInPlaylist; +- GtkWidget *checkbuttonSuppressAlbumErrors; +- GtkWidget *checkbuttonAltAccessMethod; +- GtkWidget *checkbuttonAllMediaAsFiles; +- GtkWidget *checkbuttonRetainTimeStamp; ++ extern GtkWidget *comboboxToolbarStyle; ++ extern GtkWidget *checkbuttonDeviceConnect; ++ extern GtkWidget *entryDownloadPath; ++ extern GtkWidget *entryUploadPath; ++ extern GtkWidget *checkbuttonDownloadPath; ++ extern GtkWidget *checkbuttonConfirmFileOp; ++ extern GtkWidget *checkbuttonConfirmOverWriteFileOp; ++ extern GtkWidget *checkbuttonAutoAddTrackPlaylist; ++ extern GtkWidget *checkbuttonIgnorePathInPlaylist; ++ extern GtkWidget *checkbuttonSuppressAlbumErrors; ++ extern GtkWidget *checkbuttonAltAccessMethod; ++ extern GtkWidget *checkbuttonAllMediaAsFiles; ++ extern GtkWidget *checkbuttonRetainTimeStamp; + + /** + * Callback to show the Preferences Dialog Box. +--- a/src/prefs.h ++++ b/src/prefs.h +@@ -61,7 +61,7 @@ + gboolean retain_timestamp; + } Preferences_Struct; + +- Preferences_Struct Preferences; ++ extern Preferences_Struct Preferences; + + /** + * Set some default values for the application prefences. +@@ -80,7 +80,7 @@ + gboolean savePreferences(); + + #if HAVE_GTK3 == 0 +- GConfClient *gconfconnect; ++ extern GConfClient *gconfconnect; + /** + * The callback function for GConf. + * @param client +@@ -90,7 +90,7 @@ + */ + void gconf_callback_func(GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data); + #else +- GSettings *gsettings_connect; ++ extern GSettings *gsettings_connect; + /** + * The callback for the GSettings database. + */ +--- a/src/progress.h ++++ b/src/progress.h +@@ -27,7 +27,7 @@ + #include <gtk/gtk.h> + #include <stdint.h> + +- gboolean progressDialog_killed; ++ extern gboolean progressDialog_killed; + + /** + * Create a Upload/Download Progress Window. diff --git a/media-sound/gmtp/gmtp-1.3.10.ebuild b/media-sound/gmtp/gmtp-1.3.10.ebuild deleted file mode 100644 index 9f56fbc962a1..000000000000 --- a/media-sound/gmtp/gmtp-1.3.10.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit gnome2-utils - -DESCRIPTION="A simple MTP client for MP3 players" -HOMEPAGE="http://gmtp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/glib:2 - media-libs/flac - media-libs/libid3tag - media-libs/libmtp - media-libs/libvorbis - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - econf --with-gtk3 -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/media-sound/gmtp/gmtp-1.3.11.ebuild b/media-sound/gmtp/gmtp-1.3.11.ebuild index e510d3fc03ef..0565860ce4e8 100644 --- a/media-sound/gmtp/gmtp-1.3.11.ebuild +++ b/media-sound/gmtp/gmtp-1.3.11.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit gnome2-utils DESCRIPTION="A simple MTP client for MP3 players" @@ -11,18 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-libs/glib:2 +RDEPEND=" + dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDPEND=" sys-devel/gettext virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${PN}-1.3.11-fno-common.patch ) + src_configure() { econf --with-gtk3 } diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest index 8197a50fa4c4..0e4376ad1f6b 100644 --- a/media-sound/gnomad/Manifest +++ b/media-sound/gnomad/Manifest @@ -1,3 +1,4 @@ +AUX gnomad-2.9.6-fno-common.patch 1621 BLAKE2B 7e5cffd644026bca5fe84090930535e2129be9135c1e5e97e5e4f92132026cc210321da7e0e300655c14906559888e15e4a1a13598b32831cfeeb262c199706c SHA512 97d9e3d08808a81c206ffa39bc914bc152fde781ede811ecdde3ab2257442466f4f5f792dfec6d65b9e78ed66cb07574bb036ece8895f68097e7f518b5060288 DIST gnomad2-2.9.6.tar.gz 318431 BLAKE2B 756345c1b27da5f41d46aaf2862d94a2a94cc91fece77eb5cd8428581773867a85e120e09e83337ddbf8d77a91bd7db09d50584190d9929be45bb3d94393b9eb SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1 -EBUILD gnomad-2.9.6.ebuild 783 BLAKE2B 6f2c98fa67399953d55d16b7fd2f67a26fe32aa4181ce4882ac9f83eebe43645ab07c0414baa4eedf6364a091caa366c71b74ffdf2ed4d503113e184d4a7d239 SHA512 9be4ce865bf88642b565b1cc2040f13df0a195daa503e3dc3520a6ef6430d558fda9663010b74f9939050f98e94ede1a7b2227acc765ddbb979a1c4286b8672f +EBUILD gnomad-2.9.6.ebuild 833 BLAKE2B ce3d5e0bbf90b609d205bf0f111aee40fa2b88b6d30c232c56eefc83bd01150317f2f717f6470d78d2a8e9ad73d8e873659a4a0bee7fa8ffef9d4a6d5118778c SHA512 6441b7db366561bcd679a66e07004d1deec8e4460616a79c89ffd22de1952d2397510c13e78046b54daa1c6ba1c99cfc0a46368bbf86d3b91b9fb25ce90864fc MISC metadata.xml 330 BLAKE2B da9e23c768fba646f72a220e5d3d24a78d8e021660f7310bc657df6fc2ef56a6b4419149b0d2463b9ea51ae5c70795d79c23a54ef4c8fac25b1a0d41212120f4 SHA512 c039363dc7f06ccc5d9652d41923ea06819f199758fa843adad78a11dc00d230b49ebe5141c16f0aa6bf92909021a859e5be187d918eaa0f93fe7f2be7725386 diff --git a/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch b/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch new file mode 100644 index 000000000000..76abaa9cfa2d --- /dev/null +++ b/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch @@ -0,0 +1,56 @@ +--- a/src/common.h ++++ b/src/common.h +@@ -130,25 +130,25 @@ + } playlist_widgets_t; + + /* Globally known widgets */ +-transfer_widgets_t transfer_widgets; +-data_widgets_t data_widgets; +-playlist_widgets_t playlist_widgets; ++extern transfer_widgets_t transfer_widgets; ++extern data_widgets_t data_widgets; ++extern playlist_widgets_t playlist_widgets; + + /* Global progress bar - not so good but... */ +-GtkWidget *progress_bar; ++extern GtkWidget *progress_bar; + + /* Global playlist selection for the popup, not good either ... */ +-GList *jukebox_playlist; +-GList *selected_target_playlists; ++extern GList *jukebox_playlist; ++extern GList *selected_target_playlists; + + /* Global lock variable for the jukebox */ +-gboolean volatile jukebox_locked; ++extern gboolean volatile jukebox_locked; + + /* Global cancellation variable for jukebox operations */ +-gboolean volatile cancel_jukebox_operation; ++extern gboolean volatile cancel_jukebox_operation; + + /* Global debug level variable (standard = 7) */ +-gint gnomad_debug; ++extern gint gnomad_debug; + + /* A proc for hiding dialog windows */ + GCallback dispose_of_dialog_window(GtkButton * button, gpointer data); +--- a/src/gnomad2.c ++++ b/src/gnomad2.c +@@ -34,6 +34,16 @@ + guint uevent_device_hooked = 0; + #endif + ++transfer_widgets_t transfer_widgets; ++data_widgets_t data_widgets; ++playlist_widgets_t playlist_widgets; ++GtkWidget *progress_bar; ++GList *jukebox_playlist; ++GList *selected_target_playlists; ++gboolean volatile jukebox_locked; ++gboolean volatile cancel_jukebox_operation; ++gint gnomad_debug; ++ + /* This one should be global really */ + GtkWidget *main_window; + diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6.ebuild index fb2ee99ca369..45206c12519c 100644 --- a/media-sound/gnomad/gnomad-2.9.6.ebuild +++ b/media-sound/gnomad/gnomad-2.9.6.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 MY_PN=${PN}2 MY_P=${MY_PN}-${PV} -DESCRIPTION="A GTK+ music manager and swiss army knife for the Portable Digital Entertainment (PDE) protocol" +DESCRIPTION="A GTK+ music manager for the Portable Digital Entertainment (PDE) protocol" HOMEPAGE="http://gnomad2.sourceforge.net/" SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" @@ -22,12 +22,17 @@ RDEPEND=" media-libs/libnjb media-libs/taglib >=x11-libs/gtk+-2.24:2" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( dev-util/intltool sys-devel/gettext )" + nls? ( + dev-util/intltool + sys-devel/gettext + )" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/${PN}-2.9.6-fno-common.patch ) DOCS=( AUTHORS README TODO ) # ChangeLog and NEWS are both outdated src_configure() { diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest index f7ac9a095f92..8453fcc51441 100644 --- a/media-sound/gnome-music/Manifest +++ b/media-sound/gnome-music/Manifest @@ -1,5 +1,5 @@ -DIST gnome-music-3.34.5.tar.xz 1415240 BLAKE2B 3545541171b023da116ebee5d28a2b69b6b45677cde26c833ea0992ba9bc41d4792375dbf3617105da53f0e98d21576e166980e896527a60d47c92690b343a27 SHA512 c4f3c8cd7e8a6d24d3766672acfe3abc340d0cd305ba0d3d0a87c02b5a5f9e8c47bee9d8284e76ad28c51eeebe56e3163f4e5c34c89e294801d0047b8476f80f DIST gnome-music-3.34.6.tar.xz 1415360 BLAKE2B 0b8f3a2b17242f41f3a77a9eeb60cf1f10cac57d983de6e7f44ba1a243526e0831ee2ad5baec17b726bbbe9df52e26b79dedc2b2abe4dba87c59cc4fcd4a083f SHA512 76561adf8c6ce4342825eb976de11c98c2aa66cb08075dbe46d8c7787daf7fc77763d55c2fe475dd9c75536adc98f8afbdd90bfb2b64791d05cdf11e3ed00b03 -EBUILD gnome-music-3.34.5.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791 +DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca EBUILD gnome-music-3.34.6.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791 +EBUILD gnome-music-3.36.4.1.ebuild 2047 BLAKE2B c00989998335746d9afe6e9a81094a4d6af3e9e3b8972cc5c0822fe47d380ee6ebd267cc18c40c2c2cf090c33d4794577d21359afe67123013eea5cf332cede7 SHA512 e3ca6d511b0865946eb4f9193f2dea40344ac730782fa6a891bbeb599fba6c5844acc3dc5b9e63570b3b92e55cc9453bca3be2ffc0bf88f7cafd5af011273887 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/media-sound/gnome-music/gnome-music-3.34.5.ebuild b/media-sound/gnome-music/gnome-music-3.36.4.1.ebuild index c16a85cdeef5..333450fc479b 100644 --- a/media-sound/gnome-music/gnome-music-3.34.5.ebuild +++ b/media-sound/gnome-music/gnome-music-3.36.4.1.ebuild @@ -14,23 +14,23 @@ SLOT="0" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="~amd64 ~arm64 ~x86" DEPEND="${PYTHON_DEPS} >=dev-libs/glib-2.50:2 - net-libs/gnome-online-accounts[introspection] + >=net-libs/gnome-online-accounts-3.35.90[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.24.7:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] - >=app-misc/tracker-2.2.0:=[introspection(+)] + >=app-misc/tracker-2.3.0:=[introspection(+)] $(python_gen_cond_dep ' >=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}] >=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}] ') - >=media-libs/grilo-0.3.9:0.3[introspection] - >=media-plugins/grilo-plugins-0.3.9:0.3 + >=media-libs/grilo-0.3.12:0.3[introspection] + >=media-plugins/grilo-plugins-0.3.10:0.3 " # xdg-user-dirs-update needs to be there to create needed dirs # https://bugzilla.gnome.org/show_bug.cgi?id=731613 diff --git a/media-sound/gom/Manifest b/media-sound/gom/Manifest index da02cc93c450..4a34b77ce4e4 100644 --- a/media-sound/gom/Manifest +++ b/media-sound/gom/Manifest @@ -1,4 +1,5 @@ +AUX gom-0.29.103-fno-common.patch 278 BLAKE2B c62c575a621cf029aa3385df6b83046051ecddffba43da4f54ba7a9093d77c561faf0011d53561748b003e1eb6e3781e24c2f60b33f0892121066e2a0d2134aa SHA512 d74eed4a5ef72567144c9496894ccf640e5d0576e1ac03e39d565f26970826e2d706e3aab387e78e3c25753540448a516175ac771528c70e6aad5cb7bb8f4be0 AUX gom-0.29.103-tinfo.patch 632 BLAKE2B 29e8857c9e63b4d415c747bd80ef42d50fc3fe6c3aa20f3274a0ae1fddd37d0a67ed5256fca9d833c8ce86fe58c136fe5d6cd2d2d42e249bab2aff0738e11ec5 SHA512 b02dd7751d5614532b2409161c196e11fe34dd9c5c99c7734cc1d72afc0338093d221d38c2b02da237e1be75e815b22a0479b04125670aa4f1bac0580486e419 DIST gom-0.29.103.tar.gz 88269 BLAKE2B 2ec8f767276d61dc5e16c511e62de3fdecff82de686627327ab10bfbd4bd8eb7bc3ac8a44627a8d465a4a4f4e42ec4c4b0f9f1e2affd75d8916c6435764a6c94 SHA512 2b386aab0e1fad55e39dbd902ec50db5faac39268cd7e79c0e10d252e9633d777f43b861bcf079191e0d41a3414ccc05d70b8fddb4bff0bb54e72e0606eed28b -EBUILD gom-0.29.103-r1.ebuild 856 BLAKE2B 78bd8f7ff56e0023a047657eae8d66eec17f7cae0b405597e15ab529ff305c10ca257a4c51169a5a546fd5ff50c108df83a92864b3f01973458ac00508b805b9 SHA512 3b7b7f3ca2770a2b8c65a5ca5ef880f3410c75f8ff537d263a8a9af0bfa197258016e71adb6b30c597138098d1958aa99daf5e83ac6c55a5dcf85f148bdcd441 +EBUILD gom-0.29.103-r1.ebuild 706 BLAKE2B f51bd19696a38cb5e921d2214cd7ead33ab255f5e7e6dffe188256a7e5d2bceb4c236558daf5b20e2e8d21b936207ec71c3373670361eeb3ceac3d70341a548b SHA512 eacdb96d311a6d9ceb05aab52ebdf7cf199720f55dcd963187e8b6c4c5bd07cd7bbe2253b1735bfceec27dd057c4a631a3b47e44f95b849f0064c589a2393ecc MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/gom/files/gom-0.29.103-fno-common.patch b/media-sound/gom/files/gom-0.29.103-fno-common.patch new file mode 100644 index 000000000000..b1ee6a1930bf --- /dev/null +++ b/media-sound/gom/files/gom-0.29.103-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/gom_info.h ++++ b/src/gom_info.h +@@ -52,7 +52,7 @@ + enum gom_info_types {GOM_INFO_ERROR=-1, GOM_INFO_QUIET, GOM_INFO_NORMAL, GOM_INFO_VERBOSE, GOM_INFO_DEBUG}; + + /* shown errors count */ +-int gom_info_errors; ++extern int gom_info_errors; + + /* + * FUNCTION PROTOTYPES diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild index b49d71e781ed..241883a1f654 100644 --- a/media-sound/gom/gom-0.29.103-r1.ebuild +++ b/media-sound/gom/gom-0.29.103-r1.ebuild @@ -1,45 +1,37 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools DESCRIPTION="Console Mixer Program for OSS" HOMEPAGE="http://www.fh-worms.de/~inf222" SRC_URI="http://www.Fh-Worms.DE./~inf222/code/c/gom/released/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" -IUSE="examples" -DEPEND=">=sys-libs/ncurses-5.2:0=" +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { default + rmdir examples/standard || die + mv configure.{in,ac} || die eautoreconf } -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS ChangeLog README - - if use examples; then - docinto examples - dodoc README - docinto examples/default - dodoc examples/default/* - docinto examples/two-mixers - dodoc examples/two-mixers/* - fi + default + + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples } diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest index a445d85c572d..0fb9b34c6930 100644 --- a/media-sound/grip/Manifest +++ b/media-sound/grip/Manifest @@ -1,3 +1,5 @@ DIST grip-4.1.1.tar.gz 1211196 BLAKE2B 677ace9ef740db150a2cfc9b597b148b50015dda79cb41b53cd656451b038ff71d6efdf3e17bea65accc071ec0116c6025a7c9619cb09a3782eeb94904e431a9 SHA512 c6af48b0fa89fb342c73614c6193973811ccf72837a46eb1a3971ffcfa9a20bb4fb8705ba674b093e2c4f6f78f9ded323cf5453cdecf53c467238430f98ba267 -EBUILD grip-4.1.1.ebuild 1072 BLAKE2B 1b7d04469b4266a000a6b079f93fac4c0a3107d226fd051d1dc651abe54a07b55b1087f143dc5ea6914d326d4d58c5eabebbb3e2e0762bfd3a25c0da15d29f3c SHA512 b1999167ec68c632d214a899fd1b1078c8bbe4b9d2636d10a93f95dd7a8b5973613f5212d9baacbb81a4346161a18b914bd4fab363a9c4cdd671d7b024c3a92d +DIST grip-4.2.0.tar.gz 1209972 BLAKE2B 087118b0871b149745fa083f3eeaa79ac8c00c2b094a486cb9c5188e215dd7ce4cb06d13fb362914d7b688c89989e3b6b86ee889b4027e38b727876a06f06dd1 SHA512 26cb32064019da1d1683c44caa3c52ae513cec5b1fb435930e8e4c62433a70f14145d92f2215bf54a5bface96945d3e5e879302e2824029650d2a34218528e94 +EBUILD grip-4.1.1.ebuild 1092 BLAKE2B 0aad496a74a6c26ede57ef992ea9f7c92248a2dfd9119a483f7ddccad40b8a5f389f0e7ad08c0717f8a8f348a1442873e556c9b3c879febfdb043a7c7873a720 SHA512 44e878b2c2a4ac29ff0c541f822b18a475eae791363e387f2408acbc621d6d351a127ef3ce898a9f4ef45d73527145b29ac203b0c973d83df9451a5b2452d5ea +EBUILD grip-4.2.0.ebuild 1083 BLAKE2B 2c69f86558ee41b36781f4493c20848a79e8a2fda7253ae7f307643357569baaf8220d541dba881dda7eddc1909a2a1b0d30a2f4326fb0e2d3cfd7baef14f25f SHA512 a07dc5d888d61c67f8583aafec87b0afd699a5723642a7e557f7c7bc32f8585c91b1aea44514553ab3854929d4b69f5898ff5564763736d64d236661b73687a0 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14 diff --git a/media-sound/grip/grip-4.1.1.ebuild b/media-sound/grip/grip-4.1.1.ebuild index de4b4a0ec027..684d42ec3f07 100644 --- a/media-sound/grip/grip-4.1.1.ebuild +++ b/media-sound/grip/grip-4.1.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic toolchain-funcs libtool +inherit eutils flag-o-matic toolchain-funcs libtool xdg DESCRIPTION="GTK+ based Audio CD Player/Ripper" HOMEPAGE="https://sourceforge.net/projects/grip/" @@ -17,6 +17,7 @@ IUSE="vorbis" # grip cannot convert ripped files to any format. So use them as # a sane default. RDEPEND=" + !app-text/grip dev-libs/glib:2 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia diff --git a/media-sound/grip/grip-4.2.0.ebuild b/media-sound/grip/grip-4.2.0.ebuild new file mode 100644 index 000000000000..c3d4c46b1204 --- /dev/null +++ b/media-sound/grip/grip-4.2.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit eutils flag-o-matic toolchain-funcs libtool xdg + +DESCRIPTION="GTK+ based Audio CD Player/Ripper" +HOMEPAGE="https://sourceforge.net/projects/grip/" +SRC_URI="mirror://sourceforge/grip/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="vorbis" + +# lame and vorbis-tools are no real RDEPENDs. But without them +# grip cannot convert ripped files to any format. So use them as +# a sane default. +RDEPEND=" + !app-text/grip + dev-libs/glib:2 + media-libs/id3lib + media-sound/cdparanoia + media-sound/lame + net-misc/curl + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango + vorbis? ( media-sound/vorbis-tools ) +" +# gnome-extra/yelp, see bug 416843 +DEPEND=" + ${RDEPEND} + sys-devel/gettext +" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + # Bug #69536 + [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse" + + strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW + + econf +} diff --git a/media-sound/guimup/Manifest b/media-sound/guimup/Manifest deleted file mode 100644 index 8b25699429bb..000000000000 --- a/media-sound/guimup/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST guimup_0.3.2_src.tar.gz 587543 BLAKE2B 8b8cfc3c6a42360320b44b42710b29ef0038de535d9f1004d19cbfb7d326a8e0f6e87ff1274791dac9960e4ca306299008f3324075c1f2374ce1a46749c757b0 SHA512 64f56b189e17c60432199d72e658ac2091d051d9cde7e53da7f89b96aadb006121a123bdde7ec80634c0b263e3d68ca1517592dda5a55cddf747c8ce85a535e2 -EBUILD guimup-0.3.2.ebuild 660 BLAKE2B bdb8c2e1c1aafecc84f3530377eed9ad1548e8b2913d0b3c958520f662a864d33d2b6da42278cc81fad26e1e4119c2b52cf864a4dc495d7f5b7dd0c3a63250a7 SHA512 c893349ceaf1e6c08a03b6f350f3742d20538462337fbeca29773744070b5dd94e21a55ff717d8bd600098212459b8223c8939597f6076aa61ee73ffde447e3c -MISC metadata.xml 242 BLAKE2B 46ccd4c22db60541120e422bf9e5f14889e9f15b0c49657d126b6b33d54429f7088a08d6bfa38ff17024e783ac34e85bf5921eedd4cacc71c8094061b2f49965 SHA512 6247324f1ca339f695c8043cfbe7b785db9d44146bdce490738a4ff1a093f3f2db4591e1b42fc12b5865379caeb871be5f549bbb5b1cfa758bb99abb1f114af8 diff --git a/media-sound/guimup/guimup-0.3.2.ebuild b/media-sound/guimup/guimup-0.3.2.ebuild deleted file mode 100644 index fc0433c7c556..000000000000 --- a/media-sound/guimup/guimup-0.3.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic - -MY_P=${P/-/_} - -DESCRIPTION="A client for MPD with a clean, GTK interface" -HOMEPAGE="http://coonsden.com" -SRC_URI="mirror://sourceforge/musicpd/${MY_P}_src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-cpp/gtkmm-3.2.0:3.0 - dev-libs/libunique:3 - >=media-libs/libmpdclient-2.3 - >=net-libs/libsoup-2.36 -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - append-cxxflags -std=c++11 -} - -src_install() { - default - rm -r "${ED}"/usr/doc/ || die - make_desktop_entry guimup Guimup -} diff --git a/media-sound/guimup/metadata.xml b/media-sound/guimup/metadata.xml deleted file mode 100644 index b16fad84e68a..000000000000 --- a/media-sound/guimup/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <upstream> - <remote-id type="sourceforge">musicpd</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest index b0ca8d5a288c..25490191ad08 100644 --- a/media-sound/guitarix/Manifest +++ b/media-sound/guitarix/Manifest @@ -1,8 +1,11 @@ AUX guitarix-0.40.0-noexecstack.patch 972 BLAKE2B 7ecadff2c2882392b9eab28721135dcf8f70eb83397b1fed77c483b38be0d1ff74bcc2dab774e4a5449bb29049748b808683d5a2fe3406feb2c0f40c5a106eed SHA512 805172b4dbe22f9d45e25e8da5fb838bc635773d67b7db038105e6b1f61b3a3c05c5a473038127b6487e9bf339b272f77d73b30d266cd3ab65339a587fe747d5 AUX guitarix-0.40.0-nostrip.patch 687 BLAKE2B 001f397a93b03578e6f214b517cf7af9e09a210adb0b5a5bf343ab74a9f3bc197b2d54c244bd55b6cd91ac0617299cd0937f2fed265b348253123c9873018212 SHA512 e0ee0431a19fe014b0008ff1ef94604f97aeba3bccef6571cf2fca425882081ec1eb255573a069effd9cca40427024f4ecb54836bb60e53b8c4198ae141ef240 +AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297 DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8 +DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa EBUILD guitarix-0.39.0.ebuild 1726 BLAKE2B 2efb30118ea92aef65ed8e921378324ab38eb2632812803716ced8cde854b8ed710f9c668cc9d946eecbc7d6996577c2f819d8594b6f640a5a81e41a76fd814e SHA512 065c47eb37638e4c0c60cd0eba8e613c8502ce972f534aeee6fe9ffb3235a0ef9b3bb65a69aaffbbfe2f82580d3580dcc5b42d771bb682a94b219da9f4447d59 EBUILD guitarix-0.40.0.ebuild 1801 BLAKE2B 8b171e16c2211e54bc6b536c94fa73846b244868bcbc1e757a2bf2d02fb5d273111dfa501640b3e334ff65e071ede7ed289757d93fc0e1d0c4089c44f9f610a1 SHA512 0c14080f5f7fa841cf0ad20ef1c64b399654bcbbf12bed9c33ecbe1daf9bf29fedb70fdc981cb5cb7a45e9e291db34d00361633209cf6cf67528e75f56ffc43b -EBUILD guitarix-9999.ebuild 1734 BLAKE2B cf3c2302af3ea6f2870eb32303dabaa567d38c72987d131f0205e139a19cd23b0d6421db99218806217174e12a695604ce4cec158b4cb5848a92c665fa3d0e39 SHA512 7c9f8fd4dae7a0cdf4b75024c0edffcfaac200adc07eeaef3b5bdd7b1441350961728a0d2bbf8721ab13b201eed32b832e61b91ba0eaa6e313b0abff8c162b02 -MISC metadata.xml 595 BLAKE2B 22b392d194412eb045a3892e77a79f809215cdfc7e7afa42da59284f88975bd6d789a5a8e215c1137093266ba19e0be463d7b51b7b6506ff38f8591fd7b5cefb SHA512 5ccc8bcc15cf8fd7a5a4e18cb805765d6cc1b735c08b3194f3b4bc20d94e4d00d1db4fb9869bd58c82bcd39951d7421647811f61f7add2733e6719e6b5d78c3d +EBUILD guitarix-0.41.0.ebuild 1823 BLAKE2B 5c91bf8b09a117cc5b8c06c685ae589204e166fc1fa41eb5e7588bfa6eee9f44aa9cb7f595b66146aa66ff0f0252c2e89903885a8da566478cefdb4181fd724e SHA512 f19c54cdb9abf09349ee1f6679c590cc12877b505111a8b43fdd31acd45ab9c9771bb07931950dbb6ce1c38a1eea74ece1e536f9987936344b6f309755221f91 +EBUILD guitarix-9999.ebuild 1794 BLAKE2B f0e2ea5236e0a460125fbaf455c75436f689098fbf424de42c5edf3f2410c6a7e027dfcfbf089bb6dbdb90ac9709887350c9542e8863fde0fa0a3930f708c179 SHA512 e19797d623d28ee9a5ba40d100a59b476c1906919e0c088c0a5eea95b95557febaa66235800c5c2ee78653037d935e452338892546dffe510f797666c9ab3cf3 +MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28 diff --git a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch new file mode 100644 index 000000000000..03850a8acb03 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch @@ -0,0 +1,47 @@ +From f630c226e4d6f342f78a82f6dd6df4fe3e3f3e01 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Fri, 5 Jun 2020 17:21:10 +0300 +Subject: [PATCH] Do not strip lv2 plugins + +--- + waftools/lv2.py | 4 ++-- + wscript | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/waftools/lv2.py b/waftools/lv2.py +index 7397f6b7..256d52b1 100644 +--- a/waftools/lv2.py ++++ b/waftools/lv2.py +@@ -40,7 +40,7 @@ def lv2_add_common(tg, target, install_path, defines=None, linkflags=None, cxxfl + @Configure.conf + def lv2(bld, *k, **kw): + lv2_base, dst = get_lv2_base(bld, kw) +- tg = bld.shlib(features='strip', *k, **kw) ++ tg = bld.shlib(*k, **kw) + cxxflags = [] + if not bld.env['OPT'] and bld.env['SSE2']: + cxxflags = [ "-msse2", "-mfpmath=sse"] +@@ -57,7 +57,7 @@ def lv2_gui(bld, *k, **kw): + if not bld.env['LV2GUI']: + return None + lv2_base, dst = get_lv2_base(bld, kw) +- tg = bld.shlib(features='strip', *k, **kw) ++ tg = bld.shlib(*k, **kw) + lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], ['-fvisibility=hidden','-Wl,-z,relro,-z,now','-Wl,--exclude-libs,ALL']) + return tg + +diff --git a/wscript b/wscript +index 3e2114d3..0d49cd16 100644 +--- a/wscript ++++ b/wscript +@@ -375,7 +375,6 @@ def configure(conf): + conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications')) + conf.env['BIN_NAME'] = APPNAME + if opt.lv2: +- conf.gxload('strip') + conf.gxload('lv2') + conf.env['LADSPA'] = opt.ladspa + conf.env['NEW_LADSPA'] = opt.new_ladspa +-- +2.26.2 + diff --git a/media-sound/guitarix/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild new file mode 100644 index 000000000000..95583d16f7a2 --- /dev/null +++ b/media-sound/guitarix/guitarix-0.41.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE='threads(+)' + +inherit python-any-r1 waf-utils xdg + +MY_P="${PN}2-${PV}" + +DESCRIPTION="Virtual guitar amplifier for Linux" +HOMEPAGE="https://guitarix.org/" +SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf" +REQUIRED_USE="|| ( lv2 standalone )" + +COMMON_DEPEND="dev-cpp/eigen:3 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0 + dev-libs/glib:2 + >=media-libs/libsndfile-1.0.17 + >=media-libs/zita-convolver-3:= + media-libs/zita-resampler + >=net-misc/curl-7.26.0 + >=sci-libs/fftw-3.1.2:3.0= + x11-libs/gtk+:3 + lv2? ( media-libs/lv2 ) + standalone? ( + dev-libs/boost:= + media-libs/liblrdf + media-libs/lilv + virtual/jack + bluetooth? ( net-wireless/bluez ) + nsm? ( media-libs/liblo ) + zeroconf? ( net-dns/avahi ) + ) +" +# roboto fonts are required for correct ui rendering +RDEPEND="${COMMON_DEPEND} + standalone? ( + media-fonts/roboto + ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + dev-lang/sassc + virtual/pkgconfig + nls? ( + dev-util/intltool + sys-devel/gettext + ) +" + +DOCS=( changelog README ) + +PATCHES=( + "${FILESDIR}"/${P}-nostrip.patch +) + +src_configure() { + local myconf=( + --cxxflags-debug="" + --cxxflags-release="-DNDEBUG" + --ldflags="${LDFLAGS}" + --enable-lfs + --lib-dev + --no-desktop-update + --no-faust + --no-ldconfig + --shared-lib + $(use_enable nls) + $(usex bluetooth "" "--no-bluez") + $(usex debug "--debug" "") + $(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui") + $(usex nsm "" "--no-nsm") + $(usex standalone "" "--no-standalone") + $(usex zeroconf "" "--no-avahi") + ) + waf-utils_src_configure "${myconf[@]}" +} diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild index 95daa28f6cff..1f66e9647b1f 100644 --- a/media-sound/guitarix/guitarix-9999.ebuild +++ b/media-sound/guitarix/guitarix-9999.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${P}/trunk" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="bluetooth debug lv2 nls +standalone zeroconf" +IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf" REQUIRED_USE="|| ( lv2 standalone )" COMMON_DEPEND="dev-cpp/eigen:3 @@ -38,6 +38,7 @@ COMMON_DEPEND="dev-cpp/eigen:3 media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) + nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) " @@ -74,6 +75,7 @@ src_configure() { $(usex bluetooth "" "--no-bluez") $(usex debug "--debug" "") $(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui") + $(usex nsm "" "--no-nsm") $(usex standalone "" "--no-standalone") $(usex zeroconf "" "--no-avahi") ) diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml index 73245221dba8..a17618d6ef19 100644 --- a/media-sound/guitarix/metadata.xml +++ b/media-sound/guitarix/metadata.xml @@ -15,6 +15,7 @@ </maintainer> <use> <flag name="lv2">Build lv2 plugins</flag> + <flag name="nsm">Build NSM (Non Session Manager) support</flag> <flag name="standalone">Build standalone application</flag> </use> </pkgmetadata> diff --git a/media-sound/horgand/Manifest b/media-sound/horgand/Manifest index 0a85790715ae..79eb11647de9 100644 --- a/media-sound/horgand/Manifest +++ b/media-sound/horgand/Manifest @@ -1,4 +1,4 @@ AUX horgand-1.14-overflow.patch 235 BLAKE2B 95be6c62891707f79026b7066adbf8ef52cf79f2f19ff8de771f3e7cb6515c6703aa524e82e515bc38fd41c836eb5a4efad4d54f8c8a99a2fb49bf4d3ecf0458 SHA512 d7506c99e01a3f82d3424f368764208e3bd9638c1ffe493cdc9c69a7037164ff9c3a8787fb151fa6395001bdbfd0fabcd9c46118e10b14fe4e2d542894de6807 DIST horgand-1.14.tar.gz 2531734 BLAKE2B 3b461a070e2716e1fb359b83edf2fa9db41bf24c1feff70fd80245964eaacb41861f7c43257dafadf25be096e02c78125a6987b0954b658cbefd44c798319c19 SHA512 d67a51972d2ddf3044cadfd40e298da6282c05de23faed98589602110a142728c45dd9d0f8cbc9c9a3b488a4e32d08a69ae36e7d94ea287e0880682eee066360 -EBUILD horgand-1.14-r1.ebuild 916 BLAKE2B 8cf694d2e0356820b81c270737d1b4c49d77fef53ebfc881c2ea605c63b92a6be72bb399470a6145b3d39adf44fe06d8cf67449b81e42b26ec8b99d3809242d6 SHA512 ded53590fda6c44c560573461ba37b2b13217f7de3e3c7518760ca7e73b9693b73ebcfc6aca617fcf55ab6d61e715a10010ea1d084c71774686cc946622368b5 +EBUILD horgand-1.14-r2.ebuild 878 BLAKE2B 6b540892426d02a8ed76dd9a91e1621961adfb1bfa6098c2b15a1b65abd60de418b9d0813325a34b6424e37bb9b52492a1a9325cfce609d062993fff2fbe9d16 SHA512 bdc40eefed32585d5a9169fa53ac9b081932f1cd21f4ed42942b296c99c15cfbe091e497d18e1456c7bc67644089b3fae5b0f708b375f89108ef1cf902240816 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/horgand/horgand-1.14-r1.ebuild b/media-sound/horgand/horgand-1.14-r2.ebuild index a02538b9c3e9..2de59fda12c2 100644 --- a/media-sound/horgand/horgand-1.14-r1.ebuild +++ b/media-sound/horgand/horgand-1.14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,28 +6,25 @@ EAPI=7 inherit desktop toolchain-funcs DESCRIPTION="Opensource software organ" -HOMEPAGE="http://horgand.berlios.de" -#SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.gz" +HOMEPAGE="https://sourceforge.net/projects/horgand.berlios/" +SRC_URI="https://download.sourceforge.net/${PN}.berlios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" -IUSE="" -RDEPEND="x11-libs/fltk:1 - x11-libs/libXpm - media-libs/libsndfile +RDEPEND=" media-libs/alsa-lib + media-libs/libsndfile media-sound/alsa-utils - media-sound/jack-audio-connection-kit" -DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/jack + x11-libs/fltk:1 + x11-libs/libXpm +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -src_prepare() { - default - eapply "${FILESDIR}"/${P}-overflow.patch -} +PATCHES=( "${FILESDIR}/${P}-overflow.patch" ) src_compile() { emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \ diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 01260b5d32da..ce950ab6dc4d 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,9 +1,8 @@ -AUX hydrogen-1.0.0_beta2-gnuinstalldirs.patch 2045 BLAKE2B 17c2fdf5e7cf5762db0c86bbe40f7edc58d428eadfe1e910e126d727faeb5dc04089a8a5cce0deefc2b3c4dba22dbe0fba9dc7ab2d3cb3585c4bf24e0947fa36 SHA512 c2556a65dab28977cb2a0fe20818b9b5c2bf6852fb8300721e212c9dc6fdcf32e10ee0d5b2efe9116a1621573e5d0f2eb999f68dd937235e19fe9c71b2bd51c3 -AUX hydrogen-1.0.0_rc1-gnuinstalldirs.patch 1239 BLAKE2B 5b3992a642b3a7807ee08772d9eab1db9258ac760d6937327e2aedda6ebe1c7b2e7e3708af7b63a3c031b552991e05f33f4e836b59458589538b04e08aec8238 SHA512 70c4a24db4713c77d2692dae131977c930a8357eb99151c2001ecececa8afd93b720cee8ee2ff2df2cb60fd6d797b589276e77b81a287a8e50a119ff0947e1b0 -AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792 -DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9 SHA512 8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242 +AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792 +AUX hydrogen-1.0.0_rc1-gnuinstalldirs.patch 1240 BLAKE2B 165cc1e6706a95c57d9ebcac7689c5725fbbe3c72eca8d0b960ade48b09b0c9e38b2750319f022075427c308cf55f5cf06f5c8203e02ecb999bc5695ff4cd0c3 SHA512 d48380e4ed620dd3e5cc508c9a90224b59b9d1b57b80fbfc42d6991bfc14ddab47c3082831bf8356f701c97fee48ff326f64a7c04becb9bb86b0a58b5d358a23 +DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7 DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be -EBUILD hydrogen-1.0.0_beta2.ebuild 2062 BLAKE2B 0289014d76351d56ba5c00631b8d403e1a8fb6bbb61a7aceb507e086e85907d074d9470b72a49cb43e2bbae43fac6f13fe79bd1a5efcdb77a13d9c06aa40c78a SHA512 4a007b1a2535b0f8774958646e9f362b3f0ce1bdcf536d94f52509cc0bfdf893c733095e8c07fb342243fa039815d68a28143cc8d421c01a0499670517a25613 -EBUILD hydrogen-1.0.0_rc1.ebuild 2070 BLAKE2B 7c16219b532127c58cb8aa92809f4e6f3c5e245356016802deedda897a3dcd5a08c0a9539328615f3f0c0ea28a2bffaa90b0c22e4801883c35cf513bebe0928f SHA512 ac8289c4de3e73c3cf18f83cd718aa1d9dec7c557a80abef2cb6d05d2bd2f4fc21a7edfa1fb2c271790a964cd02a4d6c2e2c4a6e72e035a19ddef42cda5826fc -EBUILD hydrogen-9999.ebuild 2047 BLAKE2B 51d1cec2bbb952555e0f76a9be02d4f9cbb5ba8abb3f4ffa835b07ba5b829a82cac91289076710daf1d6e2c780a5d52c247bfeba35b7d2fdb83370b701af54e9 SHA512 fe85e1e03b10ad11b8076166ec66cf803216e496116f127f5cad63e6ed2db6258dd1bf38d05934fb0b4df756aa524b20833b2e64793d2ff6d799bc6be931c81e +EBUILD hydrogen-1.0.0.ebuild 2089 BLAKE2B a14b411e83bc9794d94b96eade4d459c61514cde48cd6a5b9d984f9de20e1df6ee7b3b1a6ec3b0c86946604a41eb628257829aa86855dc8b04a50bc7d84bb47b SHA512 fd55d835c7d74498cd78e7678f0abd8e6230051e84f8fb4b4a585967febb593a8463650b742e879f43d5b36c0f0ef790ffc1c6228ae65622005d96cd7e194c24 +EBUILD hydrogen-1.0.0_rc1-r1.ebuild 2104 BLAKE2B 68108e4fe3b357713cc567f819634cf5a535abff1e365f6952e76218cfe5fdeb86b74e173649b306c8e209b3cfdac24c385e1babf5e163b8da16a69a2f3f04f7 SHA512 db6ebcd97acb754f004f19bb98951b0c7f5703489a6f6881fef1edea64a9230b7a25b671a7919d1e1a1d82dd8d355e9d7b04c8b55d49e38b129574a3cf508c1f +EBUILD hydrogen-9999.ebuild 2096 BLAKE2B 9372a442451a8aee63ab861496fa820e47396ee4ee2b0b9cbfc389ed8f7930c05efbb9e7cd61a9fd672f65c6dd207a98a6ff1ed237c7ceef79ff94bf5f060173 SHA512 e37238a1baf16a6f41ee930dd9c18a0d8d918c99eaba1a7f10deb311374c679355bea9dbee356381489b3e61cb894fd46f927e0aabdea865d628c57ef539a752 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch index 9b8429753072..9b8429753072 100644 --- a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch deleted file mode 100644 index 6238c47504b7..000000000000 --- a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d9e146..986e435 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,10 +362,10 @@ ELSE() - INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) - ENDIF() - IF(NOT MINGW AND NOT APPLE) -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") - ENDIF() - - # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index cfdc72a..b7b0dbc 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} - - IF(NOT APPLE AND NOT WIN32) - INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) -- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" ) -+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) - ENDIF() diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch index a137dc580b82..4c6512760b87 100644 --- a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch @@ -8,7 +8,7 @@ index 20368f1..b72a272 100644 IF(NOT MINGW AND NOT APPLE) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") + INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild index 7b7b6694b999..bfd663bbc555 100644 --- a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild +++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.hydrogen-music.org/" if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}-music/${PN}" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="" else MY_PV=${PV/_/-} SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" @@ -30,7 +30,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen ) " -DEPEND=" +CDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -49,7 +49,11 @@ DEPEND=" portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) " -RDEPEND="${DEPEND}" +DEPEND=" + ${CDEPEND} + dev-qt/qttest:5 +" +RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild index b86b1ac0cdda..dd0f1fcfd435 100644 --- a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild +++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild @@ -30,7 +30,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen ) " -DEPEND=" +CDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -49,7 +49,11 @@ DEPEND=" portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) " -RDEPEND="${DEPEND}" +DEPEND=" + ${CDEPEND} + dev-qt/qttest:5 +" +RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 9ca42ba68d70..245dc874f114 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -30,7 +30,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen ) " -DEPEND=" +CDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -49,11 +49,15 @@ DEPEND=" portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) " -RDEPEND="${DEPEND}" +DEPEND=" + ${CDEPEND} + dev-qt/qttest:5 +" +RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) -PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" ) src_prepare() { cmake_src_prepare diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest index b5a9e9eca348..f202474c6244 100644 --- a/media-sound/jack-audio-connection-kit/Manifest +++ b/media-sound/jack-audio-connection-kit/Manifest @@ -1,4 +1,5 @@ AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f -EBUILD jack-audio-connection-kit-0.125.0.ebuild 1979 BLAKE2B 372a239eed7bc52f39ab7630332887f9ab038d466e96e5313ff953b0634b0033a5a001bc46d3302e9e42a1f00f404c8cfe9112be4336211deddbe64eee702849 SHA512 45eb39223a263c6d606e4b2a575c47c8ee74a4df142426c74a8c3af4dcd3c9281e2b85457c06bb3d4b4fcbada9bcf572b14dfa421973fface1cf015f77a70e40 +EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2148 BLAKE2B 626ac9050904f455152f8ec130eef3ba783f24d3e936a0fdfeb88ceabe57194aeff526bf8ab9242ec980cbc0e08d772e45ff9bafafc04373b4fe4786dffad32f SHA512 4b65648017f0be27c027766e96c997e0b776d67b922cc93cd3affaa6d7ad929db83c7f23c1fbc724d4cdfbf4334a906faa65a848730085d1bc2f9f90111b1ba9 +EBUILD jack-audio-connection-kit-0.125.0.ebuild 1947 BLAKE2B 54ad16c5a76b562c2a9cff2bb545463121870f2414171f0b7cd46bae55a52a4e431fed51527eace5244cabd35130964fb031916d4a5028d2965c85448ef92889 SHA512 e4407c136e6a24006cbb0ae3597493d862eccd5b60e04dcc4f0418defbd10fe3d98f687d90db33f89fbada2dbe556ae86e1d1df9a7e56d222f7dc8780eb0d5b5 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21 diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild new file mode 100644 index 000000000000..ace5ea4bac35 --- /dev/null +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic eutils multilib-minimal + +DESCRIPTION="A low-latency audio server" +HOMEPAGE="http://www.jackaudio.org" +SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~s390 ~sparc" +IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam" + +# readline: only used for jack_transport -> useless for non native ABIs +# libsndfile: ditto for jackrec +# zita: ditto for jackd +RDEPEND=" + sys-libs/db:=[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=media-libs/libsndfile-1.0.0 + alsa? ( + >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] + media-libs/zita-resampler + media-libs/zita-alsa-pcmi + ) + >=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + alsa? ( sys-process/lsof ) + pam? ( sys-auth/realtime-base )" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +DOCS=( AUTHORS TODO README ) + +PATCHES=( + "${FILESDIR}/${PN}-0.125.0-freebsd.patch" +) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + local myconf="" + + # Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow + # or sse) + if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then + myconf="${myconf} --enable-dynsimd" + fi + + if multilib_is_native_abi ; then + myconf="${myconf} $(use_enable alsa zalsa)" + else + myconf="${myconf} --disable-zalsa" + fi + + use doc || export ac_cv_prog_HAVE_DOXYGEN=false + + econf \ + $(use_enable altivec) \ + $(use_enable alsa) \ + $(use_enable coreaudio) \ + $(use_enable debug) \ + $(use_enable oss) \ + --disable-portaudio \ + --disable-firewire \ + $(use_enable cpu_flags_x86_sse sse) \ + --with-html-dir=/usr/share/doc/${PF} \ + ${myconf} + + if ! multilib_is_native_abi ; then + for i in tools man ; do + sed -i -e "s/ ${i}//" Makefile || die + done + fi +} + +multilib_src_install_all() { + einstalldocs + if use examples; then + dodoc -r "${S}/example-clients" + docompress -x /usr/share/doc/${PF}/example-clients + fi +} diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild index 2dffe774f5da..2bf8c095b503 100644 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit flag-o-matic eutils multilib-minimal DESCRIPTION="A low-latency audio server" HOMEPAGE="http://www.jackaudio.org" -SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz" +SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" @@ -21,21 +21,21 @@ RDEPEND=" sys-libs/readline:0= >=media-libs/libsndfile-1.0.0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - >=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}] - !media-sound/jack-cvs" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" + >=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" RDEPEND="${RDEPEND} alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.125.0-freebsd.patch" -} +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen )" DOCS=( AUTHORS TODO README ) +PATCHES=( + "${FILESDIR}/${PN}-0.125.0-freebsd.patch" +) + multilib_src_configure() { local myconf="" @@ -69,8 +69,7 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs if use examples; then - insinto /usr/share/doc/${PF} - doins -r "${S}/example-clients" + dodoc -r "${S}/example-clients" docompress -x /usr/share/doc/${PF}/example-clients fi } diff --git a/media-sound/jack-keyboard/Manifest b/media-sound/jack-keyboard/Manifest index 0d07cacfa707..d844c687611d 100644 --- a/media-sound/jack-keyboard/Manifest +++ b/media-sound/jack-keyboard/Manifest @@ -1,3 +1,6 @@ +AUX jack-keyboard-2.7.2-man.patch 507 BLAKE2B d19f4357d110e62214940460f01c31ec10b843ac58082eb5b2daf7125e9d324e5e4f673b256f877cc3ba947b8e010ac497aeb0afce858c09bada37221fb887de SHA512 729e90c712cc52913920aaaea6d1364be96fe39e386efde1264a70fe502b171b777ac23127a40f4837cbf173442af56376a67413555db0631ad23effc811b062 DIST jack-keyboard-2.5.tar.gz 108710 BLAKE2B 563857c4b4acee8df16b720530c444fc25745734e5aaad535cb4d0d2fda3d3a526fa7523b4a0bf8da0d93fad27312fbc253e3f509b744953cd386b0a2442852a SHA512 2a8b45315f25080529dc667d869ae6bd6fe70345f74a10625e6ed6a13043333e495f37c53dc49d968533c65dfb0bd0f0a6b91eaa89e890ce492cb1f3da8c8009 +DIST jack-keyboard-2.7.2.tar.gz 46164 BLAKE2B 05e4df0298a709b5018309f7c55553da5c5246264669df12c98158a9763ded492151422c79ce47d8b107b2858a9a6135c941cd92956206209fc07ef6fbb89f1c SHA512 d47ab73c3e030a1364703ab0bf9f88865ead5a7ad9b85e88268a57fab30677ca1e731279761b453b8d8f03ec4177da8e550f51e40119e2cfd921fec6f1927534 EBUILD jack-keyboard-2.5.ebuild 608 BLAKE2B acde4d5b613a26b43abddf082a074eb7433f8ec99464c2a93e362a18e237be8292da599c9e045c08b5fd534d47cfdc364f58240d86c598570004c3d83bd386c4 SHA512 65a437235032e7adecad4084155bca77acd15cf519172af5671c1314262c6b513370256e58f6d7dc32d29185d4440938c2b3faac69131fdb12c317f38088da95 +EBUILD jack-keyboard-2.7.2-r1.ebuild 799 BLAKE2B da7b12d9a3aedd31dbcf5b475fa6c3dc3f4a1211d87d74c91652ccc9d8ff13a43543dc8d9fa0a808a81cbb6874375d2dcbf532b729bb1d7a6a94f521a02113b2 SHA512 a210b3200b1411f4867f7e70cf94031645478a41a08a75685179d46890897f4fc020f93eb0a50c2938c5ee72a429098a5ffb2eb07d74ccb7070dd39a43dd188e MISC metadata.xml 669 BLAKE2B 340b194e38aa8c5f7944961c33d675db41db1a681dfa623acc8e1da41d6eb464607a3a9e8ac9006d936e795fa08c1074289339828b29d51b35b11d78c73cf808 SHA512 70b905896625bcebe0e83a807e84a47688691e02b36e99a8d45b91be944709016a98bb5df97f591ea562d65daf79d7a33de26e9760891191abf8def0d245a9b8 diff --git a/media-sound/jack-keyboard/files/jack-keyboard-2.7.2-man.patch b/media-sound/jack-keyboard/files/jack-keyboard-2.7.2-man.patch new file mode 100644 index 000000000000..4fb6f0411eb8 --- /dev/null +++ b/media-sound/jack-keyboard/files/jack-keyboard-2.7.2-man.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5b7c98..3a9a280 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,4 +68,4 @@ target_link_libraries(jack-keyboard -lm) + install(TARGETS jack-keyboard RUNTIME DESTINATION bin) + install(FILES pixmaps/jack-keyboard.png DESTINATION share/pixmaps) + install(FILES src/jack-keyboard.desktop DESTINATION share/applications) +-install(FILES man/jack-keyboard.1 DESTINATION man/man1) ++install(FILES man/jack-keyboard.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild b/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild new file mode 100644 index 000000000000..dd40aa9f0a7f --- /dev/null +++ b/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="A virtual MIDI keyboard for JACK MIDI" +HOMEPAGE="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/" +SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="lash X" + +CDEPEND=" + dev-libs/glib:2 + virtual/jack + x11-libs/gtk+:2 + lash? ( media-sound/lash ) + X? ( x11-libs/libX11 ) +" +DEPEND="${CDEPEND}" +RDEPEND="${CDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-man.patch" +) + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DJackEnable=ON # though configurable, does not compile withou jack + -DLashEnable=$(usex lash) + -DX11Enable=$(usex X) + ) + + cmake_src_configure +} diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest index 152b0de680af..600622c5afce 100644 --- a/media-sound/jack2/Manifest +++ b/media-sound/jack2/Manifest @@ -1,4 +1,5 @@ +AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd -EBUILD jack2-1.9.14.ebuild 2366 BLAKE2B f4c6acad4ecfc5b5810adcfb8a4e71208295e2fc7ebaeaf776758792df978496310af3af9fce36b890b3436ef2618fafb7dc40fa4f42459e470759b1e6441130 SHA512 fcf627cadbba9eec3021f599d6051791a8e3cefb28ee668691e2f9cd007a2dd1735fb863936af1d83bc5626dd1416e8c270ef3e1405d537a9ea5b2e51b19687b +EBUILD jack2-1.9.14.ebuild 2432 BLAKE2B 3902fe7a37ee2429232c90465d946a85bd101e0b9fb4f7440cb9217c6978503f5189bb90013018ddc2737fcd81dad66cb8517cc4e85c00bce135d5feb21635f7 SHA512 73c6eb3774ef227ffb6c8ad83077e9328c9a24e30f88a38808d978ffca5ea43be0bdb9f0912e37d6ce03b90363a93e933581ea936c1f48ef4fd87801f4a8c9d7 EBUILD jack2-9999.ebuild 2406 BLAKE2B 4cf6581a7cf3bf8e9a60dd063fbe8d0dd2cad8734e91ff09c08c4af5431502d9f30f65a3571bf3f5e2b589a31da31b3aecf8f62338496a52d1caa20caa480744 SHA512 0abe0f5bee6a76730cd21737e6391783b1f2109b82a0b80ccf9cd2d72d5b6e2dcb52daf55465d5032882968c41da0e0f154c97386cb1c4d66e4d3d2c39aa8132 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5 diff --git a/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch b/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch new file mode 100644 index 000000000000..10dd10afe565 --- /dev/null +++ b/media-sound/jack2/files/jack2-1.9.14-fix-doc.patch @@ -0,0 +1,13 @@ +diff --git a/doxyfile.in b/doxyfile.in +index f92e264..2335ada 100644 +--- a/doxyfile.in ++++ b/doxyfile.in +@@ -792,7 +792,7 @@ HTML_HEADER = + # each generated HTML page. If it is left blank doxygen will generate a + # standard footer. + +-HTML_FOOTER = @SRCDIR@/no_date_footer.html ++HTML_FOOTER = + + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading + # style sheet that is used by each HTML page. It can be used to diff --git a/media-sound/jack2/jack2-1.9.14.ebuild b/media-sound/jack2/jack2-1.9.14.ebuild index 828b602a1d16..b321f22400c8 100644 --- a/media-sound/jack2/jack2-1.9.14.ebuild +++ b/media-sound/jack2/jack2-1.9.14.ebuild @@ -18,7 +18,7 @@ else MY_P="${PN}-${MY_PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~ppc x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" fi LICENSE="GPL-2" @@ -55,6 +55,10 @@ RDEPEND="${CDEPEND} DOCS=( ChangeLog.rst README.rst README_NETJACK2 ) +PATCHES=( + "${FILESDIR}/${P}-fix-doc.patch" +) + src_prepare() { default multilib_copy_sources diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest index 359dd5029abc..4d4ddf7bdfeb 100644 --- a/media-sound/jamin/Manifest +++ b/media-sound/jamin/Manifest @@ -1,5 +1,6 @@ -AUX jamin-0.95.0-desktop.patch 308 BLAKE2B 0c7a0dcdc4d58229fc1d15d50bcbbe53721ae3fcae0bb6c0539a81e0c11b2fa8d3a8f6f5b5975a47bd8097540af3cb4cb6b4ce40e53d34b82656a83ba06ee303 SHA512 e8a5af5ab288af1f4dceb9db09dd42a4eafc1beee14437b5b017085b597d014b76df03320c3089398f24fca9fe95dc49d4bb9ec107d7776b5102b4518d652775 -AUX jamin-0.95.0-multilib-strict.patch 335 BLAKE2B c6cd90004e8ee7ec6191dd251d41ffb462e500dba5774c82dfb71b8e77455fd5f96008b5a8bfc094c138223afb734dd2bed00033d93d88eacc5b5ba342de6918 SHA512 14adfe893d4ea18efbb3a936df34f163689a0cf734ca391d80558d92c4ef82cb944f94d962ecba25fc358e2756b252302ac648d789a850fab608216588d5ed03 -DIST jamin-0.95.0.tar.gz 1007290 BLAKE2B 52e28f05170880307a5e50424fce3511ece30ea9e36e479c38efbbfe80c8c6a4116742c42e74a5ded717ad6d3f6b5c780e6b79c764ad280cba3538678b223866 SHA512 c57079b65e89623ee6b3f1e71d4ce1c2d995e4a14f8decd17b5d936e99469bb85089da063358e966fdc19a6fa419698c9ca586909d85d69b0525e929a3bd2555 -EBUILD jamin-0.95.0-r3.ebuild 886 BLAKE2B 889c50fe1315fccb050b756c0fabd7120e9c2423208128419366bac33aee45c50ec71ebff377718752aab75d13f31e013b80de78b975c9ac88bbcd3899e43012 SHA512 ce179b56433bf6737b1f1ad56b495e670ea0af623198df16eec1918bc6563d000e7b0f3ed398f94f9636d901110e17cec419a589baf9776fa5ee316f3a451bd7 +AUX jamin-0.98.9_pre20170111-desktop.patch 511 BLAKE2B a0f7a9ec3ae5da4bc47eef228054c3330b88869e93e14aeba6225513ec2158e43684cd96b6d44ba1d2ad07101c3a0e3c78c2f201238773e6a0932e8d7f60d790 SHA512 117d589f67bc3039918de90469fba0abdccfbd59562bcbbe345a2bf9c4799a8f00b1137d89df6b929ce5bffc264e9d938d9bb65d6b4514a4cfb0322b5ce3146e +AUX jamin-0.98.9_pre20170111-gcc10.patch 762 BLAKE2B 0ad04265d62526e4652e1139cb424ed5d2cedb143b0cfd15858110aa4669bb6f1a00e22a88af0019960731f30515319c91553f5c3aea26a946e8e754a261b5c8 SHA512 5e007e149f98987739295ae952d07aa26afbb4777deff1d262b6ce3a5173ccfc15c0d8312f61603daab0b8e90e3280e7fa2fbbd36bd27d6bc552e057fd4eacdc +DIST jamin_0.98.9~git20170111~199091~repack1-1.debian.tar.xz 12476 BLAKE2B d25f0a27b754a79da7146ec3c104792a20df0e4258ce01bff29011fa04e1d62057f7c11baac7991634f8161da847ced20e8a81b9d92a1f0cb8d035b32adc5ed1 SHA512 f1d2ddc0f1139ffc8ba9036cc385b08cb4c996bf776d909d56e687ead1eee9426e249c46f3eab5d4fde220c75a435a8e4cd9a726f01c9026d42b2208b79c7da7 +DIST jamin_0.98.9~git20170111~199091~repack1.orig.tar.bz2 679350 BLAKE2B fc111a4062c4c4ed43eb9a6ea3f8c1d44afbc63780586e8e3b260ec5f5a56781e1e74dd9ebfaac4fbdbaa487662f6b9d75983e02cdca142335d9cb5d3b666dce SHA512 5887bf1f7021d9730a0904afb532d99d9681aa50468e4cdd69c7a69ea7c248192be9a64de21e3be2d01ec6cc4535361470ebfcc4ca4fa4736fcaf5653293ccbe +EBUILD jamin-0.98.9_pre20170111.ebuild 1448 BLAKE2B 2ed74f59040b9289d9fe285d852fd86553921c7993ee76d84462b9f1768941be0259e266895cac20c3a7e1af4289ed04e32965195317fcbc70e593fe238fd88d SHA512 658f43bb778fd8ebad5bd985c442d102291d424fdd8ac9e6139ee3b982b328a7b304a7f732ff44c9f528768f103577b4359721eeb545a1247b7460d6f070a688 MISC metadata.xml 334 BLAKE2B 49b789d957dd730e2d74f25297b90b83357f29cb2ef4c9b8820a39841c334c566bf82752a1ab1d53d7925d9fad8fd1243f00bfbe0bb71ee5edd0999aff303a71 SHA512 4b263c4fc008cbc6e415426fa782c934c55ad5d5f7d7d257ca79e414234cc5284c0edc938d138dcadb670bfbe35857a6103ac0b990f099e694c69e7ae349656a diff --git a/media-sound/jamin/files/jamin-0.95.0-desktop.patch b/media-sound/jamin/files/jamin-0.95.0-desktop.patch deleted file mode 100644 index 87cad61a0d0c..000000000000 --- a/media-sound/jamin/files/jamin-0.95.0-desktop.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/data/jamin.desktop.in -+++ b/data/jamin.desktop.in -@@ -3,9 +3,9 @@ - _Name=JAMin - _GenericName= - _Comment=JACK Audio Mastering interface --Categories=Application;AudioVideo; -+Categories=AudioVideo; - Exec=jamin --Icon=jamin.svg -+Icon=jamin - MimeType=application/x-jamin; - StartupNotify=true - Terminal=false diff --git a/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch deleted file mode 100644 index e2e13ce6f452..000000000000 --- a/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/controller/Makefile.am -+++ b/controller/Makefile.am -@@ -1,5 +1,5 @@ - plugin_LTLIBRARIES = jamincont_1912.la --plugindir = @prefix@/lib/ladspa -+plugindir = @libdir@/ladspa - jamincont_1912_la_CFLAGS = @OSC_CFLAGS@ -I../src - jamincont_1912_la_LIBADD = @OSC_LIBS@ - jamincont_1912_la_LDFLAGS = -module -avoid-version -Wc,-nostartfiles diff --git a/media-sound/jamin/files/jamin-0.98.9_pre20170111-desktop.patch b/media-sound/jamin/files/jamin-0.98.9_pre20170111-desktop.patch new file mode 100644 index 000000000000..bb5d8fd91582 --- /dev/null +++ b/media-sound/jamin/files/jamin-0.98.9_pre20170111-desktop.patch @@ -0,0 +1,19 @@ +--- a/data/jamin.desktop.in 2015-01-14 10:10:12.000000000 +0100 ++++ b/data/jamin.desktop.in 2020-08-07 21:23:02.617171359 +0200 +@@ -1,11 +1,10 @@ + [Desktop Entry] +-Encoding=UTF-8 +-_Name=JAMin +-_GenericName= +-_Comment=JACK Audio Mastering interface +-Categories=Application;AudioVideo; ++Name=JAMin ++Comment=JACK Audio Mastering interface ++Categories=AudioVideo;Audio ++Keywords=audio;sound;mastering;ladspa + Exec=jamin +-Icon=jamin.svg ++Icon=jamin + MimeType=application/x-jamin; + StartupNotify=true + Terminal=false diff --git a/media-sound/jamin/files/jamin-0.98.9_pre20170111-gcc10.patch b/media-sound/jamin/files/jamin-0.98.9_pre20170111-gcc10.patch new file mode 100644 index 000000000000..f070267bf90f --- /dev/null +++ b/media-sound/jamin/files/jamin-0.98.9_pre20170111-gcc10.patch @@ -0,0 +1,24 @@ +diff -rup jamin-0.97.16-orig/src/hdeq.c jamin-0.97.16/src/hdeq.c +--- jamin-0.97.16-orig/src/hdeq.c 2007-07-01 17:33:18.000000000 +0200 ++++ jamin-0.97.16/src/hdeq.c 2020-02-01 21:09:18.306430243 +0100 +@@ -122,6 +122,8 @@ void interpolate (float, int, float, flo + + /* vi:set ts=8 sts=4 sw=4: */ + ++/* Defined once here */ ++GtkNotebook *l_notebook1; + + /* HDEQ right-click popup menu. */ + +diff -rup jamin-0.97.16-orig/src/hdeq.h jamin-0.97.16/src/hdeq.h +--- jamin-0.97.16-orig/src/hdeq.h 2007-06-13 04:20:08.000000000 +0200 ++++ jamin-0.97.16/src/hdeq.h 2020-02-01 21:04:13.562907137 +0100 +@@ -62,7 +62,7 @@ void hdeq_notebook1_set_page (guint page + int get_current_notebook1_page (); + + +-GtkNotebook *l_notebook1; ++extern GtkNotebook *l_notebook1; + + + #endif diff --git a/media-sound/jamin/jamin-0.95.0-r3.ebuild b/media-sound/jamin/jamin-0.95.0-r3.ebuild deleted file mode 100644 index 6592e96b1cb1..000000000000 --- a/media-sound/jamin/jamin-0.95.0-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface" -HOMEPAGE="http://jamin.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="osc" - -RDEPEND=" - >=dev-libs/libxml2-2.5 - >=media-plugins/swh-plugins-0.4.6 - >=media-sound/jack-audio-connection-kit-0.80.0 - >=sci-libs/fftw-3.0.1 - >=x11-libs/gtk+-2:2 - media-libs/alsa-lib - media-libs/ladspa-sdk - media-libs/libsndfile - osc? ( >=media-libs/liblo-0.5 ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - AUTHORS ChangeLog NEWS README TODO -) - -PATCHES=( - "${FILESDIR}"/${P}-multilib-strict.patch - "${FILESDIR}"/${P}-desktop.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable osc) -} diff --git a/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild b/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild new file mode 100644 index 000000000000..6cf9723e2421 --- /dev/null +++ b/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg + +DESCRIPTION="Audio mastering interface for JACK Audio Connection Kit (JACK)" +HOMEPAGE="http://jamin.sourceforge.net/en/about.html https://salsa.debian.org/multimedia-team/jamin" +SRC_URI="http://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1.orig.tar.bz2 +http://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1-1.debian.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="osc" + +RDEPEND=" + dev-libs/atk + dev-libs/glib + dev-libs/libxml2 + media-libs/libsndfile + >=media-plugins/swh-plugins-0.4.6 + sci-libs/fftw:3.0= + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/pango + virtual/jack + osc? ( >=media-libs/liblo-0.26 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${WORKDIR}"/debian/patches/1003_add_dynamic_linking.patch + "${WORKDIR}"/debian/patches/fix_typos.patch + "${WORKDIR}"/debian/patches/NEWS.patch + "${FILESDIR}"/${P}-gcc10.patch # thanks Fedora + "${FILESDIR}"/${P}-desktop.patch +) + +S="${WORKDIR}/${PN}" + +src_prepare() { + default + + # bug 632470 + cat <<-EOF > po/POTFILES.skip +jam-ui.glade +src/limiter-ui.c +EOF + + sed -e "/^AC_INIT/s/.in/.ac/" -i configure.in || die + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable osc) +} diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index 3c99955c9193..02945f788fb1 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,5 +1,3 @@ -DIST kid3-3.8.2.tar.gz 2218360 BLAKE2B 26b1c0bffa6972f085538323b8836917ed4384aec5c0374bd0dbec35a150ad62912c6fd08e94fe66bfaa43928619a73a41286baa28edac2eb3da4ae8dc7aa0e9 SHA512 323806ed9af067760403d2e8c6262222640f40e76819fa31a96e34fd4e0e745dbe3c9e516540df71022d3deb03499b8529c436e7a1fda254c56b5425aa993ecf DIST kid3-3.8.3.tar.gz 3091795 BLAKE2B 245009d074c4b0734ee9fd39eb796e2679c416915e03773ca4f6fe7d570e17fefc73eaaaa03f4c42a3d81c2f2c4778b500bc8dfdff0a0cf07293d39571b8ab9f SHA512 5381c76b032e30b4a6382d160406f5ed75915c0e23bed62b3070dd875a1c812f907a7ecae833b82753fd2372f96d460b17a879ca9043c3786109074391199a5a -EBUILD kid3-3.8.2-r1.ebuild 1766 BLAKE2B b8407b370472b539a3150aa9ca0c726da25635dca41852a09e47b374ba64533d73a2b09b949c205dc05650fe9949b3d0bf68744b1d6e97d1a37d20ea18bbae1a SHA512 18f1e7c11b5cff32cd49c7e70821288e85613f64279127104af80c99974df0b685af771a3c678a1e1b471d1ceada84e421655cd9e63938886a8099af81076ccb -EBUILD kid3-3.8.3.ebuild 1761 BLAKE2B e300726d3a49a489bcd7136e708d2098a4065a57dd01dd0912a2f27530ea0dcbb039db97368df7008f0855823568d68a1ab3c1d65cc0b536b48f1f1ce9ca303b SHA512 3108889b713f895f3b2ef863a10944ec1925ff950bc7d85976cf4276e377602b99ccd5b6de47ea639175bf906c28f041eb9c4e0501381a5683b66bbe88fdece0 +EBUILD kid3-3.8.3.ebuild 1759 BLAKE2B eaf9e42b64cdb1e82e80bbda06cbba78698457787894313f7f1a591ae247d59f1cf2cee27559903cdfc1aca44ada970727d4e98cdaa64d8121147ab59d4a4dd4 SHA512 bb5bf320186a277d31ba6e97c7c774adda87e8dd51a6c6b4f44dc20a4e10f4d5d1bc97262be8f096e978913f4d740e7f213d8dc2a63a1f6aa6eb5cef3854cb6a MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1 diff --git a/media-sound/kid3/kid3-3.8.2-r1.ebuild b/media-sound/kid3/kid3-3.8.2-r1.ebuild deleted file mode 100644 index 515d09aff193..000000000000 --- a/media-sound/kid3/kid3-3.8.2-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde.org cmake xdg - -DESCRIPTION="Simple tag editor based on Qt" -HOMEPAGE="https://kid3.sourceforge.io/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+" -SLOT="5" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis" - -REQUIRED_USE="flac? ( vorbis )" - -BDEPEND=" - dev-qt/linguist-tools:5 - kde? ( kde-frameworks/extra-cmake-modules:5 ) -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/readline:0= - acoustid? ( - media-libs/chromaprint - media-video/ffmpeg - ) - flac? ( - media-libs/flac[cxx] - media-libs/libvorbis - ) - kde? ( - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2:0 ) - mpris? ( dev-qt/qtdbus:5 ) - taglib? ( >=media-libs/taglib-1.9.1 ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -RDEPEND="${DEPEND} - !media-sound/kid3:4 -" - -src_prepare() { - # overengineered upstream build system - cmake_src_prepare - # applies broken python hacks, bug #614950 - cmake_comment_add_subdirectory doc -} - -src_configure() { - local mycmakeargs=( - -DWITH_CHROMAPRINT=$(usex acoustid) - -DWITH_DBUS=$(usex mpris) - -DWITH_FLAC=$(usex flac) - -DWITH_ID3LIB=$(usex mp3) - -DWITH_MP4V2=$(usex mp4) - -DWITH_TAGLIB=$(usex taglib) - -DWITH_VORBIS=$(usex vorbis) - ) - - if use kde ; then - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) - else - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) - fi - - cmake_src_configure -} diff --git a/media-sound/kid3/kid3-3.8.3.ebuild b/media-sound/kid3/kid3-3.8.3.ebuild index fea30cf58c3f..e547876a20a7 100644 --- a/media-sound/kid3/kid3-3.8.3.ebuild +++ b/media-sound/kid3/kid3-3.8.3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://kid3.kde.org/" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2+" diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest index 01560ebe896d..9074de986638 100644 --- a/media-sound/lame/Manifest +++ b/media-sound/lame/Manifest @@ -1,9 +1,10 @@ +AUX lame-3.100-pkgconfig.patch 1048 BLAKE2B 35ff69d3c6ed4d84cad0a021aa6538237ff07adc881d0195b252f518229eab289b5cd65fe6906ba2a08c27b388eabcc812288b6d1140c1e9ccbeaf1c54550ce8 SHA512 2c97e002918f7e62afe17d68947807c1260dd711694d0df89d7ef02acbde5dd89d31e97dae838443235283d6981e52eac6a6288fe2367ef4723529574d664cf6 AUX lame-3.100-symbols.patch 400 BLAKE2B ebc8b6fdbb7a3f7f0ff2c2be78bf606d7e2251d1463cca7eb7aaa53fc3a8b682d5aed70bdf7d6521cb0fe715733cafb82aa76d8ce9f829933b5c55dc903a01e3 SHA512 ae7376cdaffbafecaa60dbaa08a7ebd73883935e65c7d7d408fb2cdf89ad04411940d2ab6313c80169a940207e9bed33917f88d1ca5bf6d35514e4c5313f330a AUX lame-3.96-ccc.patch 813 BLAKE2B 5a8b500555e9430c88487a75473989a37959ed93a30db5e90988648cfe80db2b30f3d4a87c86831033fae953d8b6fb58a0b2de2ec61d6d476cdb228e3aaf9ba5 SHA512 312cb62a6cfdb96c7bda6526f7a493088ec1053869306c4d292a31be80c5a271889348d41ae8681fcbcc11f61415b8029e8f8928e5949db8a28edb0b9657a7db AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcbb38373ddab52781e9edafb344fce7d8e773e0eb0e59982362dec507f6f560cc18f7128da2d2772f27e79e54b28 SHA512 26e65b231a69142d6bc56bad268126985ed1bc9d14ff943a5374622184efeb78f2a1fd8bb5a3988c8ab8b4e8f10255ad3d91347276f5621d4adfeadc1230e301 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b -EBUILD lame-3.100-r1.ebuild 2103 BLAKE2B 2700c52e786fca0167b7a63b64ef04ffbb0dcbc6a30cc724f760fdf5f297eadc0904c8163f28ff1cd897e78407e71f8ba06fa79c1794d5c8072c087dfe0764cb SHA512 614cbc675ab75b834e5bef4be30fb9ee52561bb88b058dc74a59e9ca305dfa2a0f94663e2840d7e2d50a17c44de8d9b20705cf7eda3699ddc194f3e465e9f004 -EBUILD lame-3.100-r2.ebuild 2216 BLAKE2B 41390606b3434bb75ed2b6125c5b4bd37737e4b15c4480448876a374dce0c9e036c14943d349fde94dae8d5d113bcf83493692d39acb9a25a21e17f44da7818f SHA512 ea537189e572e127396a57a21ab50d36d0356f95d11927f93785fd1491989603b1285d7dace5965899d4a51061acb93a18a8684fc2e445a71965ae2d830a75c5 +EBUILD lame-3.100-r2.ebuild 2205 BLAKE2B f1741d6dedb2b174cef82d7f79709f5d80a958c0d4fdfd07e429a89082fc4f44af9cccd7095524059cd50d36d795c8bce145df410f01d64bff14622674f3edff SHA512 5155a795b437c9036b45d718ce26442641367d2cfb6e16a0c7805edc883d58a96b8dedf203f138ae031375239a489c4c74f88431b8c996a3755ba2f01074edb5 +EBUILD lame-3.100-r3.ebuild 2265 BLAKE2B 93d99a086eeea8e21bd119cebfcc8d92cbc0f2c7d10fa69e9cea9e1765ae0066db8b5f2c695b31d97f0bca5c2055cb1ce3dac43f3b83da03a52d72d126fb1411 SHA512 d3ee873a77ceaad1d6ccdfde8d96263bede6c17a6d539f3bec03f596ee2bec2f970a30c0a5d387dc294d4c3428acb190b22d1c4d67bc82225335782cef3e9be5 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb diff --git a/media-sound/lame/files/lame-3.100-pkgconfig.patch b/media-sound/lame/files/lame-3.100-pkgconfig.patch new file mode 100644 index 000000000000..9cb52153e852 --- /dev/null +++ b/media-sound/lame/files/lame-3.100-pkgconfig.patch @@ -0,0 +1,45 @@ +Based on a Debian patch: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829327 + +--- lame-3.100/configure.in ++++ lame-3.100/configure.in +@@ -1240,6 +1240,7 @@ + + AC_CONFIG_FILES([Makefile \ + libmp3lame/Makefile \ ++ libmp3lame/lame.pc \ + libmp3lame/i386/Makefile \ + libmp3lame/vector/Makefile \ + frontend/Makefile \ +--- lame-3.100/libmp3lame/Makefile.am ++++ lame-3.100/libmp3lame/Makefile.am +@@ -31,6 +31,7 @@ + + EXTRA_DIST = \ + lame.rc \ ++ lame.pc.in \ + vbrquantize.h \ + logoe.ico + +@@ -100,3 +101,8 @@ + #$(OBJECTS): libtool + #libtool: $(LIBTOOL_DEPS) + # $(SHELL) $(top_builddir)/config.status --recheck ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = lame.pc ++ ++DISTCLEANFILES = $(pkgconfig_DATA) +--- lame-3.100/libmp3lame/lame.pc.in ++++ lame-3.100/libmp3lame/lame.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: MP3 encoding library ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -lmp3lame ++Cflags: -I${includedir}/lame diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild index 9aabf02c792a..1327dce92744 100644 --- a/media-sound/lame/lame-3.100-r2.ebuild +++ b/media-sound/lame/lame-3.100-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs" # These deps are without MULTILIB_USEDEP and are correct since we only build diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r3.ebuild index b0e97432291e..c9d3e9ec8766 100644 --- a/media-sound/lame/lame-3.100-r1.ebuild +++ b/media-sound/lame/lame-3.100-r3.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=7 inherit autotools multilib-minimal DESCRIPTION="LAME Ain't an MP3 Encoder" @@ -11,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs" # These deps are without MULTILIB_USEDEP and are correct since we only build @@ -22,15 +21,20 @@ RDEPEND=" sndfile? ( >=media-libs/libsndfile-1.0.2 ) ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext virtual/pkgconfig - cpu_flags_x86_mmx? ( dev-lang/nasm )" + cpu_flags_x86_mmx? ( dev-lang/nasm ) +" PATCHES=( "${FILESDIR}"/${PN}-3.96-ccc.patch "${FILESDIR}"/${PN}-3.98-gtk-path.patch "${FILESDIR}"/${PN}-3.99.5-tinfo.patch "${FILESDIR}"/${PN}-3.99.5-msse.patch + "${FILESDIR}"/${PN}-3.100-symbols.patch #662752 + "${FILESDIR}"/${PN}-3.100-pkgconfig.patch #735168 ) src_prepare() { @@ -42,6 +46,7 @@ src_prepare() { use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879 + mv configure.{in,ac} || die AT_M4DIR=. eautoreconf } @@ -73,5 +78,5 @@ multilib_src_install_all() { docinto html dodoc misc/lameGUI.html Dll/LameDLLInterface.htm - find "${ED}" -name '*.la' -exec rm -f {} + + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest index b795f27689d4..8b40eced0599 100644 --- a/media-sound/lash/Manifest +++ b/media-sound/lash/Manifest @@ -1,8 +1,9 @@ -AUX lash-0.5.4-gcc47.patch 317 BLAKE2B e886c0f87ed4e3b7b6f15387d38bf56962949d8088437a62c74a4dae9a8cc32a339bf98a35053174d5b987915fdfaf1deecbc80ef71c526d2a797ae5ab0f8c04 SHA512 a369cf98d10dcb6380fb72093fd02d6f0feec847dc4b3715bdf2dce29f4cb398a6ddf161f649470cb21407fcccfefc4ff28c66f3384eaaca3a866f8ae36a5c1a -AUX lash-0.5.4-glibc2.8.patch 337 BLAKE2B cf2b31d29850a948f7d2ce9652b429c126bf59d8524d1dac35dcca560a9fbe2c615246be0bd51248d18ee0ed7962e857bd20899f2d23516ca02da641c1c939e3 SHA512 2391e1879a0979163f722fc97fd9950d7c91116481e80c738530510289e8a35c722d634e416ed01b2cb6aead21aea4b411be806df06cbe09cc17df9d483ab8fc -AUX lash-0.5.4-strcmp.patch 278 BLAKE2B f6381f1c792c39b006e4e25134c07a3fb5f5cc97c98674905a1119a8f42db552667dabc4595038bb3653ab053b7bb04b3ae07a05d890255acbfe0f3c7815a43c SHA512 94d1985427e3b1b2fa2b9d9c86a1d0e82bf587c86b0e4a561a91848403944b9842d962a454808c3abb37ff011ad0054d8f69aef2d5849aa54699c71402d15685 -AUX lash-0.5.4-swig_version_comparison.patch 1124 BLAKE2B 12a4f3787c25ca8bd4b87ebe739486dbed52ad3f112c4a9237e4b3c4c76032c2804ea5ae23455b31a2804678af8c85f058f0acc44e1fc40beea400d217520397 SHA512 43e4bf0de6ee9eb5c010a317251ebc903569fe3d1b94f9c5c4c43ba1163088c5fb8df6d861d052184fd93baea61ac5c86f33a618f186cacaa74e27dd12cf0890 -AUX lash-0.5.4-underlinking.patch 457 BLAKE2B 0d21073bafc8ac50aa9b4a117c1268485ad131716b72fc0e2cb73b95ad8c3531c22bc6dacb420a54c68cad2185841911b238556a125395a7bc34b0879bbcb176 SHA512 09519a9b2fb2da9cd716c1460d503bba64265b26025bf987fa7a0eac2edbce5e88a59bccc2d39617c4c3ab62d4dba1e86c400922f5312c1904b1f5746f5a1fb6 +AUX lash-0.5.4-gcc47.patch 299 BLAKE2B 83e8d5805686e62a2a46b6c91283ac268dda892312210d8af0aca5f386bd2cc718917b9bdbe7db87819e5c10e7028c41c36b056b17885fbc0f999f8432e598ef SHA512 3f56550130b18becafbd9a1e544aaec6b729af398cd0abb95c17895baec65e9bba3a849122a787b8913fee7b4422b9ef0ee3fa9e627b1eec5db26543035f75a6 +AUX lash-0.5.4-glibc2.8.patch 344 BLAKE2B 6362c9d7ca824c26e0d037d80eb3221c2b4647cb999f7a16057d36e50b533a09c3228be72e7921ef8aadab7fdddb17317c85803b03144ae75392bfc9af9fd4ae SHA512 182cc371fbeb9ddd2407642b74fd5bb309f34c32ae1276d09d9c33c95ce9d065ea97df3a4306501fe151e2d3b4edc96c4140fabbc2c3016d8cba54fb0e8766cb +AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5b73d4bad7f5e27728e8e77c0032cc375a03b5ccb92c08a3e249b0539f8d3ece5a7007754af67693fbbeef4d9 SHA512 dba0d98fdd4f9cf84bb5c8e840fe76a3de8b729a7c2b88d55868939f119084433ae1bf5b7b3aacd1057995f73d6baa204878651cd9d0c4f419aca20910b84d66 +AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc +AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c -EBUILD lash-0.5.4-r3.ebuild 2604 BLAKE2B f278221e87da21abcb6e9bcbd5010a49fc0e2eed669b3a171a56fe79a5e4a78620ee9724c6e90fa6426990a9c798344eba9d99732247190ed49c96bf6747ef9d SHA512 935adfbe446a83ce08a09961b559cedbb1d53d21a6c00c3a75111e8c28568d7ab4ab5f7c6cd9298032cae8901134673a671646773b92861e2ae2dd2e6fbf19e4 +EBUILD lash-0.5.4-r3.ebuild 2603 BLAKE2B fa39a5ae0e3cfaf3714956644a4b924d298c703bbb80f7b0e66bef1ecdc11bb71ba96138d4f14fd80ab4a6d54ac6ad9cb41ed2be81dcadd9a65e3efa39b35f0e SHA512 3bff50bcb0cb252bf992349795f8876e8c158e116426109a089312da0634704129d10ec51c456eeb3beae7834efd465b363a93c146eeee3d9aa659a5f5a791e3 +EBUILD lash-0.5.4-r4.ebuild 2609 BLAKE2B 278d8e78c576252427cfcc0c335de89bc670c3240e14e54f97b0cc9c5607d96107afc51496a82b6ea392cd67658d60b334edd477ac03b79ece5684fd4d3d8179 SHA512 7f19030014a567f04ccba189e742c3422ee40818032559394178d31f102f0eea44b30baa665f31ddba01b0ee81c09aae5dc22d48c3b78e129c6a9d5a6748a769 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 diff --git a/media-sound/lash/files/lash-0.5.4-gcc47.patch b/media-sound/lash/files/lash-0.5.4-gcc47.patch index c1afeda71e90..c988ba0e37c4 100644 --- a/media-sound/lash/files/lash-0.5.4-gcc47.patch +++ b/media-sound/lash/files/lash-0.5.4-gcc47.patch @@ -1,8 +1,7 @@ -http://bugs.gentoo.org/451668 -http://pkgs.fedoraproject.org/cgit/lash.git/tree/lash-gcc47.patch - ---- liblash/lash.c -+++ liblash/lash.c +diff --git a/liblash/lash.c b/liblash/lash.c +index b47251d..f2a5095 100644 +--- a/liblash/lash.c ++++ b/liblash/lash.c @@ -22,6 +22,7 @@ #include <string.h> #include <strings.h> diff --git a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch index 56bc89af0291..578df171a462 100644 --- a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch +++ b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch @@ -1,5 +1,7 @@ ---- liblash/socket.c.old 2008-06-26 15:20:44.227064193 +0200 -+++ liblash/socket.c 2008-06-26 15:21:18.245063129 +0200 +diff --git a/liblash/socket.c b/liblash/socket.c +index b6e1b25..91caf0f 100644 +--- a/liblash/socket.c ++++ b/liblash/socket.c @@ -20,6 +20,11 @@ #define _POSIX_SOURCE /* addrinfo */ diff --git a/media-sound/lash/files/lash-0.5.4-strcmp.patch b/media-sound/lash/files/lash-0.5.4-strcmp.patch index ea9f7ee2fda3..866b8fec569d 100644 --- a/media-sound/lash/files/lash-0.5.4-strcmp.patch +++ b/media-sound/lash/files/lash-0.5.4-strcmp.patch @@ -1,7 +1,7 @@ -clients/synth/lash.c:85:2: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration] - ---- clients/synth/lash.c -+++ clients/synth/lash.c +diff --git a/clients/synth/lash.c b/clients/synth/lash.c +index 03717ae..5395198 100644 +--- a/clients/synth/lash.c ++++ b/clients/synth/lash.c @@ -22,6 +22,7 @@ #include "config.h" diff --git a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch index 6dcd4366da7c..fe20c43b1c84 100644 --- a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch +++ b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch @@ -1,6 +1,8 @@ ---- acinclude.m4 -+++ acinclude.m4 -@@ -40,9 +40,9 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 4722b53..ea37316 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,9 +40,9 @@ AC_DEFUN([AC_PROG_SWIG],[ if test -z "$available_patch" ; then [available_patch=0] fi diff --git a/media-sound/lash/files/lash-0.5.4-underlinking.patch b/media-sound/lash/files/lash-0.5.4-underlinking.patch index 3e52807d267f..3fa552721c4e 100644 --- a/media-sound/lash/files/lash-0.5.4-underlinking.patch +++ b/media-sound/lash/files/lash-0.5.4-underlinking.patch @@ -1,9 +1,8 @@ -http://bugs.gentoo.org/367589 -http://bugs.gentoo.org/514748 - ---- clients/control/Makefile.am -+++ clients/control/Makefile.am -@@ -18,6 +18,7 @@ +diff --git a/clients/control/Makefile.am b/clients/control/Makefile.am +index d3eaab2..af91a70 100644 +--- a/clients/control/Makefile.am ++++ b/clients/control/Makefile.am +@@ -18,6 +18,7 @@ lash_control_CFLAGS = $(LASH_CFLAGS) lash_control_LDADD = \ $(top_builddir)/liblash/liblash.la \ @@ -12,9 +11,11 @@ http://bugs.gentoo.org/514748 + $(UUID_LIBS) endif ---- clients/synth/Makefile.am -+++ clients/synth/Makefile.am -@@ -20,4 +20,5 @@ +diff --git a/clients/synth/Makefile.am b/clients/synth/Makefile.am +index 59437ce..fe999a0 100644 +--- a/clients/synth/Makefile.am ++++ b/clients/synth/Makefile.am +@@ -20,4 +20,5 @@ lash_synth_LDADD = \ $(JACK_LIBS) \ $(ALSA_LIBS) \ $(GTK2_LIBS) \ diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild index c1db67791ac0..b424f12e6101 100644 --- a/media-sound/lash/lash-0.5.4-r3.ebuild +++ b/media-sound/lash/lash-0.5.4-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86" IUSE="alsa debug gtk python static-libs" # doc RDEPEND="dev-libs/libxml2 diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild new file mode 100644 index 000000000000..3b1f8030c14b --- /dev/null +++ b/media-sound/lash/lash-0.5.4-r4.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit autotools eutils multilib-minimal python-single-r1 + +DESCRIPTION="LASH Audio Session Handler" +HOMEPAGE="http://www.nongnu.org/lash/" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="alsa debug gtk python static-libs" # doc + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + dev-libs/libxml2 + sys-apps/util-linux[${MULTILIB_USEDEP}] + virtual/jack + alsa? ( media-libs/alsa-lib ) + gtk? ( x11-libs/gtk+:2 ) + python? ( ${PYTHON_DEPS} ) + || ( sys-libs/readline dev-libs/libedit ) +" +DEPEND=" + ${RDEPEND} + python? ( dev-lang/swig ) +" +# doc? ( >=app-text/texi2html-5 ) + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) +HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html ) + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/${P}-glibc2.8.patch + "${FILESDIR}"/${P}-swig_version_comparison.patch + "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-strcmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + sed -i \ + -e '/texi2html/s:-number:&-sections:' \ + docs/Makefile.am || die #422045 + + default + + AT_M4DIR=m4 eautoreconf +} + +multilib_src_configure() { + # 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html + export ac_cv_prog_lash_texi2html=no #422045 + + # --enable-pylash would disable it + local myconf=() + if ! multilib_is_native_abi || ! use python; then + myconf+=( --disable-pylash ) + fi + + if ! multilib_is_native_abi; then + # disable remaining configure checks + myconf+=( + JACK_CFLAGS=' ' + JACK_LIBS=' ' + XML2_CFLAGS=' ' + XML2_LIBS=' ' + + vl_cv_lib_readline=no + ) + fi + + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + $(multilib_native_use_enable alsa alsa-midi) \ + $(multilib_native_use_enable gtk gtk2) \ + $(multilib_native_use_enable debug) \ + "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake -C liblash + fi +} + +multilib_src_test() { + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" install + else + # headers + emake -C lash DESTDIR="${D}" install + # library + emake -C liblash DESTDIR="${D}" install + # pkg-config + emake DESTDIR="${D}" install-pkgconfigDATA + fi +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + use python && python_optimize +} diff --git a/media-sound/lilycomp/Manifest b/media-sound/lilycomp/Manifest deleted file mode 100644 index 095ff5475bfb..000000000000 --- a/media-sound/lilycomp/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST lilycomp.1.0.2.tar.gz 16997 BLAKE2B 29028640edaa88017c83276a4ad67427cbcce308aee0565d8920c98a35a59e46525e426134f414125297a68404733d6a57e3a2723295fcec52a2e229181860bc SHA512 e73104d446ce154497fe6a4790f1e6ce333f945b3196da589ca87765494461351a09b604e43f9a7d5e08cebdfac22aa53886aeec8284675db08a7d377350b937 -EBUILD lilycomp-1.0.2-r2.ebuild 697 BLAKE2B a0213725739f1719ca30b87eb36e6e9e9cdad255c78b55ccbc5b94a41bbb7e6b623fad4fbb302cac8e141881011b7c7b95a5d376144852d2ff9c2565208998c7 SHA512 77a03792a3ad7f2f26da1e61cb94581a00b2b18d896a04ae65329010338e2cff5f88692a7bb85a93fe9ebda76b79529d4b27180e7b1f05af891b7181a8f4709c -MISC metadata.xml 250 BLAKE2B f7cfa7674016a08864b0ca3f38d139b3b89b4ae5a490f04207696a62202716e0a8accf4b1d4b0475800e480d93c5bb358f9914bc8a35e644dd0bb00a8d6bae69 SHA512 b7ad96184821da7f820a0f52600fd592ee901857decf4cb16a7cd4d6a77d07717f751d52813673562e38d4422c732ce384ff315d0a9ab88de83ab8ae9740330f diff --git a/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild b/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild deleted file mode 100644 index b1edca49c7f9..000000000000 --- a/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk" - -inherit python-single-r1 - -MY_P="${P/-/.}" - -DESCRIPTION="graphical note entry program for use with LilyPond" -HOMEPAGE="http://lilycomp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" -HTML_DOCS=( "${S}/lilycomp.html" ) - -src_prepare() { - default - python_fix_shebang lilycomp.py -} - -src_install() { - default - newbin lilycomp.py lilycomp -} diff --git a/media-sound/lilycomp/metadata.xml b/media-sound/lilycomp/metadata.xml deleted file mode 100644 index 2e7b268bc6c2..000000000000 --- a/media-sound/lilycomp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">lilycomp</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index cddef8a23359..3a0b17df2c66 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,6 +1,9 @@ AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c +AUX lilypond-fix-cve-2020-17353.patch 2867 BLAKE2B 135d6ccc6ed93786189b54ea77219d527e6febd59434a10b33255e2d3c21db600ea9e231d852d188a8933c6acf5f1567f48c4b7e8f905f8bc87dda1b13d8d936 SHA512 83f513a6c4999579102b592e7babc556f49a4d04f799203ff790ec211c0744a91a17700b6742c3a2044ef90c2ce52a6f768f69f376952867715315bc8096689c DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 -EBUILD lilypond-2.21.1.ebuild 3221 BLAKE2B 33351791371ec81926732bbd0fb5d85f2835e3c3548f85a9e3eb9ecdfacbc5bd545c00ec720ad7836d38d4c2dd2ef8ad1d99ad04b8bcbf230bd502268c84c473 SHA512 8cc9002fd62a60f71a3d404c873fd5149c1da6e83e3bede9303cef2f0a2724e60bf6997da2c944cc0e17a576728e185031e1e1e2172ec55f93c6a055017aa23f -EBUILD lilypond-9999.ebuild 3232 BLAKE2B 136ffb23d241355358c792690d96a6e40b2c641c6180bfc2b513a2ae6defc228301b08530a4d8f271b76b245a722d0b85c3637193d6db9e0b68c7fa6b7ad3fb8 SHA512 5c95e8e885f9d9ee77bf469763fc738703aeba5f1580218d3b2144c56b0a1cae0f7a3b2bf0671eb4e6ab01eba8e844057763084990c073dff07bd2ea271edd41 +DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 +EBUILD lilypond-2.21.1-r1.ebuild 2915 BLAKE2B 8d74f5ee00c2720c7727e01c68fc9b1b2f26c98e1fc42e924e18dc2aa5fc85d4ddf808b55a93be3b4bdaaafa61889589b3bb0c717ece561be73e556c54532e72 SHA512 d308d5fb8916446b59ef63635e18e2ff657bfac712342910836a081f2d09c3aed8236115a39ccdfd780172d472a2fed5b94c837be3205d820fb94a0cd16c8387 +EBUILD lilypond-2.21.4-r1.ebuild 2928 BLAKE2B e304dfcaf4f267b991a5f449913fdcaa195a72dd8465ddac3865395de5fb7213b296a5b5e1c0993ca1a383cbcacd83f23f262f08c99e1239755655ad3d42ecc1 SHA512 5f76b763f9f582afbc24f3b97e1ccd26593d7dc571f08e0ca9dae71f8cad93ca7b14d1bfd2608ea349174646498583185f90bf7f59e706af4c90170c04d79145 +EBUILD lilypond-9999.ebuild 2908 BLAKE2B 4fbe34b7372cc6aa790119433519b2f9f934b7315b9601f5148598dbfafdeeca2de58b0b53afe15f80efb6ed0b24fe6ff0faf13d91e21b21815184663ef9444a SHA512 2a36d755c15731d168283dd2d4a582c479d77740d5f4596baf04b502a662e9e50e63bdf4aa6becb3e273f0b0c80b098d038723ff51e441e90eaba0d75fff34b9 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch new file mode 100644 index 000000000000..e91947eae056 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch @@ -0,0 +1,101 @@ +From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001 +From: Han-Wen Nienhuys <hanwenn@gmail.com> +Date: Tue, 21 Jul 2020 14:45:08 +0200 +Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode + +This prevents executing privileged PostScript and exploiting +Ghostscript vulnerablilities + +Tested: + $ lilypond -dsafe input/regression/les-nereides.ly + (works, kinda) + + $ cat f.ly + { c4_ \markup \postscript #" (x) show " } + + $ lilypond -dsafe f + Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...): + /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps " +--- + scm/define-stencil-commands.scm | 65 ++++++++++++++++++++++------------------- + 1 file changed, 35 insertions(+), 30 deletions(-) + +diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm +index 09a2299..e388788 100644 +--- a/scm/define-stencil-commands.scm ++++ b/scm/define-stencil-commands.scm +@@ -21,36 +21,41 @@ + (define-public (ly:all-stencil-commands) + "Return the list of stencil commands that can be + defined in the output modules (@file{output-*.scm})." +- '(blank +- char +- circle +- dashed-line +- draw-line +- ellipse +- embedded-ps +- embedded-svg +- end-group-node +- glyph-string +- grob-cause +- named-glyph +- no-origin +- page-link +- path +- partial-ellipse +- placebox +- polygon +- resetcolor +- resetrotation +- resetscale +- round-filled-box +- setcolor +- setrotation +- setscale +- start-group-node +- text +- unknown +- url-link +- utf-8-string ++ (let* ++ ((commands '(blank ++ char ++ circle ++ dashed-line ++ draw-line ++ ellipse ++ end-group-node ++ glyph-string ++ grob-cause ++ named-glyph ++ no-origin ++ page-link ++ path ++ partial-ellipse ++ placebox ++ polygon ++ resetcolor ++ resetrotation ++ resetscale ++ round-filled-box ++ setcolor ++ setrotation ++ setscale ++ start-group-node ++ text ++ unknown ++ url-link ++ utf-8-string ++ ))) ++ ++ (if (ly:get-option 'safe) ++ commands ++ (append '(embedded-ps embedded-svg) ++ commands)) + )) + + ;; TODO: +-- +1.9.1 + diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild index ffc80213cf1b..521872ddafbd 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -24,11 +24,7 @@ IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" - >=dev-texlive/texlive-metapost-2013 - || ( - >=app-text/texlive-core-2013 - >=dev-tex/metapost-1.803 - ) + >=dev-texlive/texlive-metapost-2020 >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex @@ -59,22 +55,11 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${P}-fix-font-size.patch + "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch ) DOCS=( DEDICATION HACKING README.txt ROADMAP ) -pkg_setup() { - # make sure >=metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - src_prepare() { default @@ -105,6 +90,7 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 econf "${myeconfargs[@]}" } diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild new file mode 100644 index 000000000000..0196e4c7d4d9 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils + +if [[ "${PV}" = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git" +else + MAIN_VER=$(ver_cut 1-2) + SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/" + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +IUSE="debug emacs guile2 profile vim-syntax" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + >=dev-texlive/texlive-metapost-2020 + >=sys-apps/texinfo-4.11 + >=sys-devel/bison-2.0 + sys-devel/flex + virtual/pkgconfig +" +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( >=app-editors/emacs-23.1:* ) + guile2? ( >=dev-scheme/guile-2.2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + <dev-scheme/guile-2.0:12 + ) + ${PYTHON_DEPS}" +DEPEND="${RDEPEND} + app-text/t1utils + dev-lang/perl + dev-libs/kpathsea + media-gfx/fontforge[png,python] + sys-devel/gettext" + +# Correct output data for tests isn't bundled with releases +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch + "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch +) + +DOCS=( DEDICATION HACKING README.txt ROADMAP ) + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( + --with-texgyre-dir=/usr/share/fonts/tex-gyre + --disable-documentation + --disable-optimising + --disable-pipe + $(use_enable debug debugging) + $(use_enable profile profiling) + ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use emacs ; then + elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ + || die "elisp-compile failed" + fi +} + +src_install() { + emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + + # remove elisp files since they are in the wrong directory + rm -r "${ED}"/usr/share/emacs || die + + if use emacs ; then + elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ + || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el + fi + + python_fix_shebang "${ED}" + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild index eb38a121f497..fc14ef8ed34b 100644 --- a/media-sound/lilypond/lilypond-9999.ebuild +++ b/media-sound/lilypond/lilypond-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -24,11 +24,7 @@ IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" - >=dev-texlive/texlive-metapost-2013 - || ( - >=app-text/texlive-core-2013 - >=dev-tex/metapost-1.803 - ) + >=dev-texlive/texlive-metapost-2020 >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex @@ -61,19 +57,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch ) -DOCS=( DEDICATION HACKING README.txt ROADMAP ) - -pkg_setup() { - # make sure >=metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} +DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP ) src_prepare() { default @@ -105,6 +89,7 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 econf "${myeconfargs[@]}" } diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest index 90f1598aa05c..2dc307aa89f2 100644 --- a/media-sound/lltag/Manifest +++ b/media-sound/lltag/Manifest @@ -1,5 +1,5 @@ -DIST lltag-0.14.4.tar.bz2 48137 BLAKE2B 0dd209262ba15adb487642c0a15c2ee0504f0fa376763f01e12e9909bfebc47318fe671dec9057efbd7db06f1c5f55bb39aa35de043647f4ca86cf87442743a6 SHA512 d2dbc513ce5e75a808acb7676a2513ece34322d134d52e1f5ea44f51b7c134699a0a8e368265c2594fd275873e4908a21af135c8714278954d0b45f2fc239bf7 DIST lltag-0.14.5.tar.bz2 48035 BLAKE2B 15352a388fd96882d78803905c12074288b6084b72c46a5ea15a2dbe504bd416201315c0047492329f06413100ca432040a974dbe56869772dd0a36d3d18a927 SHA512 64d16ae1bfb920f2e10add6728bdbe261662688b5c99e4cc92ffa5d7dd5fe596c6c3ccbe61b432a4594e49003fc981b20588def9523a65ee934418afb512bedd -EBUILD lltag-0.14.4-r1.ebuild 1006 BLAKE2B 959ae5908cabad7b4b482389232f262b2271c7ee22117c6c931f9821bf0db607e9585685e22a65b49daa4998687fb84761249d170200cfe65e8955bc462fb5d8 SHA512 7ddfb6db5d517593d2c2bd0ce744dbacb48f6546dbf1b1b56fc65a8048d4290240e9fa56867950615a2e66926be619019a9cb219a216eddda5ae2e0201aac970 +DIST lltag-0.14.6.tar.gz 57162 BLAKE2B 9b21fa026644722bdb0cbb91e3a5f27247c4e8470273823aca71b71253e5ee50703e3cb14b1c4e8e6079e9d5d46dccc03d7a4892782c1c53189d5a13992ddd11 SHA512 9eb488ac1444ec11b02ca9c396903b5c6ef1e2f19558a6ef9d5e8d3fadb639fad902b4d6cdde8f4374768fdea553cfd6550c4151df9a755c9ae4a5652128a836 EBUILD lltag-0.14.5.ebuild 1006 BLAKE2B fa19a939185695aeedf84ca9bf13b98a206f8a3615df7148a3d010bdb88622ae10d7096c2a91d77ea012b8839f5697c53f284b1431c8c5d0fed375474a2000c3 SHA512 730621ff84e758482e0afe16f5ffe786988140ec4593e5bbf8722e37b2c9f15d757c5bd390c13e63732d14a2be4902fd842b56e47de4a9c1bd1976f9501e5563 +EBUILD lltag-0.14.6.ebuild 1076 BLAKE2B 49f65836acf36cee3cf7419c1880468447fcbe1d33bdb2edad0636d62614c9f5ce9ee1aa23a4ab9d31eff0004d62391ef735737a4929f3d7956690de6c131f01 SHA512 efc874f98817d443b1d502669321afcf7526e450253d3c0320f2ac11fac32b40443db8bce08680f24ce9513eba069df65dfb547b2839730b744fb8e761e47a54 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/lltag/lltag-0.14.4-r1.ebuild b/media-sound/lltag/lltag-0.14.6.ebuild index 87024dd4bbb7..c4d43b6f07c3 100644 --- a/media-sound/lltag/lltag-0.14.4-r1.ebuild +++ b/media-sound/lltag/lltag-0.14.6.ebuild @@ -1,34 +1,41 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + inherit perl-module DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer" -HOMEPAGE="http://home.gna.org/lltag" -SRC_URI="http://download.gna.org/lltag/${P}.tar.bz2" +HOMEPAGE="http://bgoglin.free.fr/lltag/ https://github.com/bgoglin/lltag" +SRC_URI="https://github.com/bgoglin/lltag/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="flac mp3 ogg readline" -RDEPEND="dev-perl/libwww-perl - mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) - ogg? ( media-sound/vorbis-tools ) +RDEPEND=" + dev-perl/libwww-perl flac? ( media-libs/flac ) + mp3? ( + dev-perl/MP3-Tag + media-sound/mp3info + ) + ogg? ( media-sound/vorbis-tools ) readline? ( dev-perl/Term-ReadLine-Perl )" DEPEND="${RDEPEND}" +S="${WORKDIR}/${PN}-${P}" + pkg_setup() { mylltagopts=( - "DESTDIR=${D}" - "PREFIX=/usr" - "SYSCONFDIR=/etc" - "MANDIR=/usr/share/man" - "PERL_INSTALLDIRS=vendor" - "DOCDIR=/usr/share/doc/${PF}" - ) + DESTDIR="${D}" + PREFIX=/usr + SYSCONFDIR=/etc + MANDIR=/usr/share/man + PERL_INSTALLDIRS=vendor + DOCDIR=/usr/share/doc/${PF} + ) } src_compile() { @@ -40,5 +47,5 @@ src_install() { dodoc Changes perl_delete_localpod # Move config to recommended location - mv "${D}usr/share/doc/${PF}"/config "${D}"etc/lltag/ || die + mv "${D}/usr/share/doc/${PF}"/config "${D}"/etc/lltag/ || die } diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest index 29aba03f3297..88bbedc9cb3f 100644 --- a/media-sound/lmms/Manifest +++ b/media-sound/lmms/Manifest @@ -1,5 +1,5 @@ -AUX lmms-1.2.1-add-missing-qpainterpath.patch 1833 BLAKE2B 74ee1bb96bbcdf801e5059bc3c4b067df165e217b6b4b70948dc26df5bde3afb452b9d41e2cedd75941b5c23ca120a739b8f00ef82ad9d05f814d2498e1e49b8 SHA512 1a64bdc01c33f19284ec4f3163bdfd208b40394c11ec767b3954cf0a8f32ddb0dda8014a0e8aa475e22bf75676e4fc3236317fdd76cfd4dd22b7e7bb3963ebae -DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6 -EBUILD lmms-1.2.1.ebuild 2359 BLAKE2B 90b4d6757ca369e2d4dabd68d3b9d2b51c3d23c346688f172b6dcf8ab8777721622e35c7ab164ca0363710ad83827f0c2edee35b1873bd6516d788726028f60b SHA512 d448dc77290adb24c45606016529c5bff102302ab37f27e4239ce5ace5aab4f78868e921e019ac8a8df44d8b9a79b66e0f6263f12406a12b20e2dedeb19e034b -EBUILD lmms-9999.ebuild 2288 BLAKE2B 96405ec7db1d97fa503934b6cbc4288a1331b45521c2b1668c2185dc616f323a274883036770140e05f24f87f04486139d9accaaf0bf6f3666047f5d3e2b377f SHA512 e0fb43cc8653aa1a07e3cc1a7950b36c628a6ffa6d31e48ed7e2db7762186e5ebd6276ca70a23460d8d6483f0db4358551c5ad68e431b3f776d61b802bc005bd +AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e00e706d7f328eb140babde11ca239fd516b133e698c366fa34bf72c2047b64aa14108cc82a09d0869fffd5e3bea8c1936a5 SHA512 4a414e513a3257b5eb3f472ca321504e7037c314e3d218b612b9aa9391dd0d1b038b77467f112a069479abec1b1ab3372126e27db34ec22c2a89b902a66878bd +DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028 +EBUILD lmms-1.2.2.ebuild 2389 BLAKE2B ff3dddfb8a47dc565f7c82514f954a124c72b3a6dccd3e8d0f276bdc33bc0b5164e79631de8c55096653d5b9b56004d3516f1543f4e35179964f0e429b94f2b2 SHA512 532fef9e5ee73d37ec81bbabb81782885c03f45c6c01c94c66e5c6e01f901c3f7cf138219898de50c7a9a3ad35514247c1c9b5a9f9aa9269f49635114c3e6cec +EBUILD lmms-9999.ebuild 2292 BLAKE2B 84696bb30d8b1b156e7740b2f7a1c30e750538df9139dcd363f579965899c79a4fd220686491e85045bf1b73a8099d5fb506d69adf5e3c0eb3ea79ff986cf7ce SHA512 860d4674357662dbd4f3ff0a31a8b70a6deeee6d91eaf2861f745834c7fdfb6a708d850c713c78bac77d21e8200b7eb84a90dcb0dc54a41b2fea0b9a162bd1a5 MISC metadata.xml 956 BLAKE2B 9bda57bcbb5b4f6c0831ca465ed48bb27f0c86f8de7908369140b0e7865dc4b44cf0c7b9225bdd8ba786dd4ef22af4a338134e89b23163e0f872519f2e0becfc SHA512 4a3c3bb120894acf50733e003dfdf3132201ad9d9cab21fbde39aca76c38d1e4784d70f2f01c9b889378fc8156271e0e216100dee85d028caef1eaa6dc49a3e0 diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch deleted file mode 100644 index afade79b0fd8..000000000000 --- a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com> -Date: Mon, 18 May 2020 18:58:48 +0200 -Subject: [PATCH] Fix Qt 5.15 build issues (#5498) - -Add missing QPainterPath includes ---- - plugins/Eq/EqSpectrumView.h | 1 + - src/gui/AutomationPatternView.cpp | 1 + - src/gui/LmmsStyle.cpp | 1 + - src/gui/editors/AutomationEditor.cpp | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h -index cd3f177586..84feeff13e 100644 ---- a/plugins/Eq/EqSpectrumView.h -+++ b/plugins/Eq/EqSpectrumView.h -@@ -24,6 +24,7 @@ - #define EQSPECTRUMVIEW_H - - #include <QPainter> -+#include <QPainterPath> - #include <QWidget> - - #include "fft_helpers.h" -diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp -index 448c233cb4..9889a6b460 100644 ---- a/src/gui/AutomationPatternView.cpp -+++ b/src/gui/AutomationPatternView.cpp -@@ -25,6 +25,7 @@ - - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QMenu> - - #include "AutomationEditor.h" -diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp -index e57e29e479..4fe5cb503c 100644 ---- a/src/gui/LmmsStyle.cpp -+++ b/src/gui/LmmsStyle.cpp -@@ -28,6 +28,7 @@ - #include <QApplication> - #include <QFrame> - #include <QPainter> -+#include <QPainterPath> - #include <QStyleFactory> - #include <QStyleOption> - -diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp -index 5e8ea8a0af..74f15d358c 100644 ---- a/src/gui/editors/AutomationEditor.cpp -+++ b/src/gui/editors/AutomationEditor.cpp -@@ -35,6 +35,7 @@ - #include <QLayout> - #include <QMdiArea> - #include <QPainter> -+#include <QPainterPath> - #include <QScrollBar> - #include <QStyleOption> - #include <QToolTip> diff --git a/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch b/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch new file mode 100644 index 000000000000..c087cf8387a7 --- /dev/null +++ b/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch @@ -0,0 +1,37 @@ +--- lmms/CMakeLists.txt ++++ lmms/CMakeLists.txt +@@ -575,15 +575,6 @@ + # post-install tasks + ADD_SUBDIRECTORY(cmake/postinstall) + +-ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" +- COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz +- DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1" +- COMMENT "Generating lmms.1.gz" +- VERBATIM) +- +- +-ADD_CUSTOM_TARGET(manpage ALL +- DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz") + + # install headers + +--- lmms/src/CMakeLists.txt ++++ lmms/src/CMakeLists.txt +@@ -113,7 +113,7 @@ + ) + ENDIF() + +-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz") ++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1") + + IF(LMMS_BUILD_WIN32) + SET(EXTRA_LIBRARIES "-lwinmm") +@@ -258,6 +258,6 @@ + ENDIF(NOT LMMS_BUILD_APPLE) + + INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}") +- INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) ++ INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + + ENDIF(LMMS_BUILD_WIN32) diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.2.ebuild index 2f8eba8d8cdd..edae2ae36731 100644 --- a/media-sound/lmms/lmms-1.2.1.ebuild +++ b/media-sound/lmms/lmms-1.2.2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/${P/_/-}" fi @@ -59,17 +59,19 @@ BDEPEND=" dev-qt/linguist-tools:5 " RDEPEND="${COMMON_DEPEND} - media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins + media-plugins/cmt-plugins media-plugins/swh-plugins media-plugins/tap-plugins " DOCS=( README.md doc/AUTHORS ) +S="${WORKDIR}/${PN}" + PATCHES=( - "${FILESDIR}/${P}-add-missing-qpainterpath.patch" + "${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284 ) src_configure() { diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild index 376874f97b14..a92a923b07b8 100644 --- a/media-sound/lmms/lmms-9999.ebuild +++ b/media-sound/lmms/lmms-9999.ebuild @@ -59,9 +59,9 @@ BDEPEND=" dev-qt/linguist-tools:5 " RDEPEND="${COMMON_DEPEND} - media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins + media-plugins/cmt-plugins media-plugins/swh-plugins media-plugins/tap-plugins " diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest index ef3bb8b13866..fc9c3ad9e0cf 100644 --- a/media-sound/lollypop/Manifest +++ b/media-sound/lollypop/Manifest @@ -1,5 +1,3 @@ -DIST lollypop-1.1.4.16.tar.xz 455312 BLAKE2B 358fae45a4332c10ba59d65d09ae51f28fb7fc026e137289c47951536753796e0b7efa9f3713bccde68e6260f79b1132eb00357be8c53fba04f3c827e97851cf SHA512 08b8ec7c1fbe5f1b8f95f95677012eeb9bd83951ee320470a0da852e0a446818e48ede7de045f6d7b98dff8be139fa69d780dbf03e65904c773f8ec1493f9915 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e -EBUILD lollypop-1.1.4.16.ebuild 1405 BLAKE2B 01ff4079b0a7d7be7dda9273e2b0b3a335fac6ad68560bd7c903df035866a8acf7bcda0f16e14ea4a3344bc5b70b6c3717760ca218d184a186a9ffecc1f0b844 SHA512 aa21d9d77195f47af8c65a0c2495bdf39c65f435953f8ee11e86000ea90e96df8212d13ec70d429ac09d6c54dcacb0d6a2a756baee9a2b39962002b0c2bddae7 -EBUILD lollypop-1.2.35.ebuild 1536 BLAKE2B 73a2964d3a5aa5352837049559106be7039faadb36a7e295c7be7662b6e6e8664de0c52cf0a10935d0d4007437f8a3fd039fc81262feff16043725d7ee793248 SHA512 544de09bc397676739e39f3896240f1a073120f3852c425a270c5f69ddf31795ff398e8abca43305ce9f9021f9d87a6dad930e094874a67208403af9ef571dce +EBUILD lollypop-1.2.35.ebuild 1535 BLAKE2B 6cfe98b69a1171b60f9b1bb2f42d4a65185c61e6e05fb11d2b470f71f51cbd4958a713751ce34c9bd84ebc93914241ef636425daaa3b0f6188d39d60dcbaf170 SHA512 dff7c63b08491fb8bddba5e95fc8df4ba17a3a8fe93c31091d772a986b1826969541d3b9c0899bf93fdeffd36e1d896e4e3ff8666c931c840bc3efd2412df630 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4 diff --git a/media-sound/lollypop/lollypop-1.1.4.16.ebuild b/media-sound/lollypop/lollypop-1.1.4.16.ebuild deleted file mode 100644 index 36a208574657..000000000000 --- a/media-sound/lollypop/lollypop-1.1.4.16.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) -PYTHON_REQ_USE="sqlite" -HASH="6b4e4e7a2c17f0770c1e2b3354ae5a3a" -inherit python-r1 gnome2-utils meson xdg-utils - -DESCRIPTION="Modern music player for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop" -SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz" -KEYWORDS="amd64" - -LICENSE="GPL-3" -SLOT="0" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DEPEND="${PYTHON_DEPS} - dev-libs/appstream-glib[introspection] - dev-libs/glib:2 - dev-libs/gobject-introspection[cairo(+)] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - gnome-base/gnome-common - x11-libs/gtk+:3 -" -BDEPEND="${DEPEND} - dev-python/pkgconfig[${PYTHON_USEDEP}] - dev-util/desktop-file-utils - dev-util/itstool - dev-util/intltool -" -RDEPEND="${DEPEND} - app-crypt/libsecret[introspection] - dev-libs/totem-pl-parser - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/dbus-python - dev-python/pillow[${PYTHON_USEDEP}] - >=dev-python/pylast-1.0.0[${PYTHON_USEDEP}] - media-libs/gst-plugins-base:1.0[introspection] -" - -RESTRICT="test" - -pkg_preinst() { - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_gconf_install - gnome2_schemas_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_gconf_uninstall - gnome2_schemas_update - xdg_desktop_database_update -} diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild index 74dea9a1f853..8cc6542ee210 100644 --- a/media-sound/lollypop/lollypop-1.2.35.ebuild +++ b/media-sound/lollypop/lollypop-1.2.35.ebuild @@ -10,7 +10,7 @@ inherit python-single-r1 gnome2-utils meson xdg-utils DESCRIPTION="Modern music player for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop" SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="GPL-3" SLOT="0" diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest index 652cd9defa0b..6972c927f05c 100644 --- a/media-sound/mhwaveedit/Manifest +++ b/media-sound/mhwaveedit/Manifest @@ -1,4 +1,4 @@ AUX mhwaveedit-1.4.23-missing-include.patch 205 BLAKE2B 1178613dd16aab62a4ada0937666671ff3275063a47f1e21662cc9ff10e3a6b2119bafa0e82b15e0c989b8d2294ae003f503e5c47b16c9bdcdcadcb62c7d4933 SHA512 b38349cca41b0ba97358c3b580ea904615e2a415d7f7efe08c3fc8bd1769dfed3945b1e321f5595afd47f292dcecd2a779a66bcb385a85b0f828c1bb137be1bb -DIST mhwaveedit-1.4.23.tar.bz2 642042 BLAKE2B 9d2d4ae201034df09f46a85c0b3d42978a294e888e175c18aeb02433d6f22246602cd7aaae004cdd13d24bc6e21fcb2cc2cb739bb0509476f8510603bfd42517 SHA512 c8b3f1ca2c573e03bbe8e2c61c80d8bae0f9b9ec99fff0110119698f95328d1ab86eb4641d582865cd091f2955388343cbd912fd5f0b15f2a937b88cc01b974f -EBUILD mhwaveedit-1.4.23.ebuild 1151 BLAKE2B 050f03f07d951a0a6af17e5b58f8d63ca8663d0fecbd81b6526758442349c240c35a9827b02235ac92351e22bb15f4217b09379ef2ff9a35f7422955842156e5 SHA512 7a61a4b7c9e4bbb2068aca4a727ba5c02725b917f93926561e3a785e877a4bceb09be1152038c410978ef4309c6764f4a372f47a4a2f852e662f22424308c5d7 +DIST mhwaveedit-1.4.24.tar.gz 943313 BLAKE2B 4edda0ed7ef833a5f9470087d44d8b09c58f040eedc23c0a97decdd45240ba283c891bf411decf769c8f2ad5869a5ce69f2d8da6a15b746152afee5f1676371c SHA512 392a358ae812c4be7847c4987dec40043af2e1850d9ffc498cc13f930355a7f3c407d55924fe709e5080811e49d932428b45afe904496fcb75e21a043b71ff47 +EBUILD mhwaveedit-1.4.24.ebuild 1199 BLAKE2B 34a31328a3c4afd89fbd72df5bf85c2159f3687f231f3aeb23725b82d813b92f6cc403a9399bf39fb918ba6bdaf949e68bc521f39aac429fc63cb59f9fb5fcb6 SHA512 0291565c55df4ee97ec873028004e76aca30066cb6fa45e5df9e86bb807f1f8dbf316502c1cb5ba121aa72c0ddd61f5452d6e7b81cf5a9be86c71450baf62194 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.24.ebuild index c6117c93bd72..dd823bfd76a1 100644 --- a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild +++ b/media-sound/mhwaveedit/mhwaveedit-1.4.24.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit xdg + DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)" HOMEPAGE="https://github.com/magnush/mhwaveedit/" -SRC_URI="https://github.com/magnush/mhwaveedit/${PN}/${P}.tar.bz2" +SRC_URI="https://github.com/magnush/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,13 +17,13 @@ IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox" RDEPEND=" x11-libs/gtk+:2 x11-libs/pango - sndfile? ( media-libs/libsndfile:= ) - sdl? ( media-libs/libsdl:= ) alsa? ( media-libs/alsa-lib:= ) jack? ( virtual/jack ) - libsamplerate? ( media-libs/libsamplerate:= ) ladspa? ( media-libs/ladspa-sdk ) + libsamplerate? ( media-libs/libsamplerate:= ) pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl:= ) + sndfile? ( media-libs/libsndfile:= ) sox? ( media-sound/sox:= )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -29,16 +31,18 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.4.23-missing-include.patch ) src_configure() { - econf \ - --without-arts \ - --without-esound \ - --without-portaudio \ - $(use_enable nls) \ - $(use_with sndfile libsndfile) \ - $(use_with libsamplerate) \ - $(use_with sdl) \ - $(use_with alsa alsalib) \ - $(use_with oss) \ - $(use_with jack) \ + local myeconfargs=( + --without-arts + --without-esound + --without-portaudio + $(use_with alsa alsalib) + $(use_with jack) + $(use_with libsamplerate) + $(use_enable nls) + $(use_with oss) $(use_with pulseaudio pulse) + $(use_with sdl) + $(use_with sndfile libsndfile) + ) + econf "${myeconfargs[@]}" } diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest index 74a9706a5e24..008a813a8500 100644 --- a/media-sound/milkytracker/Manifest +++ b/media-sound/milkytracker/Manifest @@ -1,5 +1,8 @@ -AUX milkytracker-1.0.0-cmake.patch 6172 BLAKE2B d0ee8dd866ff5d9b7c7558f5ca5d7b2f75a4b3e37abba2b7798816a8131ea24e250fccdd405bb48f1effb363d437115f89d7b44aae87fdbe21234b1ad08c544c SHA512 395d93dab58a9a5a7c000382ea946b1e28eecf55d3867a7acf07cef7ee2bbb7ea90ff5946125c5bf16c2ecd658f7711859e02b7058c19dbaaea39c9b3ee8c881 -AUX milkytracker-1.0.0-docdir.patch 2319 BLAKE2B 256f8f2eba611e2a6f19df117e2b4ccf6057f4de380a2098f48b0cbf4a136f7b5d45eb203990b8de36407765b6f4a9547f1801d50dec7400a55917bf286a9193 SHA512 f5e44258717a9b84956c29506c27e97e72cd50092ac179c328f3773f07f0573ac77aa50e4a27cea62f23b4f6318e1132fac2a0a039e3cf604efd1d595b357173 -DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4 -EBUILD milkytracker-1.0.0.ebuild 1040 BLAKE2B 6905982d6a4af69065592125f6e7fbd38b1a03068af4b9ac7f51719b3e3aa4c3b3e411846d56dbb5ad83841c42f30468df3b891e1d066bd4752ce583184c6f8b SHA512 49024655173f65bc0c88172478848e7f742a5310bc348eea46bf27ca17660177ed489948f1fb9709c4f7352cc913b1554ec2bd8520058ff73cb7ce50b138f2f4 +AUX milkytracker-1.02.00-CVE-2019-14464.patch 926 BLAKE2B 632af971c55cd80d1a8aa2b8d2dd2fdc5c471feaa0bbe8fff0b980de8a1db2f2281a816381a08a064f105146839fa63194e770190ca77ec79a14d9c2ff1839b0 SHA512 c37d11fd83831199075205ae9631bb6a2ac05458c63155a8a65a093fa8ce851ce7b9d8efb35d7db785760dc126c225aa292c4b11f3de5d2f87d7fa9c0bda6c76 +AUX milkytracker-1.02.00-CVE-2019-1449x.patch 3121 BLAKE2B 8b863ed8a9c78942c303e06ed8f8089d4602a9b8765a38ae9974f3871441f9b10cde4cc8a297a45cd66da567c94234c4ca9f7eed1505ba2ced92fb2407cf5fed SHA512 4805e831e6ae3934fdab2045e76eb1bfd750e3efb4df58b374ac69d7bdc6d5f88241b4a8d87a6b681cfdf11c1b0316f7c6691d505b6cfd28dd6324dc0de7bff8 +AUX milkytracker-1.02.00-CVE-2020-15569.patch 972 BLAKE2B 34dfbe0690fefce4cbcfeabe571d811092bba6c72e2bfe8db5e087d21774563bd79108e88c66b490999553587ab755fce16d53f4822e23149b86c5585aa46c00 SHA512 358b5e1709a634f2e51c6bda53684c903f57e328d73a364c5b7feac4c278288838cfde3f1afc087b2f52259f1cbcacda022dc92f3a621c7d772a9be8d248c220 +AUX milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch 2570 BLAKE2B fe0a454e34c9b7b88125ccdfb6f77e1cc014013a8f054f00c6330e733ba54154bc1d96ef256cf5befc8329c169e57f29062652f0ff84dc55201572d0201111fc SHA512 0112a805d61204ff31ad0b1b31cbc9ff60f91f5ada275a839f0c258c3f5302239fd9b00ba7d8387b5865ad2ea86abedc32630ff2f1b58c0a74bfa67895a5676a +DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba +DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134 +EBUILD milkytracker-1.02.00-r1.ebuild 1497 BLAKE2B 76e41340629253f19ba1253f3a662ced5af0ad03c0eec158a48120d7b557b96bca64a19dbac13e8a44f8f0b8e5135c20c7134f9168e67ed01bc639512867b113 SHA512 d8da48058c5fb7eb1ef9f95ccb7855fdadf50ed5415af38175d0fe08689c101e110a57685cbcbd814530bf75d05773adebd3195d192163e496aca4b1d9dd148e MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch deleted file mode 100644 index 391ec55c7d8d..000000000000 --- a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 87d0f55cd8868d91472f96cccafaf6fdb9e0cbbc Mon Sep 17 00:00:00 2001 -From: Dale Whinham <daleyo@gmail.com> -Date: Thu, 31 Oct 2019 21:21:28 +0000 -Subject: [PATCH] CMake: Use SDL2's official CMake package mechanism - -We shouldn't need to rely on a FindSDL2.cmake, as SDL2 comes with a -CMake package definition that should be installed by the distro into a -location where CMake can find it. - -Fixes #168. ---- - CMakeLists.txt | 4 +- - cmake/FindSDL2.cmake | 104 ------------------------------------------- - 2 files changed, 1 insertion(+), 107 deletions(-) - delete mode 100644 cmake/FindSDL2.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27ad4a18..5b6ed9f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,8 +31,6 @@ if(FORCESDL) - unset(APPLE) - unset(WIN32) - add_definitions(-D__FORCE_SDL_AUDIO__) -- # Frameworks not supported by findSDL2.cmake -- set(CMAKE_FIND_FRAMEWORK NEVER) - endif() - - # Lowercase project name for binaries and packaging -@@ -166,7 +164,7 @@ else() - # https://bugzilla.libsdl.org/show_bug.cgi?id=3295 - cmake_policy(SET CMP0004 OLD) - -- find_package(SDL2 2 REQUIRED) -+ find_package(SDL2 REQUIRED) - endif() - - # Prefer static linkage under OS X for libraries located with find_package() -diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake -deleted file mode 100644 -index 27c78f05..00000000 ---- a/cmake/FindSDL2.cmake -+++ /dev/null -@@ -1,104 +0,0 @@ --# - Find SDL2 library and headers --# --# Find module for SDL 2.0 (http://www.libsdl.org/). --# It defines the following variables: --# SDL2_INCLUDE_DIRS - The location of the headers, e.g., SDL.h. --# SDL2_LIBRARIES - The libraries to link against to use SDL2. --# SDL2_FOUND - If false, do not try to use SDL2. --# SDL2_VERSION_STRING - Human-readable string containing the version of SDL2. --# --# This module responds to the the flag: --# SDL2_BUILDING_LIBRARY --# If this is defined, then no SDL2_main will be linked in because --# only applications need main(). --# Otherwise, it is assumed you are building an application and this --# module will attempt to locate and set the the proper link flags --# as part of the returned SDL2_LIBRARIES variable. --# --# Also defined, but not for general use are: --# SDL2_INCLUDE_DIR - The directory that contains SDL.h. --# SDL2_LIBRARY - The location of the SDL2 library. --# SDL2MAIN_LIBRARY - The location of the SDL2main library. --# -- --#============================================================================= --# Copyright 2013 Benjamin Eikel --# --# Redistribution and use in source and binary forms, with or without --# modification, are permitted provided that the following conditions are met: --# * Redistributions of source code must retain the above copyright --# notice, this list of conditions and the following disclaimer. --# * Redistributions in binary form must reproduce the above copyright --# notice, this list of conditions and the following disclaimer in the --# documentation and/or other materials provided with the distribution. --# * Neither the name of the <organization> nor the --# names of its contributors may be used to endorse or promote products --# derived from this software without specific prior written permission. --# --# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY --# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES --# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; --# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND --# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF --# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --#============================================================================= -- --find_package(PkgConfig QUIET) --pkg_check_modules(PC_SDL2 QUIET sdl2) -- --find_path(SDL2_INCLUDE_DIR -- NAMES SDL.h -- HINTS -- ${PC_SDL2_INCLUDEDIR} -- ${PC_SDL2_INCLUDE_DIRS} -- PATH_SUFFIXES SDL2 --) -- --find_library(SDL2_LIBRARY -- NAMES SDL2 -- HINTS -- ${PC_SDL2_LIBDIR} -- ${PC_SDL2_LIBRARY_DIRS} -- PATH_SUFFIXES x64 x86 --) -- --if(NOT SDL2_BUILDING_LIBRARY) -- find_library(SDL2MAIN_LIBRARY -- NAMES SDL2main -- HINTS -- ${PC_SDL2_LIBDIR} -- ${PC_SDL2_LIBRARY_DIRS} -- PATH_SUFFIXES x64 x86 -- ) --endif() -- --if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h") -- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$") -- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$") -- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$") -- string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}") -- string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}") -- string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}") -- set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}) -- unset(SDL2_VERSION_MAJOR_LINE) -- unset(SDL2_VERSION_MINOR_LINE) -- unset(SDL2_VERSION_PATCH_LINE) -- unset(SDL2_VERSION_MAJOR) -- unset(SDL2_VERSION_MINOR) -- unset(SDL2_VERSION_PATCH) --endif() -- --set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) --set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY}) -- --include(FindPackageHandleStandardArgs) -- --find_package_handle_standard_args(SDL2 -- REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARY -- VERSION_VAR SDL2_VERSION_STRING) -- --mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY) diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch deleted file mode 100644 index aeae02af2b0b..000000000000 --- a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Sun, 7 May 2017 10:49:21 +0200 -Subject: [PATCH] Use GNUInstallDirs in order to change installation paths - -* This allows distro-specific modification of directories - to adjust to different FHS layouts. ---- - CMakeLists.txt | 5 ++++- - docs/CMakeLists.txt | 2 +- - resources/music/CMakeLists.txt | 2 +- - src/tracker/CMakeLists.txt | 2 +- - 4 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 996e2f0..bac54f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,9 +19,12 @@ - # along with MilkyTracker. If not, see <http://www.gnu.org/licenses/>. - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 2.8.5) - project(MilkyTracker) - -+# Adhere to GNU filesystem layout conventions -+include(GNUInstallDirs) -+ - # Force SDL if requested - option(FORCESDL "Force SDL instead of native" OFF) - if(FORCESDL) -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index 0aacc60..aca4a61 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -35,7 +35,7 @@ elseif(WIN32) - set(INSTALL_DEST .) - else() - list(APPEND DOCUMENTS readme_unix) -- set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER}) -+ set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR}) - endif() - - install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST}) -diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt -index f918b6e..f29fcd6 100644 ---- a/resources/music/CMakeLists.txt -+++ b/resources/music/CMakeLists.txt -@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm") - if(APPLE OR WIN32) - set(INSTALL_DEST "Example Songs") - else() -- set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs) -+ set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs) - endif() - - install(FILES ${SONGS} DESTINATION ${INSTALL_DEST}) -diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt -index 1e4062e..b7a96a7 100644 ---- a/src/tracker/CMakeLists.txt -+++ b/src/tracker/CMakeLists.txt -@@ -399,7 +399,7 @@ target_link_libraries( - if(APPLE OR WIN32) - set(INSTALL_DEST .) - else() -- set(INSTALL_DEST bin) -+ set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST}) diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch new file mode 100644 index 000000000000..d59522d6d1d0 --- /dev/null +++ b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch @@ -0,0 +1,26 @@ +This patch is from upstream: +https://github.com/milkytracker/MilkyTracker/commit/fd607a3439fcdd0992e5efded3c16fc79c804e34 + +commit fd607a3439fcdd0992e5efded3c16fc79c804e34 +Author: Christopher O'Neill <code@chrisoneill.co.uk> +Date: Tue Jul 30 19:11:58 2019 +0100 + + Fix #184: Heap overflow in S3M loader + +diff --git a/src/milkyplay/LoaderS3M.cpp b/src/milkyplay/LoaderS3M.cpp +index 5abf211..edf0fd5 100644 +--- a/src/milkyplay/LoaderS3M.cpp ++++ b/src/milkyplay/LoaderS3M.cpp +@@ -340,7 +340,11 @@ mp_sint32 LoaderS3M::load(XMFileBase& f, XModule* module) + return MP_OUT_OF_MEMORY; + + header->insnum = f.readWord(); // number of instruments +- header->patnum = f.readWord(); // number of patterns ++ if (header->insnum > MP_MAXINS) ++ return MP_LOADER_FAILED; ++ header->patnum = f.readWord(); // number of patterns ++ if (header->patnum > 256) ++ return MP_LOADER_FAILED; + + mp_sint32 flags = f.readWord(); // st3 flags + diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch new file mode 100644 index 000000000000..0560cd2b825b --- /dev/null +++ b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch @@ -0,0 +1,104 @@ +This patch is from upstream: +https://github.com/milkytracker/MilkyTracker/commit/ea7772a3fae0a9dd0a322e8fec441d15843703b7 + +commit ea7772a3fae0a9dd0a322e8fec441d15843703b7 +Author: Christopher O'Neill <code@chrisoneill.co.uk> +Date: Tue Jul 30 18:40:03 2019 +0100 + + Fixes for buffer overflow issues #182 & #183 + +diff --git a/src/milkyplay/LoaderXM.cpp b/src/milkyplay/LoaderXM.cpp +index 108d915..f87f5c1 100644 +--- a/src/milkyplay/LoaderXM.cpp ++++ b/src/milkyplay/LoaderXM.cpp +@@ -63,8 +63,8 @@ const char* LoaderXM::identifyModule(const mp_ubyte* buffer) + mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + { + mp_ubyte insData[230]; +- mp_sint32 smpReloc[96]; +- mp_ubyte nbu[96]; ++ mp_sint32 smpReloc[MP_MAXINSSAMPS]; ++ mp_ubyte nbu[MP_MAXINSSAMPS]; + mp_uint32 fileSize = 0; + + module->cleanUp(); +@@ -117,6 +117,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + memcpy(header->ord, hdrBuff+16, 256); + if(header->ordnum > MP_MAXORDERS) + header->ordnum = MP_MAXORDERS; ++ if(header->insnum > MP_MAXINS) ++ return MP_LOADER_FAILED; + + delete[] hdrBuff; + +@@ -143,7 +145,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + f.read(&instr[y].type,1,1); + mp_uword numSamples = 0; + f.readWords(&numSamples,1); +- if(numSamples > 96) ++ if(numSamples > MP_MAXINSSAMPS) + return MP_LOADER_FAILED; + instr[y].samp = numSamples; + +@@ -169,8 +171,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + if (instr[y].samp) { + mp_ubyte* insDataPtr = insData; + +- memcpy(nbu, insDataPtr, 96); +- insDataPtr+=96; ++ memcpy(nbu, insDataPtr, MP_MAXINSSAMPS); ++ insDataPtr+=MP_MAXINSSAMPS; + + TEnvelope venv; + TEnvelope penv; +@@ -285,7 +287,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + + instr[y].samp = g; + +- for (sc = 0; sc < 96; sc++) { ++ for (sc = 0; sc < MP_MAXINSSAMPS; sc++) { + if (smpReloc[nbu[sc]] == -1) + instr[y].snum[sc] = -1; + else +@@ -491,6 +493,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + f.read(&instr[y].type,1,1); + f.readWords(&instr[y].samp,1); + } ++ if (instr[y].samp > MP_MAXINSSAMPS) ++ return MP_LOADER_FAILED; + + //printf("%i, %i\n", instr[y].size, instr[y].samp); + +@@ -532,8 +536,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + + //f.read(&nbu,1,96); + +- memcpy(nbu, insDataPtr, 96); +- insDataPtr+=96; ++ memcpy(nbu, insDataPtr, MP_MAXINSSAMPS); ++ insDataPtr+=MP_MAXINSSAMPS; + + TEnvelope venv; + TEnvelope penv; +@@ -650,7 +654,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module) + + instr[y].samp = g; + +- for (sc = 0; sc < 96; sc++) { ++ for (sc = 0; sc < MP_MAXINSSAMPS; sc++) { + if (smpReloc[nbu[sc]] == -1) + instr[y].snum[sc] = -1; + else +diff --git a/src/milkyplay/XModule.h b/src/milkyplay/XModule.h +index f42d04b..4f04a2d 100644 +--- a/src/milkyplay/XModule.h ++++ b/src/milkyplay/XModule.h +@@ -40,6 +40,8 @@ + + #define MP_MAXTEXT 32 + #define MP_MAXORDERS 256 ++#define MP_MAXINS 255 ++#define MP_MAXINSSAMPS 96 + + struct TXMHeader + { diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch new file mode 100644 index 000000000000..59c2f9942ae6 --- /dev/null +++ b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch @@ -0,0 +1,35 @@ +Fix is from upstream: +https://github.com/milkytracker/MilkyTracker/commit/7afd55c42ad80d01a339197a2d8b5461d214edaf + +Gentoo Bug: https://bugs.gentoo.org/711280 + +commit 7afd55c42ad80d01a339197a2d8b5461d214edaf +Author: Jeremy Clarke <geckojsc@gmail.com> +Date: Mon Apr 13 23:53:51 2020 +0100 + + Fix use-after-free in PlayerGeneric destructor + +diff --git a/src/milkyplay/PlayerGeneric.cpp b/src/milkyplay/PlayerGeneric.cpp +index 8df2c13..59f7cba 100644 +--- a/src/milkyplay/PlayerGeneric.cpp ++++ b/src/milkyplay/PlayerGeneric.cpp +@@ -202,15 +202,16 @@ PlayerGeneric::PlayerGeneric(mp_sint32 frequency, AudioDriverInterface* audioDri + + PlayerGeneric::~PlayerGeneric() + { +- if (mixer) +- delete mixer; + + if (player) + { +- if (mixer->isActive() && !mixer->isDeviceRemoved(player)) ++ if (mixer && mixer->isActive() && !mixer->isDeviceRemoved(player)) + mixer->removeDevice(player); + delete player; + } ++ ++ if (mixer) ++ delete mixer; + + delete[] audioDriverName; + diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch new file mode 100644 index 000000000000..090e433b5fdc --- /dev/null +++ b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch @@ -0,0 +1,85 @@ +From f85f5336df72dc44e407ae756ed20a8f8422cb76 Mon Sep 17 00:00:00 2001 +From: Dale Whinham <daleyo@gmail.com> +Date: Sat, 11 Apr 2020 16:51:31 +0100 +Subject: [PATCH] Fix hard dependency on RtMidi + +It is perfectly reasonable for libasound to be installed, but not +librtmidi, and so we should only enable the MIDI code if both are +present. + +Fixes #207. +--- + src/tracker/CMakeLists.txt | 1 + + src/tracker/sdl/SDL_Main.cpp | 12 ++++++------ + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt +index 0a935330..f4243a0f 100644 +--- a/src/tracker/CMakeLists.txt ++++ b/src/tracker/CMakeLists.txt +@@ -348,6 +348,7 @@ elseif(WIN32) + target_link_libraries(tracker midi) + else() + if(ALSA_FOUND AND RTMIDI_FOUND) ++ target_compile_definitions(tracker PRIVATE -DHAVE_LIBRTMIDI) + target_link_libraries(tracker midi) + endif() + endif() +diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp +index 1a49fc12..75ffa1df 100644 +--- a/src/tracker/sdl/SDL_Main.cpp ++++ b/src/tracker/sdl/SDL_Main.cpp +@@ -78,7 +78,7 @@ + #include "PPSystem_POSIX.h" + #include "PPPath_POSIX.h" + +-#ifdef HAVE_LIBASOUND ++#ifdef HAVE_LIBRTMIDI + #include "../midi/posix/MidiReceiver_pthread.h" + #endif + // -------------------------------------------------------------------------- +@@ -89,7 +89,7 @@ static SDL_TimerID timer; + static PPScreen* myTrackerScreen = NULL; + static Tracker* myTracker = NULL; + static PPDisplayDevice* myDisplayDevice = NULL; +-#ifdef HAVE_LIBASOUND ++#ifdef HAVE_LIBRTMIDI + static MidiReceiver* myMidiReceiver = NULL; + #endif + +@@ -223,7 +223,7 @@ static Uint32 SDLCALL timerCallback(Uint32 interval, void* param) + return interval; + } + +-#ifdef HAVE_LIBASOUND ++#ifdef HAVE_LIBRTMIDI + class MidiEventHandler : public MidiReceiver::MidiEventHandler + { + public: +@@ -829,7 +829,7 @@ myDisplayDevice = new PPDisplayDeviceFB(windowSize.width, windowSize.height, sca + // Startup procedure + myTracker->startUp(noSplash); + +-#ifdef HAVE_LIBASOUND ++#ifdef HAVE_LIBRTMIDI + InitMidi(); + #endif + +@@ -962,7 +962,7 @@ int main(int argc, char *argv[]) + initTracker(defaultBPP, orientation, swapRedBlue, noSplash); + globalMutex->unlock(); + +-#ifdef HAVE_LIBASOUND ++#ifdef HAVE_LIBRTMIDI + if (myMidiReceiver && recVelocity) + { + myMidiReceiver->setRecordVelocity(true); +@@ -1036,7 +1036,7 @@ int main(int argc, char *argv[]) + SDL_RemoveTimer(timer); + + globalMutex->lock(); +-#ifdef HAVE_LIBASOUND ++#ifdef HAVE_LIBRTMIDI + delete myMidiReceiver; + #endif + delete myTracker; diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild index 3d5f9f04861d..b27c6c5260b4 100644 --- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild +++ b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild @@ -1,13 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake desktop +inherit cmake desktop xdg + +# This commit is needed so the milkytrace binary is linked properly, bug 711564 +# It is also ~40kb so it is better to fetch it rather than ship it in-tree +COMMIT="2b145b074581ddf3b4ad78a402cdf5fab500b125" DESCRIPTION="FastTracker 2 inspired music tracker" HOMEPAGE="https://milkytracker.titandemo.org/" -SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/milkytracker/MilkyTracker/commit/${COMMIT}.patch -> ${P}-cmake.patch" LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT" SLOT="0" @@ -19,16 +24,23 @@ RDEPEND=" media-libs/libsdl2[X] sys-libs/zlib alsa? ( media-libs/alsa-lib ) - jack? ( media-sound/jack-audio-connection-kit )" + jack? ( virtual/jack )" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${P}-docdir.patch - "${FILESDIR}"/${P}-cmake.patch + "${DISTDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-CVE-2019-14464.patch" + "${FILESDIR}/${P}-CVE-2019-1449x.patch" + "${FILESDIR}/${P}-CVE-2020-15569.patch" + "${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch" ) S="${WORKDIR}/MilkyTracker-${PV}" +src_prepare() { + cmake_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake_use_find_package alsa ALSA) diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index d2d61c26b9e5..8e2d73c024e7 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,10 +1,9 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59 -AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa -EBUILD mixxx-2.2.3-r2.ebuild 3202 BLAKE2B 5e21aa4910d3e136b6123ddb231a7a536db9239b7297d77e929a20bc7ace77de4c8da7809e41c94507b3f663d78a64b0cf4f0fa0717fd3d02539865c1b3fdc96 SHA512 e085cf38879c384701e37cd8ea73e63396a00bbfde371b7eaf326623b09e54078337ba5ead1ad3db1e7c850c2c5353f2262ce277d0b8b9aef29175a8dd356125 -EBUILD mixxx-2.2.4.ebuild 3253 BLAKE2B c691c61b4d483cc60aa6d94e880ba22962fbdc94eba912aa4df1c0fc9b50930ac03b1d161a4d9ad55420066097dca0c85b0e469831c6cb8dfad0a65aac9e7b81 SHA512 af092c60b7453807dd8125d9a16e3fb0e48d5dde5112026ac867a377fc8ed2c5a71243d5ece8e322ad8d4e7c5fe69da75f88fa585c5092ad7a316e978aabe364 -EBUILD mixxx-9999.ebuild 3167 BLAKE2B a043a02cd144dd31758d1dfdbf81f4aff60b1ede13f1e28bb95dac7a392dd9e6307e120cd1924d78a2116996e95a2b03fe24f4fc539da2cd22e609dfc2528f1c SHA512 92daebabad0d42cf176244f2a863f4a32724d8f62b5c6cb8a17a6304231dee27db576dedff3b1f0cb8c0ac5f9d393bd7c61d75f83f052c70500c4202b32c4027 +EBUILD mixxx-2.2.3-r2.ebuild 3152 BLAKE2B 48a5c3b9d7513a6ae4c47c6f67d0f7577234ae92ba9bbc8d6792ac4f5a62898d77e175d372ee0362e07b347ad6215433e2c857b829d47cead9d5cc677dc7c9d6 SHA512 b84b0fe2b0d40c4a17b2df624e856b36b8fd3dc899fa6b9f2f0cb834db607aa4da2bd024a5eeb75b0a3dbba8241a73ad19a545289e30da0dba17e7cbed4e67b7 +EBUILD mixxx-2.2.4.ebuild 3203 BLAKE2B 14f1574307c91b3e074aa9b223e28569ffd45f5a0dd80a9e91868b9ab04fe0963e8b2ff23b305e3d2e88814a381f434477b61eacb376d41b5eecf0d249bcaa1f SHA512 582cd886f335c7985909455db11a844ce1b7c15ec418049586bacacb46ec62ee2ee5fd4ccb1fdd050e76f2080bce39ed506e51fd361695a29ab0d3ebb815b133 +EBUILD mixxx-9999.ebuild 3104 BLAKE2B cb83684c0b11f73ee9fcfdae56f6201ed53593c26325f251784b69a2fdffe1ed14025016d67dcc3c62a1e5e23993f77c55057162d4e52e73ecea680d93aba085 SHA512 1c4074ef483feac78a36575b1dee2c6a7dc6e01429bbee5877706996712f14ac8c3bf2326b9e765f1c3ca559943ff0dd5184694889bd723efc31f39e909bf0f7 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f diff --git a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch deleted file mode 100644 index 4addc98b1e1b..000000000000 --- a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- mixxx-release-2.2.0/src/effects/lv2/lv2backend.h -+++ mixxx-release-2.2.0/src/effects/lv2/lv2backend.h -@@ -5,7 +5,7 @@ - #include "effects/effectsbackend.h" - #include "effects/lv2/lv2manifest.h" - #include "preferences/usersettings.h" --#include <lilv-0/lilv/lilv.h> -+#include <lilv/lilv.h> - - class LV2Backend : public EffectsBackend { - Q_OBJECT ---- mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h -+++ mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h -@@ -4,7 +4,7 @@ - #include "effects/effectprocessor.h" - #include "effects/effectmanifest.h" - #include "engine/effects/engineeffectparameter.h" --#include <lilv-0/lilv/lilv.h> -+#include <lilv/lilv.h> - #include "effects/defs.h" - #include "engine/engine.h" - ---- mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h -+++ mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h -@@ -3,7 +3,7 @@ - - #include "effects/effectmanifest.h" - #include "effects/defs.h" --#include <lilv-0/lilv/lilv.h> -+#include <lilv/lilv.h> - - class LV2Manifest { - public: diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild index a985c3d324ae..a0feed265b7d 100644 --- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild +++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild @@ -79,7 +79,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.0.0-docs.patch - "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch "${FILESDIR}"/${P}-qt-5.14.patch ) diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild index f0d8272d43a6..070c9470c18f 100644 --- a/media-sound/mixxx/mixxx-2.2.4.ebuild +++ b/media-sound/mixxx/mixxx-2.2.4.ebuild @@ -79,7 +79,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.0.0-docs.patch - "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch "${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch "${FILESDIR}"/${PN}-2.2.4-metadata.patch ) diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index 3c4c7d006b0d..cac6bd5d4fe2 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -77,10 +77,6 @@ DEPEND="${RDEPEND} dev-qt/qtxmlpatterns:5 " -PATCHES=( - "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch -) - src_prepare() { # use multilib compatible directory for plugins sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest index b379f286146c..1fb34e49dc78 100644 --- a/media-sound/moc/Manifest +++ b/media-sound/moc/Manifest @@ -3,4 +3,5 @@ DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667 EBUILD moc-2.6_alpha3-r1.ebuild 2279 BLAKE2B e82260010c115fbbb05d81c3f26da8fd7b1854af7533da00ccfc296b65ac41345671176b65eab3ea75c3c4bb5fe7fbe4c38abec0e551995ccc1c3c314adcc705 SHA512 cd106235b1017286763f06e0623cc339dce44e10002d5266d15ab4eecc90874be673de805038739a761df396af3fc8b1daf8685e36bc0543df6c00b628b361b4 +EBUILD moc-2.6_alpha3-r2.ebuild 2250 BLAKE2B ea3c33c85a7d37f7cc4f783bdac1a509c7d95fa219553a3feebad57a726d9a80c63fd840fe5d44bfb6ffebfafb4bce9377de4b7588082012344fca509086dd2b SHA512 2b80e2e3e7d297867001538f9cdcf825db89ef634454e80a4217da0164396fd1326c58a4de3662dccdc0149e08bf1b618f3b1c2bac090f86c89007dbcb929440 MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57 diff --git a/media-sound/moc/moc-2.6_alpha3-r2.ebuild b/media-sound/moc/moc-2.6_alpha3-r2.ebuild new file mode 100644 index 000000000000..c1b7aa63c6d9 --- /dev/null +++ b/media-sound/moc/moc-2.6_alpha3-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P=${PN}-${PV/_/-} +DESCRIPTION="Music On Console - ncurses interface for playing audio files" +HOMEPAGE="https://moc.daper.net" +SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86" +IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack + oss sid sndfile speex timidity tremor +unicode vorbis wavpack" + +RDEPEND=" + >=dev-libs/libltdl-2:0 + dev-libs/popt + sys-libs/ncurses:0=[unicode?] + aac? ( media-libs/faad2 ) + alsa? ( >=media-libs/alsa-lib-1.0.11 ) + cache? ( >=sys-libs/db-4.1:= ) + curl? ( >=net-misc/curl-7.15.1 ) + ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 ) + flac? ( >=media-libs/flac-1.1.3 ) + jack? ( virtual/jack ) + libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) + mad? ( + media-libs/libmad + sys-libs/zlib + media-libs/libid3tag + ) + magic? ( sys-apps/file ) + modplug? ( >=media-libs/libmodplug-0.7 ) + musepack? ( + media-sound/musepack-tools + >=media-libs/taglib-1.5 + ) + sid? ( >=media-libs/libsidplay-2.1.1 ) + sndfile? ( >=media-libs/libsndfile-1.0.0 ) + speex? ( >=media-libs/speex-1.0.0 ) + timidity? ( + >=media-libs/libtimidity-0.1.0 + media-sound/timidity++ + ) + vorbis? ( + >=media-libs/libogg-1.0 + tremor? ( media-libs/tremor ) + !tremor? ( >=media-libs/libvorbis-1.0 ) + ) + wavpack? ( >=media-sound/wavpack-4.31 ) +" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig +" + +S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}/ffmpeg4.patch" ) + +src_configure() { + local myconf=( + --without-rcc + $(use_enable debug) + $(use_enable cache) + $(use_with oss) + $(use_with alsa) + $(use_with jack) + $(use_with magic) + $(use_with unicode ncursesw) + $(use_with libsamplerate samplerate) + $(use_with aac) + $(use_with ffmpeg) + $(use_with flac) + $(use_with modplug) + $(use_with mad mp3) + $(use_with musepack) + $(use_with sid sidplay2) + $(use_with sndfile) + $(use_with speex) + $(use_with timidity) + $(use_with vorbis vorbis $(usex tremor tremor "")) + $(use_with wavpack) + $(use_with curl) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-sound/mp3cat/Manifest b/media-sound/mp3cat/Manifest index 48b59bc29bdc..72c12adde2a7 100644 --- a/media-sound/mp3cat/Manifest +++ b/media-sound/mp3cat/Manifest @@ -1,3 +1,3 @@ -DIST mp3cat-0.4.tar.gz 14956 BLAKE2B 3da17f7ccd5739657ebfa31fbc78a77f78d7b25fd3e1e82825fa2efc677b2aa64da8f699faaef8dd55ecea647bcfa014c7bc6149a9ca52b1f255304f838837e9 SHA512 a72bbbd296bb07a7e7fc084a494b2676c012cf3a4c71ace7eea52892f6f478769c5b6140fcd8dbfa245d537335a484fd8c5db15edd83a0146821d48e24862492 -EBUILD mp3cat-0.4.ebuild 574 BLAKE2B 5c17ad84a5a7af3cb5c57e83aef8e648ecdffc34bb0074c36757a442000320774826bd5f9f147fff4f73642aeff549384e96b52e3c614493f69ed3ea58a5d51f SHA512 8e782196451d6b9af8eebf441e3804b64990209443e0d391093a29e247f5d9ffae03a025410c7a7b554159d721634ae9f51b70e1e3c5b561d8ea35d6018a5722 +DIST mp3cat-0.5.tar.gz 15711 BLAKE2B c2b6c0e3d0dc96ac3a3356b735909f4a8dda596b6d71e97aafd62fa65c34d382c4855c8676d36044bd08b8e4ff7aad4a2d7ababf014546861ddf9f22b09a35cb SHA512 084a0640d1a9870c5fd6a5378565598c747245e0489a7d34c299a226cf5b08a2150b1f89ed5b02a0193af480487a7c3d659382af7d9fc08db2167a9541804ee1 +EBUILD mp3cat-0.5.ebuild 602 BLAKE2B 5e66633fb5cd6e5db3c461a528dcce50ed27d1d36c3cfc40ae54d8b50b633eba43f807d19dccfd551f4bdc5c3f0aa71a2de37872a657a77e18d0a0fcac87e262 SHA512 98329744d81c13f4d7d0433bdd0b82e632c48edc215b888ff05a98e056098f133d3d041ce28b8a3fe5175ef5a2a493b282f80b06b43c5a2114bd81d796f07c04 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/mp3cat/mp3cat-0.4.ebuild b/media-sound/mp3cat/mp3cat-0.5.ebuild index 19faf5591869..f12a8af66ec2 100644 --- a/media-sound/mp3cat/mp3cat-0.4.ebuild +++ b/media-sound/mp3cat/mp3cat-0.5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs -DESCRIPTION="mp3cat reads and writes MP3 files" -HOMEPAGE="http://tomclegg.net/mp3cat" -SRC_URI="http://tomclegg.net/software/${P}.tar.gz" +DESCRIPTION="Reads and writes MP3 files" +HOMEPAGE="https://tomclegg.ca/mp3cat" +SRC_URI="https://github.com/tomclegg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="" src_prepare() { + default sed -i -e 's:cc -o:${CC} ${CFLAGS} ${LDFLAGS} -o:' \ Makefile || die "sed failed" } diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest index 057a491ee290..16541bfa70cf 100644 --- a/media-sound/mp3gain/Manifest +++ b/media-sound/mp3gain/Manifest @@ -1,4 +1,7 @@ AUX mp3gain-1.6.1-CVE-2017-12911.patch 2804 BLAKE2B 71d410abe4196cb47d4f006af7d8fd73a0308280ce57aaa955434c9f7b1bb8bf3363eb1ad8dbe0da3b5dd79e4ac5a355b796cdc253608c5bf2ba7c03527c3b32 SHA512 b5b093f18160cd4205870952d8f092c300f66d6fa025ac09114f55b1e5b37af6ab8ea1b505e33446f6c7153a5ffad04c001b67f9a069db8d3418c6fae3e73002 +AUX mp3gain-1.6.2-CVE-2019-18359-plus.patch 6742 BLAKE2B 1216085064f712751ad9c7739a5d7a3ae9ca258ce41860a177756005b911371b6784a6ee4b7b68e829e5e1b4eede86287abd048cca01db99c53aa1ac9ff94c8f SHA512 b795167c594b106b8f6336d4c975bb73812a4fbcd5e16cfcedfaeff0c291f6ea01e62f20318d5107e62c9c42e843e8cd618745acdd17fd35c4e9a5052d85227e DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375 +DIST mp3gain-1_6_2-src.zip 71246 BLAKE2B 5172c2103bb2267bf819f36180e9cd7a9d57df6f7ddc29900e9063f97c4513972053bb0c3f1f69f7ddd12ec0cf4251e93e1b6920389a8246bfdd5650176a90d2 SHA512 ec9de6c755120480ccb72b34a0042aea7546ef923090ab04e420d5b189523b4504e29952a3d695d3c42c74348f5c3c9123ff090bcc671e43375711e085d67480 EBUILD mp3gain-1.6.1.ebuild 672 BLAKE2B f4bc25038d8ffde1df40f0a08b602f2c05e88870b6495cf83022acc273736ec19f1ca76e5451e07ffc1d1ed657fc6d92700d56eb5c92dfe60d5690d6c7284c22 SHA512 770d05807d4529c126a9b113dd95cf4b04abd8a5d0d3e8a9f3fe8a4d5a4f5c9ea96366eb293f8070a856694b3d6c1771d4273addc213e55f5616f6c63e7ea443 +EBUILD mp3gain-1.6.2.ebuild 683 BLAKE2B 0c38eb9b821c7514d02a9420035cd13d3edfc1cfb22883a2d408d37db2132c1f5dc98f3c9a33af7396e4e7919acf18b65f82d431f68cbfdb245d6ff24351e5bc SHA512 34cc9782ca9752e7fe9500d805277fc26bdf1293832d69c1fcb8b3db63f0aadd2f4ba2c9c7f03fb9569abb1038015a0b1bc206a8604c8e5b5d01dd67bf37499d MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119 diff --git a/media-sound/mp3gain/files/mp3gain-1.6.2-CVE-2019-18359-plus.patch b/media-sound/mp3gain/files/mp3gain-1.6.2-CVE-2019-18359-plus.patch new file mode 100644 index 000000000000..5f05fc1bf27b --- /dev/null +++ b/media-sound/mp3gain/files/mp3gain-1.6.2-CVE-2019-18359-plus.patch @@ -0,0 +1,183 @@ +openSUSE patch: https://build.opensuse.org/package/view_file/openSUSE:Factory/mp3gain/0001-fix-security-bugs.patch?expand=1 +Gentoo bug: https://bugs.gentoo.org/717940 +---- +From: Jason Craig <os-dev@jacraig.com> +Date: Mon, 30 Mar 2020 12:43:20 -0600 +Subject: [PATCH] Fix various security issues including CVE-2019-18359 +References: boo#1154971 +Upstream: dead + +Multiple POCs at https://github.com/zjuchenyuan/fuzzpoc were fixed. +--- a/apetag.c ++++ b/apetag.c +@@ -16,6 +16,13 @@ + #define _stricmp strcasecmp + #endif /* WIN32 */ + ++// Min and max values for gain and peak in order to fit in allotted space in the APE tags. For gain that is nine chars, ++// including a + or -. For peak that is eight chars, including a - but no +. Both will always have six precision digits. ++#define MIN_GAIN -9.999999 ++#define MAX_GAIN 9.999999 ++#define MIN_PEAK -9.99999 ++#define MAX_PEAK 9.999999 ++ + int ReadMP3ID3v1Tag(FILE *fi, unsigned char **tagbuff, long *tag_offset) { + char tmp[128]; + +@@ -102,9 +109,9 @@ static int ReadMP3Lyrics3v2Tag ( FILE *fp, unsigned char **tagbuff, unsigned lon + if ( fseek (fp, *tag_offset - 128 - (long)sizeof (T) - len, SEEK_SET) ) return 0; + if ( fread (tmp, 1, 11, fp) != 11 ) return 0; + if ( memcmp (tmp, "LYRICSBEGIN", 11) ) return 0; +- ++ + taglen = 128 + Lyrics3GetNumber6(T.Length) + sizeof(T); +- ++ + *tag_offset -= taglen; + if (*tagbuff != NULL) { + free(*tagbuff); +@@ -142,7 +149,7 @@ enum { + + unsigned long strlen_max(const char * ptr, unsigned long max) { + unsigned long n = 0; +- while (ptr[n] && n < max) n++; ++ while (n < max && ptr[n]) n++; + return n; + } + +@@ -234,6 +241,14 @@ int ReadMP3APETag ( FILE *fp, struct MP3GainTagInfo *info, struct APETagStruct + info->albumPeak = atof(value); + } else if (!_stricmp(name,"MP3GAIN_UNDO")) { + /* value should be something like "+003,+003,W" */ ++ /* If the file didn't specify enough bytes for the value (at least 11...see above), skip the tag. */ ++ if(vsize < 11) ++ { ++ free(value); ++ free(name); ++ p += isize + 1 + vsize; ++ continue; ++ } + info->haveUndo = !0; + vp = value; + memcpy(tmpString,vp,4); +@@ -251,6 +266,14 @@ int ReadMP3APETag ( FILE *fp, struct MP3GainTagInfo *info, struct APETagStruct + } + } else if (!_stricmp(name,"MP3GAIN_MINMAX")) { + /* value should be something like "001,153" */ ++ /* If the file didn't specify enough bytes for the value (at least 7...see above), skip the tag. */ ++ if(vsize < 7) ++ { ++ free(value); ++ free(name); ++ p += isize + 1 + vsize; ++ continue; ++ } + info->haveMinMaxGain = !0; + vp = value; + memcpy(tmpString,vp,3); +@@ -289,7 +312,7 @@ int ReadMP3APETag ( FILE *fp, struct MP3GainTagInfo *info, struct APETagStruct + } + + free (buff); +- ++ + *tag_offset -= TagLen; + (*apeTag)->originalTagSize = TagLen; + +@@ -318,7 +341,7 @@ int ReadMP3APETag ( FILE *fp, struct MP3GainTagInfo *info, struct APETagStruct + int truncate_file (char *filename, long truncLength) { + + #ifdef WIN32 +- ++ + int fh, result; + + /* Open a file */ +@@ -370,10 +393,10 @@ int ReadMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct FileT + fi = fopen(filename, "rb"); + if (fi == NULL) + return 0; +- ++ + fseek(fi, 0, SEEK_END); + tag_offset = file_size = ftell(fi); +- ++ + fileTags->lyrics3TagSize = 0; + + do { +@@ -515,7 +538,7 @@ int WriteMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct File + Write_LE_Uint32(newFooter.Flags,1<<31); /* tag has header */ + memset(newFooter.Reserved,0,sizeof(newFooter.Reserved)); + } +- ++ + if (info->haveMinMaxGain) { + /* 8 bytes + "MP3GAIN_MINMAX" + '/0' + "123,123" = 30 bytes */ + Write_LE_Uint32(mp3gainTagData,7); +@@ -575,7 +598,10 @@ int WriteMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct File + mp3gainTagData += 4; + strcpy(mp3gainTagData, "REPLAYGAIN_TRACK_GAIN"); + mp3gainTagData += 22; +- sprintf(valueString,"%-+9.6f", info->trackGain); ++ // Clamp the gain value to ensure that sprintf won't put more than 9 chars in valueString. In cases of very ++ // large trackGain value, valueString could overflow. ++ sprintf(valueString, "%-+9.6f", info->trackGain < MIN_GAIN ? MIN_GAIN ++ : (info->trackGain > MAX_GAIN ? MAX_GAIN : info->trackGain)); + memcpy(mp3gainTagData, valueString, 9); + mp3gainTagData += 9; + memcpy(mp3gainTagData, " dB", 3); +@@ -589,7 +615,10 @@ int WriteMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct File + mp3gainTagData += 4; + strcpy(mp3gainTagData, "REPLAYGAIN_TRACK_PEAK"); + mp3gainTagData += 22; +- sprintf(valueString,"%-8.6f", info->trackPeak); ++ // Clamp the peak value to ensure that sprintf won't put more than 8 chars in valueString. In cases of very ++ // large trackPeak value, valueString could overflow. ++ sprintf(valueString,"%-8.6f", info->trackPeak < MIN_PEAK ? MIN_PEAK ++ : (info->trackPeak > MAX_PEAK ? MAX_PEAK : info->trackPeak)); + memcpy(mp3gainTagData, valueString, 8); + mp3gainTagData += 8; + } +@@ -601,7 +630,9 @@ int WriteMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct File + mp3gainTagData += 4; + strcpy(mp3gainTagData, "REPLAYGAIN_ALBUM_GAIN"); + mp3gainTagData += 22; +- sprintf(valueString,"%-+9.6f", info->albumGain); ++ // Clamp the gain value, see haveTrackGain if above. ++ sprintf(valueString,"%-+9.6f", info->albumGain < MIN_GAIN ? MIN_GAIN ++ : (info->albumGain > MAX_GAIN ? MAX_GAIN : info->albumGain)); + memcpy(mp3gainTagData, valueString, 9); + mp3gainTagData += 9; + memcpy(mp3gainTagData, " dB", 3); +@@ -615,7 +646,9 @@ int WriteMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct File + mp3gainTagData += 4; + strcpy(mp3gainTagData, "REPLAYGAIN_ALBUM_PEAK"); + mp3gainTagData += 22; +- sprintf(valueString,"%-8.6f", info->albumPeak); ++ // Clamp the peak value, see haveTrackPeak if above. ++ sprintf(valueString,"%-8.6f", info->albumPeak < MIN_PEAK ? MIN_PEAK ++ : (info->albumPeak > MAX_PEAK ? MAX_PEAK : info->albumPeak)); + memcpy(mp3gainTagData, valueString, 8); + mp3gainTagData += 8; + } +@@ -641,7 +674,7 @@ int WriteMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct File + } //no Lyrics3 tag + + fclose(outputFile); +- ++ + if (saveTimeStamp) + fileTime(filename,setStoredTime); + +@@ -666,7 +699,7 @@ int RemoveMP3GainAPETag (char *filename, int saveTimeStamp) { + info.haveMinMaxGain = 0; + info.haveAlbumMinMaxGain = 0; + info.haveUndo = 0; +- ++ + fileTags.apeTag = NULL; + fileTags.id31tag = NULL; + fileTags.lyrics3tag = NULL; + + diff --git a/media-sound/mp3gain/mp3gain-1.6.2.ebuild b/media-sound/mp3gain/mp3gain-1.6.2.ebuild new file mode 100644 index 000000000000..032698c2c633 --- /dev/null +++ b/media-sound/mp3gain/mp3gain-1.6.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P="${P//./_}" + +DESCRIPTION="A program to analyze and adjust MP3 files to same volume" +HOMEPAGE="http://mp3gain.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip" +S="${WORKDIR}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +BDEPEND="app-arch/unzip" +RDEPEND="media-sound/mpg123" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.6.2-CVE-2019-18359-plus.patch" +) + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin mp3gain +} diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest index ca7ebfd70770..e33e4469aff1 100644 --- a/media-sound/mp3splt-gtk/Manifest +++ b/media-sound/mp3splt-gtk/Manifest @@ -1,3 +1,4 @@ +AUX mp3splt-gtk-0.9.2-fno-common.patch 274 BLAKE2B 2a2368bab0d06b3c347bdce2a7c19a4b1707f405716dfa7c603b65ad085a001ecd29727c4ff8ca5c4c21c2371cab5b377a106a60f396850128d753f76d6a43d1 SHA512 b9f96afc59238a2824f3d79503acccb09ed45b2ad7527df665c0274a59a2779855274c91e2ce4e4b3cc5d4dce749a634049380acc37f827e4f4b1cf34d539f8d DIST mp3splt-gtk-0.9.2.tar.gz 1070580 BLAKE2B b49a246eeb03d11ec8d4c8968323c62e200439af5d2cb52321442365615b20444908f4c33e6bddeec4051fc320f303b98a1d341bc834ec768bc4d803d2fb5be8 SHA512 e837cbc0759cd6535fc466099a170d066ab72b4854f8546f524261fe660887f5d2add60d9fa1e19d68d811004c682a324b5bcba86aa8cb89ae1ad2bc2f9b1d9d -EBUILD mp3splt-gtk-0.9.2-r1.ebuild 931 BLAKE2B bdc420f10381a12566c1d57d3f2008432823ac753865b35558b787773a3044add747b8cdfc0356368368d2a3f2d8377a81979bfcf6a5b95954c455182ecf9159 SHA512 5865f27686cb54a4eb2b3e435af561213d733b23d55fb224d17ed8cd680eecbf59c2e01dc54645e3e80c500c1e69474b23d85584b9a5ec8c88acfe2280aaaf1a +EBUILD mp3splt-gtk-0.9.2-r1.ebuild 995 BLAKE2B 390cd2ef5aa692abd5ba8bcd961a4c653498133ea0e6d4b09a11a47d33b2f3d2c0ee5205aee339ef489e7cf3fcf2e92bd0ad1ac1b46c35e2b282c3bda129c860 SHA512 6a657d68a32d0614b6478802fbb6f10c4d5a61827f9e416659187f433c70b495d818cda99047dc9c66fe4d3f4816276fd3f5634ce781e10aa196aa6cbc369503 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38 diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch new file mode 100644 index 000000000000..646d59008c6e --- /dev/null +++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/splitpoints_window.h ++++ b/src/splitpoints_window.h +@@ -41,7 +41,7 @@ + #include "all_includes.h" + + //!The enum telling which item is kept in which column of the splitpoint tree +-enum { ++typedef enum { + COL_CHECK = 0, + COL_DESCRIPTION = 1, + COL_MINUTES = 2, diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild index edd740e08563..9355f8230680 100644 --- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild +++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit versionator autotools +inherit autotools -DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding" +DESCRIPTION="A GTK+ based utility to split mp3 and ogg files without decoding" HOMEPAGE="http://mp3splt.sourceforge.net" SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz" @@ -20,12 +20,14 @@ RDEPEND=" dev-libs/dbus-glib gstreamer? ( media-libs/gstreamer:1.0 - media-plugins/gst-plugins-meta:1.0[mp3] ) -" -DEPEND="${RDEPEND} + media-plugins/gst-plugins-meta:1.0[mp3] + )" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext ) -" + nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${PN}-0.9.2-fno-common.patch ) src_prepare() { default @@ -33,15 +35,15 @@ src_prepare() { } src_configure() { - local myconf + local myconf=() - use nls || myconf+=" --disable-nls" - use gstreamer || myconf+=" --disable-gstreamer" + use nls || myconf+=( --disable-nls ) + use gstreamer || myconf+=( --disable-gstreamer ) econf \ --disable-audacious \ --disable-gnome \ $(use_enable doc doxygen_doc) \ --disable-cutter \ - ${myconf} + "${myconf[@]}" } diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index ef27082b4e65..9b4b71730a1a 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -3,6 +3,8 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961 DIST mpd-0.21.22.tar.xz 679244 BLAKE2B d2d76662d1f249b138d3a173cdf712eafcebf91e819b70f2cbc6ccb36ca4bc1f2319972548445789d8861345af5e18ea82f071cd7874a7380bbdda85cf834b73 SHA512 051d97500d8224fe4769a667a58c7915eebcca809e9345a30881f99d7c33d99907d9cc0258c0a5fd20f10609edbeb6da16941099ac3c033762ceb4b116e4df04 DIST mpd-0.21.24.tar.xz 681576 BLAKE2B 4fc46841077a4fd20c9e0f21bc3de09be0bc7d6b4964db33c51f8d79672c2911ab747d08e27d3f9ab65586594f8fd560d044048a826fcae5909e34067bbff592 SHA512 dd0f97cdb405a0995ceafb965d2e872c54b27b384a721efa8d13ae7e28544b22da9e94433bc544f475d8da52d06c020842b11104cbfbc41406a10599db2d005c -EBUILD mpd-0.21.22.ebuild 7999 BLAKE2B a6df6fef0c69a49ebf6d6f62e28e8e1c4c4fc1b018bb2117662e7d41fe76a7ec802a893694ae1cf11ea7d6d410d42828551a2a61ac7778cf59ffa5813a867fdc SHA512 d2fc65b3e08da812d18c2c80621db7c27fc60b6e5a7e6a00d1de32d6ebe349ea9ab399e904cc9b91c903631d4d4a8d7534495f2d5e05f6a9761d72e93bfd7b20 -EBUILD mpd-0.21.24.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee +DIST mpd-0.21.25.tar.xz 683768 BLAKE2B 9bc294850ddd2b5e1468d4988179f633c8fec14f7f99ffa2581d1aa30991a85ace8361a558e674f5c4b8e7471c9911dcb1286f61f1d42a2315ad05db4dfd9053 SHA512 67e0cbf176d18cd63effab0d12b22bea846458cbaa383ead9078c4b5f2a472dbb1d7308af4d6898691e8864a911c808af5ca2c553d8233323b8aaedfdc7189fc +EBUILD mpd-0.21.22.ebuild 7988 BLAKE2B b0af2e073675581b9dba7441771a7332649eef6967a59f541c25cb4f4938a201a747e9a9fa03179d80c2d22b0c51b09800964bd1f8dba4fed7c449f8b94f0b26 SHA512 a22dedd01642892ec5c9f74a075e0c554069e167639acd28b73fca817d9b439303ad3c1271fc70942341a5187f72f63036d535dfb4973db291735989b3f95027 +EBUILD mpd-0.21.24.ebuild 7990 BLAKE2B 98503ddf2a9b0783bf4396740f897223227ae79cd3eb1eb4ed3390ccc31c5f589a3e92f8a2475625247cf2f05723123710917f56465378e02e160ec09aaca932 SHA512 f53f6b14b1cefcff81e862efc1cf86f23c9441627667ca64a648567d8cf297b7b7f61e8b6f9d63dac09995da59c94a1d0c2cc6b64c6738d3fdfbaeddae69bbb8 +EBUILD mpd-0.21.25.ebuild 7990 BLAKE2B 98503ddf2a9b0783bf4396740f897223227ae79cd3eb1eb4ed3390ccc31c5f589a3e92f8a2475625247cf2f05723123710917f56465378e02e160ec09aaca932 SHA512 f53f6b14b1cefcff81e862efc1cf86f23c9441627667ca64a648567d8cf297b7b7f61e8b6f9d63dac09995da59c94a1d0c2cc6b64c6738d3fdfbaeddae69bbb8 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d diff --git a/media-sound/mpd/mpd-0.21.22.ebuild b/media-sound/mpd/mpd-0.21.22.ebuild index 2506310f4d80..a168f3877037 100644 --- a/media-sound/mpd/mpd-0.21.22.ebuild +++ b/media-sound/mpd/mpd-0.21.22.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86" IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms diff --git a/media-sound/mpd/mpd-0.21.24.ebuild b/media-sound/mpd/mpd-0.21.24.ebuild index e1d6b01c903b..fda03cb33440 100644 --- a/media-sound/mpd/mpd-0.21.24.ebuild +++ b/media-sound/mpd/mpd-0.21.24.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms diff --git a/media-sound/mpd/mpd-0.21.25.ebuild b/media-sound/mpd/mpd-0.21.25.ebuild new file mode 100644 index 000000000000..fda03cb33440 --- /dev/null +++ b/media-sound/mpd/mpd-0.21.25.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-info meson systemd xdg-utils + +DESCRIPTION="The Music Player Daemon (mpd)" +HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD" +SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug + +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify + +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms + modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz + recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd + test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp + zeroconf zip zlib" + +OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" +DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod + modplug mpg123 musepack flac sid vorbis wavpack wildmidi" +ENCODER_PLUGINS="audiofile flac lame twolame vorbis" + +REQUIRED_USE=" + || ( ${OUTPUT_PLUGINS} ) + || ( ${DECODER_PLUGINS} ) + network? ( || ( ${ENCODER_PLUGINS} ) ) + recorder? ( || ( ${ENCODER_PLUGINS} ) ) + upnp? ( expat ) + webdav? ( curl expat ) + " + +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-user/mpd + alsa? ( + media-libs/alsa-lib + media-sound/alsa-utils + ) + + ao? ( media-libs/libao[alsa?,pulseaudio?] ) + audiofile? ( media-libs/audiofile:= ) + + cdio? ( + dev-libs/libcdio:= + dev-libs/libcdio-paranoia + ) + + chromaprint? ( media-libs/chromaprint ) + curl? ( net-misc/curl ) + dbus? ( sys-apps/dbus ) + expat? ( dev-libs/expat ) + faad? ( media-libs/faad2 ) + ffmpeg? ( media-video/ffmpeg:0= ) + flac? ( media-libs/flac ) + fluidsynth? ( media-sound/fluidsynth ) + gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) + icu? ( dev-libs/icu:= ) + id3tag? ( media-libs/libid3tag ) + jack? ( virtual/jack ) + lame? ( network? ( media-sound/lame ) ) + libmpdclient? ( media-libs/libmpdclient ) + libsamplerate? ( media-libs/libsamplerate ) + libsoxr? ( media-libs/soxr ) + mad? ( media-libs/libmad ) + mikmod? ( media-libs/libmikmod ) + mms? ( media-libs/libmms ) + modplug? ( media-libs/libmodplug ) + mpg123? ( media-sound/mpg123 ) + musepack? ( media-sound/musepack-tools ) + network? ( media-libs/libshout ) + nfs? ( net-fs/libnfs ) + openal? ( media-libs/openal ) + opus? ( media-libs/opus ) + pulseaudio? ( media-sound/pulseaudio ) + qobuz? ( dev-libs/libgcrypt:0 ) + samba? ( net-fs/samba ) + selinux? ( sec-policy/selinux-mpd ) + sid? ( || ( + media-libs/libsidplay:2 + media-libs/libsidplayfp + ) ) + sndfile? ( media-libs/libsndfile ) + soundcloud? ( >=dev-libs/yajl-2:= ) + sqlite? ( dev-db/sqlite:3 ) + systemd? ( sys-apps/systemd ) + tidal? ( dev-libs/yajl + net-misc/curl ) + twolame? ( media-sound/twolame ) + udisks? ( sys-fs/udisks:2 ) + upnp? ( net-libs/libupnp:0 ) + vorbis? ( media-libs/libvorbis ) + wavpack? ( media-sound/wavpack ) + wildmidi? ( media-sound/wildmidi ) + zeroconf? ( net-dns/avahi[dbus] ) + zip? ( dev-libs/zziplib ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + >=dev-libs/boost-1.58:= + test? ( dev-cpp/gtest )" + +BDEPEND=">=dev-util/meson-0.49.2 + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.18.conf.patch +) + +pkg_setup() { + if use eventfd; then + CONFIG_CHECK+=" ~EVENTFD" + ERROR_EVENTFD="${P} requires eventfd in-kernel support." + fi + + if use signalfd; then + CONFIG_CHECK+=" ~SIGNALFD" + ERROR_SIGNALFD="${P} requires signalfd in-kernel support." + fi + + if use inotify; then + CONFIG_CHECK+=" ~INOTIFY_USER" + ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." + fi + + if use eventfd || use signalfd || use inotify; then + linux-info_pkg_setup + fi + + elog "If you will be starting mpd via /etc/init.d/mpd, please make + sure that MPD's pid_file is _set_." +} + +src_prepare() { + cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" + default +} + +src_configure() { + local emesonargs=( + -Dbzip2=$(usex bzip2 enabled disabled) + -Dcdio_paranoia=$(usex cdio enabled disabled) + -Dchromaprint=$(usex chromaprint enabled disabled) + -Dcue=$(usex cue true false) + -Dcurl=$(usex curl enabled disabled) + -Ddbus=$(usex dbus enabled disabled) + -Ddebug=$(usex debug true false) + -Deventfd=$(usex eventfd true false) + -Dexpat=$(usex expat enabled disabled) + -Dicu=$(usex icu enabled disabled) + -Did3tag=$(usex id3tag enabled disabled) + -Dinotify=$(usex inotify true false) + -Dipv6=$(usex ipv6 enabled disabled) + -Diso9660=$(usex cdio enabled disabled) + -Dlibmpdclient=$(usex libmpdclient enabled disabled) + -Dlibsamplerate=$(usex libsamplerate enabled disabled) + -Dmms=$(usex mms enabled disabled) + -Dnfs=$(usex nfs enabled disabled) + -Dsignalfd=$(usex signalfd true false) + -Dsmbclient=$(usex samba enabled disabled) + -Dsoxr=$(usex libsoxr enabled disabled) + -Dsqlite=$(usex sqlite enabled disabled) + -Dsystemd=$(usex systemd enabled disabled) + -Dtest=$(usex test true false) + -Dudisks=$(usex udisks enabled disabled) + -Dupnp=$(usex upnp enabled disabled) + -Dwebdav=$(usex webdav enabled disabled) + -Dzeroconf=$(usex zeroconf avahi disabled) + -Dzlib=$(usex zlib enabled disabled) + -Dzzip=$(usex zip enabled disabled) + ) + + emesonargs+=( + -Dalsa=$(usex alsa enabled disabled) + -Dao=$(usex ao enabled disabled) + -Dfifo=$(usex fifo true false) + -Djack=$(usex jack enabled disabled) + -Dopenal=$(usex openal enabled disabled) + -Doss=$(usex oss enabled disabled) + -Dpipe=$(usex pipe true false) + -Dpulse=$(usex pulseaudio enabled disabled) + -Drecorder=$(usex recorder true false) + ) + + if use samba || use upnp; then + emesonargs+=( -Dneighbor=true ) + fi + + append-lfs-flags + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" + + if use network; then + + emesonargs+=( + -Dshine=disabled + -Dshout=enabled + -Dvorbisenc=$(usex vorbis enabled disabled) + -Dhttpd=true + -Dlame=$(usex lame enabled disabled) + -Dtwolame=$(usex twolame enabled disabled) + -Dwave_encoder=$(usex audiofile true false) + ) + fi + + emesonargs+=( + # media-libs/adplug is not packaged anymore + -Dadplug=disabled + -Daudiofile=$(usex audiofile enabled disabled) + -Dfaad=$(usex faad enabled disabled) + -Dffmpeg=$(usex ffmpeg enabled disabled) + -Dflac=$(usex flac enabled disabled) + -Dfluidsynth=$(usex fluidsynth enabled disabled) + -Dgme=$(usex gme enabled disabled) + -Dmad=$(usex mad enabled disabled) + -Dmikmod=$(usex mikmod enabled disabled) + -Dmodplug=$(usex modplug enabled disabled) + -Dmpcdec=$(usex musepack enabled disabled) + -Dmpg123=$(usex mpg123 enabled disabled) + -Dopus=$(usex opus enabled disabled) + -Dsidplay=$(usex sid enabled disabled) + -Dsndfile=$(usex sndfile enabled disabled) + -Dvorbis=$(usex vorbis enabled disabled) + -Dwavpack=$(usex wavpack enabled disabled) + -Dwildmidi=$(usex wildmidi enabled disabled) + + ) + + emesonargs+=( + -Dqobuz=$(usex qobuz enabled disabled) + -Dsoundcloud=$(usex soundcloud enabled disabled) + -Dtidal=$(usex tidal enabled disabled) + ) + + emesonargs+=( + --libdir="/usr/$(get_libdir)" + -Ddocumentation=false + -Dsndio=disabled #not yet in the tree + -Dsolaris_output=disabled + + -Ddatabase=true + -Ddsd=true + -Dtcp=true + + -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)" + -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + ) + + if use icu; then + emesonargs+=( -Diconv=enabled ) + else + emesonargs+=( -Diconv=disabled ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + insinto /etc + newins doc/mpdconf.dist mpd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN} + + newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN} + + if use unicode; then + sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ + "${ED}"/etc/mpd.conf || die "sed failed" + fi + + doman doc/mpd.1 + doman doc/mpd.conf.5 + + keepdir /var/lib/mpd + keepdir /var/lib/mpd/music + keepdir /var/lib/mpd/playlists + +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index 0f9ea5f3c156..aec476515232 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -1,7 +1,7 @@ DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09 -DIST mpg123-1.25.12.tar.bz2 910149 BLAKE2B 4e1b6329fafb4d1e018c6f5fc0846480ef8cfb6811f92d745f7e88d45fa6a8704ad707d110b12709763ac79fe095603c8ece0bbecb54cc2cde4de819083a2078 SHA512 fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39 +DIST mpg123-1.26.2.tar.bz2 1047437 BLAKE2B 31b3434968fe48c81f599a9aa23557937ac71ed485c6c933f40f1ef2fdfaabcf8c34059de7f62e163286036db987932b6fcbf4f63f752c64659c9b9a805cf63c SHA512 aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9 EBUILD mpg123-1.25.10-r1.ebuild 2840 BLAKE2B b5fc0883aef5242b4cddfc142cb6eaea54b11a3cac3ae4ee891e32bbeda4abfda304bb76c2c55dc2d88aadbd3555e2b2639a09294d40114e432403af75c956e8 SHA512 321fbcaf8be4780387f8af4451bb8c18863c64cd8686596d9657738be8cf5a76ecc4fedc89ecd1380bd7f671ac669800ab56f889305ca3d504808dd5081481f9 -EBUILD mpg123-1.25.12.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593 -EBUILD mpg123-1.25.13.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2 +EBUILD mpg123-1.25.13.ebuild 2883 BLAKE2B a4ad4f83a516e57cf4181987fa4d59ca0680fe609b9477085e514a4227f82a819476489178db12e4caee26144416e6f73b3841f8741476a74135f61ff4e22e29 SHA512 1f9ded3f159a9bd6fbc85e1871d410d6919fde7c6cae3f069ec77c9dad3043f866cd74ab5ebd60868bbe2043f3e95f095154461821b7fb159a22125018f1bfde +EBUILD mpg123-1.26.2.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7 diff --git a/media-sound/mpg123/mpg123-1.25.13.ebuild b/media-sound/mpg123/mpg123-1.25.13.ebuild index 0b76cb7da365..6476f6e637a5 100644 --- a/media-sound/mpg123/mpg123-1.25.13.ebuild +++ b/media-sound/mpg123/mpg123-1.25.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse" # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. diff --git a/media-sound/mpg123/mpg123-1.25.12.ebuild b/media-sound/mpg123/mpg123-1.26.2.ebuild index 2a6b18dd31c2..0b76cb7da365 100644 --- a/media-sound/mpg123/mpg123-1.25.12.ebuild +++ b/media-sound/mpg123/mpg123-1.26.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse" +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse" # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. RDEPEND=" @@ -58,7 +58,7 @@ multilib_src_configure() { done fi - use altivec && _cpu=altivec + use cpu_flags_ppc_altivec && _cpu=altivec if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then use cpu_flags_x86_sse && _cpu=x86-64 diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest index c5771fb32803..f7d1765fbfd7 100644 --- a/media-sound/mumble/Manifest +++ b/media-sound/mumble/Manifest @@ -1,4 +1,6 @@ DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7 +DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba -EBUILD mumble-9999.ebuild 3814 BLAKE2B 059e88f3d7a727ca707083d0dabdc05f80c673cdba9486803c4f0bbd0e54ddde3e9de4f4da5633cf8594768dbbfff6db4ccd402bcfa52c66d7e4273c5eea8e46 SHA512 e6d6282eeaea82c2f097bd89f37f8751ab7bdb9b1db03e12c7d72a79b534180db4c8d3b8b07e6b623bf466b239f997f3534808e632dccf0c2c4b8012709fdb92 +EBUILD mumble-1.3.2.ebuild 3809 BLAKE2B 16ab839058933b827b807c3bd00d956caea4d2f70656a4495549444f93a650b17d3324b9daa8f8672350798a50eaf2fc980359e10f3e07a3e56b6ac91228e96b SHA512 3c4c178c0ea45c8fccbaa6de17b6c35669c7937d93913f175cc7eb825ff1210b104b95e7b48dfea05514ee753c460fed1f2df3412570d6d3c3173f621b1bc8e1 +EBUILD mumble-9999.ebuild 3791 BLAKE2B 8c2fa233598fbddf33686117cedea1d146cac6752320c07ab07ded9098ab99a0c4691f8cc2564ef8b8b1349ef7ce0af4840d87d15f37301aff1e2366b68f99e4 SHA512 c5edbd19160921df5671c305200b153fef8d629086b2f3d3df4b3d3e207a0f2f557d7d6e976e7f39be4f01224c75055e6a3899a2752671a2153b7c51fb8bf75e MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9 diff --git a/media-sound/mumble/mumble-1.3.2.ebuild b/media-sound/mumble/mumble-1.3.2.ebuild new file mode 100644 index 000000000000..50f19e4cdf61 --- /dev/null +++ b/media-sound/mumble/mumble-1.3.2.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop multilib-build qmake-utils xdg + +DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" +HOMEPAGE="https://wiki.mumble.info" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" + EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src ) +else + if [[ "${PV}" == *_pre* ]] ; then + SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" + else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz + https://dl.mumble.info/${MY_P}.tar.gz" + S="${WORKDIR}/${P/_*}" + fi + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="BSD MIT" +SLOT="0" +IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + >=dev-libs/protobuf-2.2.0:= + >=media-libs/libsndfile-1.0.20[-minimal] + >=media-libs/speex-1.2.0 + media-libs/speexdsp + sys-apps/lsb-release + x11-libs/libX11 + x11-libs/libXi + alsa? ( media-libs/alsa-lib ) + dbus? ( dev-qt/qtdbus:5 ) + g15? ( app-misc/g15daemon ) + jack? ( virtual/jack ) + !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) + libressl? ( dev-libs/libressl ) + opus? ( >=media-libs/opus-1.0.1 ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) + speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.41.0 + x11-base/xorg-proto +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +# NB: qmake does not support multilib but it's fine to configure +# for the native ABI here +src_configure() { + myuse() { + [[ -n "${1}" ]] || die "myuse: No use option given" + use ${1} || echo no-${1} + } + + local conf_add=( + bundled-celt + no-bundled-opus + no-bundled-speex + no-embed-qt-translations + no-server + no-update + $(myuse alsa) + $(myuse dbus) + $(usex debug 'symbols debug' release) + $(myuse g15) + $(usex jack '' no-jackaudio) + $(myuse opus) + $(myuse oss) + $(myuse portaudio) + $(myuse pulseaudio) + $(myuse rnnoise) + $(usex speech '' no-speechd) + $(usex zeroconf '' no-bonjour) + ) + + use pch || conf_add+=( no-pch ) + + eqmake5 "${S}/main.pro" -recursive \ + CONFIG+="${conf_add[*]}" \ + DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" +} + +multilib_src_compile() { + local emake_args=( + # place libmumble* in a subdirectory + DESTDIR_ADD="/${MULTILIB_ABI_FLAG}" + {C,L}FLAGS_ADD="$(get_abi_CFLAGS)" + ) + # build only overlay library for other ABIs + multilib_is_native_abi || emake_args+=( -C overlay_gl ) + emake "${emake_args[@]}" + emake clean +} + +src_compile() { + multilib_foreach_abi multilib_src_compile +} + +multilib_src_install() { + local dir=$(usex debug debug release) + insinto /usr/$(get_libdir)/${PN} + doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* + if multilib_is_native_abi; then + dobin "${dir}"/mumble + doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* + fi +} + +src_install() { + multilib_foreach_abi multilib_src_install + + newdoc README.Linux README + dodoc CHANGES + dobin scripts/mumble-overlay + + insinto /usr/share/services + doins scripts/mumble.protocol + + domenu scripts/mumble.desktop + + doicon -s scalable icons/mumble.svg + + doman man/mumble-overlay.1 + doman man/mumble.1 +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + echo + elog "Visit https://wiki.mumble.info/ for futher configuration instructions." + elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." + echo +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index 0d89e8057bf9..d821055f5f3c 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -129,8 +129,7 @@ multilib_src_install() { src_install() { multilib_foreach_abi multilib_src_install - newdoc README.Linux README - dodoc CHANGES + dodoc CHANGES README.md dobin scripts/mumble-overlay insinto /usr/share/services @@ -151,7 +150,7 @@ pkg_preinst() { pkg_postinst() { xdg_pkg_postinst echo - elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." + elog "Visit https://wiki.mumble.info/ for futher configuration instructions." elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." echo } diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index 6867f742d394..2399f1fac02f 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -3,6 +3,8 @@ AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e3 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7 +DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57 +EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb diff --git a/media-sound/murmur/murmur-1.3.2.ebuild b/media-sound/murmur/murmur-1.3.2.ebuild new file mode 100644 index 000000000000..17d28a117c43 --- /dev/null +++ b/media-sound/murmur/murmur-1.3.2.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils systemd readme.gentoo-r1 + +DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" +HOMEPAGE="https://wiki.mumble.info" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" + EGIT_SUBMODULES=( '-*' ) +else + MY_PN="mumble" + if [[ "${PV}" == *_pre* ]] ; then + MY_P="${MY_PN}-${PV}" + SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + else + MY_PV="${PV/_/-}" + MY_P="${MY_PN}-${MY_PV}" + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz + https://dl.mumble.info/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_PN}-${PV/_*}" + fi + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+dbus debug +ice pch zeroconf" + +RDEPEND=" + acct-group/murmur + acct-user/murmur + >=dev-libs/openssl-1.0.0b:0= + >=dev-libs/protobuf-2.2.0:= + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + || ( + dev-qt/qtsql:5[sqlite] + dev-qt/qtsql:5[mysql] + ) + dev-qt/qtxml:5 + sys-apps/lsb-release + >=sys-libs/libcap-2.15 + dbus? ( dev-qt/qtdbus:5 ) + ice? ( dev-libs/Ice:= ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" + +DEPEND="${RDEPEND} + >=dev-libs/boost-1.41.0 +" +BDEPEND=" + acct-group/murmur + acct-user/murmur + virtual/pkgconfig +" + +if [[ "${PV}" == *9999 ]] ; then + # Required for the mkini.sh script which calls perl multiple times + BDEPEND+=" + dev-lang/perl + " +fi + +DOC_CONTENTS=" + Useful scripts are located in /usr/share/doc/${PF}/scripts.\n + Please execute:\n + murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n + chown murmur:murmur /var/lib/murmur/murmur.sqlite\n + to set the build-in 'SuperUser' password before starting murmur. + Please restart dbus before starting murmur, or else dbus + registration will fail. +" + +src_prepare() { + default + + if [[ "${PV}" == *9999 ]] ; then + pushd scripts &>/dev/null || die + ./mkini.sh || die + popd &>/dev/null || die + fi + + sed \ + -e 's:mumble-server:murmur:g' \ + -e 's:/var/run:/run:g' \ + -i "${S}"/scripts/murmur.{conf,ini.system} || die + + # Adjust systemd service file to our config location #689208 + sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + -i scripts/${PN}.service || die +} + +src_configure() { + myuse() { + [[ -n "${1}" ]] || die "myconf: No use flag given." + use ${1} || echo "no-${1}" + } + local conf_add=( + no-client + $(myuse dbus) + $(usex debug 'symbols debug' release) + $(myuse ice) + $(myuse pch) + $(usex zeroconf '' no-bonjour) + ) + + eqmake5 main.pro -recursive \ + CONFIG+="${conf_add[*]}" +} + +src_install() { + dodoc README CHANGES + + docinto scripts + dodoc -r scripts/server + docompress -x /usr/share/doc/${PF}/scripts + + local dir="$(usex debug debug release)" + dobin "${dir}"/murmurd + + local etcdir="/etc/murmur" + insinto ${etcdir} + newins scripts/${PN}.ini.system ${PN}.ini + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/murmur.logrotate murmur + + insinto /etc/dbus-1/system.d/ + doins scripts/murmur.conf + + insinto /usr/share/murmur/ + doins src/murmur/Murmur.ice + + newinitd "${FILESDIR}"/murmur.initd-r1 murmur + newconfd "${FILESDIR}"/murmur.confd murmur + + systemd_dounit scripts/${PN}.service + systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf + + keepdir /var/lib/murmur /var/log/murmur + fowners -R murmur /var/lib/murmur /var/log/murmur + fperms 750 /var/lib/murmur /var/log/murmur + + # Fix permissions on config file as it might contain passwords. + # (bug #559362) + fowners root:murmur ${etcdir}/murmur.ini + fperms 640 ${etcdir}/murmur.ini + + doman man/murmurd.1 + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest index 9a39ec0a6946..77401f19372d 100644 --- a/media-sound/muse/Manifest +++ b/media-sound/muse/Manifest @@ -1,4 +1,4 @@ AUX muse-0.9.2_p20161002-fix-build-system.patch 2757 BLAKE2B 70b040cb30d71f303313411980e02214c0979a9555e39260edc883945e9d36a6f4dec41287a7a1f5f5a308096bc98d2671886a69fd855ee1684b884a8d7c02b5 SHA512 e4df70777579eb42d93038bf9437c36ca3a0944050186316bb9ce94a00e34492c4fc502aed26aeb64f283a7b73e1d9448105a33838819a0f0086b90768ed37ff DIST muse-0.9.2_p20161002.tar.gz 996253 BLAKE2B 7f86698fa60719235e68ad3766d9dbb19e57e55e94cab8b4c97da5be5990d132e8aa7f63034c5945d74fe3bef4c4945435791648c064be6fe65bb0d25d39d04e SHA512 7d5b35c64b1ccae14330bb35ba0e32661f6f7445055e1854c7e5e530a7645405da03836e919b6151872f254c754d99d045b9c80938148454f521d3d117332208 -EBUILD muse-0.9.2_p20161002.ebuild 1092 BLAKE2B 9c8b12c90034f20b84173d0ec468f026f024f150512e5f4b9d71bde00a1465f39ce75c7ef1af23590b6ade80fc4bffe1615c77ada17bf2030cfd1f503dfaa299 SHA512 73a6f7953ceadb0e6d5b5ad9e7071737a1b73d44fc683bbb94a19b4fd12e17aef407bff9a69e30d0502dae762010e996524b2c114643e4b3c5e8361ed39c1c96 +EBUILD muse-0.9.2_p20161002.ebuild 1164 BLAKE2B 86dd0e028bc5d0ee10139100dccf93c8bd4e54dba0f053661d250ff5ecc3b8ffb885c944423f0e6e811afdacf329554de3a10684ea60d628daeb613dea8b6eb8 SHA512 b471dc17150f02b6428017113119cb645b6f22c7c96f566eb55a24739fa533a882688b397266b2a87e27f815886888b12048794ccaec1affc0e365adad6d2cff MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild index e296b01d6582..a2a8c1500450 100644 --- a/media-sound/muse/muse-0.9.2_p20161002.ebuild +++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild @@ -3,10 +3,10 @@ EAPI=7 -inherit autotools +inherit autotools desktop xdg DESCRIPTION="Multiple Streaming Engine, an icecast source streamer" -HOMEPAGE="http://muse.dyne.org" +HOMEPAGE="https://www.dyne.org/software/muse/" SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz" LICENSE="GPL-2" @@ -22,7 +22,7 @@ RDEPEND=" media-libs/libshout media-libs/libsamplerate gtk? ( x11-libs/gtk+:2 ) - jack? ( media-sound/jack-audio-connection-kit ) + jack? ( virtual/jack ) ncurses? ( sys-libs/ncurses:0= ) portaudio? ( media-libs/portaudio )" DEPEND="${RDEPEND}" @@ -48,3 +48,9 @@ src_configure() { $(use_enable portaudio) \ $(use_enable doc) } + +src_install() { + default + + make_desktop_entry /usr/bin/muse "MuSE" +} diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index f3a1f44a9fd4..a7c8b020eb87 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,7 +1,12 @@ AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb +AUX musescore-3.5-lambda-capture-this.patch 562 BLAKE2B 4443f04bc90e01dbca81cac5d73a1683ecdcb1103e1ab72796a53a56f6a1b15347875374a73853d5dde62e5b6e145ca2f8c8d61c30667f9397a2baba99b4f0d7 SHA512 3ee07a796f605e03fd1c8dda6dcf2d28f3f0344a77764f032195e3f17fb366c5aefa464b49858e5a07065ca74b9444aaf2222255c7eafdb7d6536d6dd51952b0 +AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a34bc75bdd46f3b3832007734702d1be5f81dc41537347574e5f0955a141f9d412ce00f95370717bcb31d272b0625e7462ce3f640e69d71ac6 SHA512 7f3cc05a05c208dedd18094639534131ffbde748da653e309c21fcc414d005ad744de82186cd7484a46cb230d08e643f52555d6fe371c237686b58a559947cda AUX musescore-9999-lambda-capture-this.patch 549 BLAKE2B 2aaf1ffb0383bce4f862d6172c3e0eb2fdd756a03b2345df9f8b1ea08f30d3ef29ea89c16f56268d0116e2e65c73b974f891ddef55da3816c2d1a94f234babc0 SHA512 bcf4ed087bca2ac9771dceaf0506d0870bcc1ebc2a233157550ad2bce209a2d24c6dbb36d7474f483ba4e2959b54bc7b368878c038dc79dfd50eab0c70f69eb1 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9 +DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4 -EBUILD musescore-3.4.2.ebuild 2687 BLAKE2B 9a8286431e2694bb88c0d91a7d761244049087cadf09562210539c9ddb80b7a6a8982d0db2bcfd1d9ebed5a98ff726481773b4cb3694fd80e2fd78397198a80f SHA512 e6bb0486a2de0d0c293c5c1afe730a09ed2b6676b1e038f811b6d0bdcda1712d2a68cf4dce8dbd5e7f38457270b35fa0d410a993f48247b19c86fdb1d7acfb87 -EBUILD musescore-9999.ebuild 2727 BLAKE2B 1b69766b774dde1b2a83b14555c02f0d2151c6b7668f2a21d09d713eb70fa9d21fd57bc4c094fa9bad4c5168e940c9772d818df2c618949db2413921631f43f3 SHA512 bd6efc3d80f001cd10ae9a9518d2150da8b86d4b29ead3b94a44857d2303d662c6e8a81ea72003d9cfa484d4e9b2a83ebc050d587acfb7bb5de791d56441ef19 +DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96 +EBUILD musescore-3.4.2.ebuild 2694 BLAKE2B bbf84f8e968b06244776d6484b7b02a63c6561724f4acfc197003bbdd889cf71efb69a30aae57616132e8e63328dc2d4bd6070c001a99e5fc173ae53eb962b7a SHA512 0f3b2c6ac8146479ddd1f8890505ea797efe4e5fcd7ceb200f2fa59d4377f0ad5d90df6f6001970dd328c8489a2ec259a0ea3e40179134ac96f536553a4beca1 +EBUILD musescore-3.5.ebuild 3003 BLAKE2B c9d533992a7736df783760a9a5e5b5f3587e6dd21ecbc37a9866c19d20b86b75cadbe34917b6e623b358ccf4998dc77992a00a3f27f242db986ed3256b58b98f SHA512 9c9b94001c01a7d4069e219f2d12a2f802ede0ee52603001712e1746babddee6fb7ae3f7a6d7a96a65c5040e089e46352dc366660d295bf0dcf2cc55d9dc5d51 +EBUILD musescore-9999.ebuild 2948 BLAKE2B e4fe6270fbdbcad61e86b011e64fe952415afcef2d2a4f179585fb660e90d3638fab082ddd52a6a19845d643025e7e180ba10ce0aba9daf2d57a5400cd496fd8 SHA512 bb7051721a7847a679fded90f2debf619d34bf26d4c12cb8782f539887f0eb7ef1ed7f781604945d3a2d334de920804832f3c4e34e311d1f45de9ca44175fc61 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch new file mode 100644 index 000000000000..283ffdc92e21 --- /dev/null +++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch @@ -0,0 +1,13 @@ +diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp +index 94b1aef..6a7b4e8 100644 +--- a/mscore/scoreview.cpp ++++ b/mscore/scoreview.cpp +@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s) + cv->updateGrips(); + }}, + #ifdef OMR +- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) { ++ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) { + if (cv->score()->masterScore()->omr()) + showOmr(!_score->masterScore()->showOmr()); + }}, diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch new file mode 100644 index 000000000000..b4e1ad0baf54 --- /dev/null +++ b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch @@ -0,0 +1,12 @@ +diff --git a/omr/pattern.h b/omr/pattern.h +index b040497..1b8e0c4 100644 +--- a/omr/pattern.h ++++ b/omr/pattern.h +@@ -24,7 +24,6 @@ + + namespace Ms { + +-enum class SymId; + class Sym; + + //--------------------------------------------------------- diff --git a/media-sound/musescore/musescore-3.4.2.ebuild b/media-sound/musescore/musescore-3.4.2.ebuild index cadf43ff2d63..b151f2bf5ca4 100644 --- a/media-sound/musescore/musescore-3.4.2.ebuild +++ b/media-sound/musescore/musescore-3.4.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" REQUIRED_USE="portmidi? ( portaudio )" diff --git a/media-sound/musescore/musescore-3.5.ebuild b/media-sound/musescore/musescore-3.5.ebuild new file mode 100644 index 000000000000..d56a9bca7929 --- /dev/null +++ b/media-sound/musescore/musescore-3.5.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +CHECKREQS_DISK_BUILD=3500M +inherit cmake xdg check-reqs + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" +else + SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/MuseScore-${PV}" +fi + +DESCRIPTION="WYSIWYG Music Score Typesetter" +HOMEPAGE="https://musescore.org/" +# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ +# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there. +SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine" +REQUIRED_USE="portmidi? ( portaudio )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND=" + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtquickcontrols2:5 + >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] + dev-qt/qtsvg:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + >=media-libs/freetype-2.5.2 + media-libs/libsndfile + sys-libs/zlib:= + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + jack? ( virtual/jack ) + mp3? ( media-sound/lame ) + omr? ( app-text/poppler ) + portaudio? ( media-libs/portaudio ) + portmidi? ( media-libs/portmidi ) + pulseaudio? ( media-sound/pulseaudio ) + sf3? ( media-libs/libvorbis ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-3.0.1-man-pages.patch" + "${FILESDIR}/${P}-lambda-capture-this.patch" + "${FILESDIR}/${P}-remove-duplicite-declaration.patch" +) + +src_unpack() { + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + unpack ${A} + else + default + fi +} + +src_prepare() { + cmake_src_prepare + + # Move soundfonts to the correct directory + mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" +} + +src_configure() { + local mycmakeargs=( + -DAEOLUS=OFF # does not compile + -DBUILD_ALSA="$(usex alsa)" + -DBUILD_CRASH_REPORTER=OFF + -DBUILD_JACK="$(usex jack)" + -DBUILD_LAME="$(usex mp3)" + -DBUILD_PCH=ON + -DBUILD_PORTAUDIO="$(usex portaudio)" + -DBUILD_PORTMIDI="$(usex portmidi)" + -DBUILD_PULSEAUDIO="$(usex pulseaudio)" + -DBUILD_SHARED_LIBS=ON + -DBUILD_TELEMETRY_MODULE=ON + -DBUILD_WEBENGINE="$(usex webengine)" + -DCMAKE_SKIP_RPATH=ON + -DDOWNLOAD_SOUNDFONT=OFF + -DHAS_AUDIOFILE=ON + -DOCR=OFF + -DOMR="$(usex omr)" + -DSOUNDFONT3=ON + -DZERBERUS="$(usex sfz)" + -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON + -DUSE_SYSTEM_FREETYPE=ON + -DUSE_SYSTEM_POPPLER=ON + -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON + ) + cmake_src_configure +} + +src_compile() { + cd "${BUILD_DIR}" || die + cmake_build -j1 lrelease manpages + cmake_src_compile +} diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index d6ea4938d868..51e4cf8aa99c 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -5,14 +5,21 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit git-r3 cmake xdg check-reqs +inherit cmake xdg check-reqs + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" +else + SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/MuseScore-${PV}" +fi DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/" -# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ +# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ # It has to be repackaged because the files are not versioned, current version can be found in VERSION file there. -SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2" -EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" +SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -59,8 +66,12 @@ PATCHES=( ) src_unpack() { - git-r3_src_unpack - unpack ${A} + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + unpack ${A} + else + default + fi } src_prepare() { diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest index 93426dbe3af3..d911bc8e6158 100644 --- a/media-sound/music-file-organizer/Manifest +++ b/media-sound/music-file-organizer/Manifest @@ -1,3 +1,3 @@ -DIST music-file-organizer-1.0.2.tar.xz 501840 BLAKE2B 7ec80a3d49ec2cd36882f9bb5d78f1f82aba9f9b8690380f1fcda3f9fab4ba5a4879e94f4457fb079ceb27d27b599cf500da595d9f37736df3fda709cf2ee016 SHA512 61546f595b801d4377bbfb7e52517a149cae90dee6dbb29c81a15ae6c055d535b4b095928e6918b4e0784e1d52136705a4822cb294e9b665a996afc68b4951f0 -EBUILD music-file-organizer-1.0.2.ebuild 883 BLAKE2B 7875d0bdc46ed83f10c21b33ff846329db268dc7a01748e07e79c0f35df83555290b6cd3c04bfc9d63fa9b38ac4b3569cfcdb5a90862fb9a3d18ff64a4e440ae SHA512 0870d8fc9655ad3ffa9360b2376d897789dfec70bb37c73e0432608909b5aa4b5c4746d27faf937cff636f305055f6b890152cf679f8b2b4b38f96aa128af4f7 +DIST music-file-organizer-1.0.3.tar.xz 501856 BLAKE2B 17ceda10c7afa7902272d76b7fa547c13da6aa21d106d2de8c125a48746da310e40d315854874fa182b22318574905199d0b2143e7cd5e9bb9fa64aa4a5ac498 SHA512 9a219af094475c93b0a156c1ba01643c603a598283bf12d7d05c6ee2da96ee8055d0bd7d1ae047651a72e347a4e5580f324acc6466df13495e3c3ab2e6baceef +EBUILD music-file-organizer-1.0.3.ebuild 845 BLAKE2B bc08f03607ee9294b57bb2a5388e6a603db33bf3253a23cc062b8c1f97f2caa91426bfcfe3988876d810c348fd80a4d9bbb84641533c5224ada6f0e992291446 SHA512 1ce321db4198abaa8d128e6e32278b0162ccd562d36e4b14ec56ecee94f229f497d01beb73dbf2e8f69606e367c34bffcb3832c9abaa90cabc9f876d8c4d63e5 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5 diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild index 3906dd2747e7..8dc5c9a5cd75 100644 --- a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild +++ b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -DESCRIPTION="Organizes audio files into directories based on metadata tags, -along with other metadata utilities." +DESCRIPTION="Organizes audio files into directories based on metadata tags" HOMEPAGE="https://git.zx2c4.com/music-file-organizer/about/" SRC_URI="https://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz" diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest index 3202ebe25c1f..5801cb996b51 100644 --- a/media-sound/ncmpcpp/Manifest +++ b/media-sound/ncmpcpp/Manifest @@ -1,7 +1,7 @@ AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f -EBUILD ncmpcpp-0.7.7.ebuild 1551 BLAKE2B 3c260345afbed013eeaa72410ef8aedc9c6723668a9c819ef013002d5c71dfeffa09f9449a32875b9c3fb167d6ed61fc589c3a40fbc5488167a6ea8f54957f1a SHA512 6f476a29df5e9930e355ff59590213d030ae51f67ed71da3d12061e355e3b1b41bd9c9fb8e0baa7f765bf76547a068544cf9d107f16bc6240c79219dd66a57cc -EBUILD ncmpcpp-0.8.2-r1.ebuild 1471 BLAKE2B 6d58c5e6902c7ff4a8bbcc7c1a29e411b4cdca1dbc46beec56c00e90b1ec2c7b27acb3e62a8212f9703021895ae605176212b0eb4b89d1624763a301f5d1ec63 SHA512 89e4e9140d8103bbe26910202714d34f9dce1a0053b52c7f58a709589b63bc2ab739a2396169feb9e2b71cbf776f5ef0bfcb6f5c2e618bce668118c2fb2cc7f3 -EBUILD ncmpcpp-9999.ebuild 1357 BLAKE2B 3215c3e2f2dee61ffbfd6c8ef01f534593f2701b50b4d2beec557532626923b5cf9d68ea7205afede9fca1e51d445919510845b3d66d8b7ff2ffb47e970e9bba SHA512 d388f8371a7e4afdfb2130ff5f6405c86896391a609545b76d6dcbe0a9006aeced45a6c15012aab49efe1f8e4150d99aed85e43977e704f282e1364c03f20f00 +EBUILD ncmpcpp-0.7.7.ebuild 1540 BLAKE2B 72f2e5ade800c373fe544ef0dea32e4cf4fd6d316fb047a7ddc645f0d43543656a7f55fe698ec371ea621a22577c491901e64d4a9450100e65e6786cfb72e1da SHA512 956131ca17f644a5c7666a8bc2f5326c93e95531930ffdfff812783624ccfe539eee1a84a232a6f50a024b49f181c324bf89870fa92f69d559421311bf06567d +EBUILD ncmpcpp-0.8.2-r1.ebuild 1460 BLAKE2B c8b146f78c34b24fc9daf1f236c9dbbe2f9c02c2da1f758dee18cdf010c7af7c8482d52516af87c843a809ede79dc4395becc57669d31be6c402c2b0430f32f2 SHA512 c781f50146bc50994010e116a9697ddd47efd13afd5ecc5c772530fce3f7308f14a3cfeb53979ba4fe5905109c6fa591422320873b54b8a5dfeded7c826c3d77 +EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B 02aa9bc5abdba9b6464e55f95fafee07937954523c0ecd8c39a03c1fbef6c371c477e6a4d0c0d5b3d71bc51e38d5d141973733de796721f219484a01422cd072 SHA512 bd3d7d50ff46bce31d075372002f9de5a2f977c25d4e68c06c8c1a4110fd9db8d0543542133f90eb279d20e7c36f461aab982cc4ad4e4238cf512b245a8af352 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild index 1593220f2047..74e3b10a67fc 100644 --- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild @@ -4,7 +4,7 @@ EAPI=7 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc" -HOMEPAGE="https://rybczak.net/ncmpcpp/" +HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp" SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2" LICENSE="GPL-2" @@ -26,9 +26,9 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" - -# https://github.com/ncmpcpp/ncmpcpp/pull/385 -PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc10.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-0.8.2-gcc10.patch +) src_prepare() { default diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild index 5b38962ff92b..ae5b5d47d37e 100644 --- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc" -HOMEPAGE="https://rybczak.net/ncmpcpp/" +HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp" SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2" LICENSE="GPL-2" @@ -25,9 +25,9 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" - -# https://github.com/ncmpcpp/ncmpcpp/pull/385 -PATCHES=( "${FILESDIR}/${P}-gcc10.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-gcc10.patch +) src_prepare() { default diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild index 0be8bf6df0b4..74f29afe4abf 100644 --- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild @@ -5,8 +5,8 @@ EAPI=7 inherit autotools git-r3 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc" -HOMEPAGE="https://ncmpcpp.rybczak.net/" -EGIT_REPO_URI="https://repo.or.cz/ncmpcpp.git" +HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp" +EGIT_REPO_URI="https://github.com/ncmpcpp/ncmpcpp" LICENSE="GPL-2" SLOT="0" diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest index 099a2efd979a..630b22c126eb 100644 --- a/media-sound/openmpt123/Manifest +++ b/media-sound/openmpt123/Manifest @@ -1,3 +1,3 @@ -DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82 -EBUILD openmpt123-0.5.0.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98 +DIST libopenmpt-0.5.1+release.autotools.tar.gz 1465318 BLAKE2B 142aca3b946e5ee82fbba0f18360896baac5195412eb3f72f8f69a8ac99ba623e14ccf269bbca9cdbfba146520a14950e12fc7e427cbd930e7243512a10dbf18 SHA512 570787cfcf0b85ca10e753fe49b8a94ff69e1c881ffec5a1aee27a2bc1e142a62ae8cd79de5ab8cf4c7536688de13e9cb675b559a0aa755ad994a24010433a9f +EBUILD openmpt123-0.5.1.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297 diff --git a/media-sound/openmpt123/openmpt123-0.5.0.ebuild b/media-sound/openmpt123/openmpt123-0.5.1.ebuild index e80baefa2b25..e80baefa2b25 100644 --- a/media-sound/openmpt123/openmpt123-0.5.0.ebuild +++ b/media-sound/openmpt123/openmpt123-0.5.1.ebuild diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest index 3c249fe2575e..48c80aee7755 100644 --- a/media-sound/patchage/Manifest +++ b/media-sound/patchage/Manifest @@ -1,8 +1,4 @@ -AUX patchage-0.5.0-desktop.patch 224 BLAKE2B 74bae167f890e5c03043f8906a18576183d2519141d5413780e03091c9b5432044185812d192c12073eadaab0823e8ef1d25c81d57e8614abd120440763d6776 SHA512 ae000bc340d48a9bb89fc067b4b1abba3de39ef9be086c7eeffae71ddca6172ce500ea6ea9854fde8cc19df3117195cb6fdb4ecd0867aa69f332ac0a7d377b69 AUX patchage-1.0.2-string.patch 329 BLAKE2B 0721d815bae7aedfed9b0d8a6a8b2a528a176684d6f01c392d290ba11b0e547504ffd5200dd754800c64e44371a2304cec5d92e0327bf7739a3839aae7415ca8 SHA512 bda153cb438980982fe19e552b5d930b4ca8f7f206a4578a259c846bebbac3ed79e9b73f50cfa176a3e5f73db1059464f5c273e408f026ef9b04f1fa89ac4368 -DIST patchage-0.5.0.tar.bz2 411848 BLAKE2B 50138309d31c4806072c95af7df46e1b0ca2fe570c606886d9d6eb666cb3a499c12689b3ba1db26c0d59dd0ee732e350a6dffcdb7bee98f78906fa957e1e2609 SHA512 2b6c971f5fb192309734d6f42f17db83979805e6dcafbc95b343c3749afd85ea65c9b7d101b0b4bdf5102b6d60394cabcaa0d511aeb3fe1bf2db924b7e8b46cf DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12 -EBUILD patchage-0.5.0-r1.ebuild 1053 BLAKE2B f9325dd2613b625b24a3148c4e3564649be2c54ee8659fef6855fbe2f71a10689ef45b5ae71507052721d94d10305fb0e947d720103a7e775cb9be1366b6e582 SHA512 152269c91e8f51b549ac602ebbd01452789531b28912ee2510fd85950760f40605fe6c4549dbb3261203c493bdb87bc4f0750d8fd9a632608d659aee2ab702cb -EBUILD patchage-0.5.0-r2.ebuild 1142 BLAKE2B 70b44df31cbd9a2d8a6f883f2daf296547a7ce0eebcc4e0d88b15c2ba933d0a4722812a162aca12fbb6c182609097e4705aed95df951f7c50238ef053fbb2197 SHA512 7ed8905edf25c21bda792405bf6a404deb21074537171b8d432d6ed79557d3ff2ad906f78a19a1085df1ac991ec24de644b4c74056e9d47a56359eb06a5667dc -EBUILD patchage-1.0.2.ebuild 1076 BLAKE2B 573d6c5aa594545514f2b4e3fca25439c3b8b82248e2bcbbe314ec9ce2a57d496ad4105bab1ae4d9de72e6757ff8a0e5130f2e2d4f859422d8ab7a655f6b670b SHA512 c995d2f439761e32bd5d2a08e4a6249ba67de90650f53b620f18976a037519d30079b667545096fa87779807c46d492eb7b4da55df389d8ab3ddf42ab496a56b +EBUILD patchage-1.0.2.ebuild 1074 BLAKE2B 3160e018d6afc8bfb62da32566c8e9ac80be0e18c5d94e1c1674d7ff662af83bacc5d14a4158923b24d1b77b9ceaf4f342ceb7ce8b4b33356fa146b7994f202d SHA512 fea06d7056284ac6677828998d9df74a9af4ff598f25c322e20d7500234fd5976967f0af0b289716acf1352b9721e5bf78d0c5fb88bd51a10e2caa21e78fcad2 MISC metadata.xml 600 BLAKE2B 89bfd8b0da00e90fdd9fb85ca8604c80de0e2a8e471309aec0022f31f844d06c914c7536a3928179256f85b313fefaa3dec8937159f7131a03838276cca86162 SHA512 d08bd05a57ca03d9f91c0904f9a1b92e332e4475fd6729feefb63c75df2c5ad6eebd718b6e7db8482819f463606dcca888400c1560dd9b2c9e426c26634ece77 diff --git a/media-sound/patchage/files/patchage-0.5.0-desktop.patch b/media-sound/patchage/files/patchage-0.5.0-desktop.patch deleted file mode 100644 index cf4eaeaaa788..000000000000 --- a/media-sound/patchage/files/patchage-0.5.0-desktop.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- patchage-0.5.0/patchage.desktop.in -+++ patchage-0.5.0/patchage.desktop.in -@@ -6,4 +6,4 @@ - Terminal=false - Icon=@APP_INSTALL_NAME@ - Type=Application --Categories=Application;AudioVideo;Audio -+Categories=AudioVideo;Audio; diff --git a/media-sound/patchage/patchage-0.5.0-r1.ebuild b/media-sound/patchage/patchage-0.5.0-r1.ebuild deleted file mode 100644 index f7a464d6ad22..000000000000 --- a/media-sound/patchage/patchage-0.5.0-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit eutils flag-o-matic waf-utils python-any-r1 - -DESCRIPTION="Modular patch bay for audio and MIDI systems" -HOMEPAGE="http://wiki.drobilla.net/Patchage" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="alsa debug lash" - -RDEPEND=">=media-libs/raul-0.7.0 - >=x11-libs/flowcanvas-0.7.1 - >=dev-cpp/gtkmm-2.11.12:2.4 - >=dev-cpp/glibmm-2.14:2 - >=dev-cpp/libglademm-2.6.0:2.4 - dev-cpp/libgnomecanvasmm:2.6 - virtual/jack - alsa? ( media-libs/alsa-lib ) - lash? ( dev-libs/dbus-glib )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-libs/boost - virtual/pkgconfig" - -DOCS=( AUTHORS README ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-desktop.patch -} - -src_configure() { - append-cxxflags -std=c++11 - waf-utils_src_configure \ - $(use debug && echo "--debug") \ - $(use alsa || echo "--no-alsa") \ - $(use lash || echo "--no-lash") -} diff --git a/media-sound/patchage/patchage-0.5.0-r2.ebuild b/media-sound/patchage/patchage-0.5.0-r2.ebuild deleted file mode 100644 index 54e2fcbe5624..000000000000 --- a/media-sound/patchage/patchage-0.5.0-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit flag-o-matic gnome2-utils waf-utils python-any-r1 - -DESCRIPTION="Modular patch bay for audio and MIDI systems" -HOMEPAGE="http://drobilla.net/software/patchage" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug lash" - -RDEPEND=">=media-libs/raul-0.7.0 - >=x11-libs/flowcanvas-0.7.1 - >=dev-cpp/gtkmm-2.11.12:2.4 - >=dev-cpp/glibmm-2.14:2 - >=dev-cpp/libglademm-2.6.0:2.4 - dev-cpp/libgnomecanvasmm:2.6 - virtual/jack - alsa? ( media-libs/alsa-lib ) - lash? ( dev-libs/dbus-glib )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-libs/boost - virtual/pkgconfig" - -DOCS=( AUTHORS README ChangeLog ) - -PATCHES=( - "${FILESDIR}"/${P}-desktop.patch -) - -src_configure() { - append-cxxflags -std=c++11 - waf-utils_src_configure \ - $(use debug && echo "--debug") \ - $(use alsa || echo "--no-alsa") \ - $(use lash || echo "--no-lash") -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-sound/patchage/patchage-1.0.2.ebuild b/media-sound/patchage/patchage-1.0.2.ebuild index 7e4f4bd5b7e5..b25929f0516f 100644 --- a/media-sound/patchage/patchage-1.0.2.ebuild +++ b/media-sound/patchage/patchage-1.0.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="alsa debug jack-dbus session" RDEPEND=">=dev-cpp/glibmm-2.14:2 diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest index eba4f29b87cc..42468c35da6b 100644 --- a/media-sound/pavucontrol-qt/Manifest +++ b/media-sound/pavucontrol-qt/Manifest @@ -1,5 +1,3 @@ -DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494 DIST pavucontrol-qt-0.15.0.tar.xz 97480 BLAKE2B 183c3cbbe87b6867bb116041d41dd29f5ba72156e9078a4f09e5ffcbd3e123f6511cb06c99ce3cc8ce243a0551b132438bad7b14ae759cc775974c2ad3388bf3 SHA512 c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600 -EBUILD pavucontrol-qt-0.14.1.ebuild 716 BLAKE2B d14a074430d0a4f7e16c100eefb33bfc8d2f1229b7703f9f97ea0c93329c383dd24faccbaf7f52096611f9f0b98b8d4f3c75cb10195121c77593adc7be19af7f SHA512 174a40dd903d9ee855c96d0330d142383707bcd0c5e3ebeed459540ccc3221f5d3813a935b6a499903040e5a53aa37571b435dc6cea3ac78ae38b51e512d9afd -EBUILD pavucontrol-qt-0.15.0.ebuild 706 BLAKE2B 6d86b57145a2297d3fa0a1b45b57747afd46aa960466641feb1760d02739f0aa600f5d2c77a7822febce022a1b9c5f73b74ff9fcb828c4e644e1e5bf89784cbf SHA512 27be50a4834172e15041681b6b6987d30e393b74e1c63f2d31aff2ccf7b07e4b470d42b3ad4c82d11a7695e775fc7bcf9dfc17788551d35460f99fa10aa5d85c +EBUILD pavucontrol-qt-0.15.0.ebuild 704 BLAKE2B b2a1d666b2849b8f11e52d605e29b002e96e52ddaeb91819ad95350df2b9fe87cad729adfcb600c4008b7b378cf433a5a4dbe042309c13dabdd906b7c5769928 SHA512 b0351da1c8083bcc130c4ff560185a4dae136eb5a45071de6bb8a07703fa1de9a390f7a28d1acc00ba235a800bd612bcc2a23fe7659adc3412c3c2c4eea058d3 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild deleted file mode 100644 index 35dcd84255a0..000000000000 --- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A Pulseaudio mixer in Qt (port of pavucontrol)" -HOMEPAGE="https://lxqt.github.io/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtwidgets:5 - media-sound/pulseaudio[glib] -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild index 21b7b2ce6716..70f14e9e590c 100644 --- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild +++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest index 1a9cb44c6b8b..b4863f90e59f 100644 --- a/media-sound/picard/Manifest +++ b/media-sound/picard/Manifest @@ -1,6 +1,6 @@ -DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f DIST picard-2.3.1.tar.gz 3778379 BLAKE2B b829c29d95922e31479cea0c8bcb3294cd3751374e71f37d387a013529c294a695a2e2f4c8b73af5eeee2fa8f7423d24074bc18b7db130798411803c70a013ff SHA512 fb5ac4cbd02f4b832cb23e3c8b5881eeca04b7b101c015a97fc20c8e0e7871ad2098b750a0c486af958b2bf30221b0c28666313f768dc7d70389519dd795d9cd -EBUILD picard-2.1.3-r1.ebuild 1657 BLAKE2B fccc7ac46397e33ff9087da1bd8b3dc03d80ba758dc4abe21c7679977cb1bb8c12967a68c2abdc112f3ca1814030234269ea2a035f144409e218dab3bedf7a09 SHA512 93945e04da0957f96a77a77e670289ce7b9f962533c80c78b0a9f5e53a66384b4c6ae1d268cd088519c38c1da8d79a62154f60d11a908191c27c655597e6af5d -EBUILD picard-2.3.1.ebuild 1661 BLAKE2B 3941cd8b08808783304c9e4abfd7ab05df9d27cb94b9add63f4ad37e3d3c3c2371b25535e51ff4869bbd8703f606e5356210d000665761f0ad09b8f42a736fb6 SHA512 1380c2ccf307c5949d0310d433167f705491f6a421c4fc3ad7b7e7eddf847f61748fd20d9709f9de6e1eb503327e26df437cc5933bd380c68f50875fb1b41582 -EBUILD picard-9999.ebuild 1738 BLAKE2B 233f5965ecfa2f84ebff049b03bb961eec74fd4c9b2d13e04915c3882446bb0a3e8d229931852af5ccfcd76b9df3ff618fe5e99a716aac6daf87b8d2903161fe SHA512 7070c7ba182374053632d4c4e986f3f34acc9dbdb6fef040572213ea6bec35c42f2582060ae63ce2a300ac914d5bd2c9d40c97e2c903a87cfb2d69b1253f1d97 -MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d +DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15 +EBUILD picard-2.3.1.ebuild 1698 BLAKE2B 66c4520ce639d94b5477060aae6fc8cb3b3e56d5e9c1f8b49b82c3b1e3fad72eeb10eb7be87405afee878519aceaa286f76faaa35d90d9abe37043e915fcfba1 SHA512 a5d04bd559fe3504c7348f74abb5492c19eb2f6465419129880f00e0b90a4234f00116d8c5c13427e42173c93fdb22e8165a1fabc8f68792ec45a58ba64cabc8 +EBUILD picard-2.4.2.ebuild 1524 BLAKE2B 20cfc142ad4be84f9d93c4c78c59186cccae7ce27298fe1c68bd4fe5211b1006e8aa7687092a307cd6ddf0a6fffb8665115c617413c25d6003c6e08093b0fef7 SHA512 a53ea2556ebb77b6e5690a802fd3e782b8675482379b3417d7c8725e6b03d842a25429fcc787efff9c4424deef63a45697093e6047280854b36de730b7c6f90e +EBUILD picard-9999.ebuild 1524 BLAKE2B 20cfc142ad4be84f9d93c4c78c59186cccae7ce27298fe1c68bd4fe5211b1006e8aa7687092a307cd6ddf0a6fffb8665115c617413c25d6003c6e08093b0fef7 SHA512 a53ea2556ebb77b6e5690a802fd3e782b8675482379b3417d7c8725e6b03d842a25429fcc787efff9c4424deef63a45697093e6047280854b36de730b7c6f90e +MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5 diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml index 8492cea81197..75560516f38c 100644 --- a/media-sound/picard/metadata.xml +++ b/media-sound/picard/metadata.xml @@ -10,4 +10,8 @@ tagger for MusicBrainz, with a focus on album oriented tagging as opposed to track based tagging and cross platform compatibility. </longdescription> + <use> + <flag name="discid">Enable reading the ID of the inserted CD</flag> + <flag name="fingerprints">Enable calculation and lookup of AcoustID fingerprints</flag> + </use> </pkgmetadata> diff --git a/media-sound/picard/picard-2.3.1.ebuild b/media-sound/picard/picard-2.3.1.ebuild index 86dadf0cab58..572cf0a4420d 100644 --- a/media-sound/picard/picard-2.3.1.ebuild +++ b/media-sound/picard/picard-2.3.1.ebuild @@ -14,15 +14,17 @@ SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" +KEYWORDS="amd64 x86" +IUSE="discid nls" RDEPEND=" $(python_gen_cond_dep ' dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}] ') dev-qt/qtgui:5 - >=media-libs/mutagen-1.38" + media-libs/mutagen + discid? ( dev-python/python-discid ) +" DEPEND=" nls? ( dev-qt/linguist-tools:5 ) " diff --git a/media-sound/picard/picard-2.1.3-r1.ebuild b/media-sound/picard/picard-2.4.2.ebuild index 8b04ce903747..5aa35ce6bae8 100644 --- a/media-sound/picard/picard-2.1.3-r1.ebuild +++ b/media-sound/picard/picard-2.4.2.ebuild @@ -3,34 +3,42 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=1 DISABLE_AUTOFORMATTING=true -inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg +inherit distutils-r1 xdg + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/metabrainz/picard" + inherit git-r3 +else + SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-release-${PV}" +fi DESCRIPTION="Cross-platform music tagger" HOMEPAGE="https://picard.musicbrainz.org" -SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" +IUSE="discid fingerprints nls" +BDEPEND=" + nls? ( dev-qt/linguist-tools:5 ) +" RDEPEND=" $(python_gen_cond_dep ' dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}] ') dev-qt/qtgui:5 - >=media-libs/mutagen-1.38" -DEPEND=" - nls? ( dev-qt/linguist-tools:5 ) + media-libs/mutagen + discid? ( dev-python/python-discid ) + fingerprints? ( media-libs/chromaprint[tools] ) " RESTRICT="test" # doesn't work with ebuilds -S="${WORKDIR}/${PN}-release-${PV}" - python_compile() { local build_args=( --disable-autoupdate @@ -55,19 +63,7 @@ python_install() { python_install_all() { distutils-r1_python_install_all - local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable -calculation and lookup of AcoustID fingerprints. - -Install optional package dev-python/python-discid to enable -calculation and lookup of compact disc identifiers (disc IDs). - -If you are upgrading Picard and it does not start, try removing -Picard's settings: - rm ~/.config/MusicBrainz/Picard.conf" - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_pkg_postinst + elog "If you are upgrading Picard and it does not start, try removing" + elog "Picard's settings:" + elog " rm ~/.config/MusicBrainz/Picard.conf" } diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild index 8ddfeb52fa15..5aa35ce6bae8 100644 --- a/media-sound/picard/picard-9999.ebuild +++ b/media-sound/picard/picard-9999.ebuild @@ -3,24 +3,26 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=1 DISABLE_AUTOFORMATTING=true +inherit distutils-r1 xdg + if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/metabrainz/picard" inherit git-r3 else SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-release-${PV}" fi -inherit distutils-r1 readme.gentoo-r1 xdg -DESCRIPTION="A cross-platform music tagger" +DESCRIPTION="Cross-platform music tagger" HOMEPAGE="https://picard.musicbrainz.org" LICENSE="GPL-2+" SLOT="0" -IUSE="nls" +IUSE="discid fingerprints nls" BDEPEND=" nls? ( dev-qt/linguist-tools:5 ) @@ -29,8 +31,11 @@ RDEPEND=" $(python_gen_cond_dep ' dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}] ') - dev-qt/qtgui:5[accessibility] - >=media-libs/mutagen-1.38" + dev-qt/qtgui:5 + media-libs/mutagen + discid? ( dev-python/python-discid ) + fingerprints? ( media-libs/chromaprint[tools] ) +" RESTRICT="test" # doesn't work with ebuilds @@ -58,19 +63,7 @@ python_install() { python_install_all() { distutils-r1_python_install_all - local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable -calculation and lookup of AcoustID fingerprints. - -Install optional package dev-python/python-discid to enable -calculation and lookup of compact disc identifiers (disc IDs). - -If you are upgrading Picard and it does not start, try removing -Picard's settings: - rm ~/.config/MusicBrainz/Picard.conf" - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_pkg_postinst + elog "If you are upgrading Picard and it does not start, try removing" + elog "Picard's settings:" + elog " rm ~/.config/MusicBrainz/Picard.conf" } diff --git a/media-sound/pitchtune/Manifest b/media-sound/pitchtune/Manifest index 02458a464163..852608cd1ec4 100644 --- a/media-sound/pitchtune/Manifest +++ b/media-sound/pitchtune/Manifest @@ -1,4 +1,5 @@ +AUX pitchtune-0.0.4-fno-common.patch 11264 BLAKE2B d332527cbd7b0597d1b644596a367ece82030f07987e3303c9aa9b7c4590e074231ac651888e1eb4b4a1bcca07144f3b68570150eb16c7fc88aa93af2e89dbe1 SHA512 741b46ce7b9e8de82703b8e86779788712f28bbe258b1c9e2fd8840ead1d064fa5be0c4a4a18d8f293c8b4f283e218e16be6587dd222ee09ac6ef8a54a6684f0 AUX pitchtune-0.0.4-lm.patch 208 BLAKE2B 8c6d5a9d2ea2ddefb03a1a15f02cb7ce5ebcdea42f5f307f7de90026da2da7c04a0b2e8dc82d84104b118ddf7e217584ca84dde254f07ab9bd28e6ff6c348245 SHA512 74fc3e0f5e42c9cc61ebaa19a4f0de3e0f4893a4a8a7a638e1a200152ff8b8b4c8c69b0bcc4d2eac51a9f11573ed19c8f0883e5a5755faafff29d3d76c0c9a19 DIST pitchtune-0.0.4.tar.gz 163348 BLAKE2B 472f57409967d7af54841245ef6b8477d9dca25b1708e5e9870729faadd6a294dc636e4e0cb6d2a617206790b5170e579f37fb8f92e41361a222b76f78cf3858 SHA512 7085dada0210ae5df8437e14de3fcd5fb5cba4305718b29b33730f737008451b9dba6e667b0caf8d57921c405de6205f288c8900db5c276ff401a9f5f0a3610a -EBUILD pitchtune-0.0.4.ebuild 688 BLAKE2B 7a081e8ca210722c64a13ad8bb6a146436ff56bf8fb5ae3f176fd7b62609a5ab300db126f79a40d49c3357033cb05918afe1c8c783c97e3de5961d315f24b9bc SHA512 14a3aaaf0d7d0baa73abe98de0d89caca61d4e8416cc5fd0a055cd53195614c6e41faaba0f3f553b558b80f4fa65e320054c3e72b3782ad55c011fdc3e4c44ad +EBUILD pitchtune-0.0.4.ebuild 742 BLAKE2B 969de850ec3d1a3c4d98434b5f5177ef4f25243fdf5843e55143b972f88579f02f163c56b6f11a0cd33cbbcc0444c120e27be034079141cc2888dd283fe2f91c SHA512 e37a0936940d583f6c5814c2ca34ff68b81401008e5bc542edc4726acb52aed06dbee8e509964ddf003b4d8b32ac6c90425e53680bd45964309fdf5ce9bdc42c MISC metadata.xml 342 BLAKE2B 2c5b23966307252ad5f996f763e0bf0817f95c254796c6cf18f25c322f79dce52e138b0585ea8ebc3c0969842e6b8d92896261c04438966cb23379fe07ba253a SHA512 f1d19843fe070069700704bc96d0d195080b9a3e71569829771d9bb1269ae9c4c17ff478476c10fbe4993ff30e38d887bd5344d635ab40095fefec82c6c00af2 diff --git a/media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch b/media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch new file mode 100644 index 000000000000..4a5ee83dbb1b --- /dev/null +++ b/media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch @@ -0,0 +1,394 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -35,6 +35,99 @@ + #include <gtk/gtk.h> + #include "main.h" + ++GtkWidget *window_main; ++GtkWidget *drawingarea1; ++GtkWidget *spinbutton_freq; ++GtkWidget *spinbutton_a1freq; ++GtkWidget *optionmenu_noteselect; ++GtkWidget *optionmenu_noteselect_menu; ++GtkWidget *checkbutton_ministep_freq; ++GtkWidget *checkbutton_ministep_a1freq; ++GtkWidget *checkbutton_coarse_tuning; ++GtkWidget *hscale_finetune; ++GtkWidget *hscale_coarsetune; ++GtkWidget *label_freqwarn; ++GtkWidget *mmenu_item_sel_guitar; ++GtkWidget *mmenu_item_small_display; ++GtkWidget *button_muting1; ++GtkAdjustment *adjustment_finetune; ++GtkAdjustment *adjustment_coarsetune; ++GdkPixmap *gdkpixmap1; ++ ++GtkWidget *window_settings; ++GtkWidget *settings_entry_sounddev; ++GtkWidget *settings_alsa_device; ++GtkWidget *settings_radiobutton_scale_1; ++GtkWidget *settings_radiobutton_scale_2; ++ ++GtkWidget *fileselection1; ++ ++GtkWidget *about_dialog; ++ ++GtkWidget *help_dialog; ++ ++GtkWidget *debug_window; ++GtkWidget *debug_text_box; ++ ++GdkImage *gdkimage1; ++GdkVisual *gdkvisual1; ++ ++GdkGC *GdkGC_black; ++GdkGC *GdkGC_red; ++ ++struct sel_guitar_config sel_guitar_config; ++struct main_config main_config; ++struct config config; ++ ++int tuner_started; ++ ++u_int8_t soundbuffer[SOUNDBUFFER_SIZE]; ++int soundbuffer_len; ++int soundbuffer_readpos; ++int soundbuffer_writepos; ++double backto_lastdraw_samplecount; ++ ++u_int8_t samplepieces_buffer[DRAWAREA_WIDTH*SAMPLEPIECES_MAX]; ++int samplepieces_which_is_zero; ++int samplepieces_count; ++int samplepieces_count_finetune; ++int samplepieces_count_coarsetune; ++int samplepieces_last_valid; ++ ++double frequency; ++gboolean frequency_set; ++double wavelength_samples; ++int samplerate; ++double downsample_ratio; ++ ++int tuner_mode_coarse; ++int tuner_mode_coarse_new; ++ ++gboolean notes_note_set; ++int notes_note; ++ ++int timer_tag; ++int timer_count; ++ ++int sound_fd; ++ ++int spinbutton_freq_changed_by_user; ++ ++gboolean displaystate_is_splash; ++ ++gboolean display_big; ++gboolean display_cleared_around; ++ ++int sel_standard_note; ++int sel_standard_octave; ++int sel_standard_last_octave; ++gboolean sel_standard_last_octave_valid; ++int sel_standard_last_scale_type; ++ ++GString *gstr_sounddev; ++GString *gstr_alsa_device; ++int scale_type; ++ + #include "main_img001.h" + + +--- a/src/main.h ++++ b/src/main.h +@@ -92,12 +92,12 @@ + + /* Scale note strings */ + #define SCALE_COUNT 2 +-const char *(note_chars_lowercase_multi[2][12]); +-const char *(note_chars_uppercase_multi[2][12]); ++extern const char *(note_chars_lowercase_multi[2][12]); ++extern const char *(note_chars_uppercase_multi[2][12]); + + /* Menu entry names */ + #define MENU_ENTRIES 6 +-const char *menu_entry[MENU_ENTRIES]; ++extern const char *menu_entry[MENU_ENTRIES]; + + + +@@ -119,69 +119,71 @@ + /* GTK variables */ + + /* Main window */ +-GtkWidget *window_main; +-GtkWidget *drawingarea1; +-GtkWidget *spinbutton_freq; +-GtkWidget *spinbutton_a1freq; +-GtkWidget *optionmenu_noteselect; +-GtkWidget *optionmenu_noteselect_menu; +-GtkWidget *checkbutton_ministep_freq; +-GtkWidget *checkbutton_ministep_a1freq; +-GtkWidget *checkbutton_coarse_tuning; +-GtkWidget *hscale_finetune; +-GtkWidget *hscale_coarsetune; +-GtkWidget *label_freqwarn; +-GtkWidget *mmenu_item_sel_guitar; +-GtkWidget *mmenu_item_small_display; +-GtkWidget *button_muting1; +-GtkAdjustment *adjustment_finetune; +-GtkAdjustment *adjustment_coarsetune; +-GdkPixmap *gdkpixmap1; ++extern GtkWidget *window_main; ++extern GtkWidget *drawingarea1; ++extern GtkWidget *spinbutton_freq; ++extern GtkWidget *spinbutton_a1freq; ++extern GtkWidget *optionmenu_noteselect; ++extern GtkWidget *optionmenu_noteselect_menu; ++extern GtkWidget *checkbutton_ministep_freq; ++extern GtkWidget *checkbutton_ministep_a1freq; ++extern GtkWidget *checkbutton_coarse_tuning; ++extern GtkWidget *hscale_finetune; ++extern GtkWidget *hscale_coarsetune; ++extern GtkWidget *label_freqwarn; ++extern GtkWidget *mmenu_item_sel_guitar; ++extern GtkWidget *mmenu_item_small_display; ++extern GtkWidget *button_muting1; ++extern GtkAdjustment *adjustment_finetune; ++extern GtkAdjustment *adjustment_coarsetune; ++extern GdkPixmap *gdkpixmap1; + + /* Settings window */ +-GtkWidget *window_settings; +-GtkWidget *settings_entry_sounddev; +-GtkWidget *settings_alsa_device; +-GtkWidget *settings_radiobutton_scale_1; +-GtkWidget *settings_radiobutton_scale_2; ++extern GtkWidget *window_settings; ++extern GtkWidget *settings_entry_sounddev; ++extern GtkWidget *settings_alsa_device; ++extern GtkWidget *settings_radiobutton_scale_1; ++extern GtkWidget *settings_radiobutton_scale_2; + + /* Filesel window */ +-GtkWidget *fileselection1; ++extern GtkWidget *fileselection1; + + /* About dialog */ +-GtkWidget *about_dialog; ++extern GtkWidget *about_dialog; + + /* Help dialog */ +-GtkWidget *help_dialog; ++extern GtkWidget *help_dialog; + + /* Debug window */ +-GtkWidget *debug_window; +-GtkWidget *debug_text_box; ++extern GtkWidget *debug_window; ++extern GtkWidget *debug_text_box; + + /* GdkImage containing the drawn waves */ +-GdkImage *gdkimage1; ++extern GdkImage *gdkimage1; + /* GdkVisual for drawingarea1 */ +-GdkVisual *gdkvisual1; ++extern GdkVisual *gdkvisual1; + + /* Graphics Contexts */ +-GdkGC *GdkGC_black; +-GdkGC *GdkGC_red; ++extern GdkGC *GdkGC_black; ++extern GdkGC *GdkGC_red; + + /* Configuration structures */ +-struct ++struct sel_guitar_config + { + struct config_struct_window window; +-} sel_guitar_config; ++}; ++extern struct sel_guitar_config sel_guitar_config; + +-struct ++struct main_config + { + struct config_struct_window window; +-} main_config; ++}; ++extern struct main_config main_config; + + /** + * \brief Holds configuration from reading config file to realizing the configuration + */ +-struct ++struct config + { + gboolean sel_guitar_visible; + double a1frequency; +@@ -194,74 +196,75 @@ + int menu_accel_key[MENU_ENTRIES]; + int menu_accel_mods[MENU_ENTRIES]; + double play_sine; +-} config; ++}; ++extern struct config config; + + /* --- */ +-int tuner_started; /**< Has the tuner been started? */ ++extern int tuner_started; /**< Has the tuner been started? */ + + /* Sound buffer */ +-u_int8_t soundbuffer[SOUNDBUFFER_SIZE]; /* Rotating buffer */ +-int soundbuffer_len; +-int soundbuffer_readpos; +-int soundbuffer_writepos; +-double backto_lastdraw_samplecount; /* Samples from writepos */ ++extern u_int8_t soundbuffer[SOUNDBUFFER_SIZE]; /* Rotating buffer */ ++extern int soundbuffer_len; ++extern int soundbuffer_readpos; ++extern int soundbuffer_writepos; ++extern double backto_lastdraw_samplecount; /* Samples from writepos */ + /* to the sample which was sample 1 at last draw */ + /* This variable will be negative */ + + /* Samplepieces buffer */ +-u_int8_t samplepieces_buffer[DRAWAREA_WIDTH*SAMPLEPIECES_MAX]; ++extern u_int8_t samplepieces_buffer[DRAWAREA_WIDTH*SAMPLEPIECES_MAX]; + /* Rotating buffer */ +-int samplepieces_which_is_zero; /**< Which slot is number 0 */ ++extern int samplepieces_which_is_zero; /**< Which slot is number 0 */ + /** + * \brief Number of times to draw over and over a samplepiece + */ +-int samplepieces_count; /* How many slots to use */ ++extern int samplepieces_count; /* How many slots to use */ + /** + * \brief Number of samplepieces to stack on display in finetune mode + */ +-int samplepieces_count_finetune; ++extern int samplepieces_count_finetune; + /** + * \brief Number of samplepieces to stack on display in coarsetune mode + */ +-int samplepieces_count_coarsetune; +-int samplepieces_last_valid; /**< How many valid slots -1 */ ++extern int samplepieces_count_coarsetune; ++extern int samplepieces_last_valid; /**< How many valid slots -1 */ + + /* --- */ +-double frequency; /**< Frequency */ +-gboolean frequency_set; +-double wavelength_samples; /**< Wavelength in samples */ +-int samplerate; /**< Sampling rate */ +-double downsample_ratio; /**< Downsample ratio */ ++extern double frequency; /**< Frequency */ ++extern gboolean frequency_set; ++extern double wavelength_samples; /**< Wavelength in samples */ ++extern int samplerate; /**< Sampling rate */ ++extern double downsample_ratio; /**< Downsample ratio */ + +-int tuner_mode_coarse; /**< If tuner is in coarse mode */ +-int tuner_mode_coarse_new; /**< If tuner should be put in coarse mode */ ++extern int tuner_mode_coarse; /**< If tuner is in coarse mode */ ++extern int tuner_mode_coarse_new; /**< If tuner should be put in coarse mode */ + +-gboolean notes_note_set; +-int notes_note; ++extern gboolean notes_note_set; ++extern int notes_note; + +-int timer_tag; /**< For GTK timeout */ +-int timer_count; /**< For coarse tuning. Update only every n timer tick. */ ++extern int timer_tag; /**< For GTK timeout */ ++extern int timer_count; /**< For coarse tuning. Update only every n timer tick. */ + +-int sound_fd; /**< File descritor for sound input */ ++extern int sound_fd; /**< File descritor for sound input */ + +-int spinbutton_freq_changed_by_user; /**< Set to FALSE before program changes frequency. */ ++extern int spinbutton_freq_changed_by_user; /**< Set to FALSE before program changes frequency. */ + +-gboolean displaystate_is_splash; /**< Showing splash-screen? */ ++extern gboolean displaystate_is_splash; /**< Showing splash-screen? */ + +-gboolean display_big; /**< Big or small display? */ +-gboolean display_cleared_around; ++extern gboolean display_big; /**< Big or small display? */ ++extern gboolean display_cleared_around; + + /* Standard selector */ +-int sel_standard_note; +-int sel_standard_octave; +-int sel_standard_last_octave; /* Last octave-menu created */ +-gboolean sel_standard_last_octave_valid; +-int sel_standard_last_scale_type; ++extern int sel_standard_note; ++extern int sel_standard_octave; ++extern int sel_standard_last_octave; /* Last octave-menu created */ ++extern gboolean sel_standard_last_octave_valid; ++extern int sel_standard_last_scale_type; + + /*--- */ +-GString *gstr_sounddev; +-GString *gstr_alsa_device; +-int scale_type; /*Which type of scale to use */ ++extern GString *gstr_sounddev; ++extern GString *gstr_alsa_device; ++extern int scale_type; /*Which type of scale to use */ + + + +--- a/src/sel_guitar.c ++++ b/src/sel_guitar.c +@@ -33,6 +33,16 @@ + #include "sel_guitar_img001.h" + + ++GtkWidget *sel_guitar_window; ++int sel_guitar_window_visible; ++ ++GtkWidget *sel_guitar_gtk_pixmap1; ++GdkPixmap *sel_guitar_gdk_pixmap1; ++GdkPixmap *sel_guitar_gdk_pixmap_picture; ++GtkWidget *sel_guitar_eventbox1; ++ ++int sel_guitar_last_position; ++ + + /** + * \brief Note numbers of the 6 guitar strings (E,A,D,G,H,E) +--- a/src/sel_guitar.h ++++ b/src/sel_guitar.h +@@ -30,8 +30,8 @@ + + /**** Global variables */ + +-GtkWidget *sel_guitar_window; +-int sel_guitar_window_visible; ++extern GtkWidget *sel_guitar_window; ++extern int sel_guitar_window_visible; + + + +@@ -39,14 +39,14 @@ + + /* GTK variables */ + /*GtkWidget *sel_guitar_window; */ +-GtkWidget *sel_guitar_gtk_pixmap1; +-GdkPixmap *sel_guitar_gdk_pixmap1; +-GdkPixmap *sel_guitar_gdk_pixmap_picture; +-GtkWidget *sel_guitar_eventbox1; ++extern GtkWidget *sel_guitar_gtk_pixmap1; ++extern GdkPixmap *sel_guitar_gdk_pixmap1; ++extern GdkPixmap *sel_guitar_gdk_pixmap_picture; ++extern GtkWidget *sel_guitar_eventbox1; + + /*int sel_guitar_window_visible; */ + +-int sel_guitar_last_position; /* Last string position drawn */ ++extern int sel_guitar_last_position; /* Last string position drawn */ + + + /**** Function declarations */ diff --git a/media-sound/pitchtune/pitchtune-0.0.4.ebuild b/media-sound/pitchtune/pitchtune-0.0.4.ebuild index 480bbb1f29df..8cded71773da 100644 --- a/media-sound/pitchtune/pitchtune-0.0.4.ebuild +++ b/media-sound/pitchtune/pitchtune-0.0.4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils +EAPI=7 + +inherit autotools desktop DESCRIPTION="Precise Instrument Tweaking for Crispy Harmony - tuner" HOMEPAGE="https://sourceforge.net/projects/pitchtune/" @@ -15,26 +16,24 @@ KEYWORDS="~amd64" RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:2 - media-libs/alsa-lib -" -DEPEND=" - ${RDEPEND} - sys-devel/gettext -" - -DOCS=( AUTHORS README REQUIRED TODO ) + media-libs/alsa-lib" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + PATCHES=( "${FILESDIR}"/${PN}-0.0.4-lm.patch + "${FILESDIR}"/${PN}-0.0.4-fno-common.patch ) src_prepare() { default - + mv configure.{in,ac} || die eautoreconf } src_install() { default + dodoc REQUIRED doicon pixmaps/${PN}.xpm make_desktop_entry ${PN} Pitchtune diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest index ba7cdebf44b7..3a504c0a37fb 100644 --- a/media-sound/potamus/Manifest +++ b/media-sound/potamus/Manifest @@ -1,4 +1,3 @@ -AUX ffmpeg29.patch 684 BLAKE2B 06808e146419469de9f3d4a98db52e45c284779677b9f7525d108afbf485fb804a8bdf45909fbc53c19546dc6b56ae308348a1616f94af269c9cd1407bb134bd SHA512 3de805c7e4808863ca4fa9fa7c450ce1db6222a69ef6e43016e2d7d687a5461beda75869b3bd5ad6266f00948ce94ff63b15c9fa97104303a56300e0aa2cb475 -DIST potamus-16.tar.gz 144874 BLAKE2B ca18b2a6e948a913f652383a81a9e637265c7cf78126846c6824fe12f8a34ab2902ade69366e036b00da61604780e340671a68588b52576c0e5827f07b1b7ba8 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d -EBUILD potamus-16.ebuild 1219 BLAKE2B 4b78720ea2840ab4c0fffbb2ccd4c669780c179b606aa3d6accd0ef9904021cae87d69284b8ef83a032facf41fe8d6714ad4ac90f310ad958de50b397fca8d06 SHA512 b3b0ca291ec6b9cdf89038ac779e64f61d714b87f2a84fcbfa06e10f9eebb11d9fc7920af475d9d2147a99c014d6a1865d12680579d0973aff4bf6151010af8c +DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099 +EBUILD potamus-17.ebuild 1135 BLAKE2B b599d5bc1103afa726dcd2d83f4be4beb70d4c5a976f077980e3b51cbf9258b3a2242ed67f87a5f5127f42d9cd0a1b866c10396b1ad81f5d7fd0627021264959 SHA512 9e92cdfce334ea08f77c3216cc2d994358f88371cca90b89d5da82ac2d1fac6d6ccfcf375d6ceba6aed482fdbc5a85c45c30d70aefa6364e2bce611046f6a586 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/potamus/files/ffmpeg29.patch b/media-sound/potamus/files/ffmpeg29.patch deleted file mode 100644 index 8565d7d3d99f..000000000000 --- a/media-sound/potamus/files/ffmpeg29.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: potamus-16/src/input-avcodec.c -=================================================================== ---- potamus-16.orig/src/input-avcodec.c -+++ potamus-16/src/input-avcodec.c -@@ -41,7 +41,7 @@ static int input_avcodec_open(input *p, - g_error("out of memory"); - p->data = a; - -- a->frame = avcodec_alloc_frame(); -+ a->frame = av_frame_alloc(); - - for (int pass = 0; pass < 2; pass++) { - a->format = NULL; -@@ -114,7 +114,7 @@ static int input_avcodec_get_audio(input - - // Decode the packet. - while (packet.size > 0) { -- avcodec_get_frame_defaults(a->frame); -+ av_frame_unref(a->frame); - - int got_frame = 0; - int in_used = avcodec_decode_audio4(a->codec_ctx, diff --git a/media-sound/potamus/potamus-16.ebuild b/media-sound/potamus/potamus-17.ebuild index fe984ebe363a..20cdf12c8897 100644 --- a/media-sound/potamus/potamus-16.ebuild +++ b/media-sound/potamus/potamus-17.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome2 +EAPI=7 +inherit xdg DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality" HOMEPAGE="http://offog.org/code/potamus/" @@ -13,28 +13,27 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="+ao audiofile flac jack mad modplug opus vorbis" +BDEPEND=" + virtual/pkgconfig +" RDEPEND=" x11-libs/gtk+:2 - >=gnome-base/libglade-2 + gnome-base/libglade media-libs/libsamplerate + media-video/ffmpeg:0= ao? ( media-libs/libao ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) - jack? ( media-sound/jack-audio-connection-kit ) - >=media-video/ffmpeg-2.8:0= + jack? ( virtual/jack ) mad? ( media-libs/libmad ) modplug? ( media-libs/libmodplug ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/ffmpeg29.patch" ) +DEPEND="${RDEPEND}" src_configure() { - gnome2_src_configure \ + econf \ $(use_enable audiofile input-audiofile) \ $(use_enable flac input-flac) \ $(use_enable mad input-mad) \ diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest index 55aae38d10f7..8cfd280bacec 100644 --- a/media-sound/pulseeffects/Manifest +++ b/media-sound/pulseeffects/Manifest @@ -1,7 +1,9 @@ AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2 DIST pulseeffects-4.7.3.tar.gz 2010399 BLAKE2B a77a24fe9f8708564b146d65eb10a0021a05f102bacd25ac137ce6a2d21017c4b5c68a57c5cb2345cc228280460f1163d5dbce038d3bd427829335c8aa78d9f4 SHA512 0170ae0fbc3f72120545657ad7013f81afb40a96224c690c41206b91ae7ac2637f17b19238ef7d8a9f21a361cb9e76a0e2bf83e84d1404cc69733e7ad156c3f4 +DIST pulseeffects-4.8.0.tar.gz 2003382 BLAKE2B 4ec1089d0d3051a9697c08adf8305ce9c0ef794d6cffe25a36ffdc174d5b63ac94dee09cca0970948c25fa948c8ec521bc750a2b2e08f7f204889eceb65c0de9 SHA512 1fa32f34d2e1aa9fc87eaaecc73a5aad017f2bfd26228edb0cba938e2ab0146e8882fef4b8d74364030d7a78467e728f4e517870be422619d87be2c964b55492 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd EBUILD pulseeffects-4.7.3.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b -EBUILD pulseeffects-9999.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b +EBUILD pulseeffects-4.8.0.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3 +EBUILD pulseeffects-9999.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1 diff --git a/media-sound/pulseeffects/pulseeffects-4.8.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.0.ebuild new file mode 100644 index 000000000000..cbfd497f5e76 --- /dev/null +++ b/media-sound/pulseeffects/pulseeffects-4.8.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2-utils meson + +DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio" +HOMEPAGE="https://github.com/wwmm/pulseeffects" + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + SRC_URI="" + EGIT_REPO_URI="https://github.com/wwmm/pulseeffects" +else + SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="bs2b calf rubberband" + +#TODO: optional : lilv, zam-plugins (check from archlinux pkg) +RDEPEND=" + >=dev-libs/boost-1.41:= + >=dev-cpp/glibmm-2.56.0 + >=dev-cpp/gtkmm-3.24:3.0 + >=dev-libs/glib-2.56:2 + >=dev-libs/libsigc++-2.10:2 + >=x11-libs/gtk+-3.18:3 + >=media-libs/lilv-0.24.2-r1 + >=media-libs/lsp-plugins-1.1.24[lv2] + >=media-libs/gstreamer-1.12.0:1.0 + >=media-libs/gst-plugins-good-1.12.0:1.0 + >=media-libs/gst-plugins-bad-1.12.0:1.0 + bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) + >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 + >=media-plugins/gst-plugins-lv2-1.12.0:1.0 + >=media-plugins/gst-plugins-pulse-1.12.0:1.0 + calf? ( >=media-plugins/calf-0.90.0[lv2] ) + rubberband? ( media-libs/rubberband ) + >=media-libs/zita-convolver-3.0.0 + media-libs/libebur128 + media-sound/pulseaudio + sys-apps/dbus" +# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib +# and sys-devel/gettext depends reasoning +DEPEND=" + ${RDEPEND} + dev-libs/appstream-glib + sys-devel/gettext +" +BDEPEND=" + >=sys-devel/gcc-7.3.0 + dev-util/itstool + media-libs/libsamplerate + virtual/pkgconfig +" + +pkg_postinst() { + gnome2_gconf_install + gnome2_schemas_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_gconf_uninstall + gnome2_schemas_update + xdg_icon_cache_update +} diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild index 4ebaa69f9547..cbfd497f5e76 100644 --- a/media-sound/pulseeffects/pulseeffects-9999.ebuild +++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild @@ -19,18 +19,18 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="bs2b calf mda-lv2 rubberband" +IUSE="bs2b calf rubberband" #TODO: optional : lilv, zam-plugins (check from archlinux pkg) RDEPEND=" >=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0 - >=dev-cpp/gtkmm-3.20:3.0 + >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 - >=media-libs/lsp-plugins-1.1.7[lv2] + >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 @@ -39,7 +39,6 @@ RDEPEND=" >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) - mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 diff --git a/media-sound/pulsemixer/Manifest b/media-sound/pulsemixer/Manifest index a9ce68c58ea5..d80f3542956a 100644 --- a/media-sound/pulsemixer/Manifest +++ b/media-sound/pulsemixer/Manifest @@ -1,6 +1,4 @@ -DIST pulsemixer-1.5.0.tar.gz 21557 BLAKE2B 4c6cb9a3f9701301223c259532a0803a5c3e5f3abbce6f2763b6fd987f85aba56549e66861e9b69d0bf89c116c6c7e221d11cc65eb9a531402f74e8d63e9d824 SHA512 e07556a0cf2c9f660764977158cf1e338f7d8a92eae639c4a8f355847840e3aa9fb65adf553dbde905b64f2eff57c630bbfe19cfd5420b6205b1e2f688a6de64 DIST pulsemixer-1.5.1.tar.gz 21789 BLAKE2B 4a20be7b6499501adc64f5ac33b30ad1ea9418190104fbf452e1ed2bd3585552033c042554948b78b41e6a48c22ac62a42f4117b0311300bda738f7556ef1dc3 SHA512 c07b5e5fffa71ca60ed41e4c28a0f4ae5c8b5df9f269ea7376ed835b35536300f34504da724899bab5277f0c39a4c345654b99930ec8bdf4b43374d9b6d331be -EBUILD pulsemixer-1.5.0.ebuild 577 BLAKE2B 8b73807770eb336446a579febae9a28e0037f06e4fd99bd59d91bf1a0a5e9b601e0adae4494a51b128fdb679971b01baf177f6efcbccad2f37b4c169b285bfbb SHA512 2693ca3bf3366dbc9889fb40f4382cd9ab58de3a78e277aa0e73c8d90b512a226d62e0f24987ea0b6620fd687df22274efaf17b2d81cf547e64bfefe38f7adbc -EBUILD pulsemixer-1.5.1.ebuild 577 BLAKE2B 8e9250a77944164284605f392bbba2f1d2ad2404a56a99e049ef08e2a3443c36a3f5fa387e33d1ba6f46c8cfaa7de85e0821e8af7e8946cb5c01bd61fad5f991 SHA512 06b2cfc087cac32ce478f772f7887c716796da7fb9e8f4d8da9404db8d5bdd482dc7fae798c7d4c0771f64fa766b3553ca08b53854b812fd7eb0b1c07a72a98d +EBUILD pulsemixer-1.5.1.ebuild 589 BLAKE2B 8873721fd3393a7ace7f1749f09183042eb38af8d283d24746177e65dc41b2d6113f7e22fe688f6eaa1d0c1b8bbf4040b873e0a305a57213cd748bff851a42ea SHA512 dee7b7669d01633538ac6dcce3bf0b299b88af4f911f6fd18f75e6db5e2ed2d8ad9db5a9b162c44c6569ea5b8e52465235ced9ae051261099fa014b6d28a5274 EBUILD pulsemixer-9999.ebuild 577 BLAKE2B 8b73807770eb336446a579febae9a28e0037f06e4fd99bd59d91bf1a0a5e9b601e0adae4494a51b128fdb679971b01baf177f6efcbccad2f37b4c169b285bfbb SHA512 2693ca3bf3366dbc9889fb40f4382cd9ab58de3a78e277aa0e73c8d90b512a226d62e0f24987ea0b6620fd687df22274efaf17b2d81cf547e64bfefe38f7adbc -MISC metadata.xml 539 BLAKE2B 3c4aeb04befd6535d90492837abf142f83ca907b9d158688488537b9edea29f00973763a8d59ca3deb5bfa34a0949d1e57fa7251f014f1750f854b5ebd3044b0 SHA512 9bf6daf8ce060e87586f3c2abfe56631785624d7e449cddca3d488ec298917da2413d28db0ada915bfda40d75715a07f17db5413890fbe6a3667c34599818e0d +MISC metadata.xml 539 BLAKE2B a6a5b4a697f8009c2065d9df6ea91a43c34b5362fe0129560ecc52655391b9e9b15875189fa4d40e93b780041c44dca49546f85a32e5b4e9bfce787a6af2c9dd SHA512 a90de79e4b49b0a1ab8b3306962af79d3e7ea606d010edabd16986edafe770f0e5be12112c7eff6c01739b7168be4ec3952919ada251c40895212f299e3c755a diff --git a/media-sound/pulsemixer/metadata.xml b/media-sound/pulsemixer/metadata.xml index 8878000e28fb..5cffdd8cf98c 100644 --- a/media-sound/pulsemixer/metadata.xml +++ b/media-sound/pulsemixer/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jchelmertt3@gmail.com</email> + <email>jchelmert3@posteo.net</email> <name>John Helmert III</name> </maintainer> <maintainer type="project"> diff --git a/media-sound/pulsemixer/pulsemixer-1.5.0.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.0.ebuild deleted file mode 100644 index 45f1ee6b0c9b..000000000000 --- a/media-sound/pulsemixer/pulsemixer-1.5.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="ncurses" - -inherit distutils-r1 - -DESCRIPTION="CLI and curses mixer for PulseAudio" -HOMEPAGE="https://github.com/GeorgeFilipkin/pulsemixer" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}" -else - SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND="media-sound/pulseaudio" diff --git a/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild index 7f8ba30cd070..55f1eba0f934 100644 --- a/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild +++ b/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}" else SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="MIT" diff --git a/media-sound/pwavecat/Manifest b/media-sound/pwavecat/Manifest index 5005c00e910f..8168c5aa9d75 100644 --- a/media-sound/pwavecat/Manifest +++ b/media-sound/pwavecat/Manifest @@ -1,5 +1,7 @@ -AUX pwavecat-0.4.5-overflow.patch 1255 BLAKE2B fba5c647534041b1e22884422dcc09d540d706ca716fa0b640061b12839cbe910d17bd1099bfed78e4633cc415855778290fe10afe1fe3441969d7c6d6f5277b SHA512 560281481a1de5550f8a491d77aed483a297c5d192d71d75d0aca2274c7afb15fa7ebe01070a07961f05c15fc0adbff41548e9722d9a94b369120b8ffea225c5 -AUX pwavecat-0.4.5.diff 823 BLAKE2B c6cbd638495c8dc1bf011c26fb6ee2bf07cfb3ca77b1c29fed56585f1680c0514055f1f3b446f7b57a30682d874b729b20af1aa76e0db2d04cb9f2df5d5c0f17 SHA512 a92e9f242cb79af4392f099b2fc2014c97676e679e2646cfb5eeb5fca8173e953c031eeee8e72de08efe68750773fae77d8009ee12a43ed8be7eff6d57818336 +AUX pwavecat-0.4.5-Makefile.patch 517 BLAKE2B 4251dc8fbb415ffa800bf4db13e9f4c8af717e2c12e06d23a61e9cfa21f6875d71a4bba002728288233cbdce71cb28056bba8df09df6c04b07d15ba86441fb2b SHA512 15c3dbb210ee6bb0a00b7553cc63b5748e91fb16ff16c80da71301645d7f39d96344211973c61a0712cbb75dd0b6466a9932d1c4e704e374977747be161e08e3 +AUX pwavecat-0.4.5-fno-common.patch 1321 BLAKE2B e05ff91073e186f4dd21db8206ce7a7a6c3265331d60bdf8e447eb82e380532159f7f5f35e1814064f586d8e93cf1de00be2bd6a0301c4de7badaa53f5e3b947 SHA512 364d10b624afcd4c1833526ee1e7bde59314a95d54f2430b2120498ce67793be66dfd947790ba8142957ea296fb8605adb6075b401da970e26e77d1d158238e3 +AUX pwavecat-0.4.5-overflow.patch 1194 BLAKE2B e26022b3f90857d066784ef7e6a28914fdfec98135a955325ffd6cc58a6cd0ad9b64e3214d8da27ffd0de6efff477c31054d4ac34dec1e0942608ffdd09a539e SHA512 3d8de7db2aa0522f8fd6a0b5c5c820822eb00ab22603bd8cb385870783e9dfee679712bfb6d6d7f439ffcbfcb5a8cfbecafa0ad71822510c181b2e93164f79ba +AUX pwavecat-0.4.5-version.patch 172 BLAKE2B d5ad793c259b22116e7a4ab56693825853c06cf6c75702ee34e0fd0e475fa1b662539d9417bfbd2a27fa9fe3888834e4aea488240720094e410bbda5cdfd636c SHA512 41c6474b6e17572486f8215285d383933a3a8d6da2cdfc24f08784ceade3aebf94888ad513b357f90621a87783c30d1bcd79e9547f4869caa4b1d86790724b2d DIST pwavecat-0.4.5.tgz 13110 BLAKE2B 084286e2e056f73ed410f23ecea245466934f8475bd4143d216df312a51c62335155381ddfa1db2e9d5fcacd35dfd9fbb27d8b8cf0af5d4cdc110b64e03a57d5 SHA512 3faa03d08cc1cde47294837c0295eeabb8461327c9e13caa317b985fc12bdc8d00ec7207411aad1325a54c7cc63cca5f5638db5c988c7e6887f3a0d77b5ace55 -EBUILD pwavecat-0.4.5.ebuild 633 BLAKE2B efb22190797d5e304f300c2e2c3a28d48c411ce2253ecb394960e869f7d7f370863fe2e44b41726fa249a099ef93c8ed75b71dded7113cbbec687d8755ec2d57 SHA512 62148f51efb4b5f08e4c12f04b00a6dd891ff5d1308ca81e73dfbe1de893c487d3992a87a6c9165c2821a6eee5ab9ac18d69966b2d97c68a3cc7690332ed93e3 +EBUILD pwavecat-0.4.5.ebuild 620 BLAKE2B 5032dd4b59b3320e9a6aa6a99eda8020d63474f5bf7226fdb0b65393ac1d1507966daeb4a7dce01a705104bdec6f6e8057031940e4b484943d02fa437f550dfb SHA512 58cfada7955199b72856db88fe2afbe5ff332f19655399fdb9d6dc414d06c541e6c70b544948cd92d93c06ea79de22f50d5cf004b6a7c45c5e52d4660ad9fff9 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch new file mode 100644 index 000000000000..c46bbc6ef100 --- /dev/null +++ b/media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch @@ -0,0 +1,27 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + #CC=/usr/local/bin/gcc + + +-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS += -Wall + + LIBRARY = + +@@ -14,14 +14,8 @@ + pwavecat.o \ + parts.o + +-all: +- gcc $(CFLAGS) -c $(SRC1) +- +- gcc -o pwavecat $(OBJECT1) $(LIBRARY) +- + # DEPENDENCIES +-pwavecat.o : pwavecat.c pwavecat.h pwavecat_proto.h parts.h wave_header.h +-parts.o : parts.c parts.h pwavecat.h pwavecat_proto.h wave_header.h ++pwavecat: parts.o + + install: + cp pwavecat /usr/local/bin/ diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch new file mode 100644 index 000000000000..7fb567e0425c --- /dev/null +++ b/media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch @@ -0,0 +1,65 @@ +--- a/parts.c ++++ b/parts.c +@@ -19,6 +19,7 @@ + + #include "pwavecat.h" + ++struct part *parttab[2]; + + struct part *lookup_part(char *name) + { +--- a/parts.h ++++ b/parts.h +@@ -12,7 +12,7 @@ + struct part *nxtentr; + struct part *prventr; + }; +-struct part *parttab[2]; ++extern struct part *parttab[2]; + /* first element points to first entry, second element to last entry */ + + #endif /* _PARTS_H_ */ +--- a/pwavecat.c ++++ b/pwavecat.c +@@ -38,6 +38,9 @@ + // DWORD data_length; /* length of data */ + // } wave_header; + ++int debug_flag; ++int verbose_flag; ++ + int modus; + int sample_fq; + int byte_p_sec; +--- a/pwavecat.h ++++ b/pwavecat.h +@@ -12,20 +12,20 @@ + #include "wave_header.h" + #include "parts.h" + +-int debug_flag; +-int verbose_flag; ++extern int debug_flag; ++extern int verbose_flag; + +-int sample_fq; +-int byte_p_sec; +-int byte_p_spl; +-int bit_p_spl; +-int modus; +-int have_format_flag; // set if first wave header is read, now file format is set. ++extern int sample_fq; ++extern int byte_p_sec; ++extern int byte_p_spl; ++extern int bit_p_spl; ++extern int modus; ++extern int have_format_flag; // set if first wave header is read, now file format is set. + + #define MAX_FILES 100 + #define BUFFER_SIZE 65536 + +-char *input_filename[MAX_FILES]; ++extern char *input_filename[MAX_FILES]; + + #define VERSION "0.4.5" + diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch index f3d54221bc7d..12db68a57cf2 100644 --- a/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch +++ b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch @@ -1,5 +1,3 @@ -diff --git a/parts.c b/parts.c -index 670d0d5..a59ad98 100644 --- a/parts.c +++ b/parts.c @@ -338,10 +338,10 @@ if(! file_header) diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-version.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-version.patch new file mode 100644 index 000000000000..07e263b13be4 --- /dev/null +++ b/media-sound/pwavecat/files/pwavecat-0.4.5-version.patch @@ -0,0 +1,11 @@ +--- a/pwavecat.h ++++ b/pwavecat.h +@@ -27,7 +27,7 @@ + + char *input_filename[MAX_FILES]; + +-#define VERSION "0.4.4" ++#define VERSION "0.4.5" + + #endif /* _PWAVECAT_H_ */ + diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5.diff b/media-sound/pwavecat/files/pwavecat-0.4.5.diff deleted file mode 100644 index abe00c69daec..000000000000 --- a/media-sound/pwavecat/files/pwavecat-0.4.5.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur pwavecat-0.4.5.orig/Makefile pwavecat-0.4.5/Makefile ---- pwavecat-0.4.5.orig/Makefile 2005-10-06 15:52:56.000000000 +0200 -+++ pwavecat-0.4.5/Makefile 2007-10-06 16:27:25.000000000 +0200 -@@ -15,9 +15,9 @@ - parts.o - - all: -- gcc $(CFLAGS) -c $(SRC1) -+ $(CC) $(CFLAGS) -c $(SRC1) - -- gcc -o pwavecat $(OBJECT1) $(LIBRARY) -+ $(CC) $(LDFLAGS) -o pwavecat $(OBJECT1) $(LIBRARY) - - # DEPENDENCIES - pwavecat.o : pwavecat.c pwavecat.h pwavecat_proto.h parts.h wave_header.h -diff -Naur pwavecat-0.4.5.orig/pwavecat.h pwavecat-0.4.5/pwavecat.h ---- pwavecat-0.4.5.orig/pwavecat.h 2005-10-06 15:52:56.000000000 +0200 -+++ pwavecat-0.4.5/pwavecat.h 2007-10-06 16:27:50.000000000 +0200 -@@ -27,7 +27,7 @@ - - char *input_filename[MAX_FILES]; - --#define VERSION "0.4.4" -+#define VERSION "0.4.5" - - #endif /* _PWAVECAT_H_ */ - diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild index 21a4580caba4..f49e51ba3f36 100644 --- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild +++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="concatenates any number of audio files to stdout" HOMEPAGE="http://panteltje.com/panteltje/dvd/" @@ -12,19 +12,20 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" PATCHES=( - "${FILESDIR}/${P}.diff" - "${FILESDIR}/${P}-overflow.patch" + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-version.patch + "${FILESDIR}"/${P}-overflow.patch + "${FILESDIR}"/${P}-fno-common.patch ) -src_compile() { - append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +src_configure() { + append-lfs-flags + tc-export CC } src_install() { dobin pwavecat - default + einstalldocs } diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest index 3d60dbd8a6df..6730ce95c065 100644 --- a/media-sound/qastools/Manifest +++ b/media-sound/qastools/Manifest @@ -1,7 +1,8 @@ AUX qastools-0.22.0-nomancompress.patch 4667 BLAKE2B e9d11e1aeae8eba81ca60dbfb37da0c5e8efcc30d62899806b9415898a2484ed833caa42dfab2f5532f551486f3ce592e260c9b8396289d27eb488be00a06344 SHA512 ee10a90d8c92eeb124bef8ae6edc023cf452585679380c4e7cb406ed41cd4d04db3b8075f89c2925d2d020fc9a0d035d8e3762e2af92085418e5eb94064c604c AUX qastools-0.22.0-qt-5.15.patch 2047 BLAKE2B 01a473dce7c070b47e611ea7f05d1a16b07a6c7c692f8a98bde7dd12b286cdea04fe79fdf62ab99e1b5cd5c678181fb4f266ec35627291674475918505a59dbf SHA512 9fdd644cbb100df9ef2d593a4ba24f9fa4cda242e41e4f909e57f3e23adde566763b50b82c7e756b40623038c3df88df49d59da3efec9509c6fc0b1101bfae5d +AUX qastools-0.23.0-nomancompress.patch 4753 BLAKE2B 62755c3381455e89afc2c9de5fdb1668a93936c5f238b938cbddd608a3b4e7421982f5bcf4cae027e005db1db9c19e870f28aaffc098d421cb245a080b4c70ab SHA512 a3b54f0313e1c0019d6a25009befecb2e48b022fddf78ce38e1c52194ef8711160e9d72bc637bf3c55223a043e091550cfdb8582c1cfd1044bb5a96bbaa76dce DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712 -DIST qastools_0.21.0.tar.xz 206548 BLAKE2B e9a8e9f20aa6d0388f16866911c0bc85da28ff51e6e23d3d61fd2bd0fc1540630caf4f95807d6072c96f73372d4633eef7f9148a9940552e9bd0c76fba7de20e SHA512 17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b -EBUILD qastools-0.21.0.ebuild 676 BLAKE2B 9a472ba6e291477c858996f91eee97ec732221c33d09e4681b18350a4ab92c3b08ea055ab4611ad5340fd6006554004a7def8bb571fdfa3c5f8cc435c9a542d0 SHA512 82527c93e4b524b63344169c22bcf699fe8302afb357bb9b5eeff89e75c8bed8f33a7ad24c8f4a850162f9137a9bd774b04c06cc65a1d170a533c8cd9319ce86 -EBUILD qastools-0.22.0.ebuild 829 BLAKE2B 9b37e864b14554819d6e3b6ca241e98152b8ff09a71a38eb342dbe059e9eb540c143c02c89b5cc16df0023763de8e84021e1a5dbbad5f06fef6d003d0ba7ed9f SHA512 f8950b1396bca869eae32296ef9f836360cc85660738d0f1fa62761d9424af4962bc1148ce3f53613e4c8365bf31cad714cc436d8fd836144c7a65396f902c63 +DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9 +EBUILD qastools-0.22.0.ebuild 827 BLAKE2B 313456cebd163c4ecb5d9a73f41a2c7d246d37597a61d8904074b8d9fe4b13465bdde4cab980e9ac80fa8803ef5d324789ba73f0bc8845ef84ab55ec6433f340 SHA512 ddc5f654b3f99831537df6f76a40852f0d098729aad24e4131bb310463ea37281801409693ed55009936325d80831469032f697d58f2719ba15bf37d7d0d637e +EBUILD qastools-0.23.0.ebuild 794 BLAKE2B 8d5d7e15b2d3c806294ba7d48bc3b76ae5c1ab97ace908d5658f7e4d615ef4fd3256a6842b47511beb852e78aed9e88311bd8b759d87060e14006ce1799e99e4 SHA512 618ab55bf38feb98e234e508d3c32f70b2a60aa3b93f71fb766fce21bb0a89c81096a7faafb1fbe9de4f5432bf1f739849f6dc1c2bf2f395fcf49774349a9c7a MISC metadata.xml 325 BLAKE2B 1568315a082d0a94f0dc43ae932dce5ca93e9cbced0c7cf7f518900b594281f012809f729e62501271606bfd0f31ec04870f3849e47730fb196689f16088b73c SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276 diff --git a/media-sound/qastools/files/qastools-0.23.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.23.0-nomancompress.patch new file mode 100644 index 000000000000..477e5f1d9f34 --- /dev/null +++ b/media-sound/qastools/files/qastools-0.23.0-nomancompress.patch @@ -0,0 +1,173 @@ +From 6532d0458e027485d997091f57d651e517d53c38 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 8 Jun 2020 11:45:09 +0200 +Subject: [PATCH] Compress manpages optionally + +--- + qasconfig/share/man/CMakeLists.txt | 26 +++++++++++++------------- + qashctl/share/man/CMakeLists.txt | 26 +++++++++++++------------- + qasmixer/share/man/CMakeLists.txt | 26 +++++++++++++------------- + 3 files changed, 39 insertions(+), 39 deletions(-) + +diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt +index 638b6a3..6ab3f7e 100644 +--- a/qasconfig/share/man/CMakeLists.txt ++++ b/qasconfig/share/man/CMakeLists.txt +@@ -1,35 +1,35 @@ + # Find gzip +-FIND_PACKAGE ( UnixCommands REQUIRED ) +- +-IF ( NOT GZIP ) +- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) +-ENDIF ( NOT GZIP ) +- ++FIND_PACKAGE ( UnixCommands ) + + # Configure manpages + + SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) + SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) +-SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) ++SET ( man_gz .gz ) + + CONFIGURE_FILE ( ${man_src} ${man_plain} ) + + + # Compress manpages + ++IF ( NOT GZIP ) ++ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) ++ SET ( man_gz "" ) ++ELSE() + ADD_CUSTOM_COMMAND ( +- OUTPUT ${man_gz} +- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} ++ OUTPUT ${man_plain}${man_gz} ++ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} + DEPENDS ${man_plain} +- COMMENT "Building ${man_gz}" ) ++ COMMENT "Building ${man_plain}${man_gz}" ) ++ENDIF() + + ADD_CUSTOM_TARGET ( + qasconfig_manpage ALL +- DEPENDS ${man_gz} ) ++ DEPENDS ${man_plain}${man_gz} ) + + + # Installation of the manpage + +-INSTALL ( FILES ${man_gz} ++INSTALL ( FILES ${man_plain}${man_gz} + DESTINATION ${INSTALL_DIR_MAN} +- RENAME ${PROGRAM_NAME}.1.gz ) ++ RENAME ${PROGRAM_NAME}.1${man_gz} ) +diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt +index 1916374..57f4faa 100644 +--- a/qashctl/share/man/CMakeLists.txt ++++ b/qashctl/share/man/CMakeLists.txt +@@ -1,35 +1,35 @@ + # Find gzip +-FIND_PACKAGE ( UnixCommands REQUIRED ) +- +-IF ( NOT GZIP ) +- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) +-ENDIF ( NOT GZIP ) +- ++FIND_PACKAGE ( UnixCommands ) + + # Configure manpages + + SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) + SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) +-SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) ++SET ( man_gz .gz ) + + CONFIGURE_FILE ( ${man_src} ${man_plain} ) + + + # Compress manpages + ++IF ( NOT GZIP ) ++ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) ++ SET ( man_gz "" ) ++ELSE() + ADD_CUSTOM_COMMAND ( +- OUTPUT ${man_gz} +- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} ++ OUTPUT ${man_plain}${man_gz} ++ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} + DEPENDS ${man_plain} +- COMMENT "Building ${man_gz}" ) ++ COMMENT "Building ${man_plain}${man_gz}" ) ++ENDIF() + + ADD_CUSTOM_TARGET ( + qashctl_manpage ALL +- DEPENDS ${man_gz} ) ++ DEPENDS ${man_plain}${man_gz} ) + + + # Installation of the manpage + +-INSTALL ( FILES ${man_gz} ++INSTALL ( FILES ${man_plain}${man_gz} + DESTINATION ${INSTALL_DIR_MAN} +- RENAME ${PROGRAM_NAME}.1.gz ) ++ RENAME ${PROGRAM_NAME}.1${man_gz} ) +diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt +index 7fa745a..2929863 100644 +--- a/qasmixer/share/man/CMakeLists.txt ++++ b/qasmixer/share/man/CMakeLists.txt +@@ -1,35 +1,35 @@ + # Find gzip +-FIND_PACKAGE ( UnixCommands REQUIRED ) +- +-IF ( NOT GZIP ) +- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) +-ENDIF ( NOT GZIP ) +- ++FIND_PACKAGE ( UnixCommands ) + + # Configure manpages + + SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) + SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) +-SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) ++SET ( man_gz .gz ) + + CONFIGURE_FILE ( ${man_src} ${man_plain} ) + + + # Compress manpages + ++IF ( NOT GZIP ) ++ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) ++ SET ( man_gz "" ) ++ELSE() + ADD_CUSTOM_COMMAND ( +- OUTPUT ${man_gz} +- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} ++ OUTPUT ${man_plain}${man_gz} ++ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} + DEPENDS ${man_plain} +- COMMENT "Building ${man_gz}" ) ++ COMMENT "Building ${man_plain}${man_gz}" ) ++ENDIF() + + ADD_CUSTOM_TARGET ( + qasmixer_manpage ALL +- DEPENDS ${man_gz} ) ++ DEPENDS ${man_plain}${man_gz} ) + + + # Installation of the manpage + +-INSTALL ( FILES ${man_gz} ++INSTALL ( FILES ${man_plain}${man_gz} + DESTINATION ${INSTALL_DIR_MAN} +- RENAME ${PROGRAM_NAME}.1.gz ) ++ RENAME ${PROGRAM_NAME}.1${man_gz} ) +-- +2.28.0 + diff --git a/media-sound/qastools/qastools-0.21.0.ebuild b/media-sound/qastools/qastools-0.21.0.ebuild deleted file mode 100644 index 52bc9b5486cf..000000000000 --- a/media-sound/qastools/qastools-0.21.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -MY_P=${PN}_${PV} - -DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser" -HOMEPAGE="http://xwmw.org/qastools/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - virtual/libudev:= -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -S=${WORKDIR}/${MY_P} - -src_configure() { - local mycmakeargs=( -DSKIP_LICENSE_INSTALL=TRUE ) - cmake-utils_src_configure -} diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild index 040661446193..579642b937f1 100644 --- a/media-sound/qastools/qastools-0.22.0.ebuild +++ b/media-sound/qastools/qastools-0.22.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" BDEPEND=" diff --git a/media-sound/qastools/qastools-0.23.0.ebuild b/media-sound/qastools/qastools-0.23.0.ebuild new file mode 100644 index 000000000000..9f055f434b6b --- /dev/null +++ b/media-sound/qastools/qastools-0.23.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser" +HOMEPAGE="https://gitlab.com/sebholt/qastools" +SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/alsa-lib + virtual/libudev:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-nomancompress.patch" ) + +S="${WORKDIR}"/${PN}-v${PV} + +src_configure() { + local mycmakeargs=( + -DSKIP_LICENSE_INSTALL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON + ) + cmake_src_configure +} diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest index e35832b51738..e3efecf9a869 100644 --- a/media-sound/qjackctl/Manifest +++ b/media-sound/qjackctl/Manifest @@ -1,4 +1,6 @@ DIST qjackctl-0.6.2.tar.gz 1027742 BLAKE2B d2db9e0496223844e3cb289aa8c4ae136011ad36578f3526fd54b44344606e14885d7272bd8e333035b2c908216e60ce2bfe7698c4c8395fd3b017da6b64f03f SHA512 a05f514d749b4f2344c7f0d57a2a0dd1ac6a97f35d0227827e78d3bd7abfbddc3201e2fc7e23f878cd318e408f169a4006a150dc0e43101086e9ba32004e5520 +DIST qjackctl-0.6.3.tar.gz 1033664 BLAKE2B 98d80d0fea3db359b732fad14711352ba688e605b7225daad64d7df1dabf1d19e24b4d643581f1936afa0df0c84350cf5727686246bd8a850e09da969a228e44 SHA512 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b EBUILD qjackctl-0.6.2.ebuild 1227 BLAKE2B d620ddcc5f4e2fe0b691dbcc1bc22d1882597de0481366dfa2909be7b759d6ba1b301a8a75e839a5cdf6d7c9abd8e15222ca425b9593c5753e56d1475bab7711 SHA512 e06251755f474ad4e06a91feebd3f514eba6de3072d85f5a6c23667f0cde7304d5879a9a7b9d29f335220bd723e5e9e5803aee965e2d3293083c89fa5d00b0af -EBUILD qjackctl-9999.ebuild 1280 BLAKE2B 601994fadff1a533cbb05935246832099648f5933dc79f6fa5bf26ed77239fd268e0c755d26aa148d73f936b3dccca2691e42f9627cc31a068241871dbb03d54 SHA512 c614e03bfa3c1d53d546d882b4f28d59f39401ca405f28c71520cd15606e6ba3040313573c569ece6dd6de4683d53ea63d0394173d9692685a0f1220e537ab71 +EBUILD qjackctl-0.6.3.ebuild 1139 BLAKE2B 99e675983c1880f44ef99ef024dfcf2d063f9ba7d98afeb7b8c13e138decc46ca4c5981c93cb4fe003a4c97a5c7f6bd238c60b2545924a52b693245896a1a781 SHA512 ca91cccec3dd6f42cbe784c8eecde0b92a6fe1989a836791747910d1ca23abaa4b65967c2498f18d100061172e79185c8bbac2f9f1e398a0a86904102f21f1ed +EBUILD qjackctl-9999.ebuild 1190 BLAKE2B 2b78ad39d1ffc40cfaa4ee47e670bfd39c0af52919f591214b21edc6756011f531ce08aeba187a0cde72a3d04b3ad7d1f87754610e2579ec59950797daad1740 SHA512 8461a4b4777a31bdee87cb1d10c40e914fff708e9512570512cce03312be5e6b3c4517185d7c32e0b59ac1c12f1d4720a309960b53dc7eedcd8e3a5e27ce560a MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9 diff --git a/media-sound/qjackctl/qjackctl-0.6.3.ebuild b/media-sound/qjackctl/qjackctl-0.6.3.ebuild new file mode 100644 index 000000000000..00a83f8b64bf --- /dev/null +++ b/media-sound/qjackctl/qjackctl-0.6.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic qmake-utils xdg + +DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections" +HOMEPAGE="https://qjackctl.sourceforge.io/" +SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa dbus debug portaudio" + +BDEPEND="dev-qt/linguist-tools:5" +RDEPEND=" + app-arch/gzip + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + virtual/jack + alsa? ( media-libs/alsa-lib ) + dbus? ( dev-qt/qtdbus:5 ) + portaudio? ( media-libs/portaudio )" +DEPEND="${RDEPEND}" + +src_configure() { + append-cxxflags -std=c++11 + local myeconfargs=( + $(use_enable alsa alsa-seq) + $(use_enable dbus) + $(use_enable debug) + $(use_enable portaudio) + --enable-jack-version + ) + econf "${myeconfargs[@]}" + eqmake5 ${PN}.pro -o ${PN}.mak +} + +src_compile() { + emake -f ${PN}.mak +} + +src_install() { + default + + gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz" || die + gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die +} diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild index 3d91bddef6f4..61dd95c2c302 100644 --- a/media-sound/qjackctl/qjackctl-9999.ebuild +++ b/media-sound/qjackctl/qjackctl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic qmake-utils autotools git-r3 xdg-utils +inherit flag-o-matic qmake-utils autotools git-r3 xdg DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections" HOMEPAGE="https://qjackctl.sourceforge.io/" @@ -56,11 +56,3 @@ src_install() { gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz" || die gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest index f956a4acb8c4..d78adaeec212 100644 --- a/media-sound/qmidiarp/Manifest +++ b/media-sound/qmidiarp/Manifest @@ -1,3 +1,3 @@ -DIST qmidiarp-0.6.4.tar.bz2 537804 BLAKE2B 6cb1ed8e2abd1289b65d9a2a1a2762caec673fc5df5d3a847d7d872ae9b2fad5b1dadfdf94ab79f762ddb769ae65d7b919a8ed8cf93835b4a6a2e21ef974aa82 SHA512 06f3dc52c6673f452af4d5c5f4d2efc50fbe16b8fe792cb9d115f9efa124224e0131e763d31ee60cee68b78d952061e69976a09fa3118b23362ea3cea76260d0 -EBUILD qmidiarp-0.6.4-r1.ebuild 850 BLAKE2B 76ea5cc1090b77a0baa266647093bebdf0802e5e5dc3810ed3144a44362444bb71962e911d55d286eb69b32175f65d6aad6d13d987fff894d001ab4110c97a78 SHA512 05a7b2a1b036a8eb298ec8fda5190f6c7af13cf0990ee3bc0024ee77d003b0f287b653b8ec8771c63d5a81ddf044e73297f88aa9e0179c80030e534ce64a9de6 +DIST qmidiarp-0.6.5.tar.bz2 541288 BLAKE2B eb2acb80c6fd442b197510eef2be000dc6a8e4cf7142cebbbbd156dad464f80062cc0a41881476aedc41c1b7cff27b1c56ae64354134b255b6cbd7672ef182f0 SHA512 171d74230a77b15453367fd38f9bcc94bbbd025a9665853180172bdfd812c2ee5ae0954124706d46c7e5cec0aafaebd5de68435f717789f052e7f86c48917379 +EBUILD qmidiarp-0.6.5.ebuild 797 BLAKE2B 841918068fe901cdf1b9fb6e48542b643fd16020fa36ced955e78b18035789e34e5c466d352d1c9229d656ecc1bf874158fae7675ee18932ddd0f831b792c70e SHA512 216d9ea1fe06af480d45b31d522e28606d5c130f1e17efa7719c67ebcb9275881cf75c32e21a9a15e37e47ae0d402ef00e0076c131751c28a8b3e7c385a7183f MISC metadata.xml 399 BLAKE2B 5c11c34be94abf2b8497e14bdffcc16baf402efe2fe4645dec9b61524fe06e92245eb75d93e519074a172f45bd2ae43a1c4963c2ea82cda6cbc6f46d2534d76d SHA512 5db8b45e29ca3273d2ee4f61d4b3ee356ec361fa241eaab4b8d77193bed588b36db6d8184b99f3333061c254854f2ebee42301c66e755943d7b126b8465bc7fc diff --git a/media-sound/qmidiarp/qmidiarp-0.6.4-r1.ebuild b/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild index 3e2094065a09..3f32bdbdb919 100644 --- a/media-sound/qmidiarp/qmidiarp-0.6.4-r1.ebuild +++ b/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic qmake-utils +inherit qmake-utils xdg DESCRIPTION="Arpeggiator, sequencer and MIDI LFO for ALSA" HOMEPAGE="http://qmidiarp.sourceforge.net/" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="nls lv2 osc" +IUSE="lv2 nls osc" BDEPEND=" nls? ( dev-qt/linguist-tools:5 ) @@ -30,10 +30,7 @@ DEPEND="${RDEPEND}" src_configure() { export PATH="$(qt5_get_bindir):${PATH}" - append-cxxflags -std=c++11 - local myeconfargs=( - --enable-qt5 $(use_enable lv2 lv2plugins) $(use_enable nls translations) $(use_enable osc nsm) diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest index 4f2cb113e45f..cd31c64499d9 100644 --- a/media-sound/qmmp/Manifest +++ b/media-sound/qmmp/Manifest @@ -1,8 +1,10 @@ DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4 DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d498c1de0549414b728fd9eb88e238bcffde9a3bd74e75adf106b6bf4fcb120547a83892c0bca8da17bf18f2ee SHA512 a67185fcdc7419c8542e64fd54eea3302dcf44c5d8d0c3b739ce3115b00811733234807460d39585ee57b7e105a52285ee3aafa9f24d86d2af09e881ebf2e068 DIST qmmp-1.4.0.tar.bz2 1293438 BLAKE2B 9da3a00a31dd0ad03f3405dbae65f55d7b4fbde2a3a030d2cbe8d11ac9b5660754e519aff19431dada792f2ebb02e40fa05e177ad6bedc37e3aa5d7e2a441642 SHA512 b4ae764c223e1ce28477e86493ba409429e191ff51ef11d9b7c4fa356f90e5ff7e390bc8d1dcaf7779b231d59bf668d64000ea196b4020a7255eeb009706643d -EBUILD qmmp-1.3.2-r1.ebuild 4203 BLAKE2B b2ef63f7fc9f580b9acba8fbb91ceb243a701c23813cbf827a9304700fcc1c2ec2f2ac60d842d55280ee6cef61615f7ed9d19521d7494ee7703e951164f4fa62 SHA512 261846c7d2a4ec4a0d2f10b2aec542deac3ef6f6fc11b606fe880e9c2ff3c0416c6f9e44d0a8e712e7f87e0252ce09bae6f13ec60bbd5f63eb20a01055690046 -EBUILD qmmp-1.3.7.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185 -EBUILD qmmp-1.4.0.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185 -EBUILD qmmp-9999.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185 +DIST qmmp-1.4.1.tar.bz2 1296224 BLAKE2B 4a4b72f30bbfb06d312d69c9c0d48fcaaed2d936453ab29c0bd5223819358d2894f4f016a8203c2ea15b7a193b811ae2892e700dec98e580393a9fbf5e0f767c SHA512 af971447383730328e33dc724b9d598a26404517d5aa6e8bb5a2d84bbeb1f628d363383bb5ddc571855d8416b084edd09f64174de7985788671e47317ec9f1bf +EBUILD qmmp-1.3.2-r1.ebuild 4207 BLAKE2B 3da46dab28fbf9747f35cefae578dcc3b407abc2c5b032060e7eb8a401911ab5f4a798932e42e82fd2967e45ee4af90aa7d7d63b0455a468c2bca50a4dbffb7a SHA512 4d8eb5669edde5f39c4a0212f4bda8704606f3c995996c6660d97ca2711bd63af80e88c08e666d09b09853684ec26506b432d4242a09c38bb5c8d6e140abfb51 +EBUILD qmmp-1.3.7.ebuild 4181 BLAKE2B b3bec00895515fda32c1cafb6c261fcfc9408176e865f3629189e7bfbca5269661fab298466ce1185a41c54f29b5a1e2d9e69eed8378eee25e733d84405b6c1c SHA512 83b77d61fe775d1b4d4f475cb49a9c48eadd366a7e09b11fd8244afaecdf4b355afeed0dad9aedcbbd1472e790b212c6a1c2e2094bd171c10509485d795e68bc +EBUILD qmmp-1.4.0.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427 +EBUILD qmmp-1.4.1.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427 +EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c diff --git a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild index f11837f77b72..ac37a740c308 100644 --- a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild +++ b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild @@ -58,7 +58,7 @@ RDEPEND=" media-libs/libsamplerate media-sound/jack-audio-connection-kit ) - ladspa? ( media-libs/ladspa-cmt ) + ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 diff --git a/media-sound/qmmp/qmmp-1.3.7.ebuild b/media-sound/qmmp/qmmp-1.3.7.ebuild index 4c02d12db02d..65622fdb05ff 100644 --- a/media-sound/qmmp/qmmp-1.3.7.ebuild +++ b/media-sound/qmmp/qmmp-1.3.7.ebuild @@ -57,7 +57,7 @@ RDEPEND=" media-libs/libsamplerate media-sound/jack-audio-connection-kit ) - ladspa? ( media-libs/ladspa-cmt ) + ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 diff --git a/media-sound/qmmp/qmmp-1.4.0.ebuild b/media-sound/qmmp/qmmp-1.4.0.ebuild index 4c02d12db02d..45e48d80e0dc 100644 --- a/media-sound/qmmp/qmmp-1.4.0.ebuild +++ b/media-sound/qmmp/qmmp-1.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake xdg-utils +inherit cmake xdg [[ ${PV} = 9999 ]] && inherit subversion DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" @@ -55,9 +55,9 @@ RDEPEND=" game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate - media-sound/jack-audio-connection-kit + virtual/jack ) - ladspa? ( media-libs/ladspa-cmt ) + ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 @@ -154,11 +154,3 @@ src_configure() { cmake_src_configure } - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-sound/qmmp/qmmp-1.4.1.ebuild b/media-sound/qmmp/qmmp-1.4.1.ebuild new file mode 100644 index 000000000000..45e48d80e0dc --- /dev/null +++ b/media-sound/qmmp/qmmp-1.4.1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg +[[ ${PV} = 9999 ]] && inherit subversion + +DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" +HOMEPAGE="http://qmmp.ylsoftware.com" +if [[ ${PV} != 9999 ]]; then + SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2 + mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +else + QMMP_DEV_BRANCH="1.3" + ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}" +fi + +LICENSE="GPL-2" +SLOT="0" +# KEYWORDS further up +IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game +gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm +pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack" + +REQUIRED_USE=" + gnome? ( dbus ) + shout? ( soxr vorbis ) + udisks? ( dbus ) +" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-libs/taglib + x11-libs/libX11 + aac? ( media-libs/faad2 ) + alsa? ( media-libs/alsa-lib ) + archive? ( app-arch/libarchive ) + bs2b? ( media-libs/libbs2b ) + cdda? ( + dev-libs/libcdio:= + dev-libs/libcdio-paranoia + ) + curl? ( net-misc/curl ) + dbus? ( dev-qt/qtdbus:5 ) + enca? ( app-i18n/enca ) + ffmpeg? ( media-video/ffmpeg:= ) + flac? ( media-libs/flac ) + game? ( media-libs/game-music-emu ) + jack? ( + media-libs/libsamplerate + virtual/jack + ) + ladspa? ( media-plugins/cmt-plugins ) + mad? ( || ( + media-libs/libmad + media-sound/mpg123 + ) ) + midi? ( media-sound/wildmidi ) + mms? ( media-libs/libmms ) + modplug? ( >=media-libs/libmodplug-0.8.4 ) + mplayer? ( media-video/mplayer ) + musepack? ( >=media-sound/musepack-tools-444 ) + opus? ( media-libs/opusfile ) + projectm? ( + dev-qt/qtgui:5[-gles2-only] + dev-qt/qtopengl:5 + media-libs/libprojectm:= + ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) + qtmedia? ( dev-qt/qtmultimedia:5 ) + scrobbler? ( net-misc/curl ) + shout? ( media-libs/libshout ) + sid? ( >=media-libs/libsidplayfp-1.1.0 ) + sndfile? ( media-libs/libsndfile ) + soxr? ( media-libs/soxr ) + udisks? ( sys-fs/udisks:2 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + wavpack? ( media-sound/wavpack ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 +" + +DOCS=( AUTHORS ChangeLog README ) + +src_prepare() { + if has_version dev-libs/libcdio-paranoia; then + sed -i \ + -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ + src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_AAC="$(usex aac)" + -DUSE_ALSA="$(usex alsa)" + -DUSE_ANALYZER="$(usex analyzer)" + -DUSE_ARCHIVE="$(usex archive)" + -DUSE_BS2B="$(usex bs2b)" + -DUSE_CDA="$(usex cdda)" + -DUSE_COVER="$(usex cover)" + -DUSE_CROSSFADE="$(usex crossfade)" + -DUSE_CUE="$(usex cue)" + -DUSE_CURL="$(usex curl)" + -DUSE_KDENOTIFY="$(usex dbus)" + -DUSE_MPRIS="$(usex dbus)" + -DUSE_ENCA="$(usex enca)" + -DUSE_FFMPEG="$(usex ffmpeg)" + -DUSE_FILEWRITER="$(usex vorbis)" + -DUSE_FLAC="$(usex flac)" + -DUSE_GME="$(usex game)" + -DUSE_GNOMEHOTKEY="$(usex gnome)" + -DUSE_HAL=OFF + -DUSE_JACK="$(usex jack)" + -DUSE_LADSPA="$(usex ladspa)" + -DUSE_LYRICS="$(usex lyrics)" + -DUSE_MAD="$(usex mad)" + -DUSE_MIDI="$(usex midi)" + -DUSE_MMS="$(usex mms)" + -DUSE_MODPLUG="$(usex modplug)" + -DUSE_MPLAYER="$(usex mplayer)" + -DUSE_MPC="$(usex musepack)" + -DUSE_NOTIFIER="$(usex notifier)" + -DUSE_OPUS="$(usex opus)" + -DUSE_OSS="$(usex oss)" + -DUSE_PROJECTM="$(usex projectm)" + -DUSE_PULSE="$(usex pulseaudio)" + -DUSE_QSUI="$(usex qsui)" + -DUSE_QTMULTIMEDIA="$(usex qtmedia)" + -DUSE_SCROBBLER="$(usex scrobbler)" + -DUSE_SHOUT="$(usex shout)" + -DUSE_SID="$(usex sid)" + -DUSE_SNDFILE="$(usex sndfile)" + -DUSE_SOXR="$(usex soxr)" + -DUSE_STEREO="$(usex stereo)" + -DUSE_STATICON="$(usex tray)" + -DUSE_UDISKS2="$(usex udisks)" + -DUSE_VORBIS="$(usex vorbis)" + -DUSE_WAVPACK="$(usex wavpack)" + ) + + cmake_src_configure +} diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild index 4c02d12db02d..45e48d80e0dc 100644 --- a/media-sound/qmmp/qmmp-9999.ebuild +++ b/media-sound/qmmp/qmmp-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake xdg-utils +inherit cmake xdg [[ ${PV} = 9999 ]] && inherit subversion DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" @@ -55,9 +55,9 @@ RDEPEND=" game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate - media-sound/jack-audio-connection-kit + virtual/jack ) - ladspa? ( media-libs/ladspa-cmt ) + ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 @@ -154,11 +154,3 @@ src_configure() { cmake_src_configure } - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest index 21828ef53d29..5a2e7b4eba72 100644 --- a/media-sound/qsampler/Manifest +++ b/media-sound/qsampler/Manifest @@ -1,6 +1,8 @@ AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155 -AUX qsampler-9999-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751 +AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751 DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e +DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004 -EBUILD qsampler-9999.ebuild 1480 BLAKE2B e937433e396dfdb3474e9a5c53b4a4a45a0d729bfd6c08be4b07159e7d3cba8373887f513e6cfe5c981e977dd28bc05e5a7c629e8382f50ae3cc96f7fed48ea5 SHA512 520c03a9dc34616972b76f040f5438be71cf5395a5cca41053c864333f6d818fc17cad32c2760340760c1c018509bd420973778aa81cfacb5f96cb4fe0b9b304 +EBUILD qsampler-0.6.3.ebuild 1000 BLAKE2B 7bb7b8ef05cec4637340b639dfd562e2d16c0fae437aa987c50caccc62e8544d6c8b8cd33b4b1a5318acb395cd37cd8aa9d51a7236793b9aefa8e51601dc4274 SHA512 efdd00dd01f36a78e72f251a10e97816af5a18daa41135c488e8731e9a8fa93f8358088c41597b4426d33d319f5581a4df2d8f6f9c75fbe54b5801adfd55a27e +EBUILD qsampler-9999.ebuild 1079 BLAKE2B 7b68bb9196760efef7f8f8880356d0ec511d238333d192a9bdcb587fe90a6c9d019b52b52ea8fcbb5011fe1313d11f6bcfabdfe94bedac5a594ced17aa38a65d SHA512 30123798a8c6dc1adc28ac1d6f0e2bdd4e35375bc720e1bbf4641a8f5d565e1b42c29feae3f6d3f4f0eb1f224b2b4b7fbb879cf2f75442a7483f4f46438d1682 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch index 5da44d8a8175..5da44d8a8175 100644 --- a/media-sound/qsampler/files/qsampler-9999-Makefile.patch +++ b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild new file mode 100644 index 000000000000..6cb59ab6dfc0 --- /dev/null +++ b/media-sound/qsampler/qsampler-0.6.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils xdg + +DESCRIPTION="Graphical frontend to the LinuxSampler engine" +HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +libgig" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-libs/alsa-lib + >=media-libs/liblscp-0.5.6:= + x11-libs/libX11 + libgig? ( >=media-libs/libgig-3.3.0:= ) +" +RDEPEND="${DEPEND} + >=media-sound/linuxsampler-0.5 +" +BDEPEND="dev-qt/linguist-tools:5" + +DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS ) + +PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable libgig) + ) + ac_qmake="$(qt5_get_bindir)/qmake" \ + econf "${myeconfargs[@]}" + + cd src || die + eqmake5 src.pro -o Makefile +} diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild index c59da124ba79..fbbbc262bb94 100644 --- a/media-sound/qsampler/qsampler-9999.ebuild +++ b/media-sound/qsampler/qsampler-9999.ebuild @@ -3,20 +3,21 @@ EAPI=7 -inherit qmake-utils xdg autotools subversion +EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code" +inherit qmake-utils xdg autotools git-r3 DESCRIPTION="Graphical frontend to the LinuxSampler engine" HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" -ESVN_REPO_URI="https://svn.linuxsampler.org/svn/qsampler/trunk" LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="debug +libgig" -COMMON_DEPEND=" +DEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib @@ -24,16 +25,14 @@ COMMON_DEPEND=" x11-libs/libX11 libgig? ( >=media-libs/libgig-3.3.0:= ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} >=media-sound/linuxsampler-0.5 " -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 -" +BDEPEND="dev-qt/linguist-tools:5" DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS ) -PATCHES=( "${FILESDIR}/${P}-Makefile.patch" ) +PATCHES=( "${FILESDIR}"/${PN}-0.6.3-Makefile.patch ) src_prepare() { default @@ -53,17 +52,3 @@ src_configure() { cd src || die eqmake5 src.pro -o Makefile } - -pkg_postinst() { - # these are not run automagically in live ebuild for some reason so running them manually - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - # these are not run automagically in live ebuild for some reason so running them manually - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest index 3cff203ab486..a992a942c4cd 100644 --- a/media-sound/qsynth/Manifest +++ b/media-sound/qsynth/Manifest @@ -1,5 +1,7 @@ AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1 DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08 +DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2 EBUILD qsynth-0.6.2.ebuild 1400 BLAKE2B a1cb77b898f94ed280c1ba061bd6af65e7819fbcd204b1c52f6ed712f4b8b997eb1049c692a1b72c8a620eb4dcc118d44d8e42931a9adfab4f0bbab17bb6cf20 SHA512 cc3fa6b94b342d42541cb9b01aacaf349dee2cd9c73fab482c0ee8d78de5cb3dbecd2ca2924c7f6790ab565143690b324352a0bc1e19ca339252f9dec4e83f75 -EBUILD qsynth-9999.ebuild 1444 BLAKE2B 73fe5bb7f1217e209e80faeea59a0d250e49ab51b37bd3597650f3e68b3a84d8f4d1920a959a2a53bef6165175abed55d6ed6015d80b01028892503f82f4fdd4 SHA512 818faed6786b0369fa96d42493c9f99e27f0db9e45d7bfa709a95ff02f99e4712955e98316f19b14a2c309486f71c102db75b7b688c529f6c9ec50711dfb8fc9 +EBUILD qsynth-0.6.3.ebuild 1360 BLAKE2B 85c307a92f7b1168e5798740147434197642ebbc375b34e25c0ad67c81aee08a9ef92346a0d5e411ad6acad722c9291b982dd7eb0fc3270bb729897fe1a1db5c SHA512 697327bee1cdb81af3e3b68eaf2d247b7a26785d9c8ae89450deacf63dc9f391520eae1694de9ebef6569bf1a47c96b539bf31c42d80d5ee1268b2d470c231b3 +EBUILD qsynth-9999.ebuild 1399 BLAKE2B c37202cdc8cacadeccaff9256aa15d0d2877f2e69a2806d3d807b506ae1f8e17120f641f05c06a55322f080297b8fc5dfbf4a06234a6d8e86547d3605d83ca47 SHA512 5e58896d4ea6e3c85e6abcdf5d2f973e6e5c9f234814e3571d400cda70f82c257c1f7dab0a89c8ac6859bfb39f6fa09528602cef1eef9a81e852d51e07a5da1c MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933 diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild new file mode 100644 index 000000000000..5cb416916d3d --- /dev/null +++ b/media-sound/qsynth/qsynth-0.6.3.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop qmake-utils xdg-utils + +DESCRIPTION="Qt application to control FluidSynth" +HOMEPAGE="https://qsynth.sourceforge.io/" +SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+alsa debug jack pulseaudio" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] +" +RDEPEND="${DEPEND}" + +REQUIRED_USE="|| ( alsa jack pulseaudio )" + +PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" ) + +src_configure() { + sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die + econf \ + $(use_enable debug) + + eqmake5 ${PN}.pro -o ${PN}.mak +} + +src_install() { + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install + einstalldocs + + # The desktop file is invalid, and we also change the command + # depending on useflags + rm "${D}/usr/share/applications/qsynth.desktop" || die + + local cmd + if use jack; then + cmd="qsynth" + elif use pulseaudio; then + cmd="qsynth -a pulseaudio" + elif use alsa; then + cmd="qsynth -a alsa" + else + cmd="qsynth -a oss" + fi + + make_desktop_entry "${cmd}" Qsynth qsynth +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild index b8f87dedef2b..341c0c4efdbb 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-9999.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit desktop flag-o-matic qmake-utils xdg-utils git-r3 autotools +inherit desktop qmake-utils xdg-utils git-r3 autotools -DESCRIPTION="A Qt application to control FluidSynth" +DESCRIPTION="Qt application to control FluidSynth" HOMEPAGE="https://qsynth.sourceforge.io/" EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code" @@ -31,13 +31,11 @@ REQUIRED_USE="|| ( alsa jack pulseaudio )" PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" ) src_prepare() { - eautoreconf - default + eautoreconf } src_configure() { - append-cxxflags -std=c++11 sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die econf \ $(use_enable debug) @@ -51,7 +49,7 @@ src_install() { # The desktop file is invalid, and we also change the command # depending on useflags - rm "${ED}/usr/share/applications/qsynth.desktop" || die + rm "${D}/usr/share/applications/qsynth.desktop" || die local cmd if use jack; then diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest index b042a9d94001..4d2dcd60ddee 100644 --- a/media-sound/qtractor/Manifest +++ b/media-sound/qtractor/Manifest @@ -1,4 +1,6 @@ AUX qtractor-0.9.13-dont-compress-manpages.patch 515 BLAKE2B edaa13a27776997913b9f2049d4c607dc622ae721ab03b3265b9e9c2729aac5796c43c8730d61cd1996a246a6752ab99041bbcccac0e3fa5879864c20499d43f SHA512 3a49c5e175e7b64ff0a2d1a791c59a38b44b0f7116d068fe2877e3fd1636259288becda9cb922150a8166ef7df116df6ec34783a750ff4aec3e276d681c05a0a -DIST qtractor-0.9.13.tar.gz 1923166 BLAKE2B 2c380c169eb34d7acfd7e4d2594dcaae51fc268fd1ce4a0112752333852b1fd633161a089f451347d14ff1fb06a9971cbc6d9f9f00437a88c4673befe1e11bd3 SHA512 9344a992d315e024aaf4d1e7277665e26085667077835cad0f75682bf2a474877808dbe244680e7fe3a2dd81184c8962d22a58d84ac24402afada2dabcd2b8d4 -EBUILD qtractor-0.9.13.ebuild 1545 BLAKE2B 0d644eb5ee0de071a1c9ad0e614557399d7ced7f895a48f1f312279a331bdbc9093e93c81ff4c187585dfdc6c77da4741c102b463bebf2eaf0dc9047e12e48dd SHA512 c1476707f35b119671865fecfefdd936c12e9e99050c2c1b247b0a373dfad29520bf8815d9dee027bec6a7e65721122e88620127490faa38ffc95a629beccca9 +DIST qtractor-0.9.15.tar.gz 1934680 BLAKE2B 347e66266d5b4456c1bafc5ff2120d4a17a5c0a6bb8ab8fe434a84f64b6fd02dc432c5b76bb4e547d7adb6a5959a3f964ceb443ae379b347d69c9d72dae414cf SHA512 11fa61dcdb8960ff86939ade2694d7cbeb623d9bd1bac2c0f27ff1d459b5685116ed8c59037f67d07def59f38c8c8c0a5e8678a2b5f1d002eb10c09b020d044d +DIST qtractor-0.9.16.tar.gz 1937425 BLAKE2B b49c2455338bf14c918b9a00567855d68e0bc954ce1e7d4df53cb8330a44e65d51e6ea21571d0cc22900182a39efa099194d2cc676c9f353eb76ee69a62d48ab SHA512 7312b73bccf79e1ca2cadb0bf33b492b221a65fec9894225e78512d63a9ac65b8387edb854607c44cc8a7ecd72758437c5c67ef901e58e495b09c0f48bbda01a +EBUILD qtractor-0.9.15.ebuild 1553 BLAKE2B 4535de76cc27d77876c0bd9b0156eb5ed9861873a2950fddbe8ccbfc258bd6d61874661f7c37b2930e6a5be68e56bb4d6f77d6eecb486355d0898de722f22ca5 SHA512 803fd64d73659c1e24e9cfbd566a881d676a4f7dab93291c1e4b94037e3243181d3f2e64d2dfcf664dea939df26081e338ce7878890c595b54a0a0ff27ca0224 +EBUILD qtractor-0.9.16.ebuild 1555 BLAKE2B b179551cf5445d870b138029fd71c772270da6e89c44b22010ad083a6fc49396a8870b2407c317d58c4b8f6cab4152be698c28ac878fc67343b788225da62483 SHA512 ffbbdc88c99b5ce48e0bfba3e2a00f8077cd11aafa8c01594ebeb4c3272d1d6192671aaaa3a8a200a0b180e13059c0dc22c0b6d62406510a53135c090a29bd9a MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249 diff --git a/media-sound/qtractor/qtractor-0.9.13.ebuild b/media-sound/qtractor/qtractor-0.9.15.ebuild index 174c125ccf79..f4986fa3a51a 100644 --- a/media-sound/qtractor/qtractor-0.9.13.ebuild +++ b/media-sound/qtractor/qtractor-0.9.15.ebuild @@ -44,7 +44,7 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${P}-dont-compress-manpages.patch" + "${FILESDIR}/${PN}-0.9.13-dont-compress-manpages.patch" ) src_configure() { diff --git a/media-sound/qtractor/qtractor-0.9.16.ebuild b/media-sound/qtractor/qtractor-0.9.16.ebuild new file mode 100644 index 000000000000..52e2dec5d0e4 --- /dev/null +++ b/media-sound/qtractor/qtractor-0.9.16.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic qmake-utils xdg + +DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework" +HOMEPAGE="https://qtractor.sourceforge.io" +SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtx11extras:5 + media-libs/alsa-lib + media-libs/ladspa-sdk + media-libs/libsndfile + >=media-libs/lilv-0.16.0 + media-libs/lv2 + media-libs/suil + virtual/jack + aubio? ( media-libs/aubio ) + dssi? ( media-libs/dssi ) + libsamplerate? ( media-libs/libsamplerate ) + mad? ( media-libs/libmad ) + osc? ( media-libs/liblo ) + rubberband? ( media-libs/rubberband ) + vorbis? ( media-libs/libvorbis ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.13-dont-compress-manpages.patch" +) + +src_configure() { + append-cxxflags -std=c++11 + econf \ + --enable-ladspa \ + --enable-liblilv \ + $(use_enable debug) \ + $(use_enable aubio libaubio) \ + $(use_enable dssi) \ + $(use_enable libsamplerate) \ + $(use_enable mad libmad) \ + $(use_enable osc liblo) \ + $(use_enable rubberband librubberband) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable vorbis libvorbis) \ + $(use_enable zlib libz) + + eqmake5 ${PN}.pro -o ${PN}.mak +} diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest index b562d5a958e3..cf583feb12ed 100644 --- a/media-sound/quimup/Manifest +++ b/media-sound/quimup/Manifest @@ -1,3 +1,5 @@ +DIST Quimup_1.4.4_source.tar.gz 240902 BLAKE2B a411653b1c5ced5dc7f4b9ebe6244380d23cd165eaf2b14760a3f87946094f7ffad3df73afe500c0f8ea8f6d77e690391e78a0403b9436485b4c670de3c3b0da SHA512 4fac921df6e7157952536e1cdda0e468b72f70f8f938ccfd5d1a7d286f4b7d7ac063ca2c6111f38fb76b2a6235a323858f2f898165c80702b2c0aaeaff8869c9 DIST quimup_1.4.3_source.tar.gz 587260 BLAKE2B ee2ce0d9f71c63db73af00fe385d643f5ec08e322137c0c4d372fec68b875587e0f46ca2a46d9afc366afdd29e5381816457e4b3b3891af8c0113c577385aa23 SHA512 fb3727bf5c0f756c888484f7c061da95a1ece15673079ac8e6ffc82289f78cfce3dda7245ae25b1d705ffe057f1b0930baf2338bdfe0f16c900dc1ffd3fef807 EBUILD quimup-1.4.3.ebuild 792 BLAKE2B a87e111bc4e8eab3950bf1cce8ae6317bf081d74f4102bfcf7a615990b3d297e39aafaa7bf512f0777c345b30d04bf27f88ff10626e99847b6f1d681e3108d00 SHA512 901c1890a815ecd838b218aea2d55ba939c2dc263bcb52f11e52e2620dbbbc538b8984bb247f025902238d7c6065713708e88aeff7dc69376ea09117cdb8af2b +EBUILD quimup-1.4.4.ebuild 779 BLAKE2B 6f49ff008facdfb611691ca0216feabf90d7d2fc51228032bf83f87bcaf071d0ebd4576bd89fcc0fbaf249569d51e74cdd6a2a9935d46d3d4af25fbe6ea4b965 SHA512 84c354ef0a8069df63e282dd2bd5ac59a65cf08178356d5ebf6f99e933f4b1e2c87a406c00a52d0e51427829c4fa296c988c748de379b8739b8ac7baaa72328b MISC metadata.xml 339 BLAKE2B 6bb8fc9b606a6375c7997836909a5396bba8e726e2f0e06820e43574353a83ebe8cfe7fda125c6a1c892eed799195c7b74f1fa5c365686e0335a75f82848bbeb SHA512 02c262de7f82e49ebd91d60aa4e6577b8c4cead1b0b1df8a7bc18b575358e93b17384bc42ace5cf64b13116db9077fbc2262f110f6308cfa3621e994170cebd6 diff --git a/media-sound/quimup/quimup-1.4.4.ebuild b/media-sound/quimup/quimup-1.4.4.ebuild new file mode 100644 index 000000000000..c3c815355b9c --- /dev/null +++ b/media-sound/quimup/quimup-1.4.4.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop qmake-utils + +DESCRIPTION="Qt5 client for the music player daemon (MPD)" +HOMEPAGE="https://sourceforge.net/projects/quimup/" +SRC_URI="mirror://sourceforge/${PN}/${PN^}_${PV}_source.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + >=media-libs/libmpdclient-2.3 + media-libs/taglib +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN^}_${PV}_source" + +DOCS=( changelog FAQ.txt README ) + +src_configure() { + eqmake5 +} + +src_install() { + default + dobin ${PN} + + newicon src/resources/mn_icon.png ${PN}.png + make_desktop_entry ${PN} Quimup +} diff --git a/media-sound/rcenter/Manifest b/media-sound/rcenter/Manifest index 9fed8b83622c..2f4cd9ce5b2d 100644 --- a/media-sound/rcenter/Manifest +++ b/media-sound/rcenter/Manifest @@ -1,5 +1,6 @@ AUX rcenter-0.6.2-Wimplicit-function-declaration.patch 267 BLAKE2B 52460e47e6fd3e74fa36af96cb89eba8f9f4a246367e42f975d4b364098f8142fef0cb100da1782bb0ed9707599695a4c852e9bfa8bce01bd4e59d295dda5509 SHA512 95ba345dcd1716723f74a802e858f0352501fa5c12ee40fb4f1aa1d270d50e4dd465e00d6df243345bf79742469a4b3f0e85e250121090d5c050a45e4741dfa9 +AUX rcenter-0.6.2-fno-common.patch 638 BLAKE2B 87d2aa635dedfa5aa968de47b15658b731613524dad671a29b248f57118fc6464617119660d4bab766ee19f18594c894588e5c7b8f8d3138f26bad8f588a825f SHA512 def8b5475d19dcbc65fb2a37f1920e1a6d927f0b601c9765280afd037e9481e31d30c44d095fd4dd262341efe210e5f9736a8c9b16fb7f1e0f6dc32ee6ea79e5 AUX rcenter-0.6.2-makefile.patch 549 BLAKE2B dde87bd6143d878be35574119d2605c1a4b9731c961ff390b76eab71f079679fc8a643409ecd7755a12ebba27b6fa885cabad810a4f2c43d0a8788a154120eec SHA512 7f06434da1605cf903b14a4de830b1f8ab819379a0022f8f95aeb7a7dfe7823ad9e44baebd15a06732720f13016cc9413aa6ac7662878902e9261f82bfdb7582 DIST rcenter-0.6.2.tgz 15053 BLAKE2B 1a2cf30a42332bfd7dc3141d7cdb9454dffbf4270571f2f6bae581c033eee36e867d980a0ddf49e72bf77f27aa2f45a6ee3c5f15aaee06003031a50d4dc8c979 SHA512 0db7780c3c9f991ff79a9513fcb1640b18050336241d52b99fc63c8632a5d0a1d9a96e1e265c41c0ff2f0c11be9ddf17dd6d4d9b1ee8ce92cdcd2afd716e788b -EBUILD rcenter-0.6.2.ebuild 1079 BLAKE2B 59fb3f5417e6dd214d489d666112572575750634caa679355b2c268266f3ff4806b4dd91c7f280bffe09f449858a15f17a8ec202731c04412069732e131c328c SHA512 56bda1cc2990f069f87912d3dd5a78af11bf1f75eecb47fa9288e5560e8844abbc0ba6a77ce0880ef589bc1807df5ee6326c796b0dbc72795ea102fed08baef6 +EBUILD rcenter-0.6.2.ebuild 1116 BLAKE2B 083740b4ab6f3d36fc66cc9f07cc055ba7507f328c7d1b37708e3431887ee2cee0f7c5b8fb57265e58bed9ac5cf8df845856bbf4023d39aeac4fe3d75aff58a4 SHA512 915a44caad448304f5f164806ff2fd1248e3fcfd11142fdcb857aa47041e9763e8559c104e97cc2d51ae45cb440f526d0920c61b2df74e9a3a642f9b5cba3b98 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/rcenter/files/rcenter-0.6.2-fno-common.patch b/media-sound/rcenter/files/rcenter-0.6.2-fno-common.patch new file mode 100644 index 000000000000..11f3efdd38b5 --- /dev/null +++ b/media-sound/rcenter/files/rcenter-0.6.2-fno-common.patch @@ -0,0 +1,29 @@ +--- a/button.h ++++ b/button.h +@@ -60,8 +60,8 @@ + button_max = 34 + }; + +-char *button_name[button_max]; +-int button_code[button_max]; ++extern char *button_name[button_max]; ++extern int button_code[button_max]; + + unsigned int speaker_code(unsigned int code); + +--- a/main.h ++++ b/main.h +@@ -18,9 +18,9 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ +-char *midi_device; ++extern char *midi_device; + +-int delay_sec; +-int delay_usec; ++extern int delay_sec; ++extern int delay_usec; + +-int string_digit_limit; ++extern int string_digit_limit; diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild b/media-sound/rcenter/rcenter-0.6.2.ebuild index 295c65fb14a2..a32acc38076b 100644 --- a/media-sound/rcenter/rcenter-0.6.2.ebuild +++ b/media-sound/rcenter/rcenter-0.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,6 +17,7 @@ KEYWORDS="amd64 -sparc x86" PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_configure() { diff --git a/media-sound/rgain/Manifest b/media-sound/rgain/Manifest deleted file mode 100644 index 9f85270bf010..000000000000 --- a/media-sound/rgain/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST rgain-1.2.1.tar.gz 24741 BLAKE2B f920fa45c31f4cda367b93443b9f358827d4032dcd1ce5adce3bd3e7f3834899a2e58fb384d40cb53f9d099d957fe422b3752d1c56da975a7931767f40b37a77 SHA512 ac9a0c9918e55150d34b07dfbe839a0e497f8c5793ecbaad4f35063f2e00e0ebd1cb9739c5d0022513c2fe9b0aa880941ba848d791a4db31373ad0d421a133df -EBUILD rgain-1.2.1-r1.ebuild 705 BLAKE2B c5c31129ab3fb4010c4b54111e8b2f9c1df928ab1bbb8541e50812dd57a7e5791070102e96d16fe81e0a32b3a017feba515ee32cd723d0894fd181b5c8439617 SHA512 7d968ef88708c3afa2420e8e6126c10ba51f496190d70f6d14b23176aaf6bcd9795fbe454a23129a021ce09440912195ded0fcfe3ecc80ed40c8f78c7961a50d -MISC metadata.xml 941 BLAKE2B cbab8ea24959d93c4ce88b85abe7957c0eba6d99fb0510bdc272a1a69cac37f47530db1f553bc68fd4ff6927fe7b8e8081b5759052937a95e0f51ff5b98609cb SHA512 d4dbb433f49bb08cb4a6dde9dc3bcc94228769db10f52b8058aef9c86f00b879cef3361b1b17423bb2f2a4e4798d6f1cbbf50da9fdc26992566b1cba69435993 diff --git a/media-sound/rgain/metadata.xml b/media-sound/rgain/metadata.xml deleted file mode 100644 index 4096733e8436..000000000000 --- a/media-sound/rgain/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files. - </longdescription> - <upstream> - <remote-id type="pypi">rgain</remote-id> - <remote-id type="bitbucket">fk/rgain</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-sound/rgain/rgain-1.2.1-r1.ebuild b/media-sound/rgain/rgain-1.2.1-r1.ebuild deleted file mode 100644 index 76302e53f211..000000000000 --- a/media-sound/rgain/rgain-1.2.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Set of programmes and Python modules to deal with Replay Gain information" -HOMEPAGE="https://bitbucket.org/fk/rgain" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="flac mp3 vorbis wavpack" - -DEPEND=">=dev-python/docutils-0.9" -RDEPEND="media-libs/mutagen - dev-python/pygobject:3[$PYTHON_USEDEP] - media-libs/gstreamer:1.0[introspection] - media-plugins/gst-plugins-meta:1.0[flac?,mp3?,vorbis?,wavpack?] -" - -src_install() { - distutils-r1_src_install - doman build/man/* -} diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest index 55c0bb34e348..ed38a67a632c 100644 --- a/media-sound/rosegarden/Manifest +++ b/media-sound/rosegarden/Manifest @@ -1,7 +1,4 @@ -DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495 -DIST rosegarden-19.06.tar.bz2 6667374 BLAKE2B c204a99dd46a0dcbfda6afc361ec31b7f211d2b95a8d171ff3fb06e37b3dbabc2b36fdbc04a3dfc821a9e331681d2a1e2395e91a86fe9d9fecd3af173f5b675b SHA512 13eddd4ec88662f3275d83bf40471ca0a34d43b3c9c9f07cf46b891c74f087ec7fe0d4b8ffe8204f2f3a30829352f4d952bb035a5bd09a7b6bdeb41ff5d1e8d8 -DIST rosegarden-19.12.tar.bz2 6672820 BLAKE2B f4541c894d0de7f4c5fc435ce463b9fc6940cf1c595e9d9b6c168f51b9e05e63a449b8f3a99456801baf864d0788130368ed87c81646af04a6f2891a6372e444 SHA512 22c45346b1a4d69f009e59091bdf5f5f68633241a48df7bd6ee73462cc281ee7182be3d48c3afc0843aa551145c203a8b881501891eb84b6d3f3def5f7650fc6 -EBUILD rosegarden-17.12.1.ebuild 978 BLAKE2B 7c57370632c64626aefa7d1c68f16c254d0674a6d3d3b5e8d2bc0e1fcc820fef2f9eb1791ce437841973f248ea07f938ebf2dec8a4bfe98fab394b19b77643f2 SHA512 5f1b554f6f7c602a390deb20015ba33813591edf3f43a014dfbd0703549bf4791323773438d990280ef618630310ce04b339288759f4a5798bda09f397d1946a -EBUILD rosegarden-19.06.ebuild 1054 BLAKE2B b5f72dea27fe57c9afec4bf5377e31eb2ab705a8e08b260015557dde8f2ae8f5b7248ccd5b8a64302afd197f323f53119b7ead85dddf89214efce2c1638d7ae5 SHA512 a5b3d1431c58ca1dde4875217f328660d11913673e7d61b43f4b4a177ea53497596dcb1fa3372aa90e54763f4016141eee0ffa1763dd7dc6b0aa7ac2d7e25457 -EBUILD rosegarden-19.12.ebuild 1055 BLAKE2B f0f41218f8c351f42e7cf101798c502b820f7852a4bacd134f5ca3302372982248aa78b3cc056dabaa16d5d857f5b10b6922ae5f2f1ac79c0cdf9b8231b255a0 SHA512 bbbb8e0ac28266978036aba8cccbf859abca4e4bd6e22cfa4616ed990802e5d8c18acc211008e9b788e9d02948cc1cf988af09f3bdc12721161926d91defac34 +AUX rosegarden-fix-qt5.15.patch 670 BLAKE2B 4c8eb957c80ddad78444ee484b11da94865e55d161a6bd3e5b4f08d1697a0bcc89e2b5c947df99b89840734a84cca773bb1f9252d444e6b39a8630235f7eddf0 SHA512 a13ced3528552e3c2609442f81696628ef93cbab3d31526cbc7d2d3c0f4d6d44a84171fb3824d6a662f297d792f27d62ccb2c9e89f074e0aca3fcc1dd3ed645d +DIST rosegarden-20.06.tar.bz2 6821122 BLAKE2B 2c37729133f60524466c9eb6cb761e36698acc2addee802fa01b498c4450e0f87a8d02dc66f893e87c23484f7fc4f32e4e4e13f01a457a86363b4fa98bca4a1d SHA512 7f3892697b99344d47e2bf398f6fe82de9867a093f3396d571730a30f3442a923f16a5472a74bda865205696ff3834c0a188ceefae17e56b137d8df1a56e03f7 +EBUILD rosegarden-20.06.ebuild 1189 BLAKE2B d7e10002805af53a13a51070d95768d63970ec161ba700dbb9397458d9cc8af3b18f9711a372a2a76d67f949a2ac3988bcd5c3e6b33554b8e90a8735fb89c84b SHA512 42f7d4363b59fe2313f2c056591dbe63d7ab2d50f53c36df3d9f3873fdf24fb2c0a273ebc1437d02160fc8c4d3c784a74467ddad173c8119f602e87402d1b4d6 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee diff --git a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch new file mode 100644 index 000000000000..bb4244baeba9 --- /dev/null +++ b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch @@ -0,0 +1,24 @@ +diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp +index 4374607..de426f1 100644 +--- a/src/gui/general/ThornStyle.cpp ++++ b/src/gui/general/ThornStyle.cpp +@@ -34,6 +34,7 @@ + #include <QLabel> + #include <QLayout> + #include <QPainter> ++#include <QPainterPath> + #include <QRadioButton> + #include <QStyleFactory> + #include <QStyleOption> +diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp +index ceba4ea..ead23fa 100644 +--- a/src/gui/widgets/Panner.cpp ++++ b/src/gui/widgets/Panner.cpp +@@ -24,6 +24,7 @@ + #include "misc/Debug.h" + #include "base/Profiler.h" + ++#include <QPainterPath> + #include <QPolygon> + #include <QMouseEvent> + diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild deleted file mode 100644 index dac7760081c1..000000000000 --- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="MIDI and audio sequencer and notation editor" -HOMEPAGE="https://www.rosegardenmusic.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="lirc" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/alsa-lib:= - >=media-libs/dssi-1.0.0:= - media-libs/ladspa-sdk:= - media-libs/liblo:= - media-libs/liblrdf:= - media-libs/libsamplerate:= - media-libs/libsndfile:= - sci-libs/fftw:3.0 - sys-libs/zlib:= - virtual/jack - x11-libs/libSM:= - lirc? ( app-misc/lirc:= ) -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 -" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DDISABLE_LIRC=$(usex lirc OFF ON)" - ) - cmake_src_configure -} diff --git a/media-sound/rosegarden/rosegarden-19.12.ebuild b/media-sound/rosegarden/rosegarden-19.12.ebuild deleted file mode 100644 index 7ed9801029fe..000000000000 --- a/media-sound/rosegarden/rosegarden-19.12.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg virtualx - -DESCRIPTION="MIDI and audio sequencer and notation editor" -HOMEPAGE="https://www.rosegardenmusic.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="lirc" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/alsa-lib:= - >=media-libs/dssi-1.0.0:= - media-libs/ladspa-sdk:= - media-libs/liblo:= - media-libs/liblrdf:= - media-libs/libsamplerate:= - media-libs/libsndfile:= - sci-libs/fftw:3.0 - sys-libs/zlib:= - virtual/jack - x11-libs/libSM:= - lirc? ( app-misc/lirc:= ) -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 -" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DDISABLE_LIRC=$(usex lirc OFF ON)" - ) - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} diff --git a/media-sound/rosegarden/rosegarden-19.06.ebuild b/media-sound/rosegarden/rosegarden-20.06.ebuild index a86fbbdda3ed..2042a29fe018 100644 --- a/media-sound/rosegarden/rosegarden-19.06.ebuild +++ b/media-sound/rosegarden/rosegarden-20.06.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,9 +11,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="lirc" -RESTRICT="!test? ( test )" BDEPEND=" dev-qt/linguist-tools:5 @@ -43,17 +42,25 @@ DEPEND="${RDEPEND} dev-qt/qttest:5 " +PATCHES=( + "${FILESDIR}"/rosegarden-fix-qt5.15.patch +) + src_prepare() { cmake_src_prepare } src_configure() { local mycmakeargs=( - "-DDISABLE_LIRC=$(usex lirc OFF ON)" + -DDISABLE_LIRC=$(usex !lirc) ) cmake_src_configure } src_test() { - virtx cmake_src_test + # bug 701682, tries to open network socket and fails. + local myctestargs=( + -E "(test_notationview_selection)" + ) + virtx cmake_src_test } diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest index bd34850a51f4..61dde7bded61 100644 --- a/media-sound/scmpc/Manifest +++ b/media-sound/scmpc/Manifest @@ -1,4 +1,5 @@ +AUX scmpc-0.4.1-fno-common.patch 1953 BLAKE2B 37a5009a622a9b192867db03a66ac434f775c54b62cad308e4edaf9b26a3edeaa249fb94ef1a39009b37ff8dfbbc96e6f39353f0ffda179676eaf8db280ae5b2 SHA512 9cc2df98bbb571506b196b78d77e60fad1c556fd656370d4cfcb24b32117b130386f40d2fbf569e1e44749663358de59a0607aa035c97ba1a7b467f9270d5731 AUX scmpc-2.init 317 BLAKE2B 4b6f9aad5b4f993b5e34ec35aaf1af67a2407e815ba51942e3634451b0bb814e6dec10004e9df43df5aa3ffae4f1ef84899438dd704748d0e5925e4a6156481c SHA512 58cd9269acbdb92bd4ab0ae23c1f5a07909debf9b37131824827089aece9552493b984f5d73c654a7f6ef47e7bb496e424cbe3885db932ab5554bee9f296f0df DIST scmpc-0.4.1.tar.bz2 88288 BLAKE2B 6502b21b512604e611f2d6a3210b3f5d64d3dd476b5c17e7e92480478b1488220147ccaa3b43f838fcae646c6c501f6b4bdaaf543df05151782f46bf689cd25d SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876 -EBUILD scmpc-0.4.1.ebuild 633 BLAKE2B 1c610892a7f1ba3e68fc3f57f0e5a4095fe3a32de4dbd6a16cb6696dce01a14d5de25a83c2707e3c52a7b778223c56a8bcd38f1e36fed64769b9c11175a15f87 SHA512 a08429f1c4f8e7da4b8b7e9b1050f36978feef9c450f75015f53638540b5b7d304e881b15b1cfff64018e6e833643afe21a3646648228bd34d2cc256b1ec9c08 +EBUILD scmpc-0.4.1.ebuild 689 BLAKE2B c9048555227ed15468b535392c4650275bcf56ad9bb8da54fc06e67a2875e2753ff7e501df902bf3738584f4bd9e5663014f713f2f592ed8bcefa3864ce14442 SHA512 f4c7347814996f9b4f122a7be939ab2194e504f40bb3875442ae1de7606c3335a0a6bd3bff131f0308c29b5b5a13798849298a90303cacb76cdc615d47fff9cc MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/media-sound/scmpc/files/scmpc-0.4.1-fno-common.patch b/media-sound/scmpc/files/scmpc-0.4.1-fno-common.patch new file mode 100644 index 000000000000..22cd4621e745 --- /dev/null +++ b/media-sound/scmpc/files/scmpc-0.4.1-fno-common.patch @@ -0,0 +1,103 @@ +--- a/src/audioscrobbler.c ++++ b/src/audioscrobbler.c +@@ -50,6 +50,9 @@ + #define API_KEY "3ec5638071c41a864bf0c8d451566476" + #define API_SECRET "365e18391ccdee3bf820cb3d2ba466f6" + ++static struct as_conn_t as_conn; ++gchar *buffer; ++ + gboolean as_connection_init(void) + { + as_conn.handle = curl_easy_init(); +--- a/src/audioscrobbler.h ++++ b/src/audioscrobbler.h +@@ -37,19 +37,19 @@ + /** + * Last.fm connection data + */ +-struct { ++struct as_conn_t { + gchar *session_id; + gint64 last_auth; + gint64 last_fail; + connection_status status; + CURL *handle; + struct curl_slist *headers; +-} as_conn; ++}; + + /** + * cURL data buffer + */ +-gchar *buffer; ++extern gchar *buffer; + + /** + * Initialize cURL +--- a/src/mpd.c ++++ b/src/mpd.c +@@ -37,6 +37,8 @@ + static gboolean mpd_parse(GIOChannel *source, GIOCondition condition, + gpointer data); + ++struct mpd_t mpd; ++ + gboolean mpd_connect(void) + { + mpd.conn = mpd_connection_new(prefs.mpd_hostname, prefs.mpd_port, +--- a/src/mpd.h ++++ b/src/mpd.h +@@ -32,7 +32,7 @@ + /** + * MPD connection data + */ +-struct { ++struct mpd_t { + struct mpd_connection *conn; + struct mpd_status *status; + struct mpd_song *song; +@@ -42,7 +42,9 @@ + guint idle_source; + guint check_source; + guint reconnect_source; +-} mpd; ++}; ++ ++extern struct mpd_t mpd; + + /** + * Connect to MPD +--- a/src/preferences.c ++++ b/src/preferences.c +@@ -36,6 +36,8 @@ + #include "scmpc.h" + #include "preferences.h" + ++struct prefs_t prefs; ++ + static gint cf_log_level(cfg_t *cfg, cfg_opt_t *opt, const gchar *value, + void *result); + static gint cf_validate_num(cfg_t *cfg, cfg_opt_t *opt); +--- a/src/preferences.h ++++ b/src/preferences.h +@@ -32,7 +32,7 @@ + /** + * scmpc settings + */ +-struct { ++struct prefs_t { + gchar *mpd_hostname; + gushort mpd_port; + gushort mpd_timeout; +@@ -48,7 +48,9 @@ + gchar *cache_file; + guint queue_length; + guint cache_interval; +-} prefs; ++}; ++ ++extern struct prefs_t prefs; + + /** + * Initialize preferences diff --git a/media-sound/scmpc/scmpc-0.4.1.ebuild b/media-sound/scmpc/scmpc-0.4.1.ebuild index 7eee1b1aa5be..2b76d4155534 100644 --- a/media-sound/scmpc/scmpc-0.4.1.ebuild +++ b/media-sound/scmpc/scmpc-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,6 +18,9 @@ RDEPEND=" net-misc/curl:=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-0.4.1-fno-common.patch +) src_install() { default diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest index b16a0b386f25..d449154c3999 100644 --- a/media-sound/sexypsf/Manifest +++ b/media-sound/sexypsf/Manifest @@ -1,3 +1,5 @@ +AUX sexypsf-0.4.8-Makefile.patch 198 BLAKE2B 9d3e07c15356465aef9810d2bd4bb3a8212b3aeaf829e64c02f26293a4c4f2eb042bd0c517836806cdfca28377c0516c2af38406d73532ea0157a91f38165596 SHA512 0e4b1db579bda33833912e05d2ac2705994dfaeb1949f8dee40fc86e0e23b66d257cff5507b6a866d052ebe6eb8ae7793fd3c81b5bb77cbfd8545edd46ccdbcf +AUX sexypsf-0.4.8-fno-common.patch 1862 BLAKE2B 26dcce198f5df33118c0ab8b8ffc39696aafc8a20aec4a7461d1305f6e932c372672ecc905578ae4484df214ac8ad9d0f5c772eb32750ce5e7acfbd53a67939a SHA512 d06fefab54f643748dd50d50f0880d0236798210bb41e600ef90d05e7680d1391641836228a9b11d0d8d1200514aa82b075691de5da82d006434bbeef23113b7 DIST sexypsf-0.4.8.tar.bz2 82954 BLAKE2B ce710cfe20372f81e5c4f18857b46e7eef1837b87469bdf999dd677f617802da0f7cb0ff9ff1a0ee78f6424b179b33cc111ba98619dde4a03b178c63397749a4 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0 -EBUILD sexypsf-0.4.8.ebuild 503 BLAKE2B af80d45dc051c55562414f5c956a7e34f4246bc49ea5d2e2a1de01a9b11cdb4f5527a0fb9365e8b8d783d91956b902177350e33c1435c29cec18fc987aa0cbfd SHA512 2fe3a6dfec41d33f5148a05e87e811479065e2ad41e92fd5df61a22f204a8cf20bdcb96bbb352dbe7d4b858651cd5cc2e04bbc175cd15304f02a6988236e6741 +EBUILD sexypsf-0.4.8.ebuild 630 BLAKE2B cb885bf57fd74d97439b112577ed8909ef3565413361195343962716b9cb406e197bf01657d7886fe193053057f0277e7089602fd1472b28de756c910837d38e SHA512 7948fbe01ddbed97267eda57fdf7d6ce0711c336a0a0411a4be0b234074e7cce18a1d4e00c7fb12fd7c15fe86c104a6785118fffc2925ebb68880d0311c9aa6f MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/sexypsf/files/sexypsf-0.4.8-Makefile.patch b/media-sound/sexypsf/files/sexypsf-0.4.8-Makefile.patch new file mode 100644 index 000000000000..348c392f3574 --- /dev/null +++ b/media-sound/sexypsf/files/sexypsf-0.4.8-Makefile.patch @@ -0,0 +1,12 @@ +--- a/Linux/Makefile ++++ b/Linux/Makefile +@@ -28,9 +28,3 @@ + + clean: + ${RM} *.o ../*.o ../spu/*.o sexypsf +- +-../%.o: ../%.c +- ${CC} ${CFLAGS} -c -o $@ $< +- +-%.o: %.c +- ${CC} ${CFLAGS} -c -o $@ $< diff --git a/media-sound/sexypsf/files/sexypsf-0.4.8-fno-common.patch b/media-sound/sexypsf/files/sexypsf-0.4.8-fno-common.patch new file mode 100644 index 000000000000..fd0d96525b33 --- /dev/null +++ b/media-sound/sexypsf/files/sexypsf-0.4.8-fno-common.patch @@ -0,0 +1,102 @@ +--- a/PsxCounters.c ++++ b/PsxCounters.c +@@ -20,6 +20,9 @@ + + #include "PsxCommon.h" + ++psxCounter psxCounters[5]; ++u32 psxNextCounter, psxNextsCounter; ++ + static int cnts = 4; + static u32 last=0; + +--- a/PsxCounters.h ++++ b/PsxCounters.h +@@ -24,9 +24,9 @@ + u32 sCycle, Cycle, rate, interrupt; + } psxCounter; + +-psxCounter psxCounters[5]; ++extern psxCounter psxCounters[5]; + +-u32 psxNextCounter, psxNextsCounter; ++extern u32 psxNextCounter, psxNextsCounter; + + void psxRcntInit(); + void psxRcntUpdate(); +--- a/PsxMem.c ++++ b/PsxMem.c +@@ -21,6 +21,12 @@ + + #include "PsxCommon.h" + ++s8 *psxM; ++s8 *psxP; ++s8 *psxR; ++s8 *psxH; ++char **psxMemLUT; ++ + void LoadPSXMem(u32 address, s32 length, char *data) + { + //printf("%08x %08x\n",address,length); +--- a/PsxMem.h ++++ b/PsxMem.h +@@ -41,21 +41,21 @@ + } + #endif + +-s8 *psxM; ++extern s8 *psxM; + #define psxMu32(mem) (*(u32*)&psxM[(mem) & 0x1fffff]) + +-s8 *psxP; +-s8 *psxR; ++extern s8 *psxP; ++extern s8 *psxR; + #define psxRu32(mem) (*(u32*)&psxR[(mem) & 0x7ffff]) + +-s8 *psxH; ++extern s8 *psxH; + + #define psxHu8(mem) (*(u8*) &psxH[(mem) & 0xffff]) + + #define psxHu16(mem) (*(u16*)&psxH[(mem) & 0xffff]) + #define psxHu32(mem) (*(u32*)&psxH[(mem) & 0xffff]) + +-char **psxMemLUT; ++extern char **psxMemLUT; + + #define PSXM(mem) (psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff))) + +--- a/R3000A.c ++++ b/R3000A.c +@@ -22,6 +22,9 @@ + + #include "PsxCommon.h" + ++R3000Acpu *psxCpu; ++psxRegisters psxRegs; ++ + int psxInit() { + + psxCpu = &psxInt; +--- a/R3000A.h ++++ b/R3000A.h +@@ -32,7 +32,7 @@ + void (*Shutdown)(); + } R3000Acpu; + +-R3000Acpu *psxCpu; ++extern R3000Acpu *psxCpu; + extern R3000Acpu psxInt; + + typedef union { +@@ -68,7 +68,7 @@ + u32 interrupt; + } psxRegisters; + +-psxRegisters psxRegs; ++extern psxRegisters psxRegs; + + #define _i32(x) (s32)x + #define _u32(x) (u32)x diff --git a/media-sound/sexypsf/sexypsf-0.4.8.ebuild b/media-sound/sexypsf/sexypsf-0.4.8.ebuild index 427a0518e2ca..7f7bf7f7e776 100644 --- a/media-sound/sexypsf/sexypsf-0.4.8.ebuild +++ b/media-sound/sexypsf/sexypsf-0.4.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,19 +11,25 @@ SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND="sys-libs/zlib" +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" -src_compile() { +PATCHES=( + "${FILESDIR}"/${PN}-0.4.8-Makefile.patch + "${FILESDIR}"/${PN}-0.4.8-fno-common.patch +) + +src_configure() { tc-export CC - cd Linux || die - emake +} + +src_compile() { + emake -C Linux } src_install() { dobin Linux/sexypsf - dodoc Docs/* + dodoc -r Docs/. } diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest index f6258b12fb6b..a20297fb59a1 100644 --- a/media-sound/shntool/Manifest +++ b/media-sound/shntool/Manifest @@ -1,3 +1,3 @@ DIST shntool-3.0.10.tar.gz 216061 BLAKE2B b662c64992409c1a12dd3fffab5f39c69b2c1f8fb958cba590009f599e4363403aa1d353efdec8ab7529fc22cfac0b908368a132b60f7e5acd55dcae932909e2 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d -EBUILD shntool-3.0.10-r1.ebuild 777 BLAKE2B 02a73b4603d28ed7e077b99878d9e283ede402486a438ec43ab7919e0097329bb73cbc3aa81483657608ecb9cb76ed2bbbf8098a99e3e87cdfedc7513e641258 SHA512 c254d110f3bbb2f86f243870f353c921d31feea3557318dbb7ac3f47dedb6a53956d948ffd66b157af2fe105894a456c7e5f3574da0496068c1801941299b5a1 +EBUILD shntool-3.0.10-r1.ebuild 766 BLAKE2B 013ccefaab2cd195ae08e023a8f1f52643dc10cdaae5f5d2e8aed8852905593390566e9306005efc220dff6fe86f3d63bcdafa9eab22d09f8df3cd524867bf2f SHA512 609bc3e4ce740250a486ecb890ea30ff0be81f1d42ffdecfdc5e39ac482891dc432e520664e45981d6cd4a08c886a9fd41f6346c945227f20a84faa8f41f4b7c MISC metadata.xml 496 BLAKE2B 2a2e3262f4ff6fc070d1f4693db8610e00c85317232b21799b897a40f353f15d5b8effcace525c99ea556ff51316d8d40da923c9372684510247d48f316f3e2d SHA512 81a78997d73d8356ccfa4d2a8a37b8c114cd80e6ccafd4705be1741e5ee7abdbf3eb77373f45c529dcf1bc67c4ba3f4ed147cffd790606189a233daac66dac66 diff --git a/media-sound/shntool/shntool-3.0.10-r1.ebuild b/media-sound/shntool/shntool-3.0.10-r1.ebuild index 15e78ed34413..85c00e64e36c 100644 --- a/media-sound/shntool/shntool-3.0.10-r1.ebuild +++ b/media-sound/shntool/shntool-3.0.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://www.etree.org/shnutils/shntool/dist/src/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="alac flac mac shorten sox wavpack" RDEPEND=" diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest index 06dc0cc3bff8..b09bdfd1ba21 100644 --- a/media-sound/sndpeek/Manifest +++ b/media-sound/sndpeek/Manifest @@ -1,6 +1,5 @@ -AUX sndpeek-1.3-makefile.patch 7578 BLAKE2B b06da3d723a0d49e5e8ca058b7622f6b34c6ecf60233b26ede0b1f1a1f933cbe4db56519f39886f621169e0cfe7a03091eb70580fc4f3e58af3a1f21b9f2b242 SHA512 4f89535d28a2e01b752b689513e67fdbaeab9b6aa03b62724e96bfafa4f49b9be310647268a43564b96686e20d52e7fd646a7a2e654eec1dd1c9e38e686e20e7 AUX sndpeek-1.4-gcc.patch 315 BLAKE2B 782db101136b691904424dea1d72c02a4308ce99018868d6831be978029be4a51ace611f41e36e91b2f70add83c3269722e1a5061e7fb267a63cce5772f3b1b1 SHA512 184f4e39b033aed7f7ce49e5e15ee2bda016bc56b0f5fba05ab52a13f40e0c957a0a8c2754f0437b782556de9d0a5bb2a3694bb107261b4c80fda07a4b228d18 -AUX sndpeek-1.4-ldflags.patch 2255 BLAKE2B b78a6a15228e7c5d0a38b4ed1bdc86c6e6ec540099e6ac4e066135b9fcb53a3ac307a3239022fda14ec596b9e145317c2e61e65dec26e9940fbc37f3515c1b93 SHA512 36c8f4dd7a63c06a7cbefd66e1f2eca39cf7567ddfb8a76e6d50de7808086b17cdd3f4028e4d5ca458edbf6d257d75bce8d40538d865151d0ce11283b2cf3991 -DIST sndpeek-1.4.tgz 311174 BLAKE2B 8f75aa90e71c4b12e15da68774a357ecaab61dea64071b5276ea1fe5311c1e937350a8e46f6a8c4714a43f7174145881fa9be04c80c54ede351e0ece08de88ca SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb -EBUILD sndpeek-1.4.ebuild 1659 BLAKE2B d3c15cd95858558c86d06829f54cba9ba4eb48206ab63dce3b707ba39c3dbe37b0ba3b1184008a18c76a8f0b77d8f260fb54a764c4f0c1124e783a2b0e571070 SHA512 40701ac8ce7f4299f8081746ad1ec1396ebc3e58a194fc5ca982be1fc1a812bbeab6d34d66ecb669b4749b57ce7a42d6f8930b27e04e306325ecabde32fc3226 +AUX sndpeek-1.41-makefile.patch 8410 BLAKE2B 13df444073c55efac49ea862957375b2284567134bf1313069e4b41254232440b6e7f83c25e79cfc62611caa0a215cc56d14f130a5bfa2d8b4ded307860ba3cb SHA512 9999454775686174bb9561eefb0150cd7031ed2faad26c5830a367e21a844aee62dd0ced65cb17a7cd063f45cc05c6824f3abc5d427ad3ba2c8b5c0efb5de71a +DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465 +EBUILD sndpeek-1.41-r1.ebuild 1599 BLAKE2B 187ce2f3860f4346b93b8733e4fff6fb0e88de0f35c29256ffda7a49a80928b6c608cd6fd05c6c17653b954a15aa4ba4031ecd844b5f8a2725bb73f5e0ae7074 SHA512 f330b9951dafa25fda881bdf1e9bf64c57672e1d39d80f12039c7960b61ea152803939f356b9a96f23d992ea42cd720602db4f708b4400c01716399065a1e993 MISC metadata.xml 334 BLAKE2B d0828ab0ff2b5bc3a88013773a5653206e57420f5d0eceadcfa7db7e587d24e12ded0edd775123ecdb887b3adf8f357599f59a6b0997667346ab846d6656bd52 SHA512 13ab3514fb82b417aa9b69680d3370a9f674c307a10a289de8b370c9cbd7e8a6b3aa14a00b2d69885e8805473940cf0dbf1606571827e021c5245c20e0078fa8 diff --git a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch deleted file mode 100644 index 9b17c99e146b..000000000000 --- a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch +++ /dev/null @@ -1,296 +0,0 @@ -diff -ru sndpeek-1.3~/src/sndpeek/makefile.alsa sndpeek-1.3/src/sndpeek/makefile.alsa ---- sndpeek-1.3~/src/sndpeek/makefile.alsa 2007-08-12 19:22:00.000000000 +0200 -+++ sndpeek-1.3/src/sndpeek/makefile.alsa 2007-08-12 19:27:57.000000000 +0200 -@@ -1,10 +1,10 @@ - --CC=gcc --CPP=g++ -+CC?=gcc -+CXX?=g++ - INCLUDES=-I../marsyas/ - MARSYAS_DIR=../marsyas/ --CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c --LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -+CFLAGS+=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c -+LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile - - OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ - Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ -@@ -12,55 +12,55 @@ - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) - - Centroid.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - DownSampler.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Flux.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - LPC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MFCC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - RMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Rolloff.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - System.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fvec.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - AutoCorrelation.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Communicator.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Hamming.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MagFFT.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - NormRMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MarSignal.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fmatrix.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - .o: $*.h - -@@ -68,7 +68,7 @@ - $(CC) $(CFLAGS) $*.c - - .cpp.o: $*.h $*.cpp -- $(CC) $(CFLAGS) $*.cpp -+ $(CXX) $(CFLAGS) $*.cpp - - clean: - rm -f sndpeek *~ *.o -diff -ru sndpeek-1.3~/src/sndpeek/makefile.jack sndpeek-1.3/src/sndpeek/makefile.jack ---- sndpeek-1.3~/src/sndpeek/makefile.jack 2007-08-12 19:22:00.000000000 +0200 -+++ sndpeek-1.3/src/sndpeek/makefile.jack 2007-08-12 19:31:29.000000000 +0200 -@@ -1,9 +1,9 @@ --CC=gcc --CPP=g++ -+CC?=gcc -+CXX?=g++ - INCLUDES=-I../marsyas/ - MARSYAS_DIR=../marsyas/ --CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c --LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile -+CFLAGS+=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c -+LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile - - OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ - Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ -@@ -11,55 +11,55 @@ - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) - - Centroid.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - DownSampler.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Flux.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - LPC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MFCC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - RMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Rolloff.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - System.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fvec.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - AutoCorrelation.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Communicator.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Hamming.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MagFFT.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - NormRMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MarSignal.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fmatrix.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - .o: $*.h - -@@ -67,7 +67,7 @@ - $(CC) $(CFLAGS) $*.c - - .cpp.o: $*.h $*.cpp -- $(CC) $(CFLAGS) $*.cpp -+ $(CXX) $(CFLAGS) $*.cpp - - clean: - rm -f sndpeek *~ *.o -diff -ru sndpeek-1.3~/src/sndpeek/makefile.oss sndpeek-1.3/src/sndpeek/makefile.oss ---- sndpeek-1.3~/src/sndpeek/makefile.oss 2007-08-12 19:22:00.000000000 +0200 -+++ sndpeek-1.3/src/sndpeek/makefile.oss 2007-08-12 19:33:28.000000000 +0200 -@@ -1,8 +1,8 @@ --CC=gcc --CPP=g++ -+CC?=gcc -+CXX?=g++ - INCLUDES=-I../marsyas/ - MARSYAS_DIR=../marsyas/ --CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c -+CFLAGS+=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c - LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile - - TARGE=sndpeek -@@ -12,55 +12,55 @@ - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) - - Centroid.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - DownSampler.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Flux.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - LPC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MFCC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - RMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Rolloff.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - System.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fvec.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - AutoCorrelation.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Communicator.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Hamming.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MagFFT.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - NormRMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MarSignal.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fmatrix.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - .o: $*.h - -@@ -68,7 +68,7 @@ - $(CC) $(CFLAGS) $*.c - - .cpp.o: $*.h $*.cpp -- $(CC) $(CFLAGS) $*.cpp -+ $(CXX) $(CFLAGS) $*.cpp - - clean: - rm -f sndpeek *~ *.o diff --git a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch deleted file mode 100644 index 9822434b263a..000000000000 --- a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: sndpeek-1.4/src/sndpeek/makefile.alsa -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.alsa -+++ sndpeek-1.4/src/sndpeek/makefile.alsa -@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.jack -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.jack -+++ sndpeek-1.4/src/sndpeek/makefile.jack -@@ -11,7 +11,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.oss -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.oss -+++ sndpeek-1.4/src/sndpeek/makefile.oss -@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.osx -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.osx -+++ sndpeek-1.4/src/sndpeek/makefile.osx -@@ -13,7 +13,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.win32 -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.win32 -+++ sndpeek-1.4/src/sndpeek/makefile.win32 -@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp diff --git a/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch new file mode 100644 index 000000000000..9dc4fa06d10a --- /dev/null +++ b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch @@ -0,0 +1,306 @@ +diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa +index a0f76ba..e50cf82 100644 +--- a/src/sndpeek/makefile.alsa ++++ b/src/sndpeek/makefile.alsa +@@ -1,10 +1,10 @@ + +-CC=gcc +-CPP=g++ ++CC?=gcc ++CXX?=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ +-CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c +-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile ++CFLAGS_MAIN=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c ++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile + + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ +@@ -12,55 +12,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + MagFFT.o NormRMS.o MarSignal.o fmatrix.o + + sndpeek: $(OBJS) +- $(CPP) -o $@ $(OBJS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ ++chuck_fft.o: ++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c + + Centroid.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + DownSampler.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Flux.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + LPC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MFCC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + RMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Rolloff.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + System.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fvec.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + AutoCorrelation.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Communicator.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Hamming.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MagFFT.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + NormRMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MarSignal.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fmatrix.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + .o: $*.h + +@@ -68,7 +71,7 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o +diff --git a/src/sndpeek/makefile.jack b/src/sndpeek/makefile.jack +index ec15276..70fa6e3 100644 +--- a/src/sndpeek/makefile.jack ++++ b/src/sndpeek/makefile.jack +@@ -1,8 +1,8 @@ +-CC=gcc +-CPP=g++ ++CC?=gcc ++CXX?=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ +-CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c ++CFLAGS_MAIN=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c + LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile + + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ +@@ -11,55 +11,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + MagFFT.o NormRMS.o MarSignal.o fmatrix.o + + sndpeek: $(OBJS) +- $(CPP) -o $@ $(OBJS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ ++chuck_fft.o: ++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c + + Centroid.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + DownSampler.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Flux.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + LPC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MFCC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + RMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Rolloff.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + System.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fvec.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + AutoCorrelation.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Communicator.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Hamming.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MagFFT.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + NormRMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MarSignal.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fmatrix.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + .o: $*.h + +@@ -67,7 +70,7 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o +diff --git a/src/sndpeek/makefile.oss b/src/sndpeek/makefile.oss +index f092df2..3ef005c 100644 +--- a/src/sndpeek/makefile.oss ++++ b/src/sndpeek/makefile.oss +@@ -1,8 +1,8 @@ +-CC=gcc +-CPP=g++ ++CC?=gcc ++CXX?=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ +-CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c ++CFLAGS_MAIN=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c + LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile + + TARGE=sndpeek +@@ -12,55 +12,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + MagFFT.o NormRMS.o MarSignal.o fmatrix.o + + sndpeek: $(OBJS) +- $(CPP) -o $@ $(OBJS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ ++chuck_fft.o: ++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c + + Centroid.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + DownSampler.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Flux.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + LPC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MFCC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + RMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Rolloff.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + System.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fvec.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + AutoCorrelation.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Communicator.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Hamming.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MagFFT.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + NormRMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MarSignal.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fmatrix.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + .o: $*.h + +@@ -68,7 +71,7 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild index b60e397e0d76..ce8567bae371 100644 --- a/media-sound/sndpeek/sndpeek-1.4.ebuild +++ b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit eutils toolchain-funcs DESCRIPTION="real-time audio visualization" @@ -13,24 +13,27 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+alsa jack oss" -RDEPEND="media-libs/freeglut - virtual/opengl +RDEPEND=" + app-eselect/eselect-sndpeek + media-libs/freeglut virtual/glu - x11-libs/libXmu + virtual/opengl x11-libs/libX11 x11-libs/libXext + x11-libs/libXmu media-libs/libsndfile - jack? ( media-sound/jack-audio-connection-kit ) + jack? ( virtual/jack ) alsa? ( media-libs/alsa-lib ) - app-eselect/eselect-sndpeek" +" DEPEND="${RDEPEND}" REQUIRED_USE="|| ( alsa jack oss )" -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.3-makefile.patch \ - "${FILESDIR}"/${P}-gcc.patch \ - "${FILESDIR}"/${P}-ldflags.patch -} +DOCS=( AUTHORS README THANKS TODO VERSIONS ) + +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" +# "${FILESDIR}/${PN}-1.4-gcc.patch" +) compile_backend() { backend=$1 @@ -53,7 +56,7 @@ src_install() { use alsa && dobin src/sndpeek/sndpeek-alsa use jack && dobin src/sndpeek/sndpeek-jack use oss && dobin src/sndpeek/sndpeek-oss - dodoc AUTHORS README THANKS TODO VERSIONS + einstalldocs } pkg_postinst() { diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest index 7d3545e9843d..8881671e6230 100644 --- a/media-sound/sonic-visualiser/Manifest +++ b/media-sound/sonic-visualiser/Manifest @@ -3,5 +3,9 @@ AUX sonic-visualiser-4.0.1-qt-5.15-fix.patch 951 BLAKE2B 0148b2a825891b74664dd84 AUX sonic-visualiser-4.0.1-qt-deprecated.patch 564 BLAKE2B 4ee5743d4dac92c5cfe7530a5d57c97f8ab875ba95fa3148424bc827c3735f1833203e8e30a3777e0a9219c0404205514ca28ca06874e8a7357794890d607403 SHA512 8af7b53474244aed2c61bff7a1276fe826a1be933b79e5aa1cf5f3af579d5ba374ff9cc2e65f7f4f97d6cd8fd2d28d19915856db6f9e196b35e9ee3280a07421 AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264 DIST sonic-visualiser-4.0.1.tar.gz 6649178 BLAKE2B c231833f7cc6228d450600e5cbc6a6db85d0aa784ce67a225bedb1393ca82a99bca492912bbaf8bf87f5fcce48e57facc3f216b057233b53f596ccd71835d174 SHA512 6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220 +DIST sonic-visualiser-4.1.tar.gz 6535840 BLAKE2B b3afdb2026405148e2efb217e960a4e70fd8efbe3779c6cc3671b17a808f12e288efb89bbd5200da9ccfc8bdbd0c684d555f7394aab8e67d2963fd84f967da0c SHA512 57edfc52ddbc9198a6608460a8f4e4fc2a382588f2881b7ea99cc738d7944d66c942f24218a303fb20eaa698ee365f29006c985f2385afd7f5c27fec5a241adb +DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3 EBUILD sonic-visualiser-4.0.1.ebuild 2790 BLAKE2B 776c2cf8fed6e68128ac5fa07adf129ae0ba0c4f44f3f37052d182029ab8744822266c8374654534201659089cd8e50b82d1cadec917314ab3c4afe26e77f477 SHA512 5ed5e4b90396c22c1d0e78bbb7efdedf3158f890dd23751a15d3bc04abebeb0df898e9fb751c3a2a20596b53a85a45deaf578411a2453bdff394b1b3eb176bef +EBUILD sonic-visualiser-4.1.ebuild 2804 BLAKE2B 75fba7ef4041429c4571c8cba2a635cea6dd76a8aa0eda4ee0f634a2b950f8194f32598497ecf7a3d98bad41a190ea8959772cc603cd0d28cb8258d5de97a78f SHA512 c3c76d4a6881fb24141d86f886d3cff9adc7607d45b5a7856cdfd9163ce8dec0a95eab570db6f56336f82e07b80c89b6ab67b33f18d2ecedcd49144fce87f756 +EBUILD sonic-visualiser-4.2.ebuild 2852 BLAKE2B f27bdad00e9ff277fe6c380b81a1a5a50f054079088c6aabe907278b093ff4e45504d84516bcb14249f9572f6a95eadf8132909d5f46ab0bfa736516d871d611 SHA512 96d659f47bbf29102385f2ddf45b0c956a44f18e8310eeb8d9dbf52dba70f6a7ad8334543f6834192203d17c4cfc517492935a45a3363b43c898da54c0b893fb MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild new file mode 100644 index 000000000000..5433a3bec4ff --- /dev/null +++ b/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop qmake-utils xdg + +DESCRIPTION="Music audio files viewer and analiser" +HOMEPAGE="https://www.sonicvisualiser.org/" +SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2717/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test" + +BDEPEND=" + dev-qt/qttest:5 + sys-devel/autoconf-archive + virtual/pkgconfig +" +RDEPEND=" + app-arch/bzip2 + >=dev-libs/capnproto-0.6:= + dev-libs/serd + dev-libs/sord + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/alsa-lib + media-libs/dssi + media-libs/ladspa-sdk + media-libs/liblrdf + media-libs/libsamplerate + media-libs/libsndfile + media-libs/rubberband + media-libs/speex + media-libs/vamp-plugin-sdk + sci-libs/fftw:3.0= + id3tag? ( media-libs/libid3tag ) + jack? ( virtual/jack ) + mad? ( media-libs/libmad ) + ogg? ( + media-libs/libfishsound + media-libs/liboggz + ) + opus? ( media-libs/opusfile ) + osc? ( media-libs/liblo ) + portaudio? ( >=media-libs/portaudio-19 ) + pulseaudio? ( media-sound/pulseaudio ) +" +DEPEND="${RDEPEND}" + +# tests fail without mp3 support +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( jack pulseaudio portaudio ) + test? ( mad ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.1-notest.patch" +) + +sv_disable_opt() { + einfo "Disabling $1" + for i in . svapp svcore svgui ; do + sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support" + done +} + +src_prepare() { + default + + use id3tag || sv_disable_opt id3tag + use jack || sv_disable_opt jack + use mad || sv_disable_opt mad + use ogg || sv_disable_opt fishsound + use ogg || sv_disable_opt oggz + use opus || sv_disable_opt opus + use osc || sv_disable_opt liblo + use portaudio || sv_disable_opt portaudio + use pulseaudio || sv_disable_opt libpulse + + # capnproto 0.7 requires c++14 now + sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \ + -i configure.ac \ + -i */configure.ac \ + || die + + eautoreconf +} + +src_configure() { + export QMAKE="$(qt5_get_bindir)"/qmake + econf + eqmake5 -r sonic-visualiser.pro + sed -e 's/std=gnu++11/std=gnu++14/g' \ + -i Makefile.* \ + -i checker/Makefile.* \ + || die +} + +src_test() { + for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do + einfo "Running ${i}" + HOME="${T}" ./${i} || die + done +} + +src_install() { + dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker + dodoc README* + + #install samples + insinto /usr/share/${PN}/samples + doins samples/* + + # desktop entry + doicon icons/sv-icon.svg + domenu sonic-visualiser.desktop + + # mime types + insinto /usr/share/mime/packages + doins "${FILESDIR}/${PN}.xml" +} diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild new file mode 100644 index 000000000000..cd2faeea1677 --- /dev/null +++ b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop qmake-utils xdg + +DESCRIPTION="Music audio files viewer and analiser" +HOMEPAGE="https://www.sonicvisualiser.org/" +SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test" + +BDEPEND=" + dev-qt/qttest:5 + sys-devel/autoconf-archive + virtual/pkgconfig +" +RDEPEND=" + app-arch/bzip2 + >=dev-libs/capnproto-0.6:= + dev-libs/serd + dev-libs/sord + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/alsa-lib + media-libs/dssi + media-libs/ladspa-sdk + media-libs/liblrdf + media-libs/libsamplerate + media-libs/libsndfile + media-libs/rubberband + media-libs/speex + media-libs/vamp-plugin-sdk + sci-libs/fftw:3.0= + id3tag? ( media-libs/libid3tag ) + jack? ( virtual/jack ) + mad? ( media-libs/libmad ) + ogg? ( + media-libs/libfishsound + media-libs/liboggz + ) + opus? ( media-libs/opusfile ) + osc? ( media-libs/liblo ) + portaudio? ( >=media-libs/portaudio-19 ) + pulseaudio? ( media-sound/pulseaudio ) +" +DEPEND="${RDEPEND}" + +# tests fail without mp3 support +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( jack pulseaudio portaudio ) + test? ( mad ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.1-notest.patch" +) + +sv_disable_opt() { + einfo "Disabling $1" + for i in . svapp svcore svgui ; do + sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support" + done +} + +src_prepare() { + default + + use id3tag || sv_disable_opt id3tag + use jack || sv_disable_opt jack + use mad || sv_disable_opt mad + use ogg || sv_disable_opt fishsound + use ogg || sv_disable_opt oggz + use opus || sv_disable_opt opus + use osc || sv_disable_opt liblo + use portaudio || sv_disable_opt portaudio + use pulseaudio || sv_disable_opt libpulse + + # capnproto 0.7 requires c++14 now + sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \ + -i configure.ac \ + -i */configure.ac \ + || die + + eautoreconf +} + +src_configure() { + export QMAKE="$(qt5_get_bindir)"/qmake + econf + eqmake5 -r sonic-visualiser.pro + sed -e 's/std=gnu++11/std=gnu++14/g' \ + -i Makefile.* \ + -i checker/Makefile.* \ + || die +} + +src_test() { + for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do + einfo "Running ${i}" + HOME="${T}" ./${i} || die + done +} + +src_install() { + dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker + dodoc README* + + #install samples + insinto /usr/share/${PN}/samples + doins samples/* + + # desktop entry + mv icons/sv-icon.svg icons/${PN}.svg + doicon -s scalable icons/${PN}.svg + domenu sonic-visualiser.desktop + + # mime types + insinto /usr/share/mime/packages + doins "${FILESDIR}/${PN}.xml" +} diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest index 8ae85f456894..11f5eefe5f7f 100644 --- a/media-sound/sooperlooper/Manifest +++ b/media-sound/sooperlooper/Manifest @@ -1,8 +1,4 @@ -AUX sooperlooper-1.7.3-clash.patch 52851 BLAKE2B 8bc313d488306b2c5ab6b9055ccad4173835a3715dfc39ec85e434555dfa930dc38d566883f8d2c88ca6c87f3d626c7026b77754e6b77827e524f6d0bfb443f7 SHA512 a95db701cbc62bb0e730a34fe2bbc8e6f0351c9d7c579c87465a8b9808ed9c213f2ed406ee42787313c08e9a6ba9ce4c5e8aa215ddea8bbf984b0d7bd0429536 -AUX sooperlooper-1.7.3-libsigc28.patch 3219 BLAKE2B 05a0afbf8f5d0038df97d86ad4b4ae76dbf08bc717dee3932779abc450d025a82aa9314f97252256a660f0bfff473ea882999e12431545b260ba3998353e54ce SHA512 1de246e8bef9ea6f2163070034ee829166a89d0e670fceb36f8df2d47e2de7b845d98f3556a67575a793b01e2823a62f1c6d27e594932cfba7b1620e1e3007b5 -AUX sooperlooper-1.7.3-tinfo.patch 682 BLAKE2B 670e14508384de3fbab0eeaf38ab8db451822a42dae88ff570a49d5ece4b22f50254c830b72db04016c66491d20cf2cd992c09f20ba75af8f0aed668327daf37 SHA512 6d3c4d5ee8625d0dc833c0150fcf5bbe1d19f0492cd66b5a260d2a9e72816af964cdebb470fbf665f45ea37193b20d8f9d4309e6dc845f47b7ab42304df4a15a -AUX sooperlooper-1.7.3-wx3.0.patch 8149 BLAKE2B a2afa2d64dc2390db6690304339249f046639c6f0cba5f754c388515cc8093cca57342ed634cbb460678a3d0bddb2ac05a2d2c4f43c8e51175d1dc27dc13bd39 SHA512 93e3630f2a7f839b282b04cd35cdfee025f91bd24b5e715c668ef0f63a675c1c57f53aaa1ead0d27c73a9a2323160217fd9d62c25a5da27c5ed361f527880381 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d -DIST sooperlooper-1.7.3.tar.gz 732406 BLAKE2B 65adf851c0f8e4152176ac5a53a02c2113cb4876f1abf1cbbc5c12556d8508b8e1b063cc7107032f6cd3118afa3f239303c7b04e66786bded24e5950bef16bf7 SHA512 cbc9f6b3e4cafc6f18ddb2e2415d2bac274c8cc578b5dadc6ad878b1bed34e514208bc990c3a7dab0106cbf34ad16be12846851e446d724d77386e70d975e14b -EBUILD sooperlooper-1.7.3-r2.ebuild 1426 BLAKE2B 3f47d23b730c693b2feff00c91493758d69f5590f3b55c05a2990eb0b83366e274f12aec9a0225df325f39cd3708443960221bb1a7d7ef565306bfda333baa19 SHA512 32bc01c21cb171f45b80c9cc8085a3a6432f907cac85dd4551592029d4a8367597738cd8509184618182859d137ee20f2d9837f25613afee310ae30882e43215 +DIST sooperlooper-1.7.4.tar.gz 857069 BLAKE2B 0e7f13195a73ec9e41deaf93443c612bd2e44a3133dcc5685a3da497bfdc2acb24c5de33ea853c79e3c1a13c552d19f06370d96fe8fd17569c6e94541d035f5f SHA512 f2921346759ad3821c43cc75d77e3a5b3a5433e03204048580e36cd2cddb08bd2447e509e01e01fcce4585a1759a913fd01fd098a50d9bcdb30f8dde6cc509c2 +EBUILD sooperlooper-1.7.4.ebuild 1332 BLAKE2B 3d49a16370ba0042ad3221ac714302963a5f2a785ec6a793a826b107de3ce0f0a082e39b2c8ed6ad1b4f8a9129667d2151087199b9faf54b4f5eb174d881bc65 SHA512 8501cc4879ced833646e13a79379e0d9a670720d099cefeb43c5b1a313fa09c46924714453f3ebb097de2a2293bd27ef45b0c859d96f59c361b254525750cd6a MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch deleted file mode 100644 index a5df2e2c2252..000000000000 --- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch +++ /dev/null @@ -1,661 +0,0 @@ -From 0cb1e65166c777250cf3737c418fcfc12ffac815 Mon Sep 17 00:00:00 2001 -From: vixus0 <vixus0@gmail.com> -Date: Tue, 7 Jun 2016 22:10:39 +0100 -Subject: [PATCH] Use sigc::bind due to clash with std::bind - ---- - src/engine.cpp | 2 +- - src/gui/latency_panel.cpp | 4 +- - src/gui/looper_panel.cpp | 182 +++++++++++++++++++++++----------------------- - src/gui/main_panel.cpp | 150 +++++++++++++++++++------------------- - 4 files changed, 169 insertions(+), 169 deletions(-) - -diff --git a/src/engine.cpp b/src/engine.cpp -index a7a6395..3175c20 100644 ---- a/src/engine.cpp -+++ b/src/engine.cpp -@@ -313,7 +313,7 @@ void Engine::set_midi_bridge (MidiBridge * bridge) - _midi_bridge->MidiControlEvent.connect (mem_fun(*this, &Engine::push_midi_control_event)); - _midi_bridge->MidiSyncEvent.connect (mem_fun(*this, &Engine::push_sync_event)); - -- ParamChanged.connect(bind (mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this)); -+ ParamChanged.connect(sigc::bind(mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this)); - - _midi_bridge->set_output_midi_clock(_output_midi_clock); - } -diff --git a/src/gui/latency_panel.cpp b/src/gui/latency_panel.cpp -index 10e16e8..cb28723 100644 ---- a/src/gui/latency_panel.cpp -+++ b/src/gui/latency_panel.cpp -@@ -150,7 +150,7 @@ void LatencyPanel::init() - _input_spin->set_allow_outside_bounds(false); - //_input_spin->SetFont (sliderFont); - _input_spin->set_decimal_digits(0); -- _input_spin->value_changed.connect (bind (mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_InputLatency)); -+ _input_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_InputLatency)); - rowsizer->Add (_input_spin, 1, wxLEFT|wxEXPAND, 10); - - _output_spin = new SpinBox(this, ID_OutputLatency, 0.0f, 100000.0f, 512.0f, false, wxDefaultPosition, wxSize(200, 35)); -@@ -160,7 +160,7 @@ void LatencyPanel::init() - _output_spin->set_allow_outside_bounds(false); - _output_spin->set_decimal_digits(0); - //_output_spin->SetFont (sliderFont); -- _output_spin->value_changed.connect (bind (mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_OutputLatency)); -+ _output_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_OutputLatency)); - rowsizer->Add (_output_spin, 1, wxLEFT|wxRIGHT|wxEXPAND, 10); - - -diff --git a/src/gui/looper_panel.cpp b/src/gui/looper_panel.cpp -index 4c5650d..34f7a84 100644 ---- a/src/gui/looper_panel.cpp -+++ b/src/gui/looper_panel.cpp -@@ -212,8 +212,8 @@ LooperPanel::init() - slider->set_show_indicator_bar (false); - slider->set_scale_mode(SliderBar::ZeroGainMode); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - inthresh_sizer->Add (slider, 1, wxALL|wxEXPAND, 0); - - _thresh_control = slider = new SliderBar(this, ID_ThreshControl, 0.0f, 1.0f, 0.0f); -@@ -222,8 +222,8 @@ LooperPanel::init() - slider->set_show_indicator_bar (true); - slider->set_scale_mode(SliderBar::ZeroGainMode); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - inthresh_sizer->Add (slider, 1, wxLEFT|wxEXPAND, 3); - - colsizer->Add (inthresh_sizer, 1, wxEXPAND|wxLEFT, 5); -@@ -232,8 +232,8 @@ LooperPanel::init() - slider->set_units(wxT("%")); - slider->set_label(wxT("feedback")); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - - _maininsizer->Add (slider, 1, wxEXPAND|wxTOP, 5); - -@@ -281,8 +281,8 @@ LooperPanel::init() - // slider->set_label(wxT("dry")); - // slider->set_scale_mode(SliderBar::ZeroGainMode); - // slider->SetFont(sliderFont); --// slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); --// slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+// slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+// slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - // _toppansizer->Add (slider, 1, wxEXPAND, 0); - - // panners are added later -@@ -297,8 +297,8 @@ LooperPanel::init() - slider->set_show_indicator_bar (true); - slider->set_scale_mode(SliderBar::ZeroGainMode); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - _botpansizer->Add (slider, 1, wxEXPAND, 0); - - /* -@@ -307,7 +307,7 @@ LooperPanel::init() - _outlatency_spin->set_label(wxT("o.lat")); - _outlatency_spin->set_snap_mode (SpinBox::IntegerSnap); - _outlatency_spin->set_allow_outside_bounds(true); -- _outlatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _outlatency_spin->GetId())); -+ _outlatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _outlatency_spin->GetId())); - _outlatency_spin->SetFont(sliderFont); - _botpansizer->Add (_outlatency_spin, 0, wxALL, 0); - -@@ -316,7 +316,7 @@ LooperPanel::init() - _inlatency_spin->set_label(wxT("i.lat")); - _inlatency_spin->set_snap_mode (SpinBox::IntegerSnap); - _inlatency_spin->set_allow_outside_bounds(true); -- _inlatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _inlatency_spin->GetId())); -+ _inlatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _inlatency_spin->GetId())); - _inlatency_spin->SetFont(sliderFont); - _botpansizer->Add (_inlatency_spin, 0, wxALL, 0); - */ -@@ -361,8 +361,8 @@ LooperPanel::init() - _sync_check = new CheckBox(this, ID_SyncCheck, wxT("sync"), true, wxDefaultPosition, wxSize(55, 18)); - _sync_check->SetFont(sliderFont); - _sync_check->SetToolTip(wxT("sync operations to quantize source")); -- _sync_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("sync"))); -- _sync_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _sync_check->GetId())); -+ _sync_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("sync"))); -+ _sync_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _sync_check->GetId())); - lilrowsizer->Add (_sync_check, 1, wxLEFT, 3); - lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0); - -@@ -370,8 +370,8 @@ LooperPanel::init() - _play_sync_check = new CheckBox(this, ID_PlaySyncCheck, wxT("play sync"), true, wxDefaultPosition, wxSize(55, 18)); - _play_sync_check->SetFont(sliderFont); - _play_sync_check->SetToolTip(wxT("sync playback auto-triggering to quantized sync source")); -- _play_sync_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("playback_sync"))); -- _play_sync_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_sync_check->GetId())); -+ _play_sync_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("playback_sync"))); -+ _play_sync_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_sync_check->GetId())); - lilrowsizer->Add (_play_sync_check, 1, wxLEFT, 3); - lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0); - -@@ -379,15 +379,15 @@ LooperPanel::init() - _play_feed_check = new CheckBox(this, ID_UseFeedbackPlayCheck, wxT("p. feedb"), true, wxDefaultPosition, wxSize(55, 18)); - _play_feed_check->SetFont(sliderFont); - _play_feed_check->SetToolTip(wxT("enable feedback during playback")); -- _play_feed_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("use_feedback_play"))); -- _play_feed_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_feed_check->GetId())); -+ _play_feed_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("use_feedback_play"))); -+ _play_feed_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_feed_check->GetId())); - lilrowsizer->Add (_play_feed_check, 1, wxLEFT, 3); - - _tempo_stretch_check = new CheckBox(this, ID_TempoStretchCheck, wxT("t. stretch"), true, wxDefaultPosition, wxSize(55, 18)); - _tempo_stretch_check->SetFont(sliderFont); - _tempo_stretch_check->SetToolTip(wxT("enable automatic timestretch when tempo changes")); -- _tempo_stretch_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("tempo_stretch"))); -- _tempo_stretch_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _tempo_stretch_check->GetId())); -+ _tempo_stretch_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("tempo_stretch"))); -+ _tempo_stretch_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _tempo_stretch_check->GetId())); - lilrowsizer->Add (_tempo_stretch_check, 1, wxLEFT, 3); - - lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0); -@@ -440,8 +440,8 @@ LooperPanel::init() - slider->set_show_value(false); - slider->set_show_indicator_bar (true); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); - - // pitch control -@@ -452,8 +452,8 @@ LooperPanel::init() - slider->set_decimal_digits (1); - slider->set_snap_mode(SliderBar::IntegerSnap); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); - - // pause -@@ -476,8 +476,8 @@ LooperPanel::init() - slider->set_style (SliderBar::CenterStyle); - slider->set_decimal_digits (3); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); - - // stretch control -@@ -487,8 +487,8 @@ LooperPanel::init() - slider->set_style (SliderBar::CenterStyle); - slider->set_decimal_digits (2); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); - - -@@ -498,7 +498,7 @@ LooperPanel::init() - _triglatency_spin->set_label(wxT("t.lat")); - _triglatency_spin->set_snap_mode (SpinBox::IntegerSnap); - _triglatency_spin->set_allow_outside_bounds(true); -- _triglatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _triglatency_spin->GetId())); -+ _triglatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _triglatency_spin->GetId())); - _triglatency_spin->SetFont(sliderFont); - rowsizer->Add (_triglatency_spin, 0, wxALL, 0); - */ -@@ -555,15 +555,15 @@ LooperPanel::post_init() - slider->set_label(wxT("in mon")); - slider->set_scale_mode(SliderBar::ZeroGainMode); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); - _toppansizer->Add (slider, 1, wxEXPAND, 0); - - _use_main_in_check = new CheckBox(this, ID_UseMainInCheck, wxT("main in"), true, wxDefaultPosition, wxSize(65, 18)); - _use_main_in_check->SetFont(sliderFont); - _use_main_in_check->SetToolTip(wxT("mix input from Main inputs")); -- _use_main_in_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("use_common_ins"))); -- _use_main_in_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _use_main_in_check->GetId())); -+ _use_main_in_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("use_common_ins"))); -+ _use_main_in_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _use_main_in_check->GetId())); - _maininsizer->Add (_use_main_in_check, 0, wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL ,0); - _maininsizer->Layout(); - -@@ -595,8 +595,8 @@ LooperPanel::post_init() - slider->set_decimal_digits (3); - slider->set_show_value (false); - slider->SetFont(sliderFont); -- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::pan_events), (int) i)); -- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::pan_bind_events), (int) i)); -+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pan_events), (int) i)); -+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::pan_bind_events), (int) i)); - - if (!_has_discrete_io) { - _toppansizer->Add (slider, 1, (i==0) ? wxEXPAND : wxEXPAND|wxLEFT, 2); -@@ -652,83 +652,83 @@ LooperPanel::set_index(int ind) - void - LooperPanel::bind_events() - { -- _undo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("undo")))); -- _undo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("undo")))); -- _undo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("undo")))); -+ _undo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("undo")))); -+ _undo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("undo")))); -+ _undo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("undo")))); - -- _redo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("redo")))); -- _redo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("redo")))); -- _redo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("redo")))); -+ _redo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("redo")))); -+ _redo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("redo")))); -+ _redo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("redo")))); - -- _record_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("record")))); -- _record_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("record")))); -- _record_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("record")))); -+ _record_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("record")))); -+ _record_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("record")))); -+ _record_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("record")))); - -- _overdub_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("overdub")))); -- _overdub_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("overdub")))); -- _overdub_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("overdub")))); -+ _overdub_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("overdub")))); -+ _overdub_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("overdub")))); -+ _overdub_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("overdub")))); - -- _multiply_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("multiply")))); -- _multiply_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("multiply")))); -- _multiply_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("multiply")))); -+ _multiply_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("multiply")))); -+ _multiply_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("multiply")))); -+ _multiply_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("multiply")))); - -- _replace_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("replace")))); -- _replace_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("replace")))); -- _replace_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("replace")))); -+ _replace_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("replace")))); -+ _replace_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("replace")))); -+ _replace_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("replace")))); - -- _insert_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("insert")))); -- _insert_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("insert")))); -- _insert_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("insert")))); -+ _insert_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("insert")))); -+ _insert_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("insert")))); -+ _insert_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("insert")))); - -- _once_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("oneshot")))); -- _once_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("oneshot")))); -- _once_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("oneshot")))); -+ _once_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("oneshot")))); -+ _once_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("oneshot")))); -+ _once_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("oneshot")))); - -- _trig_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("trigger")))); -- _trig_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("trigger")))); -- _trig_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("trigger")))); -+ _trig_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("trigger")))); -+ _trig_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("trigger")))); -+ _trig_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("trigger")))); - - _delay_button->pressed.connect (mem_fun (*this, &LooperPanel::delay_button_press_event)); - _delay_button->released.connect (mem_fun (*this, &LooperPanel::delay_button_release_event)); -- _delay_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("delay_trigger")))); -+ _delay_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("delay_trigger")))); - -- _reverse_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("reverse")))); -- _reverse_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("reverse")))); -- _reverse_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("reverse")))); -+ _reverse_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("reverse")))); -+ _reverse_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("reverse")))); -+ _reverse_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("reverse")))); - -- _substitute_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("substitute")))); -- _substitute_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("substitute")))); -- _substitute_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("substitute")))); -+ _substitute_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("substitute")))); -+ _substitute_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("substitute")))); -+ _substitute_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("substitute")))); - -- _mute_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("mute")))); -- _mute_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("mute")))); -- _mute_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("mute")))); -+ _mute_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("mute")))); -+ _mute_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("mute")))); -+ _mute_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("mute")))); - -- _pause_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("pause")))); -- _pause_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("pause")))); -- _pause_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("pause")))); -+ _pause_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("pause")))); -+ _pause_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("pause")))); -+ _pause_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("pause")))); - -- _solo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("solo")))); -- _solo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("solo")))); -- _solo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("solo")))); -+ _solo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("solo")))); -+ _solo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("solo")))); -+ _solo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("solo")))); - -- _halfx_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 0.5f)); -- _halfx_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 0.5f)); -- _1x_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 1.0f)); -- _1x_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 1.0f)); -- _2x_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 2.0f)); -- _2x_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 2.0f)); -+ _halfx_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 0.5f)); -+ _halfx_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 0.5f)); -+ _1x_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 1.0f)); -+ _1x_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 1.0f)); -+ _2x_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 2.0f)); -+ _2x_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 2.0f)); - -- _scratch_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("scratch")))); -- _scratch_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("scratch")))); -- _scratch_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("scratch")))); -+ _scratch_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("scratch")))); -+ _scratch_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("scratch")))); -+ _scratch_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("scratch")))); - -- _save_button->clicked.connect (bind (mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("save")))); -- _load_button->clicked.connect (bind (mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("load")))); -+ _save_button->clicked.connect (sigc::bind(mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("save")))); -+ _load_button->clicked.connect (sigc::bind(mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("load")))); - - -- _scratch_control->pressed.connect (bind (mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_press")))); -- _scratch_control->released.connect (bind (mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_release")))); -+ _scratch_control->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_press")))); -+ _scratch_control->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_release")))); - - - _loop_control->MidiBindingChanged.connect (mem_fun (*this, &LooperPanel::got_binding_changed)); -diff --git a/src/gui/main_panel.cpp b/src/gui/main_panel.cpp -index 1734eb6..b0c1bac 100644 ---- a/src/gui/main_panel.cpp -+++ b/src/gui/main_panel.cpp -@@ -217,7 +217,7 @@ MainPanel::init() - _sync_choice->set_label (wxT("sync to")); - _sync_choice->SetFont (sliderFont); - _sync_choice->value_changed.connect (mem_fun (*this, &MainPanel::on_syncto_change)); -- _sync_choice->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("sync"))); -+ _sync_choice->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("sync"))); - - rowsizer->Add (_sync_choice, 0, wxALL|wxEXPAND, 2); - -@@ -228,7 +228,7 @@ MainPanel::init() - _tempo_bar->set_allow_outside_bounds(true); - _tempo_bar->SetFont (sliderFont); - _tempo_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_tempo_change)); -- _tempo_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("tempo"))); -+ _tempo_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("tempo"))); - rowsizer->Add (_tempo_bar, 0, wxALL|wxEXPAND, 2); - - _taptempo_button = new PixButton(_top_panel, ID_TapTempoButton, true); -@@ -239,7 +239,7 @@ MainPanel::init() - _taptempo_button->set_active_bitmap (wxBitmap(tap_tempo_active)); - _taptempo_button->pressed.connect (mem_fun (*this, &MainPanel::on_taptempo_press)); - _taptempo_button->released.connect (mem_fun (*this, &MainPanel::on_taptempo_release)); -- _taptempo_button->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("taptempo"))); -+ _taptempo_button->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("taptempo"))); - rowsizer->Add (_taptempo_button, 0, wxALL|wxEXPAND, 2); - - -@@ -250,7 +250,7 @@ MainPanel::init() - _eighth_cycle_bar->set_allow_outside_bounds(true); - _eighth_cycle_bar->SetFont (sliderFont); - _eighth_cycle_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_eighth_change)); -- _eighth_cycle_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("eighth"))); -+ _eighth_cycle_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("eighth"))); - rowsizer->Add (_eighth_cycle_bar, 0, wxALL|wxEXPAND, 2); - - -@@ -258,7 +258,7 @@ MainPanel::init() - _quantize_choice->SetFont (sliderFont); - _quantize_choice->set_label (wxT("quantize")); - _quantize_choice->value_changed.connect (mem_fun (*this, &MainPanel::on_quantize_change)); -- _quantize_choice->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("quantize"))); -+ _quantize_choice->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("quantize"))); - _quantize_choice->append_choice (wxT("off"), 0); - _quantize_choice->append_choice (wxT("cycle"), 1); - _quantize_choice->append_choice (wxT("8th"), 2); -@@ -269,21 +269,21 @@ MainPanel::init() - _mute_quant_check->SetFont(sliderFont); - _mute_quant_check->SetToolTip(wxT("quantize mute operations")); - _mute_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_mute_quant_check)); -- _mute_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("mute_quantized"))); -+ _mute_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("mute_quantized"))); - rowsizer->Add (_mute_quant_check, 0, wxALL|wxEXPAND, 2); - - _odub_quant_check = new CheckBox(_top_panel, ID_OdubQuantCheck, wxT("odub quant"), true, wxDefaultPosition, wxSize(90, 18)); - _odub_quant_check->SetFont(sliderFont); - _odub_quant_check->SetToolTip(wxT("quantize overdub operations")); - _odub_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_odub_quant_check)); -- _odub_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("overdub_quantized"))); -+ _odub_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("overdub_quantized"))); - rowsizer->Add (_odub_quant_check, 0, wxALL|wxEXPAND, 2); - - _repl_quant_check = new CheckBox(_top_panel, ID_ReplQuantCheck, wxT("repl quant"), true, wxDefaultPosition, wxSize(90, 18)); - _repl_quant_check->SetFont(sliderFont); - _repl_quant_check->SetToolTip(wxT("quantize replace and substitute operations")); - _repl_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_repl_quant_check)); -- _repl_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("replace_quantized"))); -+ _repl_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("replace_quantized"))); - rowsizer->Add (_repl_quant_check, 0, wxALL|wxEXPAND, 2); - - -@@ -305,7 +305,7 @@ MainPanel::init() - _xfade_bar->set_decimal_digits (0); - _xfade_bar->SetFont (sliderFont); - _xfade_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_xfade_change)); -- _xfade_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("fade_samples"))); -+ _xfade_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("fade_samples"))); - rowsizer->Add (_xfade_bar, 0, wxALL|wxEXPAND, 2); - - _common_ingain_bar = new SliderBar(_top_panel, ID_InGainControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20)); -@@ -315,7 +315,7 @@ MainPanel::init() - _common_ingain_bar->set_show_indicator_bar(true); - _common_ingain_bar->SetFont(sliderFont); - _common_ingain_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_ingain_change)); -- _common_ingain_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("input_gain"))); -+ _common_ingain_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("input_gain"))); - rowsizer->Add (_common_ingain_bar, 0, wxALL|wxEXPAND, 2); - - _common_dry_bar = new SliderBar(_top_panel, ID_DryControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20)); -@@ -325,7 +325,7 @@ MainPanel::init() - _common_dry_bar->set_show_indicator_bar(true); - _common_dry_bar->SetFont(sliderFont); - _common_dry_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_dry_change)); -- _common_dry_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("dry"))); -+ _common_dry_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("dry"))); - rowsizer->Add (_common_dry_bar, 0, wxALL|wxEXPAND, 2); - - _common_wet_bar = new SliderBar(_top_panel, ID_WetControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20)); -@@ -335,7 +335,7 @@ MainPanel::init() - _common_wet_bar->set_show_indicator_bar(true); - _common_wet_bar->SetFont(sliderFont); - _common_wet_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_wet_change)); -- _common_wet_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("wet"))); -+ _common_wet_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("wet"))); - rowsizer->Add (_common_wet_bar, 0, wxALL|wxEXPAND, 2); - - -@@ -343,13 +343,13 @@ MainPanel::init() - _round_check = new CheckBox (_top_panel, ID_RoundCheck, wxT("round"), true, wxDefaultPosition, wxSize(60, 20)); - _round_check->SetFont (sliderFont); - _round_check->value_changed.connect (mem_fun (*this, &MainPanel::on_round_check)); -- _round_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("round"))); -+ _round_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("round"))); - rowsizer->Add (_round_check, 0, wxALL|wxEXPAND, 2); - - _relsync_check = new CheckBox (_top_panel, ID_RelSyncCheck, wxT("rel sync"), true, wxDefaultPosition, wxSize(75, 20)); - _relsync_check->SetFont (sliderFont); - _relsync_check->value_changed.connect (mem_fun (*this, &MainPanel::on_relsync_check)); -- _relsync_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("relative_sync"))); -+ _relsync_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("relative_sync"))); - rowsizer->Add (_relsync_check, 0, wxALL|wxEXPAND, 2); - - -@@ -357,7 +357,7 @@ MainPanel::init() - _smart_eighths_check->SetFont(sliderFont); - _smart_eighths_check->SetToolTip(wxT("auto adjust 8ths per cycle with tempo")); - _smart_eighths_check->value_changed.connect (mem_fun (*this, &MainPanel::on_smart_eighths_check)); -- _smart_eighths_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("smart_eighths"))); -+ _smart_eighths_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("smart_eighths"))); - rowsizer->Add (_smart_eighths_check, 0, wxALL|wxEXPAND, 2); - - -@@ -379,7 +379,7 @@ MainPanel::init() - - // todo request how many loopers to construct based on connection - _loop_connect_connection = _loop_control->LooperConnected.connect (mem_fun (*this, &MainPanel::init_loopers)); -- _loop_disconnect_connection = _loop_control->Disconnected.connect (bind (mem_fun (*this, &MainPanel::init_loopers), 0)); -+ _loop_disconnect_connection = _loop_control->Disconnected.connect (sigc::bind(mem_fun (*this, &MainPanel::init_loopers), 0)); - _loop_update_connection = _loop_control->NewDataReady.connect (mem_fun (*this, &MainPanel::osc_data_ready)); - - -@@ -1112,67 +1112,67 @@ MainPanel::process_key_event (wxKeyEvent &ev) - void MainPanel::intialize_keybindings () - { - -- _keyboard->add_action ("record", bind (mem_fun (*this, &MainPanel::command_action), wxT("record"))); -- _keyboard->add_action ("overdub", bind (mem_fun (*this, &MainPanel::command_action), wxT("overdub"))); -- _keyboard->add_action ("multiply", bind (mem_fun (*this, &MainPanel::command_action), wxT("multiply"))); -- _keyboard->add_action ("insert", bind (mem_fun (*this, &MainPanel::command_action), wxT("insert"))); -- _keyboard->add_action ("replace", bind (mem_fun (*this, &MainPanel::command_action), wxT("replace"))); -- _keyboard->add_action ("reverse", bind (mem_fun (*this, &MainPanel::command_action), wxT("reverse"))); -- _keyboard->add_action ("scratch", bind (mem_fun (*this, &MainPanel::command_action), wxT("scratch"))); -- _keyboard->add_action ("substitute", bind (mem_fun (*this, &MainPanel::command_action), wxT("substitute"))); -- _keyboard->add_action ("mute", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute"))); -- _keyboard->add_action ("mute_on", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_on"))); -- _keyboard->add_action ("mute_off", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_off"))); -- _keyboard->add_action ("mute_trigger", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_trigger"))); -- _keyboard->add_action ("undo", bind (mem_fun (*this, &MainPanel::command_action), wxT("undo"))); -- _keyboard->add_action ("redo", bind (mem_fun (*this, &MainPanel::command_action), wxT("redo"))); -- _keyboard->add_action ("undo_all", bind (mem_fun (*this, &MainPanel::command_action), wxT("undo_all"))); -- _keyboard->add_action ("redo_all", bind (mem_fun (*this, &MainPanel::command_action), wxT("redo_all"))); -- _keyboard->add_action ("oneshot", bind (mem_fun (*this, &MainPanel::command_action), wxT("oneshot"))); -- _keyboard->add_action ("trigger", bind (mem_fun (*this, &MainPanel::command_action), wxT("trigger"))); -- _keyboard->add_action ("pause", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause"))); -- _keyboard->add_action ("pause_on", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause_on"))); -- _keyboard->add_action ("pause_off", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause_off"))); -- _keyboard->add_action ("solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo"))); -- _keyboard->add_action ("solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo_prev"))); -- _keyboard->add_action ("solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo_next"))); -- _keyboard->add_action ("record_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo"))); -- _keyboard->add_action ("record_solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo_prev"))); -- _keyboard->add_action ("record_solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo_next"))); -- _keyboard->add_action ("set_sync_pos", bind (mem_fun (*this, &MainPanel::command_action), wxT("set_sync_pos"))); -- _keyboard->add_action ("reset_sync_pos", bind (mem_fun (*this, &MainPanel::command_action), wxT("reset_sync_pos"))); -- _keyboard->add_action ("record_or_overdub", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub"))); -- _keyboard->add_action ("record_exclusive", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive"))); -- _keyboard->add_action ("record_exclusive_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_next"))); -- _keyboard->add_action ("record_exclusive_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_prev"))); -- _keyboard->add_action ("record_or_overdub_excl", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl"))); -- _keyboard->add_action ("record_or_overdub_excl_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_next"))); -- _keyboard->add_action ("record_or_overdub_excl_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_prev"))); -- _keyboard->add_action ("record_or_overdub_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo"))); -- _keyboard->add_action ("record_or_overdub_solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_next"))); -- _keyboard->add_action ("record_or_overdub_solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_prev"))); -- _keyboard->add_action ("record_overdub_end_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo"))); -- _keyboard->add_action ("record_overdub_end_solo_trig", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo_trig"))); -+ _keyboard->add_action ("record", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record"))); -+ _keyboard->add_action ("overdub", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("overdub"))); -+ _keyboard->add_action ("multiply", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("multiply"))); -+ _keyboard->add_action ("insert", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("insert"))); -+ _keyboard->add_action ("replace", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("replace"))); -+ _keyboard->add_action ("reverse", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("reverse"))); -+ _keyboard->add_action ("scratch", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("scratch"))); -+ _keyboard->add_action ("substitute", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("substitute"))); -+ _keyboard->add_action ("mute", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute"))); -+ _keyboard->add_action ("mute_on", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_on"))); -+ _keyboard->add_action ("mute_off", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_off"))); -+ _keyboard->add_action ("mute_trigger", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_trigger"))); -+ _keyboard->add_action ("undo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("undo"))); -+ _keyboard->add_action ("redo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("redo"))); -+ _keyboard->add_action ("undo_all", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("undo_all"))); -+ _keyboard->add_action ("redo_all", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("redo_all"))); -+ _keyboard->add_action ("oneshot", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("oneshot"))); -+ _keyboard->add_action ("trigger", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("trigger"))); -+ _keyboard->add_action ("pause", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause"))); -+ _keyboard->add_action ("pause_on", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause_on"))); -+ _keyboard->add_action ("pause_off", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause_off"))); -+ _keyboard->add_action ("solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo"))); -+ _keyboard->add_action ("solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo_prev"))); -+ _keyboard->add_action ("solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo_next"))); -+ _keyboard->add_action ("record_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo"))); -+ _keyboard->add_action ("record_solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo_prev"))); -+ _keyboard->add_action ("record_solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo_next"))); -+ _keyboard->add_action ("set_sync_pos", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("set_sync_pos"))); -+ _keyboard->add_action ("reset_sync_pos", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("reset_sync_pos"))); -+ _keyboard->add_action ("record_or_overdub", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub"))); -+ _keyboard->add_action ("record_exclusive", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive"))); -+ _keyboard->add_action ("record_exclusive_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_next"))); -+ _keyboard->add_action ("record_exclusive_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_prev"))); -+ _keyboard->add_action ("record_or_overdub_excl", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl"))); -+ _keyboard->add_action ("record_or_overdub_excl_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_next"))); -+ _keyboard->add_action ("record_or_overdub_excl_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_prev"))); -+ _keyboard->add_action ("record_or_overdub_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo"))); -+ _keyboard->add_action ("record_or_overdub_solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_next"))); -+ _keyboard->add_action ("record_or_overdub_solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_prev"))); -+ _keyboard->add_action ("record_overdub_end_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo"))); -+ _keyboard->add_action ("record_overdub_end_solo_trig", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo_trig"))); - - -- _keyboard->add_action ("delay", bind (mem_fun (*this, &MainPanel::misc_action), wxT("delay"))); -- _keyboard->add_action ("taptempo", bind (mem_fun (*this, &MainPanel::misc_action), wxT("taptempo"))); -- _keyboard->add_action ("load", bind (mem_fun (*this, &MainPanel::misc_action), wxT("load"))); -- _keyboard->add_action ("save", bind (mem_fun (*this, &MainPanel::misc_action), wxT("save"))); -- _keyboard->add_action ("cancel_midi_learn", bind (mem_fun (*this, &MainPanel::misc_action), wxT("cancel_learn"))); -- -- _keyboard->add_action ("select_prev_loop", bind (mem_fun (*this, &MainPanel::select_loop_action), -2)); -- _keyboard->add_action ("select_next_loop", bind (mem_fun (*this, &MainPanel::select_loop_action), -1)); -- _keyboard->add_action ("select_loop_1", bind (mem_fun (*this, &MainPanel::select_loop_action), 1)); -- _keyboard->add_action ("select_loop_2", bind (mem_fun (*this, &MainPanel::select_loop_action), 2)); -- _keyboard->add_action ("select_loop_3", bind (mem_fun (*this, &MainPanel::select_loop_action), 3)); -- _keyboard->add_action ("select_loop_4", bind (mem_fun (*this, &MainPanel::select_loop_action), 4)); -- _keyboard->add_action ("select_loop_5", bind (mem_fun (*this, &MainPanel::select_loop_action), 5)); -- _keyboard->add_action ("select_loop_6", bind (mem_fun (*this, &MainPanel::select_loop_action), 6)); -- _keyboard->add_action ("select_loop_7", bind (mem_fun (*this, &MainPanel::select_loop_action), 7)); -- _keyboard->add_action ("select_loop_8", bind (mem_fun (*this, &MainPanel::select_loop_action), 8)); -- _keyboard->add_action ("select_loop_9", bind (mem_fun (*this, &MainPanel::select_loop_action), 9)); -- _keyboard->add_action ("select_loop_all", bind (mem_fun (*this, &MainPanel::select_loop_action), 0)); -+ _keyboard->add_action ("delay", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("delay"))); -+ _keyboard->add_action ("taptempo", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("taptempo"))); -+ _keyboard->add_action ("load", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("load"))); -+ _keyboard->add_action ("save", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("save"))); -+ _keyboard->add_action ("cancel_midi_learn", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("cancel_learn"))); -+ -+ _keyboard->add_action ("select_prev_loop", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), -2)); -+ _keyboard->add_action ("select_next_loop", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), -1)); -+ _keyboard->add_action ("select_loop_1", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 1)); -+ _keyboard->add_action ("select_loop_2", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 2)); -+ _keyboard->add_action ("select_loop_3", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 3)); -+ _keyboard->add_action ("select_loop_4", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 4)); -+ _keyboard->add_action ("select_loop_5", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 5)); -+ _keyboard->add_action ("select_loop_6", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 6)); -+ _keyboard->add_action ("select_loop_7", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 7)); -+ _keyboard->add_action ("select_loop_8", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 8)); -+ _keyboard->add_action ("select_loop_9", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 9)); -+ _keyboard->add_action ("select_loop_all", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 0)); - - - // these are the defaults... they get overridden by rc file diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch deleted file mode 100644 index 653303cfb55d..000000000000 --- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 920443d3f7afb26f735f4002f3beed8766530d9b Mon Sep 17 00:00:00 2001 -From: vixus0 <vixus0@gmail.com> -Date: Tue, 7 Jun 2016 22:06:02 +0100 -Subject: [PATCH] Update libsigc++ trackable header import - -The `object.h` header was removed in libsigc++ 2.5.2 and `sigc::trackable` is now provided -in `trackable.h`. - -Original fix for Arch provided by AUR user sahquievaedoajie. ---- - src/control_osc.hpp | 2 +- - src/gui/app_frame.hpp | 2 +- - src/gui/config_panel.hpp | 2 +- - src/gui/keys_panel.hpp | 2 +- - src/gui/latency_panel.hpp | 2 +- - src/gui/main_panel.hpp | 2 +- - src/gui/midi_bind_panel.hpp | 2 +- - src/gui/prefs_dialog.hpp | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/control_osc.hpp b/src/control_osc.hpp -index 11b4e78..d83564f 100644 ---- a/src/control_osc.hpp -+++ b/src/control_osc.hpp -@@ -27,7 +27,7 @@ - #include <list> - #include <utility> - --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - - #include "event.hpp" - #include "event_nonrt.hpp" -diff --git a/src/gui/app_frame.hpp b/src/gui/app_frame.hpp -index e24ff92..36cc18f 100644 ---- a/src/gui/app_frame.hpp -+++ b/src/gui/app_frame.hpp -@@ -26,7 +26,7 @@ - #include <string> - #include <vector> - --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - #include <sigc++/signal.h> - #include <sigc++/connection.h> - -diff --git a/src/gui/config_panel.hpp b/src/gui/config_panel.hpp -index 2b413e9..46c849f 100644 ---- a/src/gui/config_panel.hpp -+++ b/src/gui/config_panel.hpp -@@ -26,7 +26,7 @@ - - #include <string> - #include <vector> --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - - class wxListCtrl; - class wxSpinCtrl; -diff --git a/src/gui/keys_panel.hpp b/src/gui/keys_panel.hpp -index b2c5955..c028c8f 100644 ---- a/src/gui/keys_panel.hpp -+++ b/src/gui/keys_panel.hpp -@@ -26,7 +26,7 @@ - - #include <string> - #include <vector> --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - - class wxListCtrl; - -diff --git a/src/gui/latency_panel.hpp b/src/gui/latency_panel.hpp -index 07dc30f..847da2b 100644 ---- a/src/gui/latency_panel.hpp -+++ b/src/gui/latency_panel.hpp -@@ -26,7 +26,7 @@ - - #include <string> - #include <vector> --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - - class wxListCtrl; - -diff --git a/src/gui/main_panel.hpp b/src/gui/main_panel.hpp -index 0b4ac7d..64cba4c 100644 ---- a/src/gui/main_panel.hpp -+++ b/src/gui/main_panel.hpp -@@ -26,7 +26,7 @@ - #include <string> - #include <vector> - --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - #include <sigc++/signal.h> - #include <sigc++/connection.h> - -diff --git a/src/gui/midi_bind_panel.hpp b/src/gui/midi_bind_panel.hpp -index e919cf2..0d05003 100644 ---- a/src/gui/midi_bind_panel.hpp -+++ b/src/gui/midi_bind_panel.hpp -@@ -26,7 +26,7 @@ - - #include <string> - #include <vector> --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - #include <list> - - #include <midi_bind.hpp> -diff --git a/src/gui/prefs_dialog.hpp b/src/gui/prefs_dialog.hpp -index ea59db1..29fee16 100644 ---- a/src/gui/prefs_dialog.hpp -+++ b/src/gui/prefs_dialog.hpp -@@ -26,7 +26,7 @@ - - #include <string> - #include <vector> --#include <sigc++/object.h> -+#include <sigc++/trackable.h> - - class wxListCtrl; - class wxSpinCtrl; diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch deleted file mode 100644 index 82694f463839..000000000000 --- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/683738 - -Thanks-to: Jeroen Roovers <jer@gentoo.org> - ---- a/configure.ac -+++ b/configure.ac -@@ -214,10 +216,11 @@ - AC_SUBST(LOSC_CFLAGS) - - dnl curses -- AC_CHECK_LIB(ncurses,initscr,have_ncurses=yes,[AC_MSG_WARN([******** you don't have the ncurses library correctly installed])]) -- -- NCURSES_LIBS=-lncurses -- AC_SUBST(NCURSES_LIBS) -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [have_ncurses=yes], -+ AC_CHECK_LIB(ncurses, initscr, have_ncurses=yes, -+ [AC_MSG_WARN([******** you don't have the ncurses library correctly installed])] -+ ) -+ ) - - dnl sigc++ - PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10) diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch deleted file mode 100644 index fee40e8f98be..000000000000 --- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch +++ /dev/null @@ -1,177 +0,0 @@ -Author: JaromÃr MikeÅ¡ <mira.mikes@seznam.cz>, Olly Betts <olly@survex.com> -Description: build against wx 3.0. -Forwarded: yes - -Index: sooperlooper/src/gui/main_panel.cpp -=================================================================== ---- sooperlooper.orig/src/gui/main_panel.cpp -+++ sooperlooper/src/gui/main_panel.cpp -@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count) - while (count < (int)_looper_panels.size()) { - looperpan = _looper_panels.back(); - _looper_panels.pop_back(); -- _main_sizer->Remove(looperpan); -+ _main_sizer->Detach(looperpan); - looperpan->Destroy(); - } - } -@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas - } - - -- wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); -+ wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); - - if ( !filename.empty() ) - { -@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas - index = 0; - } - -- wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); -+ wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); - - if ( !filename.empty() ) - { -@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index - - void MainPanel::do_load_session () - { -- wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); -+ wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); - - if ( !filename.empty() ) - { -@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session () - - void MainPanel::do_save_session (bool write_audio) - { -- wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); -+ wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); - - if ( !filename.empty() ) - { -Index: sooperlooper/src/gui/pix_button.cpp -=================================================================== ---- sooperlooper.orig/src/gui/pix_button.cpp -+++ sooperlooper/src/gui/pix_button.cpp -@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent & - pt.x += bounds.x; - pt.y += bounds.y; - -- if (bounds.Inside(pt)) { -+ if (bounds.Contains(pt)) { - clicked (get_mouse_button(ev)); // emit - - if (ev.MiddleUp() && ev.ControlDown()) { -Index: sooperlooper/src/gui/looper_panel.cpp -=================================================================== ---- sooperlooper.orig/src/gui/looper_panel.cpp -+++ sooperlooper/src/gui/looper_panel.cpp -@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button, - if (cmd == wxT("save")) - { - wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"), -- wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); -+ wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); - - if ( !filename.empty() ) - { -@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button, - } - else if (cmd == wxT("load")) - { -- wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR); -+ wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR); - - if ( !filename.empty() ) - { -Index: sooperlooper/src/gui/keyboard_target.cpp -=================================================================== ---- sooperlooper.orig/src/gui/keyboard_target.cpp -+++ sooperlooper/src/gui/keyboard_target.cpp -@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const - keycode = WXK_RETURN; - } - else if ( keyname == wxT("PGUP") ) { -- keycode = WXK_PRIOR; -+ keycode = WXK_PAGEUP; - } - else if ( keyname == wxT("PGDN") ) { -- keycode = WXK_NEXT; -+ keycode = WXK_PAGEDOWN; - } - else if ( keyname == wxT("LEFT") ) { - keycode = WXK_LEFT; -@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco - case WXK_RETURN: - text += wxT("return"); - break; -- case WXK_PRIOR: -+ case WXK_PAGEUP: - text += wxT("pageup"); - break; -- case WXK_NEXT: -+ case WXK_PAGEDOWN: - text += wxT("pagedown"); - break; - case WXK_LEFT: -Index: sooperlooper/src/gui/check_box.cpp -=================================================================== ---- sooperlooper.orig/src/gui/check_box.cpp -+++ sooperlooper/src/gui/check_box.cpp -@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e - } - else if (ev.LeftUp()) - { -- if (bounds.Inside(ev.GetPosition())) { -+ if (bounds.Contains(ev.GetPosition())) { - // toggle value - _value = !_value; - -Index: sooperlooper/src/gui/midi_bind_panel.cpp -=================================================================== ---- sooperlooper.orig/src/gui/midi_bind_panel.cpp -+++ sooperlooper/src/gui/midi_bind_panel.cpp -@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand - } - else if (ev.GetId() == ID_LoadButton) - { -- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR); -+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR); - if ( !filename.empty() ) - { - _parent->get_loop_control().load_midi_bindings(filename, _append_check->GetValue()); -@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand - } - else if (ev.GetId() == ID_SaveButton) - { -- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); -+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); - - if ( !filename.empty() ) - { -Index: sooperlooper/src/gui/config_panel.cpp -=================================================================== ---- sooperlooper.orig/src/gui/config_panel.cpp -+++ sooperlooper/src/gui/config_panel.cpp -@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv - else if (ev.GetId() == ID_MidiBrowseButton) { - - _parent->get_keyboard().set_enabled(false); -- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR); -+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR); - _parent->get_keyboard().set_enabled(true); - - if ( !filename.empty() ) -@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv - else if (ev.GetId() == ID_SessionBrowseButton) { - - _parent->get_keyboard().set_enabled(false); -- wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); -- //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); -+ wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); -+ //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); - _parent->get_keyboard().set_enabled(true); - - if ( !filename.empty() ) diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild index 62c837de9ed6..3e5a9107cf31 100644 --- a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild +++ b/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -WX_GTK_VER=3.0 +EAPI=7 +WX_GTK_VER=3.0-gtk3 -inherit autotools flag-o-matic wxwidgets toolchain-funcs +inherit autotools flag-o-matic wxwidgets toolchain-funcs desktop xdg DESCRIPTION="Live looping sampler with immediate loop recording" HOMEPAGE="http://essej.net/sooperlooper/index.html" @@ -17,32 +17,26 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="wxwidgets" +BDEPEND=" + virtual/pkgconfig +" RDEPEND=" - media-sound/jack-audio-connection-kit - >=media-libs/liblo-0.10 - >=dev-libs/libsigc++-2.8:2 - >=media-libs/libsndfile-1.0.2 - >=media-libs/libsamplerate-0.0.13 + media-libs/liblo + dev-libs/libsigc++:2 + media-libs/libsndfile + media-libs/libsamplerate dev-libs/libxml2:2 - >=media-libs/rubberband-0.0.13 + media-libs/rubberband sci-libs/fftw:3.0= + virtual/jack wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" S="${WORKDIR}/${P/_p*}" DOCS=( OSC README ) -PATCHES=( - "${FILESDIR}"/${P}-wx3.0.patch - "${FILESDIR}"/${P}-libsigc28.patch - "${FILESDIR}"/${P}-clash.patch - "${FILESDIR}"/${P}-tinfo.patch -) - src_prepare() { default cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed" @@ -50,7 +44,7 @@ src_prepare() { } src_configure() { - use wxwidgets && need-wxwidgets unicode + use wxwidgets && setup-wxwidgets append-cppflags -std=c++11 # Its ugly build system honors CPPFLAGS instead of CXXFLAGS for this econf \ $(use_with wxwidgets gui) \ @@ -61,3 +55,9 @@ src_configure() { src_compile() { emake AR="$(tc-getAR)" } + +src_install() { + default + + use wxwidgets && make_desktop_entry /usr/bin/slgui SooperLooper +} diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest index 3eeddc6c6e6f..91eeead6ccab 100644 --- a/media-sound/soundkonverter/Manifest +++ b/media-sound/soundkonverter/Manifest @@ -1,6 +1,7 @@ -AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542 +AUX soundkonverter-3.0.1-deps.patch 1063 BLAKE2B 091119f745bd8732bdb307fec5a4860038a89f3607301c33463a278fd1ac83aca967722e338c5731652fa06e254019792fdf34cd584bc84e0ae72216117d9e70 SHA512 64bb6f590287692253f07520845c38d3de70b893e97337b5cb3c1419812be5653a34788e7e1dcfce6d692d8c12b4996e5783c31b2eb62044210fe0425a061b5b AUX soundkonverter-3.0.1-fix-add-dirs.patch 936 BLAKE2B 93d19df6f74c46b5b5755c85fd548cbd5e654be6b0fbc1459db90358ce129ecf6f1afbe7b15528551e227edd61ffc4f6156c311f30a0939968b1dad86f86f7aa SHA512 2d692e3c304706b0cb135299da6d31ab1fcac352b055725e577435d44321f04ece3309ddbb3f9568dc11a85528348522cdc637ed195e7ff1c5e0710e85b1d513 +AUX soundkonverter-3.0.1-kf-5.72-findtaglib.patch 10033 BLAKE2B 15e98cfd6a725e3665075345297cd1e6060fd978fc0fe2ed980af6d6c814baf856eaf46866a9faccdae867e38bb9dec910948bca70fff858219ea48141b28f37 SHA512 a52ce152369f2583d0d569ba3369c05978c58e7771958c7ad4dab2e91b86c54350df4d5e0c2afb9bdfb929ee4b002a312c6da7a37564a5f0d882f6e704303f37 AUX soundkonverter-3.0.1-metainfodir.patch 1033 BLAKE2B d2c845bc2b5fc18ade9b7d689e291e088fa53c11d400fd1b598e74fd9da83e7082e406949722846013c413743ed672e40089ba0960086f3dcdeb2c8a2501f8b7 SHA512 d16314f12179a0caf9d09489c4dd838f814c468185f0c7bcb0eadc3078be4eedfa5ec0f76025216b3750cefe0b5a75039e645936e58a827ba10d6503442fec9f DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911 -EBUILD soundkonverter-3.0.1-r2.ebuild 1670 BLAKE2B 8aea75224a197407269360dfb98ca23be9cc9ab8694772d150e46b96977fc8fcb436cd266f817147281dbc41e9321b4f40fe910c8e9deaf2acc387e49e87c8d2 SHA512 e27248b788dec7b2e866c9e51769cf1d6e9c499f26ea602137813ac6dc28987b878ab4674c9ba18d761a5b62bf309bb45552ed6ec63f508f65655b57c9d84683 +EBUILD soundkonverter-3.0.1-r2.ebuild 1746 BLAKE2B 299e58978b3e185c0c419d3aa8f4f39ec9acb2b9a6a7aa59daa9acdb69e91f2e5c5c898ace80c02754b92b3fb564bd19884dd71eb94f7d0cfd6d8b037669138b SHA512 fd6ab63a5bcd1b64ef0f4902fbe966ae9226ccf7039512ef263516c92b3d50eb7bfcdf1127ebe7d82653429f69e3541882e8861ec381653bfd92e7cc414189af MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044 diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch deleted file mode 100644 index aa5f68af9394..000000000000 --- a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2017-09-12 23:39:15.648029711 +0200 -+++ b/CMakeLists.txt 2017-09-12 23:44:47.944469934 +0200 -@@ -30,7 +30,7 @@ - include(ECMInstallIcons) - include(FeatureSummary) - --find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets) -+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml) - find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support) - find_package(KF5Cddb) - find_package(Phonon4Qt5 REQUIRED) diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch new file mode 100644 index 000000000000..b7009d33125d --- /dev/null +++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch @@ -0,0 +1,30 @@ +From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 19 Jul 2020 11:43:30 +0200 +Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt + +- Drop unused Qt5Network +- Search for Qt5Xml once instead of in most plugins +- KF5WidgetsAddons and KF5KIO were already being searched for + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 521d0da..7e578f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers) + include(ECMInstallIcons) + include(FeatureSummary) + +-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets) ++find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml) + find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support) + find_package(KF5Cddb) + find_package(Phonon4Qt5 REQUIRED) +-- +2.27.0 + diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch new file mode 100644 index 000000000000..8439e7a83df9 --- /dev/null +++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch @@ -0,0 +1,300 @@ +From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 19 Jul 2020 12:06:28 +0200 +Subject: [PATCH 1/2] FindTaglib.cmake: Update local copy with ECM 5.72.0 + version and adapt cmake + +ECM 5.72.0 ships an incompatible FindTaglib.cmake module. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 6 +- + cmake/modules/FindTaglib.cmake | 209 +++++++++++------------------ + 2 files changed, 85 insertions(+), 130 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 521d0da..c9d9bee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED) + find_package(Cdparanoia REQUIRED) + + set(TAGLIB_MIN_VERSION "1.10") +-find_package(Taglib REQUIRED) ++find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED) + + + # plugins +@@ -48,7 +48,7 @@ add_subdirectory(plugins) + + + # include directories +-include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR}) ++include_directories(${CDPARANOIA_INCLUDE_DIR}) + + + # translation +@@ -120,7 +120,7 @@ set(soundkonverter_SRCS + ) + + add_executable(soundkonverter ${soundkonverter_SRCS}) +-target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) ++target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) + + install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR}) + +diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake +index 5a985f9..40c5ca2 100644 +--- a/cmake/modules/FindTaglib.cmake ++++ b/cmake/modules/FindTaglib.cmake +@@ -1,135 +1,90 @@ +-# - Try to find the Taglib library +-# Once done this will define ++#.rst: ++# FindTaglib ++# ---------- + # +-# TAGLIB_FOUND - system has the taglib library +-# TAGLIB_CFLAGS - the taglib cflags +-# TAGLIB_LIBRARIES - The libraries needed to use taglib +- +-# Copyright (c) 2006, Laurent Montel, <montel@kde.org> ++# Try to find the Taglib library. + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-if(NOT TAGLIB_MIN_VERSION) +- set(TAGLIB_MIN_VERSION "1.6") +-endif(NOT TAGLIB_MIN_VERSION) +- +-if(NOT WIN32) +- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +- ${BIN_INSTALL_DIR} +- ) +-endif(NOT WIN32) +- +-#reset vars +-set(TAGLIB_LIBRARIES) +-set(TAGLIB_CFLAGS) +- +-# if taglib-config has been found +-if(TAGLIBCONFIG_EXECUTABLE) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) +- +- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") +- set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) ++# This will define the following variables: ++# ++# ``Taglib_FOUND`` ++# True if the system has the taglib library of at least the minimum ++# version specified by the version parameter to find_package() ++# ``Taglib_INCLUDE_DIRS`` ++# The taglib include dirs for use with target_include_directories ++# ``Taglib_LIBRARIES`` ++# The taglib libraries for use with target_link_libraries() ++# ``Taglib_VERSION`` ++# The version of taglib that was found ++# ++# If ``Taglib_FOUND is TRUE, it will also define the following imported ++# target: ++# ++# ``Taglib::Taglib`` ++# The Taglib library ++# ++# Since 5.72.0 ++# ++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org> ++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org> ++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org> ++# SPDX-License-Identifier: BSD-3-Clause + +- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- set(TAGLIB_FOUND TRUE) +- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) ++find_package(PkgConfig QUIET) + +-else(TAGLIBCONFIG_EXECUTABLE) ++pkg_search_module(PC_TAGLIB QUIET taglib) + +- find_path(TAGLIB_INCLUDES +- NAMES +- tag.h ++find_path(Taglib_INCLUDE_DIRS ++ NAMES tag.h + PATH_SUFFIXES taglib +- PATHS +- ${KDE4_INCLUDE_DIR} +- ${INCLUDE_INSTALL_DIR} +- ) +- +- IF(NOT WIN32) +- # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX +- +- FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) +- +- ELSE(NOT WIN32) +- +- # 1. get all possible libnames +- SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) +- SET(newargs "") +- SET(libnames_release "") +- SET(libnames_debug "") +- +- LIST(LENGTH args listCount) +- +- # just one name +- LIST(APPEND libnames_release "tag") +- LIST(APPEND libnames_debug "tagd") +- +- SET(newargs ${args}) +- +- # search the release lib +- FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE +- NAMES ${libnames_release} +- ${newargs} +- ) +- +- # search the debug lib +- FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG +- NAMES ${libnames_debug} +- ${newargs} +- ) +- +- IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) +- +- # both libs found +- SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE} +- debug ${TAGLIB_LIBRARIES_DEBUG}) +- +- ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) +- +- IF(TAGLIB_LIBRARIES_RELEASE) +- +- # only release found +- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE}) +- +- ELSE(TAGLIB_LIBRARIES_RELEASE) +- +- # only debug (or nothing) found +- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG}) +- +- ENDIF(TAGLIB_LIBRARIES_RELEASE) +- +- ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) +- +- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE) +- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG) +- +- ENDIF(NOT WIN32) +- +- INCLUDE(FindPackageMessage) +- INCLUDE(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) +- +-endif(TAGLIBCONFIG_EXECUTABLE) +- ++ HINTS ${PC_TAGLIB_INCLUDEDIR} ++) ++ ++find_library(Taglib_LIBRARIES ++ NAMES tag ++ HINTS ${PC_TAGLIB_LIBDIR} ++) ++ ++set(Taglib_VERSION ${PC_TAGLIB_VERSION}) ++ ++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION) ++ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h") ++ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H) ++ ++ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H}) ++ ++ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}") ++ ++ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}") ++ endif() ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Taglib ++ FOUND_VAR ++ Taglib_FOUND ++ REQUIRED_VARS ++ Taglib_LIBRARIES ++ Taglib_INCLUDE_DIRS ++ VERSION_VAR ++ Taglib_VERSION ++) ++ ++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib) ++ add_library(Taglib::Taglib UNKNOWN IMPORTED) ++ set_target_properties(Taglib::Taglib PROPERTIES ++ IMPORTED_LOCATION "${Taglib_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}" ++ ) ++endif() + +-if(TAGLIB_FOUND) +- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") +- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +-else(TAGLIB_FOUND) +- if(Taglib_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Taglib") +- endif(Taglib_FIND_REQUIRED) +-endif(TAGLIB_FOUND) ++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS) + ++include(FeatureSummary) ++set_package_properties(Taglib PROPERTIES ++ URL "https://taglib.org/" ++ DESCRIPTION "A library for reading and editing the meta-data of audio formats" ++) +-- +2.27.0 + + +From ff943d9cb19aa46b555826a053642ac2e84d392d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 19 Jul 2020 13:02:33 +0200 +Subject: [PATCH 2/2] Use local cmake modules first + +Although FindTaglib.cmake was fixed in previous commit, local cmake modules +should not be overriden by system versions anyway. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9d9bee..7a92898 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") + + # kde libs + find_package(ECM REQUIRED NO_MODULE) +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) ++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) + + add_definitions(-DSOUNDKONVERTER_KF5_BUILD) + +-- +2.27.0 + diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild index 0beceea2e00e..98e141c9a710 100644 --- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild +++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild @@ -45,7 +45,8 @@ RDEPEND="${DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-3.0.0-deps.patch" + "${FILESDIR}/${P}-deps.patch" # pending upstream + "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" # pending upstream "${FILESDIR}/${P}-fix-add-dirs.patch" "${FILESDIR}/${P}-metainfodir.patch" ) diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest index 1673c87fa45e..634106e91ee2 100644 --- a/media-sound/sox/Manifest +++ b/media-sound/sox/Manifest @@ -9,5 +9,7 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6 AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca -EBUILD sox-14.4.2-r1.ebuild 2609 BLAKE2B a92a0eb8f64c75c379f858c851e3d5f1d0781cf675c71d54bbd9cc8942d5f46fceaf6faaba3acd0451f3f73a229c7f0a298c102dc38fb9f4769d3aa76e3d168e SHA512 49463fe4e7fcd0b9b1c26ac7334c0488dadadf5ccb9ed6b4d9743bfc16ecd4099d7e201555bfe51266e54a529a015a04d84f69b7b80af751f433020049fa8154 +DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392 +EBUILD sox-14.4.2-r1.ebuild 2598 BLAKE2B 337d1484a42517ed096862cf30c6b251d2d0bc5cf6bd119fb53d881dcd059fb563948985359be95a794b86be4cee1e091836c0038f969caba4f9dcb6960c1da4 SHA512 66d7c2bbafbfa61626ff399f056d2bb3208e403cc83b44f7a66447e53273bc5716b0cc3d13f46f2a5669461f4ffa6dab5a23be7b24599f70584c3aebf025389f +EBUILD sox-14.4.2_p20200803.ebuild 2809 BLAKE2B 6550bcaa2bec0459a4c3193c85aeed5305041fa08d3ff482a501452bfabe8ae3a235c0ab187bb575d196b361779db322a830320245102718a4bdc052bb57b8fc SHA512 e48719322b56b708ceb25a2047c16f529af39373f819d0eb76205fe825e53958f07861e1982187b72b9d82bbfc0211b3c3139cbee3dcb4be27336db79256fde8 MISC metadata.xml 653 BLAKE2B 73d6e024f7b8cf87cc0640a749af4bf3d45604e9e28cd9ff1f68fea9b7f4c05ff2e1ee676efd07d1221070492a3575c1f4397cfe7008df00403232353f22afcd SHA512 578f6db7fbe2ae3dc3a732a2cbfb8627bfcce1801b4834071040df1b9e3bf20ca9dd6e7a8d7df221d38f4e8fff22cefa6ad57fd19dc145ab4a247f688c497c71 diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild index 54d9729c5e72..f6a0b545d51a 100644 --- a/media-sound/sox/sox-14.4.2-r1.ebuild +++ b/media-sound/sox/sox-14.4.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack" RDEPEND=" diff --git a/media-sound/sox/sox-14.4.2_p20200803.ebuild b/media-sound/sox/sox-14.4.2_p20200803.ebuild new file mode 100644 index 000000000000..1d9f0c22f731 --- /dev/null +++ b/media-sound/sox/sox-14.4.2_p20200803.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +# We take a snapshot because of the huge number of security +# and other fixes since the release of 14.4.2. +# Recommend mirroring the snapshot; unclear if they are stable URIs. +COMMIT="50857c46c03a85c72826e819f5e815aad4a4633d" +MY_P="sox-code-${COMMIT}" + +DESCRIPTION="The swiss army knife of sound processing programs" +HOMEPAGE="http://sox.sourceforge.net" +# Source: https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/${MY_P}.zip +SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.zip -> ${P}.zip" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack" + +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" +RDEPEND=" + dev-libs/libltdl:0= + >=media-sound/gsm-1.0.12-r1 + alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + ao? ( media-libs/libao ) + encode? ( >=media-sound/lame-3.98.4 ) + flac? ( >=media-libs/flac-1.1.3 ) + id3tag? ( media-libs/libid3tag ) + ladspa? ( media-libs/ladspa-sdk ) + mad? ( media-libs/libmad ) + ogg? ( + media-libs/libogg + media-libs/libvorbis + ) + opus? ( + media-libs/opus + media-libs/opusfile + ) + png? ( + media-libs/libpng:0= + sys-libs/zlib + ) + pulseaudio? ( media-sound/pulseaudio ) + sndfile? ( >=media-libs/libsndfile-1.0.11 ) + twolame? ( media-sound/twolame ) + wavpack? ( media-sound/wavpack )" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS ) + +src_prepare() { + default + + # bug #386027 + sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die + + # bug #712630 + if use elibc_musl ; then + ewarn "Applying musl workaround for bug #712630." + ewarn "File-type detection with pipes may be missing." + sed -i '/error FIX NEEDED HERE/d' src/formats.c || die + fi + + eautoreconf +} + +src_configure() { + econf \ + $(use_with alsa) \ + $(use_with amr amrnb) \ + $(use_with amr amrwb) \ + $(use_with ao) \ + $(use_enable debug) \ + $(use_with encode lame) \ + $(use_with flac) \ + $(use_with id3tag) \ + $(use_with ladspa) \ + $(use_with mad) \ + $(use_enable openmp) \ + $(use_with ogg oggvorbis) \ + $(use_with oss) \ + $(use_with opus) \ + $(use_with png) \ + $(use_with pulseaudio) \ + $(use_with sndfile) \ + $(use_enable static-libs static) \ + $(use_with twolame) \ + $(use_with wavpack) \ + --with-distro="Gentoo" +} + +src_install() { + default + # libltdl is used for loading plugins, keeping libtool files with empty + # dependency_libs what otherwise would be -exec rm -f {} + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + +} diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index d167410d0c20..cc5b74226063 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -4,4 +4,4 @@ DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422 EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553 -MISC metadata.xml 543 BLAKE2B 13703333c28b0f4a9898a30a9f3b8c2a56d360571ef7afed97b794c4fee154f9989c3f53309b71e1ed3135150d6a5aec8303e269117d0689dcca55d2557fd7d1 SHA512 229addc42faddeeb72208081749107adb25eda1cc8201dd629b474e3f733e78e77a4f2cbecd70c3d308e9946bdeb2d5b475a91180d2bde50447d01fdbf3428b6 +MISC metadata.xml 542 BLAKE2B 112c082ca9d2775e0225eadf3ec24260438db4ec3122be340395edae3096f378ddb349275fe5c31435c5196d606d099812fea831d06ce2ac913ddc777e65d66d SHA512 a414c96da5c9c5af23491937a86edf26ca5207f4cd9277a187059f2196b8ce9b28cab80f0ee5a326911a9aa5945d2604bea310608bc5270e507fb8052e1bd2ef diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml index ff06ccc103fe..6e853bb00209 100644 --- a/media-sound/spotify/metadata.xml +++ b/media-sound/spotify/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <use> <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag> - <flag name="pulseaudio">Constrols the dependency on pulseaudio or apulse</flag> + <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag> <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag> </use> <maintainer type="person"> diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest index b0e284f632da..69a4d5595934 100644 --- a/media-sound/strawberry/Manifest +++ b/media-sound/strawberry/Manifest @@ -1,6 +1,6 @@ -DIST strawberry-0.6.11.tar.xz 9295808 BLAKE2B f772e80714a4165d996b117f17503b91d70dc651d4f151f8468200637e5f5a307d566634e197a19464cee7c0bbe5c825be9af88ff503b6eb4d6088b38f4e597f SHA512 f044e1b75ef6617f9901c7fa95020ca84030aa5011f8d9122e92d3d47ab90f6eb55e7e01d88d925a8a00b046810d1ba65070707650d3c465a2cef7dd228f3c2d -DIST strawberry-0.6.12.tar.xz 9311104 BLAKE2B 331c2605616791f4b355bbf0e78738b0b91ca6da7533f676289e0b2ab8a5895a6eb85f605114f782f574c7530db812fb7043580f73a86f9c506c08549f9b643d SHA512 cce4fcef1cc3700dcbab9a9ac8d1cb72d2f0b1b6072002bd837825c2504b42ad2f2f8c2a23a600cf9c12c91ce6628130c166779eb6902aedb12835ff3765ee12 -EBUILD strawberry-0.6.11.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6 -EBUILD strawberry-0.6.12.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6 -EBUILD strawberry-9999.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6 +DIST strawberry-0.6.13.tar.xz 10156576 BLAKE2B 04d27d8a96a8664348623c11f393324b410f8224b22089e200947cfd90eaafe04c3aa13cc5345a7c95d83d24ed04ec9221a8badfb2e3dc42922739b568fc2e90 SHA512 b3db58a30d50f74b313c0af5a492ea809d631c4152f856b19debb5f811688eb21d97ba35b58f3f1d00779fcd76220d88b4dafc32520416f7e749c6680257ad49 +DIST strawberry-0.7.2.tar.xz 10123596 BLAKE2B cfd3384ded94bc5e638d79e4dea8e4a04a42abcc36d1d34da5d39150c2f20e785fd5f199c91ca515d02391e90acd23d1a5d90602ec07f52fdfa711d3ec88bc0e SHA512 d664ce81c2eef2e1bbbbdda40e420142c6c0bf6df42a785cc1c7f572f9b7521e44161f93c4694434db8752d7056df946e6e2aa064a62f45b143da6860f007483 +EBUILD strawberry-0.6.13.ebuild 2864 BLAKE2B 1b35982666541292b3c1a38e53aca7c5c14d84f96d6a9da6f0660b1e7b9e00b260d3862663b30c7cbf6ca4b9dde3cc7832cb7403be34ecef6daba4f2e40de162 SHA512 8554f8920f8bf96d3790c85413a0b16dfcf74b91c0e0d0fffa99c9ce2e5a9f6d8ce07bc5f127da62cec3049d95d25f275e7a5a420b62bce2f98de444b0837eb0 +EBUILD strawberry-0.7.2.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39 +EBUILD strawberry-9999.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39 MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7 diff --git a/media-sound/strawberry/strawberry-0.6.11.ebuild b/media-sound/strawberry/strawberry-0.6.13.ebuild index 54ca03a40f5c..9ef36a11ada9 100644 --- a/media-sound/strawberry/strawberry-0.6.11.ebuild +++ b/media-sound/strawberry/strawberry-0.6.13.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit cmake flag-o-matic l10n virtualx xdg -PLOCALES="de es fr id it nb ru" +PLOCALES="cs de es fr hu id it ko nb pl ru" DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" HOMEPAGE="https://www.strawbs.org/" diff --git a/media-sound/strawberry/strawberry-0.6.12.ebuild b/media-sound/strawberry/strawberry-0.7.2.ebuild index 54ca03a40f5c..92c336d58feb 100644 --- a/media-sound/strawberry/strawberry-0.6.12.ebuild +++ b/media-sound/strawberry/strawberry-0.7.2.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit cmake flag-o-matic l10n virtualx xdg -PLOCALES="de es fr id it nb ru" +PLOCALES="cs de es fr hu id it ko nb pl ru" DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" HOMEPAGE="https://www.strawbs.org/" @@ -99,6 +99,7 @@ src_configure() { -DENABLE_LIBPULSE="$(usex pulseaudio)" -DENABLE_UDISKS2="$(usex udisks)" -DUSE_SYSTEM_TAGLIB=ON + -DWITH_QT6=OFF ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild index 54ca03a40f5c..92c336d58feb 100644 --- a/media-sound/strawberry/strawberry-9999.ebuild +++ b/media-sound/strawberry/strawberry-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit cmake flag-o-matic l10n virtualx xdg -PLOCALES="de es fr id it nb ru" +PLOCALES="cs de es fr hu id it ko nb pl ru" DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" HOMEPAGE="https://www.strawbs.org/" @@ -99,6 +99,7 @@ src_configure() { -DENABLE_LIBPULSE="$(usex pulseaudio)" -DENABLE_UDISKS2="$(usex udisks)" -DUSE_SYSTEM_TAGLIB=ON + -DWITH_QT6=OFF ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest index f57612684910..8ec6b8138bbf 100644 --- a/media-sound/supercollider/Manifest +++ b/media-sound/supercollider/Manifest @@ -3,5 +3,5 @@ AUX supercollider-3.11.0-boost-1.72.patch 1830 BLAKE2B b9a9f358199de97865fc0d8a2 AUX supercollider-3.11.0-fewer-qt-deps.patch 4412 BLAKE2B 433a51ca1e6b537811392891bec8f4de5aa289473c733c78567d4dddb3c5bc1b2b36c8a8f79222f2a70aa3eb6f0908b20d1cae5e87a9a57c1e56e3725b3787cf SHA512 742b4991c3402acb70ad731d4c535bea9671916360b9e0f17c6611359c1488c23599b613c4a0ff4846a74a55a7af7b5848865998bb4ebae4b0a4944f9caa892c AUX supercollider-3.11.0-qt-5.15.patch 2709 BLAKE2B ec9fd1241d6a5c244716434e0b1b44528f7c55a29dc9df09b47099685f5453e708edec6f106af9282ab31034bd1aa8f8e73c359e0228bbd9d63dc85ed41b4ddf SHA512 d26ae878b83f6cd5c7eca29893954bda1dd0adf70252e074f218851d931c97bd7b9aa6fd3ca9234ed7e7f0a52e26a28ad77ba3d5d08a7dee37bed2313d22a9b8 DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da -EBUILD supercollider-3.11.0.ebuild 3173 BLAKE2B acc717d7b2ed67113d1b088092af7e07382d0f2498d2328add2a3507aa8d71ee10b13d4650b9587f7da13590addd1934f7a23e53142048dcc66d855363f9820c SHA512 53ed68c6a543537de6d6fe5191496ba383f5f62d175652cb35a8e6fe5383efc741d8bf7d5ad4cacf27fedcc98375059a7b8e5e23cdc1fc86e752cf855974065f +EBUILD supercollider-3.11.0.ebuild 3239 BLAKE2B 6d25fe5fb7bd1d34e96dbcef45ebf4f815103685f861face7672e853563038d52ae89ab8b5f5170fce5d369870bbf7b08261eb15be4f00cc6f0d09d3233f5b5d SHA512 177c2e1771ca0b3b6b9f16aae9254b07705dae6fc66b43512b0c5520a70e354a90053418d752d5b48a696cff4d2c69006a650b1d1e8b15e86044a6297a3fa9db MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f diff --git a/media-sound/supercollider/supercollider-3.11.0.ebuild b/media-sound/supercollider/supercollider-3.11.0.ebuild index 3b3865ba3a00..c4f164b9dc16 100644 --- a/media-sound/supercollider/supercollider-3.11.0.ebuild +++ b/media-sound/supercollider/supercollider-3.11.0.ebuild @@ -116,6 +116,11 @@ src_install() { use vim && newdoc editors/scvim/README.md README.vim } +src_test() { + export QT_QPA_PLATFORM=offscreen + cmake_src_test +} + pkg_postinst() { einfo "Notice: SuperCollider is not very intuitive to get up and running." einfo "The best course of action to make sure that the installation was" diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest index 907359c8ba23..4c2bc96a6303 100644 --- a/media-sound/takcd/Manifest +++ b/media-sound/takcd/Manifest @@ -1,4 +1,5 @@ +AUX takcd-0.10-fno-common.patch 926 BLAKE2B 2bda7bfaebb59506c4218fa5bc4fe966f7fe8230d78105ab76a6e2e9b3276fdaae548ae1615127d3ab5d79b03e2cbf724dd74163ecd3c1efb2fcf3ca731e46a4 SHA512 e52b3f686205aecca2b71c4a0fbabcafc9ab589c911f4650e3b6d1db372e13e6d07442111dc25107a5022b05d1f1f941fc05f39dd058cd8e155cb9f4729b5b12 AUX takcd-0.10-overflow.patch 367 BLAKE2B ab2168e1445ace23dcf31410040f363575302ea38ddee9a308ee4dcf7d24ccd0ae9909a72444a4c663412c54a5ccb3811f7f14e222569c76bbf52e2c40c83d92 SHA512 0e1193d558c0c3af0d37d06b0dbacbd10491e0be3dc42e58bcdecdad3308ed19394a9ba3401996df8df5f9cba9186f727272fd9d51cc34ac4334778ec809b7f4 DIST takcd-0.10.tar.gz 95457 BLAKE2B 60e29a67d84fc600bcd55a7aa24e65bc042de13bc02686597a41cfd2e0490110ac66d60d0dc66977b4dce7bbdd34b7a20a1f6fe46474df16b11cbe1149b7d403 SHA512 a7211ec32adac1a9caf278cdceef9b9daf1ae47fa8ccb1d10eda51ca95566d8d6693f2f635b36e6d78f8f6f9e0efa711bc7263bbdd0f23c3f3ad884682b01e33 -EBUILD takcd-0.10-r1.ebuild 506 BLAKE2B 035190925d420bc64fcb1981d7b002972d2076e1f0d44a387c26c6e19eeb3c8e35733b065d8281ea7bed8132111131719a74080e9b70879f5593a0414f815406 SHA512 226dc7b6d496816043a322c3a667e1096071875d81e87ca40501b4ad72337f9d176db1c451870e246d10c99ec76a8799087f770b5ded4af402b62675b48514b4 +EBUILD takcd-0.10-r1.ebuild 536 BLAKE2B a80cbe24d5f48261e806eeb4c961dced9e8170a2416f3183c8f79749afce932a0391cd798eb65c9d70ad5755fbe4014273569a2fb75553541d1870a15466b762 SHA512 247b16b0e79f22aa155de32d4669fcb8b6ecf169416b86dc84fda87845052260b628b314b31456c8bfa007d5b8d3c3680bcdf41279a5101d337c170c30319b35 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/takcd/files/takcd-0.10-fno-common.patch b/media-sound/takcd/files/takcd-0.10-fno-common.patch new file mode 100644 index 000000000000..ec97e62eea30 --- /dev/null +++ b/media-sound/takcd/files/takcd-0.10-fno-common.patch @@ -0,0 +1,44 @@ +--- a/bsd_discid.c ++++ b/bsd_discid.c +@@ -29,7 +29,7 @@ + #include "config.h" + + const char *cdrom_device=DEV_CDROM; +-int cdrom_fd; ++extern int cdrom_fd; + + int Discid_Init(void) { + /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) { +--- a/darwin_discid.c ++++ b/darwin_discid.c +@@ -29,7 +29,7 @@ + #include "config.h" + + const char *cdrom_device=DEV_CDROM; +-int cdrom_fd; ++extern int cdrom_fd; + + int Discid_Init(void) { + /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) { +--- a/linux_discid.c ++++ b/linux_discid.c +@@ -31,7 +31,7 @@ + + char *cdrom_device = NULL; + +-int cdrom_fd; ++extern int cdrom_fd; + + int Discid_Init(void) { + /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) { +--- a/sun_discid.c ++++ b/sun_discid.c +@@ -30,7 +30,7 @@ + #include "config.h" + + const char *cdrom_device=DEV_CDROM; +-int cdrom_fd; ++extern int cdrom_fd; + + int Discid_Init(void) { + /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) { diff --git a/media-sound/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild index 154fab65024c..9bbbf1143850 100644 --- a/media-sound/takcd/takcd-0.10-r1.ebuild +++ b/media-sound/takcd/takcd-0.10-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,9 +12,11 @@ SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc x86" -IUSE="" -PATCHES=( "${FILESDIR}"/${P}-overflow.patch ) +PATCHES=( + "${FILESDIR}"/${P}-overflow.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { default diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest index 9583214c25f7..e18dead383c4 100644 --- a/media-sound/teamspeak-client/Manifest +++ b/media-sound/teamspeak-client/Manifest @@ -1,8 +1,5 @@ AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d -DIST TeamSpeak3-Client-linux_amd64-3.3.2.run 95632176 BLAKE2B b1a418e6af6c364050a532063b3129e27d03ac36ec325ab5f2044896f5eae02fb4a251e71b23bc125d41f169aa35d8dde340b333a67b845ebaca7faefa49fe70 SHA512 1dd8912120ba0e9e84849fd793d54aee56e98396f6228a4bcec5c79485b9902398eeefb8f276abd46bbe627e7bd3c8fc5d740d05807342f837ac226f475510d7 DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6 -DIST TeamSpeak3-Client-linux_x86-3.3.2.run 94323084 BLAKE2B f3b0317e8cbc7143d9814a52c8a8c9cd04aa012a40172aca59e6d4db956a19ae5752bffa102f06e34ad0dd5b211082e00ca06056c05a4a2dbbd8adfd76a0c0e7 SHA512 56b7b231ffa5195418823da435fd4daef2cbdbc653d3cfd328f60881a1370b9dd6f99479e9093216d0768ddb04bdd6c6cf1a7019d836abd89806518eeee23496 DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7 -EBUILD teamspeak-client-3.3.2-r1.ebuild 2535 BLAKE2B 41d4f8d3565b4d6801b1619adc2c32b120f33ba8d7b3b0ce1206371c93797d29da7849d0c100c4d8d85d144e759e88db0488def3a65668a7a5d8c5b235f19414 SHA512 ef5f3594fc6c8ebf6febb80b3fc3bfda2b45a4d6b318e4640f5c0ffe4450412a3081c9fa2836547da1fab4d51f2ea000472038a6ed6048529d6410bb737ba963 -EBUILD teamspeak-client-3.5.3.ebuild 2884 BLAKE2B 2341c038f6dead7ab1e309c13bc5d99d3cc20a96f6feb6ac76c1a7ba0da8b4d97ea2071087ddb212cce24daa669e95a3a61de69c57830bc83411687f75f6de1e SHA512 e03383cc17feaee129e86a291c42c5674739ae806a7bdd6d2d49f73236dedb71763e9e668a7f65bc5a0eaf5ef18b183ab2bf585e7d4bef36ac65d2789f88bce2 +EBUILD teamspeak-client-3.5.3.ebuild 2889 BLAKE2B 020a68a08d191a21b356a0ea2a731658666dffea461b80c2d871776743fc360194b4f2be78fa5b2f378652748c3ab34fb6c272e8f54c157a7b7e1e85c0485932 SHA512 28041f314d5d6dfe0254b977105e3c73747b2f575276021b8222d92106464cc60cb42b8b8fcad10d281b5d4318b53ee7d9d1d54bbc1aafa920a182db6d9383ea MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f diff --git a/media-sound/teamspeak-client/teamspeak-client-3.3.2-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.3.2-r1.ebuild deleted file mode 100644 index e80daf5efa28..000000000000 --- a/media-sound/teamspeak-client/teamspeak-client-3.3.2-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs unpacker xdg-utils - -MY_PV="${PV/_/-}" - -DESCRIPTION="A client software for quality voice communication via the internet" -HOMEPAGE="https://www.teamspeak.com/" -SRC_URI=" - amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run ) - x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run ) -" - -KEYWORDS="-* amd64 x86" -LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )" -SLOT="0" -IUSE="alsa pulseaudio" -REQUIRED_USE="|| ( alsa pulseaudio )" - -RDEPEND=" - app-arch/snappy:0/1 - dev-libs/openssl:0 - dev-libs/quazip - dev-qt/qtcore:5 - || ( - dev-qt/qtgui:5[accessibility,dbus,X(-)] - dev-qt/qtgui:5[accessibility,dbus,xcb(-)] - ) - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[geolocation(+),widgets] - dev-qt/qtwidgets:5 - net-libs/libsrtp:0 - sys-libs/libcxx[libcxxabi] - sys-libs/zlib:0/1 - virtual/udev - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" - -RESTRICT="bindist mirror" - -S="${WORKDIR}" - -QA_PREBUILT=" - opt/teamspeak3-client/error_report - opt/teamspeak3-client/package_inst - opt/teamspeak3-client/soundbackends/libalsa_linux_*.so - opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so - opt/teamspeak3-client/ts3client - opt/teamspeak3-client/update -" - -src_prepare() { - default - - if ! use alsa; then - rm -f soundbackends/libalsa_linux_*.so || die - fi - - if ! use pulseaudio ; then - rm -f soundbackends/libpulseaudio_linux_*.so || die - fi - - mv ts3client_linux_* ts3client || die - - tc-export CXX -} - -src_install() { - exeinto /opt/teamspeak3-client - doexe error_report package_inst ts3client update - newexe "${FILESDIR}"/ts3client-bin-r2 ts3client-bin - - exeinto /opt/teamspeak3-client/soundbackends - doexe soundbackends/*.so - - insinto /opt/teamspeak3-client - doins -r gfx html resources sound styles translations - - dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess - - dodir /opt/bin - dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client - - make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network" - - einstalldocs -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild index 8a98c0de7a5b..af57b75982cb 100644 --- a/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild +++ b/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild @@ -14,13 +14,13 @@ SRC_URI=" x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run ) " -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )" SLOT="0" IUSE="+alsa pulseaudio" REQUIRED_USE="|| ( alsa pulseaudio )" -BDEPEND="dev-util/patchelf" +BDEPEND=">=dev-util/patchelf-0.10" RDEPEND=" app-arch/snappy:0/1 diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest index 5d242b5359d4..1de42ca12300 100644 --- a/media-sound/terminatorx/Manifest +++ b/media-sound/terminatorx/Manifest @@ -1,4 +1,4 @@ AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a9766f6b35d6547339a839bbc7460f800bcf0721e30c6c77e42cfcfb5a91c683a11c90fb967849e8b7577e68dc11448b1a1f9873 SHA512 d801d60deb2d18444979791246c9eac7b41f2e7f8ecf5fa25a9b4d9294b0c0bd5dc107ac63aab04a85962efdea316f43df9736ef6009a174f1e8d6a7eb53c1c3 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093 -EBUILD terminatorx-4.0.1-r2.ebuild 1363 BLAKE2B 7d536c015a6f5c90086586213cb27d303b1f7f7f9e76672f8e48a6479cae6a3821a62beaff61308f3af71b5868f8d7072242f328153a16f8e8ab8bcef44a5c36 SHA512 7f13d3277be0ce8ee10c62b36c52f5fd3fe94a251bd7dbd247eefff2ddb806c8d3369753279adb86382c6b4f2533a05350cb8d4c1b33607a852586b250d84448 +EBUILD terminatorx-4.0.1-r2.ebuild 1367 BLAKE2B f7739ab4a165bdf6c9f3beacc572ca36083f3a6612f40fb670d8ad9a1d6572279f2cd24ad793bda6d64344b3d9fd74a4245a4276b5073643b38523fff0b2fcec SHA512 c4250247ebde946f87228cc96d8e2ad761d4aca8d299b814b2ba5d320da4fd3804ef6936114e760d89850e4c70dcdb5d0c8e2db62d33a9565d5d773be514d0d5 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild index 30a6bd889148..8e85e9878242 100644 --- a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild +++ b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild @@ -32,8 +32,8 @@ RDEPEND=" dev-libs/libxml2:2 media-libs/audiofile:= media-libs/ladspa-sdk - media-libs/ladspa-cmt media-libs/liblrdf + media-plugins/cmt-plugins " DEPEND="${RDEPEND} x11-base/xorg-proto diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest index 9537904323f4..90fa02e11a4b 100644 --- a/media-sound/timidity++/Manifest +++ b/media-sound/timidity++/Manifest @@ -17,6 +17,6 @@ AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cac AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f -EBUILD timidity++-2.14.0-r3.ebuild 5317 BLAKE2B 33747f1b6fe1e63e037870e5e4a0268e173175c15849937d79696efd0ef8767f1db261fced6ee081b3845f81d12e0b33009b69b365f025c78b4ce260f8c677c4 SHA512 fa74f3574d706851649f7e902d7f6c38c49222f444737ba2a117cdff9531e2a24ae90c11d342f1214bd71732f58a82b30a52b73dab05d766793dcecbb7cd1369 +EBUILD timidity++-2.14.0-r3.ebuild 5314 BLAKE2B 78f1c18ab9c918f6a1909d73274df8fc3adf539524bceb1c17a1f5ea9d3a7b196da86c3527135d06bc960c8443203d3c2ac26cb4a2da2e953a0daafb747c97e0 SHA512 7de7da1ac55bcb4d83b3869daeb942aabddaa989ac29d2595d66d6e60b6b8deb877552b2abb99043f479cbd9284b76159b50b8e7f8997fc6b16f506befdd47cf EBUILD timidity++-2.15.0.ebuild 5206 BLAKE2B e726e7354e4f46122794ad9432ab6c9b304282cf8c08f8dd997d0e46c6cc01b6b2543b0e5a71386e1cd1a1a4a5f8005e8442ea3155cce1ee1219077ef1c10a6a SHA512 13198dd6881e8ce3f0a159ef8ca2354e31484e8bfa3888c583423da3cf71165e9435aeb82daef1202e26791be4a27c4d87c76bd0e10e879ab4bcc948a9794161 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3 diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild index 6f7038afbfca..b2272da476b3 100644 --- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild +++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86" IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X" REQUIRED_USE="tk? ( X )" diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest index 847f4c4da743..2dec7f0c6a31 100644 --- a/media-sound/timidity-eawpatches/Manifest +++ b/media-sound/timidity-eawpatches/Manifest @@ -1,4 +1,4 @@ AUX timidity-eawpatches-12-fix-dir.patch 251 BLAKE2B 40efdb10eaadd4d4430fdcc5f0f2b9cacb5976b4068537f012227919c853d3264fddfbea0d362d1d7e32de593b3d40a49105a1ba08f0b627ca3637afea13749e SHA512 fe5ef5ab981a9430bcecd5a7c00094daccc45f0e9e580830cde3a9e9f8c75bb15519f99771c89768efca74aca41ea582bf4a99edc7597ad0526368c8de5ec514 DIST eawpats12_full.tar.gz 32047230 BLAKE2B e2711c59e95b29f77d07dc7465e1eee717007759328ce03c85ae4897d6507ad6801ca7040b1b08d26fcefae5afaba1d6415b6fe152920b58a77947682a9bfb08 SHA512 fb5532c85653e624ed310cd5607d1e24231bcaa9bf966548e9383daf463b9221b21945d2786db0bc44dbabc5342b224a4cbb6c9329f1eee1ee8137d56b3cf71a -EBUILD timidity-eawpatches-12-r5.ebuild 1103 BLAKE2B 617dfc072441e0e65907942218641b219a8d09bd498f0f2c347d90be5edc48a15052310d9bc274d64afe06bcc3116a03115d3260fa4366262ba25db1002697fa SHA512 0dda5d940bf5a7f582925791900654e1a9662c53b9fe32bc20ff87c5dee0e9b543b7dcf339b6a8c97e307eebc96f8e99117de0b4efe4109421a2c19c6ebc176a +EBUILD timidity-eawpatches-12-r5.ebuild 1102 BLAKE2B 1689382d809e3f0f7148f41db4a30bc0bd869037de87a7e63acbdc8c3dad7a908e0bc5c7fd8777ee0485e69957fe050810ed1de91fade722e45fd10504f929bc SHA512 cabd9258913a006b3a6fd6ef8474f4c4ae85db1d1dd6d1f3085d7d206f83ba7b82d403c39d3e5a98b0424b43a26578dd98afe635589a0b1aa2c3546066cbfc4d MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild index 3c9b2827791e..634ecd53fc06 100644 --- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild +++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz" LICENSE="free-noncomm" SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86" RESTRICT="binchecks strip" # These can be used for libmodplug too, so don't depend on timidity++ diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest index 40e7c45ba99a..2e494218edd6 100644 --- a/media-sound/timidity-freepats/Manifest +++ b/media-sound/timidity-freepats/Manifest @@ -1,3 +1,3 @@ DIST freepats-20060219.tar.bz2 25791733 BLAKE2B fcf512bf85bca61e29a32640a45e3dbb6132cdf4246baa54c7ed4540c955451b47d2e3d7f01219dfb1be5837dbe0d7e332583ce5b29918229718b22b237a6026 SHA512 6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f -EBUILD timidity-freepats-20060219-r1.ebuild 795 BLAKE2B 22cec0c8a12ade04bd26e4ab1575831741e84cc02efffb116783141bebb2b069452702ca0ade752b443f8e919b4fdca89346c5dc318ff8487590b358fef505d3 SHA512 abc261c99693f8271f8dda48c2cb5d6d05c510bba28e60bf012c8070e290fa89e1ec64739e3b6fea947ed989bec08a9eeba47bb1522b924fc9b9c09a6efbdbfe +EBUILD timidity-freepats-20060219-r1.ebuild 808 BLAKE2B db0855fc1c8c8d7f726a711c2e9db9c26291dda400f7be40570ba0b4a9994f4789423e3241acc3451d6a783175c6d1e994f99be121dbfda5beb677a4d147d0e4 SHA512 b41aa7233d1798c5cd780d5498cfeb1740a307c417346b5272abe74246f5cfe9be7453d0486c1979ee0c816b50251cdf8c3147e179e6ad72d579c93bc663d010 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild index a1b8f89a3eeb..e7eb715cab55 100644 --- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild +++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86" IUSE="" RESTRICT="binchecks strip" diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest index 7e04b031da1c..5e025182e54a 100644 --- a/media-sound/tomahawk/Manifest +++ b/media-sound/tomahawk/Manifest @@ -1,6 +1,7 @@ AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21 +AUX tomahawk-0.9.0_pre20181030-findtaglib.patch 8972 BLAKE2B 939a01eadce7709ed499bee56c6d3b9b1327cedda4d803024ca52ac11eacf798c62ccdc01e1fc6f8477545207ca9e17e85f3d000ce6b7d09379aad33677edf03 SHA512 8225e6b03c4b747f9179bb434c7ab3e1eb3708a8c62e95db87e918cb254d8717a2bc7fcee587ada70a954e73da2d85cac708121fe1884536450a8e7c2cfe185b AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5 AUX tomahawk-0.9.0_pre20181030-qt-5.15.patch 4668 BLAKE2B 40c40daa9079f1695234dff83102087ab3eaa26ef6b084df36fc2040e9f23d69296a452e3d263a6e7fd902c78f62f2ae12a15ae181b8ff8848e4db0542df3462 SHA512 e5dbef2b9cf042576565ca16fd278778847af1657bf22d9c27cb177b5ba20fbc492f6769cc661657dbfc23bbfde66399f42a657c2fbea2c91d87216b921da8bd DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202 -EBUILD tomahawk-0.9.0_pre20181030.ebuild 1835 BLAKE2B 077307ceebcaeb6c3db3c5b1b2534528435dd6a5f58e94fdd4777546cec9bcebd095fe659d3096ee380ee7539faa5f06ba1fd227fbb56f5bbc0a24f9e72380b0 SHA512 780432d7b50209b140281db8329b4cdfa9409e87285fbbb57e66c1881f5816e498579713abbc29c6864538945a05abcbd2e55971c2b1a70429424e4219c27b35 +EBUILD tomahawk-0.9.0_pre20181030.ebuild 1885 BLAKE2B 6ba75ba004d9b7137fba269c6853567ed278c0a5daa025f69a77dc959a07f6e97890f2a000fd4f4f245d527127ad0a2e54f768c50556d250fbc1748528790039 SHA512 b83c1fd7ff15d1431a28f3716ea43b07e405015b350a8e1d31a0491315a300ef8c7c93755573b614e8c942c99cac4290f0fd9cee38e9eb03d15684881f018263 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15 diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch new file mode 100644 index 000000000000..9a53e0d69020 --- /dev/null +++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch @@ -0,0 +1,244 @@ +From 7c7b57e295aebcca9b09d8c5798e172cb8fd179c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 13 Jul 2020 02:11:06 +0200 +Subject: [PATCH] Import FindTaglib.cmake from ECM 5.72.0 + +This version of ECM gained a module that is overriding Tomahawk's own, but +variables are incompatible. Use the updated ECM module until we can depend +on the necessary ECM version itself. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + CMakeModules/CheckTagLibFileName.cmake | 5 +- + CMakeModules/FindTaglib.cmake | 173 +++++++++++++------------ + src/libtomahawk/CMakeLists.txt | 4 +- + 4 files changed, 93 insertions(+), 91 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9422a808e..2f1e72238 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -213,7 +213,7 @@ macro_optional_find_package(Lucene++ 3.0.0) + macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection") + + macro_optional_find_package(Taglib 1.8.0) +-macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files") ++macro_log_feature(Taglib_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files") + include( CheckTagLibFileName ) + check_taglib_filename( COMPLEX_TAGLIB_FILENAME ) + +diff --git a/CMakeModules/CheckTagLibFileName.cmake b/CMakeModules/CheckTagLibFileName.cmake +index e5b3706c9..7828dcf34 100644 +--- a/CMakeModules/CheckTagLibFileName.cmake ++++ b/CMakeModules/CheckTagLibFileName.cmake +@@ -1,9 +1,8 @@ + # taglib changed filenames to be a char/wchar struct on some platforms, need to check for it + macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX) + include (CheckCXXSourceCompiles) +- set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS}) +- set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES}) +- set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES}) ++ set (CMAKE_REQUIRED_INCLUDES ${Taglib_INCLUDE_DIRS}) ++ set (CMAKE_REQUIRED_LIBRARIES ${Taglib_LIBRARIES}) + check_cxx_source_compiles( + "#include <tfile.h> + int main() +diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake +index d4ada2592..ad14c79cd 100644 +--- a/CMakeModules/FindTaglib.cmake ++++ b/CMakeModules/FindTaglib.cmake +@@ -1,87 +1,90 @@ +-# - Try to find the Taglib library +-# Once done this will define ++#.rst: ++# FindTaglib ++# ---------- + # +-# TAGLIB_FOUND - system has the taglib library +-# TAGLIB_CFLAGS - the taglib cflags +-# TAGLIB_LIBRARIES - The libraries needed to use taglib +- +-# Copyright (c) 2006, Laurent Montel, <montel@kde.org> ++# Try to find the Taglib library. + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-IF(TAGLIB_FOUND) +- MESSAGE(STATUS "Using manually specified taglib locations") +-ELSE() +- +- if(NOT TAGLIB_MIN_VERSION) +- set(TAGLIB_MIN_VERSION "1.6") +- endif(NOT TAGLIB_MIN_VERSION) +- +- if(NOT WIN32) +- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +- ${BIN_INSTALL_DIR} +- ) +- endif(NOT WIN32) +- +- #reset vars +- set(TAGLIB_LIBRARIES) +- set(TAGLIB_CFLAGS) +- +-# MESSAGE( STATUS "PATHS: ${PATHS}") +- # if taglib-config has been found +- if(TAGLIBCONFIG_EXECUTABLE) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) +- +- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") +- set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) +- +- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- set(TAGLIB_FOUND TRUE) +-# message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") +- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) +- +- else(TAGLIBCONFIG_EXECUTABLE) +- +- include(FindLibraryWithDebug) +- include(FindPackageHandleStandardArgs) +- +- find_path(TAGLIB_INCLUDES +- NAMES +- tag.h +- PATH_SUFFIXES taglib +- PATHS +- ${INCLUDE_INSTALL_DIR} +- ) +- +- find_library_with_debug(TAGLIB_LIBRARIES +- WIN32_DEBUG_POSTFIX d +- NAMES tag +- PATHS +- ${LIB_INSTALL_DIR} +- ) +- +- find_package_handle_standard_args(Taglib DEFAULT_MSG +- TAGLIB_INCLUDES TAGLIB_LIBRARIES) +- endif(TAGLIBCONFIG_EXECUTABLE) +-ENDIF() +- +-if(TAGLIB_FOUND) +- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +- message(STATUS "Found TagLib: ${TAGLIB_LIBRARIES}") +- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +-else(TAGLIB_FOUND) +- if(Taglib_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Taglib") +- endif(Taglib_FIND_REQUIRED) +-endif(TAGLIB_FOUND) ++# This will define the following variables: ++# ++# ``Taglib_FOUND`` ++# True if the system has the taglib library of at least the minimum ++# version specified by the version parameter to find_package() ++# ``Taglib_INCLUDE_DIRS`` ++# The taglib include dirs for use with target_include_directories ++# ``Taglib_LIBRARIES`` ++# The taglib libraries for use with target_link_libraries() ++# ``Taglib_VERSION`` ++# The version of taglib that was found ++# ++# If ``Taglib_FOUND`` is TRUE, it will also define the following imported ++# target: ++# ++# ``Taglib::Taglib`` ++# The Taglib library ++# ++# Since 5.72.0 ++# ++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org> ++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org> ++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org> ++# SPDX-License-Identifier: BSD-3-Clause ++ ++find_package(PkgConfig QUIET) ++ ++pkg_search_module(PC_TAGLIB QUIET taglib) ++ ++find_path(Taglib_INCLUDE_DIRS ++ NAMES tag.h ++ PATH_SUFFIXES taglib ++ HINTS ${PC_TAGLIB_INCLUDEDIR} ++) ++ ++find_library(Taglib_LIBRARIES ++ NAMES tag ++ HINTS ${PC_TAGLIB_LIBDIR} ++) ++ ++set(Taglib_VERSION ${PC_TAGLIB_VERSION}) ++ ++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION) ++ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h") ++ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H) ++ ++ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H}) ++ ++ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}") ++ ++ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}") ++ endif() ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Taglib ++ FOUND_VAR ++ Taglib_FOUND ++ REQUIRED_VARS ++ Taglib_LIBRARIES ++ Taglib_INCLUDE_DIRS ++ VERSION_VAR ++ Taglib_VERSION ++) ++ ++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib) ++ add_library(Taglib::Taglib UNKNOWN IMPORTED) ++ set_target_properties(Taglib::Taglib PROPERTIES ++ IMPORTED_LOCATION "${Taglib_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}" ++ ) ++endif() ++ ++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS) ++ ++include(FeatureSummary) ++set_package_properties(Taglib PROPERTIES ++ URL "https://taglib.org/" ++ DESCRIPTION "A library for reading and editing the meta-data of audio formats" ++) +diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt +index 348d6b1dd..e0a342f0e 100644 +--- a/src/libtomahawk/CMakeLists.txt ++++ b/src/libtomahawk/CMakeLists.txt +@@ -533,8 +533,8 @@ TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} PRIVATE + ) + + # TagLib +-TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${TAGLIB_LIBRARIES}) +-TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${TAGLIB_INCLUDES}) ++TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${Taglib_LIBRARIES}) ++TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${Taglib_INCLUDE_DIRS}) + + INSTALL( TARGETS ${TOMAHAWK_LIBRARY} + EXPORT TomahawkLibraryDepends +-- +2.27.0 + diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild index e3e201984d00..442d0f525b7b 100644 --- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild +++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild @@ -19,6 +19,12 @@ BDEPEND=" dev-qt/linguist-tools:5 " COMMON_DEPEND=" + app-crypt/qca:2[qt5(+)] + dev-cpp/lucene++ + dev-cpp/sparsehash + dev-libs/boost:= + dev-libs/qtkeychain:=[qt5(+)] + >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 @@ -29,12 +35,6 @@ COMMON_DEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 - app-crypt/qca:2[qt5(+)] - dev-cpp/lucene++ - dev-cpp/sparsehash - dev-libs/boost:= - dev-libs/qtkeychain:=[qt5(+)] - >=dev-libs/quazip-0.7.2[qt5(+)] kde-frameworks/extra-cmake-modules:5 kde-frameworks/attica:5 >=media-libs/liblastfm-1.1.0_pre20150206 @@ -58,7 +58,8 @@ S="${WORKDIR}/${PN}-${COMMIT}" PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" "${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826 - "${FILESDIR}/${P}-qt-5.15.patch" # pending upstream + "${FILESDIR}/${P}-qt-5.15.patch" # git master + "${FILESDIR}/${P}-findtaglib.patch" # pending upstream ) src_configure() { diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest index 86507a3e77cd..803e86e7f54f 100644 --- a/media-sound/toolame/Manifest +++ b/media-sound/toolame/Manifest @@ -1,6 +1,7 @@ -AUX toolame-02l-gentoo.diff 2188 BLAKE2B 5129ce926e4ee55a6f5baa73bf164eda41e273882392bb151338035d0cb5017ae05acc8000a583961cfed195eba92fc7cac27ae4bca6b781975b0f3fd88fabd6 SHA512 1d2c19fa4607f67f2fc8b6384d80fdf52e21438ecfecc6b2e2a0cbb84abd7019b340196324f1e43f81f698be96a2cccf970890908d8c05415b82ecb516da2484 +AUX toolame-02l-Makefile.patch 1986 BLAKE2B b08cd26cb0aa77372693eb2cf8cb850c4d0bbc6897b8f048d683c36c416922fc6ee118f45265f1d7b7e8be33b3adf96e1fcc107565cf6e7341f033a02f555cc1 SHA512 9b186a4245a8c445506796e5a646a9a74edfaeb7027dcf6c874363cae1175792a260e0b55c9fbe19b2d20b43627ec1a6d18a033ee4b45096cc97f4e83047daf2 +AUX toolame-02l-fno-common.patch 389 BLAKE2B 2dc0b94bb4fcd1b7692d6922dd62b7a43535bd336e8b156107b2adde4a9bd63a047b4d324d2fd9119f7c038f877696a7ed9e54747813c8ec922ad2ed8f0a71a3 SHA512 e5bddcb1407a3885dc5e2f9afdfaafe05c3b117434331b18e37b13e4e6f68573eedd63c763b2e666fa7839b6aacbbc24d87b492798f7289e245cd0a6e0a22e53 AUX toolame-02l-uint.patch 950 BLAKE2B 6f689e4ff7eb5aa8b6f9f5603813882e2a2fe80b4b37b2a88876b770f6d25c40437b378c7a5df03a57e2f49ba9f7460e7268c90af33a878104edff26be14c2b9 SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d AUX toolame-02l-uint32_t.patch 624 BLAKE2B 9a07c69bc91f4a90c6169d5c820ceda37dcbad90cb964025c786e8b8d4081434f76f8d0fdf2532abba6ab0a88ee07e07266a9fb0eab8617a0f76bc3c753566aa SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05 DIST toolame-02l.tgz 127493 BLAKE2B eaa20e1bdc966003401b6fe720bcb6d81aa1c9bf3f8a7aa4f05732ca3c43a71cc55f979a65536197e236e536ada445cfb0c31e3296307100f6d43f64cfb5d16a SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e -EBUILD toolame-02l-r4.ebuild 734 BLAKE2B 084e45c06732b84c3d5c2c1d4d913316886baff7e5a448a44a78685ce8c0ce8dced65eed492e3c3b11f07609da3607fbc8cac39c4b904b8cbb66efbb6ff4354e SHA512 bb1e867a87d1839ebffa6586370ba8e81f957d6b31e3ee8814c3cb4107598072066bafb481c8f83693164595573d360d119c7d4283ce825f6d2cd9e9bfa327a2 +EBUILD toolame-02l-r4.ebuild 674 BLAKE2B 253ac81fbdfff8181240703f8da5e30e46cc59b72cf0fd8ed941e8db88d60a7b197e2a2620556c8ccefa0980f3255711cfcef7196b33ce02be729fe33983b099 SHA512 001419e4bf9e973c072e9eabb067346ce5c1cb5fd12e829fbec33ef211661c5cae570b12a2535951b1b41965601be0013cd1d2e87f57bdfffcb75cefda175bbf MISC metadata.xml 330 BLAKE2B 632691c8ef2f3340e3d9f7e55ee85d64d73aed0286c654e60b3abf674fe79231b85b7d606f36d6c799fb2206ba1074eb1b15960c72124b2d589fe471eb793976 SHA512 e4b6308fa4241c592a768a0a21629e0b0de427c39c8d0ef9c26e093e029de51e55a28ae547b93a584c373a1f29034069198cff2667d647238e20bd4b4f7b8b2e diff --git a/media-sound/toolame/files/toolame-02l-gentoo.diff b/media-sound/toolame/files/toolame-02l-Makefile.patch index f96020f0a815..28009555d858 100644 --- a/media-sound/toolame/files/toolame-02l-gentoo.diff +++ b/media-sound/toolame/files/toolame-02l-Makefile.patch @@ -1,5 +1,5 @@ ---- toolame-02l/Makefile 2003-03-02 08:07:02.000000000 +0100 -+++ toolame-02l/Makefile.new 2003-04-14 14:00:10.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -1,6 +1,3 @@ - -CC = gcc @@ -7,7 +7,7 @@ c_sources = \ common.c \ encode.c \ -@@ -26,37 +23,16 @@ +@@ -26,29 +23,8 @@ OBJ = $(c_sources:.c=.o) @@ -19,8 +19,8 @@ -OPTIM = -O3 - # These flags are pretty much mandatory - REQUIRED = -DNDEBUG -DINLINE=inline - +-REQUIRED = -DNDEBUG -DINLINE=inline +- -#pick your architecture -ARCH = -march=pentium -#Possible x86 architectures @@ -34,15 +34,16 @@ -# -malign-double \ -# -mfancy-math-387 -funroll-loops -funroll-all-loops -pipe \ -# -fschedule-insns2 -fno-strength-reduce -- ++REQUIRED = -DNDEBUG -DINLINE= + #Set a stack of warnings to overcome my atrocious coding style . MFC. WARNINGS = -Wall - WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls +@@ -56,7 +32,7 @@ NEW_02L_FIXES = -DNEWENCODE -DNEWATAN -CC_SWITCHES = $(OPTIM) $(REQUIRED) $(ARCH) $(PG) $(TWEAKS) $(WARNINGS) $(NEW_02L_FIXES) -+CC_SWITCHES = $(CFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES) ++CC_SWITCHES = $(CFLAGS) $(CPPFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES) PGM = toolame diff --git a/media-sound/toolame/files/toolame-02l-fno-common.patch b/media-sound/toolame/files/toolame-02l-fno-common.patch new file mode 100644 index 000000000000..c414324785bb --- /dev/null +++ b/media-sound/toolame/files/toolame-02l-fno-common.patch @@ -0,0 +1,20 @@ +--- a/common.c ++++ b/common.c +@@ -19,6 +19,8 @@ + * + ***********************************************************************/ + ++options glopts; ++ + char *mode_names[4] = { "stereo", "j-stereo", "dual-ch", "single-ch" }; + char *version_names[2] = { "MPEG-2 LSF", "MPEG-1" }; + +--- a/options.h ++++ b/options.h +@@ -19,5 +19,5 @@ + } + options; + +-options glopts; ++extern options glopts; + #endif diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild index fea144e8c601..659ebf40b047 100644 --- a/media-sound/toolame/toolame-02l-r4.ebuild +++ b/media-sound/toolame/toolame-02l-r4.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic toolchain-funcs +EAPI=7 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder" HOMEPAGE="http://www.planckenergy.com" @@ -11,25 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" PATCHES=( - "${FILESDIR}/${P}-gentoo.diff" - "${FILESDIR}/${P}-uint.patch" - "${FILESDIR}/${P}-uint32_t.patch" + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-uint.patch + "${FILESDIR}"/${P}-uint32_t.patch + "${FILESDIR}"/${P}-fno-common.patch ) -src_prepare() { - # fix #571774 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - +src_configure() { append-lfs-flags tc-export CC - - default } src_install() { dobin ${PN} - dodoc README HISTORY FUTURE html/* text/* + dodoc -r README HISTORY FUTURE html/. text/. } diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest index 02a9ca782b8f..f01499a3ea54 100644 --- a/media-sound/twolame/Manifest +++ b/media-sound/twolame/Manifest @@ -2,5 +2,5 @@ AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03 EBUILD twolame-0.3.13-r2.ebuild 1246 BLAKE2B 16e43d7796cb506a1173f6ea691474227745f4f89b07068b093df9816b88b4f39cf04ec4ab07148c7425acfe155a70285bc3af2f2836eb70450556e4bbfeab3d SHA512 9b91fb852268aa8cfeeba8a38530a3f1d9b057c269a5d687ece955fa445c5cd5cc5dcd0a850f2341872290939d78324d826ee01ba0fde032136d97ef528b049f -EBUILD twolame-0.4.0.ebuild 1337 BLAKE2B 4305b9e27367069ea41544970eae755d34a38eb4795ae7ee54e5bf3fbb5394e233e5bf71b1dc855f85c2f62a661ddd4e2d9dbac500b24567bf320ea292778c7b SHA512 8da6d2db35357ac2e0408b588243c73868e58164ec9a26007f6eb58c3d017365d4211b634f1a4c88f528032b274de78543467a9a13b1802a67a25c3ab6e901eb +EBUILD twolame-0.4.0.ebuild 1329 BLAKE2B b81660a096872a09db3ffea95db207d7cb21cdab6eeb3977c282c1e8db4a5c0c3aff8465738b1ea117a3eae2f496c55aaf230b9170dd67cf7847fa6e6b3ee0d1 SHA512 34dff4b8b54d510c3c346610a09ab79297e278bd015df5c541748f44d5c19c4e871deaeedb14cf4885e47d6b73ea39d9e445dd07d1d90beda969f105b19b9256 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8 diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild index 0018eda92a5c..628c6942148e 100644 --- a/media-sound/twolame/twolame-0.4.0.ebuild +++ b/media-sound/twolame/twolame-0.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="+sndfile static-libs test" RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )" diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest index f11c30489d22..36af98575ed0 100644 --- a/media-sound/vimpc/Manifest +++ b/media-sound/vimpc/Manifest @@ -1,6 +1,6 @@ AUX vimpc-0.09.2-boost.patch 8262 BLAKE2B 4f35c6bf2a5b2d9072a2cba699fe8175af60f5c18d61fd57fdc497e06dd9260eacb41a29af5db6003f40b0b1e7f28a2fed4abe532b64aabd9f7265eab035bf6e SHA512 f1680f0f63277fdc0b57af24558e3715de656f39fdad00ed218c32542bbbe0a63f891b75802709275d4b0e7bac086ed5ea74cded4c37cbfc5c34586c067abac1 DIST vimpc-0.09.2.tar.gz 452593 BLAKE2B b6cbeab32318e723d7be114255fba7360fa2608d03bde6b2186d47b1cb8e74b4369d0d2b1d683cf5668232bf4581e9acb79d726308b18ff0d82122aa979f81a1 SHA512 456e2d2c0510273c071b24c2dd8f90b73d40a0b02565c00ea986a78f1231cb26fb053ce5b0d1476647c813b84684e400c21948086299e445ffd651c2af46d4c9 -EBUILD vimpc-0.09.2-r1.ebuild 885 BLAKE2B 70ed5ae0615f2bdd0e7288265c7b54e23d8f88a9aec7215c2bb898be831c0fd7bded48e47e37a07c99486e4bd34260daf4b105542a8506b2a1544df04dd518c2 SHA512 dab75c696f12296cb199f4f630fbc11a1045f060e3fbe2c9c1c24a3592c751abf6c65da70204b046df19b1ee3dfdf334940ff399d69080f297fe9c464cf17c0e +EBUILD vimpc-0.09.2-r1.ebuild 883 BLAKE2B 109572f2207822b6415ecfbb5e4dc98f4453b7ff9e4b0c0abf719423bc1ccf2b857459dff4bdc2acd5076b03ceb45e358260711b6437f3dc58f19252e5543572 SHA512 de9fcb8e3bbf39d5b57775310f7c530a9d98b3af223e6b986486ece18a8a0623b2b7398e9100fa1d72189d155a029e31e06024e1066e08dec90e49fe01dcbaf9 EBUILD vimpc-0.09.2.ebuild 832 BLAKE2B e550304f0f7a0d6e306bcc5843f13d3d13d69231142e7a034c9167836d6b130b6bcea9b16575fa5932b7d98bfad414c96ff42895df1730d98a4e12a3de76ceb0 SHA512 822a40efa7211b268b9bb91f780027c24c94d892e8757df5e242222377d3a277b3b77b9613f2c5479856bfea1075f83043a90a801f6956aff6fa52fedbe7e398 EBUILD vimpc-9999.ebuild 791 BLAKE2B 12cb3bf53815fe9e688e6e8cf85283fa48419aa1baa2f61df71163bcc2591f18845e428a0db66456eb3e4718e874ee78f3261ff6dab92756a704a40b808956ee SHA512 bec3d1fd2a27e6196902e23b8827d41c391aee5c6bc68b838b68fd650553ec2739d26d167ec015ca0c14b377dab7905b7a44acd1aeb8f7b2d77c6c4165c1db54 MISC metadata.xml 523 BLAKE2B 110214d23c67c2e0b6255e8472feb6678d3ade52e55232d50067d228fadaddb90f0662db7eb1d036b59d963356b321a9b4ed829cc1860ad7208ac4c5e74f50ea SHA512 88dc39c9a62b9234604d95256ab3c94fa33a98c4df3d3e8583d9692d45ac416995faa2249431ddbf9c8edb31cce77474d2c4572215dec4c3551f02d315d732df diff --git a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild index 427022a706f2..06b1c98bc5b5 100644 --- a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild +++ b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="boost taglib" RDEPEND="dev-libs/libpcre diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest index 0b50ce149c80..8cd786e8c762 100644 --- a/media-sound/vmpk/Manifest +++ b/media-sound/vmpk/Manifest @@ -1,3 +1,3 @@ -DIST vmpk-0.6.2a.tar.bz2 452963 BLAKE2B 490a8f39d2a9f9eeef51abe4d090942a26aa9b84514da8b8852b3abf23bec1c5b8d71c48e456be6a6ac17ae20609440e40dc7a9b62bb4e24e495fe952e608f87 SHA512 89ba161c3ca7ae260d02c175d1116bea7cdfdfddb0f303d8b9177eeb3d77ded8f6126bed43efa6c279daec0a987d0be30c280d59f42a7c145167fb54a7b8db16 -EBUILD vmpk-0.6.2a.ebuild 815 BLAKE2B d29a65c957c21bcd009b8ce5d38161fe47bfa33836f0f599ab006cc30c46bc102dbbf177ec12a6f1046562f32690e4152be12bae440c206b9a0371478e5f80de SHA512 c13c575df4d08c4bb139245c9c0874de9f517d7a5c3338cc645e2b723cb92afe0b0b9ae1a3c8e5e73eaf574aa4d7ea8f2914f949f39386398843a5e025ab80d2 +DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477 +EBUILD vmpk-0.7.2.ebuild 848 BLAKE2B c3f0cb551fd71c6f14335189b9c2d7904b931abd63e2acaae9041548805e5d60c42357561a762b081bb43c40a4ce275bc89bb047a8c1b895284e589c5cc3104b SHA512 f74f22b0f41c3f75077e2dadfefb0cbd13b2e1cbf64a1dee59f7ec649a7907f56e48c4db944e59537df3c8ff8b82f9a23aa291ad31cf4be6db1d5ce51f9235e1 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0 diff --git a/media-sound/vmpk/vmpk-0.6.2a.ebuild b/media-sound/vmpk/vmpk-0.7.2.ebuild index d79c1b766b02..12365dd4917c 100644 --- a/media-sound/vmpk/vmpk-0.6.2a.ebuild +++ b/media-sound/vmpk/vmpk-0.7.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake xdg DESCRIPTION="Virtual MIDI Piano Keyboard" HOMEPAGE="http://vmpk.sourceforge.net/" @@ -14,6 +14,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="dbus" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-qt/linguist-tools:5 + virtual/pkgconfig +" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -24,19 +29,20 @@ RDEPEND=" >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-qt/linguist-tools:5 - virtual/pkgconfig" +DEPEND="${RDEPEND}" + +src_prepare() { + cmake_src_prepare +} src_configure() { local mycmakeargs=( -DENABLE_DBUS=$(usex dbus) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install rm -rf "${D}/usr/share/doc/packages" || die } diff --git a/media-sound/wavegain/Manifest b/media-sound/wavegain/Manifest index a7f36ea94672..f040ca1e131c 100644 --- a/media-sound/wavegain/Manifest +++ b/media-sound/wavegain/Manifest @@ -1,3 +1,5 @@ +AUX wavegain-1.3.1-fno-common.patch 288 BLAKE2B be7971168f7d7405ddb848ab3803ef1b07ce5ee0921a8e7636b513f84ab592ec0e0475670ac56c012333c229fe5e697126d29c3e6cf23bf1f938e0f68206927d SHA512 ee3836ff3792890c7aa152d1006ec81cbde359b807450b0d2a55298ac36662b62387d5f2926e86c2a6e0b19307452e509feb18e3bca1bc0cb7458f07c611a26a +AUX wavegain-1.3.1-makefile.patch 178 BLAKE2B f24aa0ce70548e94835f2ffb8d4777bca32af36d09582e0ca65534e97c16f7509a9c499f22e5bcbec01049d979fbe5bbe152381a435d6575137dd2e5e99fdc44 SHA512 47c2e089fe6ff7a5db8f1cef2fdf18997ee67401e8666abb34d0c8d22a0961114c017e5d1adec8e12db90568ed4068d4b23b35cc915e8f6f8d4410b182dd02f1 DIST wavegain-1.3.1srcs.zip 72180 BLAKE2B 99cccf2f2845ddb9109dec9eefc99a656ffe71f89be761db59c154c54512cac454663c669b2e586af2cdf7c9f5307e2d5335b75999e6d2284dcd799523572761 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054 -EBUILD wavegain-1.3.1.ebuild 560 BLAKE2B 53b55446a5322bcbc468c6da0a52f117ee2921c5e98af6044dac8bca29d1398abfd230bd888b58e96c646ca2b454f765f104d9c4476e4d67e858a45f31525372 SHA512 1f15d7e75b5a7c5b22aa05a066e74733ba59a2c3f3c48a4396402a77a31255411d1b128827bb45732f6a22ffac8305125802cad22d181e46102ba336a5b773cd +EBUILD wavegain-1.3.1.ebuild 576 BLAKE2B 78b71968d9e17fdd89b4ef0d57824dd8daf13980aa44c11f668b8b3df27828577ee009aad0de4f8abb2c5b0bc46aa2b71a6cbc0d9739432d943ddedacc15dd2d SHA512 622a712fe3abba3d20e3f034a901e53d42229f059b3e05ba16ec86c4104e1405ce07fc1e126abec9af9e2fa4948c6bf8568dd65d5339ac1f71b192a8269b2871 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch b/media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch new file mode 100644 index 000000000000..ff282740f8ff --- /dev/null +++ b/media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch @@ -0,0 +1,11 @@ +--- a/audio.h ++++ b/audio.h +@@ -136,7 +136,7 @@ + long wav_read(void *, double **buffer, int samples, int fast, int chunk);
+ long wav_ieee_read(void *, double **buffer, int samples, int fast, int chunk);
+
+-enum {
++typedef enum {
+ WAV_NO_FMT = 0,
+ WAV_FMT_8BIT,
+ WAV_FMT_16BIT,
diff --git a/media-sound/wavegain/files/wavegain-1.3.1-makefile.patch b/media-sound/wavegain/files/wavegain-1.3.1-makefile.patch new file mode 100644 index 000000000000..a5364f561b59 --- /dev/null +++ b/media-sound/wavegain/files/wavegain-1.3.1-makefile.patch @@ -0,0 +1,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -0,0 +1,4 @@ ++LDLIBS = -lm ++CPPFLAGS += -DHAVE_CONFIG_H ++ ++wavegain: audio.o dither.o gain_analysis.o getopt1.o getopt.o main.o misc.o recurse.o diff --git a/media-sound/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1.ebuild index 8e51ee45a376..9790a1958c4e 100644 --- a/media-sound/wavegain/wavegain-1.3.1.ebuild +++ b/media-sound/wavegain/wavegain-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,15 +12,18 @@ SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" BDEPEND="app-arch/unzip" -S=${WORKDIR}/${P/wavegain/WaveGain} +S="${WORKDIR}/${P/wavegain/WaveGain}" -src_compile() { - $(tc-getCC) ${LDFLAGS} ${CFLAGS} *.c -o ${PN} \ - -DHAVE_CONFIG_H -lm || die "build failed" +PATCHES=( + "${FILESDIR}"/${PN}-1.3.1-makefile.patch + "${FILESDIR}"/${PN}-1.3.1-fno-common.patch +) + +src_configure() { + tc-export CC } src_install() { diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest index 228e5a35ad9d..23a93a08223e 100644 --- a/media-sound/wavpack/Manifest +++ b/media-sound/wavpack/Manifest @@ -1,10 +1,3 @@ -AUX wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch 2488 BLAKE2B cabb0741eff1df18c185cb7d2e4f3eb8cf7101a3dcac0bf8641d2cdc2ca5b0bb9d983edb47e7c92884878237994024e66be8aa48edf3b651b2bcb03a82a91cbd SHA512 58c7c4bc3475e88a1f997e879c2220da8b638100f3da20f169d1131f9827677118628e6e05f61fe55ae3e00cad63c318535f28d47185b72c174477bfde6823be -AUX wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch 2664 BLAKE2B d11f2a15cbfd595f08b225ad322379bf1725cef280ae7fb516b8b57014e9c7da0f05d98bc82a80ddab1987671192a4ce69930bc39cc9cba5d2b26a600094d32d SHA512 1a469c5a36f037509951cc1afbd7b558434061d656c5f252350879c18ff31836c13dfbbaadff2bd075b5c6399b07c3b1e9ec80986cf44e0175e5c185a34680eb -AUX wavpack-5.1.0-CVE-2018-6767.patch 5430 BLAKE2B 7131fbc90bddeec7fc2d4995685204e1506b142c4a442051119c20e47f97e3d484f3cf4fd4a138d999cfb2e0fdf27b0ac1aca87deee44cbe8a12bc8695853252 SHA512 f3ad6ac08e428dabd8c56de5bd430809378aaaf0ef846fd807b54cbe7637c1e42b75ff495c093dbbd4e3c0f5da3e3cbcaa69e8625059778acbd5682566d221dc -AUX wavpack-5.1.0-CVE-2018-7253.patch 1299 BLAKE2B e2a40e2518208d143072a201ef5c8e187b1562d905639ceb13bc9fecc89dfcb5a8266bafa4f738d52abd606ada06037ddc94e916a436c3770aa77d398a26bdc9 SHA512 d00d47ea3a6141fb85402d68984ec1217b6f21c68c5de968488ce349e059d70b3d497902a7a6f1149eb61ec41f83182c53359ec2af738c7f5ba965d7a3b676f1 -AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b65173a350f0aec90d8c4ae82eb558461016da1e89a485b2a8a67b5b76959cf579337e3f603de3a2f63c113d7f19a05f01b32 SHA512 cb83dd1767ee9759e14bac5eacf8b29cae3a2c22c326cd34bcc6d6941c0565c68d16a3d07e4c2b2f7a591284b8faf5b8697b4505e4bfd5e5e83f2a9de70df586 -AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e -AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594 -DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 -EBUILD wavpack-5.1.0-r1.ebuild 970 BLAKE2B 4d91995768fd6a3b2e4c4c356b3c853ccefc93b0a2ea7d5258a3040ad8b730138815ca0f0348a1a6b36dbe42dc5f01661be04f979642420d7dabef2083a9c410 SHA512 e4070df6f2ba1674ef45ee2f7730561c9f26fddfd9825868516e3c755190f9d04f8205a6f79ba3a53787d4e3b4762b958508708f6a6ef0efb9d5cc92a1eb5a5d +DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b +EBUILD wavpack-5.3.2.ebuild 1017 BLAKE2B c8effcd2e290fba0ae33eb1bdfa4a0db6ab7d9a4ffd66f08e6dfdda267ec867d3213188838b960f91fd9fb80608989cc1dd5d091c6b6620d6df8e8a0d0c0e046 SHA512 57ad228698c36bc29ac4a0569507b5893795dc45aa68c3775a3d8b72b8ed58be4259a3c50f5d4b0cf98bba8f9b93e6fb47031325c9f5a557e7b1360d5af439a5 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch deleted file mode 100644 index d8ac3552ddd5..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: David Bryant <david@wavpack.com> -Date: Tue, 24 Apr 2018 22:18:07 -0700 -Subject: issue #30 issue #31 issue #32: no multiple format chunks in WAV or - W64 - ---- - cli/riff.c | 7 ++++++- - cli/wave64.c | 6 ++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/cli/riff.c b/cli/riff.c -index 7bddf63..5d6452e 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -53,7 +53,7 @@ extern int debug_logging_mode; - - int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) - { -- int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0; -+ int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0; - int64_t total_samples = 0, infilesize; - RiffChunkHeader riff_chunk_header; - ChunkHeader chunk_header; -@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else if (!strncmp (chunk_header.ckID, "fmt ", 4)) { // if it's the format chunk, we want to get some info out of there and - int supported = TRUE, format; // make sure it's a .wav file we can handle - -+ if (format_chunk++) { -+ error_line ("%s is not a valid .WAV file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || - !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) || - bcount != chunk_header.ckSize) { -diff --git a/cli/wave64.c b/cli/wave64.c -index fa928a0..0388dc7 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - Wave64ChunkHeader chunk_header; - Wave64FileHeader filehdr; - WaveHeader WaveHeader; -+ int format_chunk = 0; - uint32_t bcount; - - infilesize = DoGetFileSize (infile); -@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) { - int supported = TRUE, format; - -+ if (format_chunk++) { -+ error_line ("%s is not a valid .W64 file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; - - if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch deleted file mode 100644 index d924bb624bdc..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: David Bryant <david@wavpack.com> -Date: Tue, 24 Apr 2018 17:27:01 -0700 -Subject: issue #33, sanitize size of unknown chunks before malloc() - ---- - cli/dsdiff.c | 9 ++++++++- - cli/riff.c | 9 ++++++++- - cli/wave64.c | 9 ++++++++- - 3 files changed, 24 insertions(+), 3 deletions(-) - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index c016df9..fa56bbb 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - else { // just copy unknown chunks to output file - - int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1); -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", -diff --git a/cli/riff.c b/cli/riff.c -index de98c1e..7bddf63 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else { // just copy unknown chunks to output file - - int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L; -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .WAV file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", -diff --git a/cli/wave64.c b/cli/wave64.c -index 591d640..fa928a0 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - } - else { // just copy unknown chunks to output file - int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L; -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .W64 file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-6767.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-6767.patch deleted file mode 100644 index aa2cdd40fb62..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-6767.patch +++ /dev/null @@ -1,111 +0,0 @@ -From: David Bryant <david@wavpack.com> -Date: Sun, 4 Feb 2018 11:28:15 -0800 -Subject: issue #27, do not overwrite stack on corrupt RF64 file - ---- - cli/riff.c | 39 ++++++++++++++++++++++++++++++++------- - 1 file changed, 32 insertions(+), 7 deletions(-) - -diff --git a/cli/riff.c b/cli/riff.c -index 8b1af45..de98c1e 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -42,6 +42,7 @@ typedef struct { - - #pragma pack(pop) - -+#define CS64ChunkFormat "4D" - #define DS64ChunkFormat "DDDL" - - #define WAVPACK_NO_ERROR 0 -@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - - if (!strncmp (chunk_header.ckID, "ds64", 4)) { - if (chunk_header.ckSize < sizeof (DS64Chunk) || -- !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || -- bcount != chunk_header.ckSize) { -+ !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || -+ bcount != sizeof (DS64Chunk)) { - error_line ("%s is not a valid .WAV file!", infilename); - return WAVPACK_SOFT_ERROR; - } - else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && -- !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { -+ !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { - error_line ("%s", WavpackGetErrorMessage (wpc)); - return WAVPACK_SOFT_ERROR; - } -@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - - int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) - { -- int do_rf64 = 0, write_junk = 1; -+ int do_rf64 = 0, write_junk = 1, table_length = 0; - ChunkHeader ds64hdr, datahdr, fmthdr; - RiffChunkHeader riffhdr; - DS64Chunk ds64_chunk; -+ CS64Chunk cs64_chunk; - JunkChunk junkchunk; - WaveHeader wavhdr; - uint32_t bcount; -@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); - total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); - if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); -+ total_riff_bytes += table_length * sizeof (CS64Chunk); - if (write_junk) total_riff_bytes += sizeof (junkchunk); - strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); - strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); -@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - - if (do_rf64) { - strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); -- ds64hdr.ckSize = sizeof (ds64_chunk); -+ ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); - CLEAR (ds64_chunk); - ds64_chunk.riffSize64 = total_riff_bytes; - ds64_chunk.dataSize64 = total_data_bytes; - ds64_chunk.sampleCount64 = total_samples; -+ ds64_chunk.tableLength = table_length; - riffhdr.ckSize = (uint32_t) -1; - datahdr.ckSize = (uint32_t) -1; - WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); -@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - datahdr.ckSize = (uint32_t) total_data_bytes; - } - -+ // this "table" is just a dummy placeholder for testing (normally not written) -+ -+ if (table_length) { -+ strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); -+ cs64_chunk.chunkSize64 = 12345678; -+ WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); -+ } -+ - // write the RIFF chunks up to just before the data starts - - WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); -@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - - if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || - (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || -- (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || -- (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || -+ (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { -+ error_line ("can't write .WAV data, disk probably full!"); -+ return FALSE; -+ } -+ -+ // again, this is normally not written except for testing -+ -+ while (table_length--) -+ if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { -+ error_line ("can't write .WAV data, disk probably full!"); -+ return FALSE; -+ } -+ -+ -+ if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || - !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || - !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || - !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) { diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7253.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7253.patch deleted file mode 100644 index 2bf554d8b525..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7253.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: David Bryant <david@wavpack.com> -Date: Sat, 10 Feb 2018 16:01:39 -0800 -Subject: issue #28, do not overwrite heap on corrupt DSDIFF file - ---- - cli/dsdiff.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 410dc1c..c016df9 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - error_line ("dsdiff file version = 0x%08x", version); - } - else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) { -- char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); -+ char *prop_chunk; -+ -+ if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ if (debug_logging_mode) -+ error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize); -+ -+ prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); - - if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) || - bcount != dff_chunk_header.ckDataSize) { diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7254.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7254.patch deleted file mode 100644 index f6e1cc42b134..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7254.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: David Bryant <david@wavpack.com> -Date: Sun, 11 Feb 2018 16:37:47 -0800 -Subject: issue #28, fix buffer overflows and bad allocs on corrupt CAF files - ---- - cli/caff.c | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/cli/caff.c b/cli/caff.c -index ae57c4b..6248a71 100644 ---- a/cli/caff.c -+++ b/cli/caff.c -@@ -89,8 +89,8 @@ typedef struct - - #define CAFChannelDescriptionFormat "LLLLL" - --static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 }; --static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 }; -+static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 }; -+static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 }; - - static struct { - uint32_t mChannelLayoutTag; // Core Audio layout, 100 - 146 in high word, num channels in low word -@@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - } - else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) { -- CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); -+ CAFChannelLayout *caf_channel_layout; - -- if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || -- !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || -+ if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) { -+ error_line ("this .CAF file has an invalid 'chan' chunk!"); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ if (debug_logging_mode) -+ error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize); -+ -+ caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); -+ -+ if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || - bcount != caf_chunk_header.mChunkSize) { - error_line ("%s is not a valid .CAF file!", infilename); - free (caf_channel_layout); -@@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - else { // just copy unknown chunks to output file - -- int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; -- char *buff = malloc (bytes_to_copy); -+ uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; -+ char *buff; -+ -+ if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) { -+ error_line ("%s is not a valid .CAF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", diff --git a/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch b/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch deleted file mode 100644 index f6e6f66280fa..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch +++ /dev/null @@ -1,19 +0,0 @@ -ARM asm is armv7 only in wavpack. Restrict based on host cpu. -https://bugs.gentoo.org/show_bug.cgi?id=609168 - -Upstream PR: -https://github.com/dbry/WavPack/pull/20 - -Index: wavpack-5.1.0/configure.ac -=================================================================== ---- wavpack-5.1.0.orig/configure.ac -+++ wavpack-5.1.0/configure.ac -@@ -159,7 +159,7 @@ AS_IF([test "x$enable_asm" != "xno"],[ - AS_CASE([$host_cpu], - [i386|i486|i586|i686|i786], [AC_DEFINE([OPT_ASM_X86]) asm_selected=x86], - [x86_64], [AC_DEFINE([OPT_ASM_X64]) asm_selected=x64], -- [arm*], [AC_DEFINE([OPT_ASM_ARM]) asm_selected=arm], -+ [armv7*], [AC_DEFINE([OPT_ASM_ARM]) asm_selected=arm], - [AS_IF([test "x$enable_asm" = "xyes"],[AC_MSG_ERROR(no assembly code for CPU $host_cpu)])] - ) - AC_MSG_RESULT($asm_selected) diff --git a/media-sound/wavpack/files/wavpack-5.1.0-memleaks.patch b/media-sound/wavpack/files/wavpack-5.1.0-memleaks.patch deleted file mode 100644 index 18f782fa7721..000000000000 --- a/media-sound/wavpack/files/wavpack-5.1.0-memleaks.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: David Bryant <david@wavpack.com> -Date: Sun, 8 Apr 2018 16:27:40 -0700 -Subject: fix memory leaks - ---- - src/common_utils.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/src/common_utils.c b/src/common_utils.c -index caf6b8f..629e60e 100644 ---- a/src/common_utils.c -+++ b/src/common_utils.c -@@ -373,6 +373,19 @@ WavpackContext *WavpackCloseFile (WavpackContext *wpc) - - WavpackFreeWrapper (wpc); - -+ if (wpc->metadata) { -+ int i; -+ -+ for (i = 0; i < wpc->metacount; ++i) -+ if (wpc->metadata [i].data) -+ free (wpc->metadata [i].data); -+ -+ free (wpc->metadata); -+ } -+ -+ if (wpc->channel_identities) -+ free (wpc->channel_identities); -+ - if (wpc->channel_reordering) - free (wpc->channel_reordering); - diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.3.2.ebuild index b0bce8e71976..33880cc9703d 100644 --- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild +++ b/media-sound/wavpack/wavpack-5.3.2.ebuild @@ -5,24 +5,23 @@ EAPI=7 inherit autotools multilib-minimal +# Need to fetch a commit because upstream didn't tag the minor release +COMMIT="e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d" + DESCRIPTION="Hybrid lossless audio compression tools" -HOMEPAGE="http://www.wavpack.com/" -SRC_URI="http://www.wavpack.com/${P}.tar.bz2" +HOMEPAGE="https://www.wavpack.com/" +SRC_URI="https://github.com/dbry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=">=virtual/libiconv-0-r1" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${P}-armv7.patch - "${FILESDIR}"/${P}-CVE-2018-{6767,7253,7254}.patch - "${FILESDIR}"/${P}-CVE-2018-10536-CVE-2018-10537.patch - "${FILESDIR}"/${P}-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch - "${FILESDIR}"/${P}-memleaks.patch -) +S="${WORKDIR}/WavPack-${COMMIT}" src_prepare() { default @@ -32,9 +31,14 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE=${S} econf \ --disable-static \ + $(use_enable test tests) \ $(multilib_native_enable apps) } +multilib_src_test() { + cli/wvtest --default +} + multilib_src_install_all() { einstalldocs find "${D}" -name '*.la' -delete || die diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest index a6078b786b27..4965224d93c9 100644 --- a/media-sound/whipper/Manifest +++ b/media-sound/whipper/Manifest @@ -1,4 +1,4 @@ AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453 DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7 -EBUILD whipper-0.9.0.ebuild 1281 BLAKE2B 694cedbf147e060019c23fa24ce13c1e02a202dc76dcf381cffaa84bb33910b8aabb9aeccea0c807f1bdcf1f91c2b26f41f8b1823225491e75b9fb26bfcbdd83 SHA512 29daecfa45df1ac6f021952f76ead81e8c3a37ec7fb9ea55eb1274f337e92b1a43cc9bf1040df3a103ee4918638191eee1a2f55f8e7119fa9b202a547a13fac7 +EBUILD whipper-0.9.0.ebuild 1283 BLAKE2B c29c0d57c34cdc42542fce17cd5b06a9f265c54c6a0dd3a36cc8eb295893a33b013cb558e903827391f58df4d01d8b564d3babaa6f43de635e6e5f2f67144790 SHA512 d1e9db4884c59d60d47a76187157e7928f491cdc2d0847cada325be85a4d2d5d1235f8dead9eee67c3653e80a70fa37687043dbee0bf5d84a93de2c7d7cb11c8 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172 diff --git a/media-sound/whipper/whipper-0.9.0.ebuild b/media-sound/whipper/whipper-0.9.0.ebuild index c89a9f317c12..8875ed087dc4 100644 --- a/media-sound/whipper/whipper-0.9.0.ebuild +++ b/media-sound/whipper/whipper-0.9.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index 88a19adc7435..72f9580a80a5 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -9,5 +9,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb -EBUILD xmms2-0.8_p20161122-r8.ebuild 8170 BLAKE2B 3e5e02ad808b681fda322ca7bb0875b87f35f928dc3ee5cc554de40104600fa68036aae7e2cdb45d320ec402aefac6ffc1c1d6cd67c6ef741bf662d718c2348b SHA512 08f48db27dda98828970be93b6d68c8d45d2b6fe8b7681ec3f52747d4885efb18d131a8bdd3f111b4add507878569c38c9a89d14a5f14ccaabcf6bb25e138b43 +EBUILD xmms2-0.8_p20161122-r8.ebuild 8170 BLAKE2B 2a2dcdb540e6808e245ea4312c9b26d7b6aeb5207986bf99e2f3dea887247e1856565af939322cddb2fcc6c52b253d142e5681a21a9cf010929ceb9091daf417 SHA512 be02d615408596f1e195604068ad5ab299eb348b280a4ed5bcf819500127a0217e8701b0a61fa279298f02048c1833c22e4adb9075b0ea34c585565d9cd73a39 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild index 76112766d786..12fa7d074dc4 100644 --- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild +++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" inherit eutils multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest index 1a093fe03dc3..7eeb4657f97a 100644 --- a/media-sound/xwax/Manifest +++ b/media-sound/xwax/Manifest @@ -1,4 +1,6 @@ AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015 +DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4 EBUILD xwax-1.6-r1.ebuild 2017 BLAKE2B a1f9f5f24da4ea048258726735124962e479fe049e33156657a9a29674d7416e1ad495f3b211522a5c6032d14a2b9519c2a74654f88fb23bc00e4544e539d49a SHA512 dfdb53177359f6f5a02c5a6ee1f776ce6f7cdcbc8f2bafb60cc552fcccefc3c7c6083af0982ab19113b4981c2995c29763847ece04490d68c3f6dc0c366b75ac -MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8 +EBUILD xwax-1.7.ebuild 1996 BLAKE2B b73c4e2ef6ff8a5d791b6bfe740dd6cd18f0ad17e67c458759f702b56ec9d7f3c2baa113cc2daf29decaca29907d8ec84b9d8a5ca8e5304b0efc2ccf00790960 SHA512 053addad8cdbd8177349c999635c1796d7ff1430d9758f5851acd8007eee78136a7d2a97836789bdd2e30d46d16f583e99ccb5954a90f5cf3d054e1bd6798965 +MISC metadata.xml 705 BLAKE2B 0c5c6a1538fbe0faef37eac4c62ac8e806041e1dc2883b4341981e75e8829da8af4588f371215794e40a452b7178a538489abd4a1b211233370b85cdded4d9eb SHA512 39e87e361947199009b2b9c0d722418d21181d330f503e9fae493c6b7300e5ef287b78a2ef609e3084719c51de57cfe536e7ae726eae257b967871422639c54c diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml index 762283d3c0c5..aa4bd1f8dd50 100644 --- a/media-sound/xwax/metadata.xml +++ b/media-sound/xwax/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="alsa">Adds support for ALSA audio input/output.</flag> - <flag name="jack">Adds support for audio input/output via the JACK Audio Connection Kit.</flag> <flag name="oss">Adds support for OSS (open sound system) audio input/output.</flag> <flag name="cdda">Sets runtime dependencies to support decoding audio from a compact disc.</flag> <flag name="mp3">Sets runtime dependencies to support decoding MP3 audio.</flag> diff --git a/media-sound/xwax/xwax-1.7.ebuild b/media-sound/xwax/xwax-1.7.ebuild new file mode 100644 index 000000000000..edf6f44c7c6d --- /dev/null +++ b/media-sound/xwax/xwax-1.7.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs user + +DESCRIPTION="Digital vinyl emulation software" +HOMEPAGE="https://xwax.org/" +SRC_URI="https://xwax.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="alsa jack oss cdda mp3 +fallback" + +REQUIRED_USE="|| ( cdda mp3 fallback ) + || ( alsa jack oss )" + +DEPEND=" + media-fonts/dejavu + media-libs/libsdl + media-libs/sdl-ttf + sys-libs/glibc + sys-libs/pam + alsa? ( media-libs/alsa-lib ) + cdda? ( media-sound/cdparanoia ) + fallback? ( media-video/ffmpeg ) + jack? ( virtual/jack ) + mp3? ( media-sound/mpg123 ) +" +RDEPEND="${DEPEND}" + +DOCS=( README CHANGES ) + +src_prepare() { + default + # Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in + # the Makefile + # Also remove the dependency on the .version target so we don't need + # git just to build + sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \ + -e 's/^xwax\.o:.*\.version//' \ + Makefile || die "sed failed" +} + +src_configure() { + tc-export CC + econf \ + --prefix "${EROOT}/usr" \ + $(use_enable alsa) \ + $(use_enable jack) \ + $(use_enable oss) +} + +src_compile() { + # EXECDIR is the default directory in which xwax will look for + # the 'xwax-import' and 'xwax-scan' scripts + emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax +} + +pkg_preinst() { + enewgroup ${PN} +} + +src_install() { + # This is easier than setting all the environment variables + # needed, running the sed script required to get the man directory + # correct, and removing the GPL-2 after a 'make install' run + dobin xwax + newbin scan xwax-scan + newbin import xwax-import + doman xwax.1 + + dodoc ${DOCS} + + insinto "/etc/security/limits.d" + newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf +} + +pkg_postinst() { + elog "Be sure to add any users that will be using ${PN} to the" + elog "\"${PN}\" group. Doing so will allow processes that user" + elog "runs to request realtime priority." +} diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest index 617f01ed91da..0faf61f0cc04 100644 --- a/media-sound/yoshimi/Manifest +++ b/media-sound/yoshimi/Manifest @@ -1,3 +1,6 @@ +AUX yoshimi-1.7.1-fix-LV2_Descriptor.patch 3062 BLAKE2B 4c69d385c2b5e7b90e79b6e19bf6c41ee6fbe4219e3b96d1cd53cc4a760e0bc21379fc6c753c24c63c825463f5fefe9f94aadcb69be7dc3935b4a8b42601d8b8 SHA512 0a57f3a4e68e74569d4a8d9182a5d3692ca16f46e4c3dba126c8e49b4579c759554d451d7526ca1245a9e5947d4b37b9a1b12a78e322472f6c97e4dc985010ae DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c -EBUILD yoshimi-1.7.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116 +DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9 +EBUILD yoshimi-1.7.1-r1.ebuild 1094 BLAKE2B 3ea86703750ade54eb4449a4a93afd589b366f58122649899d2f2b020e9ed8eaeb2925dec7da3f5efe354503475c805185fcb3bb1192f1f2836397ccea9e55d6 SHA512 8153ec253ded0aac30a759781e5ba6d3150213fdb8ac96a2b630179bcc67da0267a560c438250814e9194c30af851b5b46dfab4743752c4b64b9381b2cc72493 +EBUILD yoshimi-1.7.2.ebuild 1011 BLAKE2B b28c7c74baa9813d5cb76a114f259b758882a6100856c9bbdf3dd212cef46c927a9e9a9ffd41f6c84ca37bc0352aa1cbfe52db179b193b4c700df716e2d542bc SHA512 63906d2c45c61560fa04c1db3be7d7566fac17bb610f1b7906921b27e73a03401b0742a55f95bdfad4f34d60c080453eb5d648bc993c8c833c483be992c4ec73 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152 diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch new file mode 100644 index 000000000000..94e225e4f48f --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch @@ -0,0 +1,47 @@ +diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp +index 3502689..9be6128 100644 +--- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp ++++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp +@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init() + } + + +-LV2_Handle YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features) ++LV2_Handle YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features) + { + SynthEngine *synth = new SynthEngine(0, NULL, true); + if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){ +@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init() + } + + +-LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features) ++LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features) + { +- const _LV2UI_Descriptor *desc = descriptor; ++ const LV2UI_Descriptor *desc = descriptor; + descriptor = desc; + const char *plug = plugin_uri; + plugin_uri = plug; +diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h +index a484a8b..47f4729 100644 +--- a/src/LV2_Plugin/YoshimiLV2Plugin.h ++++ b/src/LV2_Plugin/YoshimiLV2Plugin.h +@@ -106,7 +106,7 @@ public: + virtual void registerAudioPort(int) {} + + //static methods +- static LV2_Handle instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features); ++ static LV2_Handle instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features); + static void connect_port(LV2_Handle instance, uint32_t port, void *data_location); + static void activate(LV2_Handle instance); + static void deactivate(LV2_Handle instance); +@@ -159,7 +159,7 @@ public: + YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features); + ~YoshimiLV2PluginUI(); + bool init(); +- static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features); ++ static LV2UI_Handle instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features); + static void cleanup(LV2UI_Handle ui); + static void static_guiClosed(void *arg); + void run(); diff --git a/media-sound/yoshimi/yoshimi-1.7.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild index d9faf9344bfe..4c2573a12e31 100644 --- a/media-sound/yoshimi/yoshimi-1.7.1.ebuild +++ b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild @@ -35,6 +35,8 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/src" DOCS=( Changelog README.txt ) +PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" ) + src_prepare() { cmake_src_prepare append-cxxflags -lpthread diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.2.ebuild new file mode 100644 index 000000000000..bb04f4a15df6 --- /dev/null +++ b/media-sound/yoshimi/yoshimi-1.7.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Software synthesizer based on ZynAddSubFX" +HOMEPAGE="https://yoshimi.github.io/" +SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+lv2" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + >=dev-libs/mxml-2.5 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/libsndfile + sci-libs/fftw:3.0= + sys-libs/ncurses:0= + sys-libs/readline:0= + sys-libs/zlib + virtual/jack + x11-libs/cairo[X] + x11-libs/fltk:1[opengl] + lv2? ( media-libs/lv2 ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}/src" + +DOCS=( ../Changelog ../README.txt ) + +src_prepare() { + cmake_src_prepare + sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die + append-cxxflags -lpthread + append-cppflags -lpthread +} + +src_configure() { + local mycmakeargs=( + -DLV2Plugin=$(usex lv2) + ) + cmake_src_configure +} |