From 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Mar 2018 15:59:12 +0000 Subject: gentoo resync : 02.03.2018 --- media-sound/Manifest.gz | Bin 63269 -> 62975 bytes media-sound/abcmidi/Manifest | 2 + media-sound/abcmidi/abcmidi-2018.02.22.ebuild | 40 ++ media-sound/clementine/Manifest | 6 +- .../clementine/clementine-1.3.1_p20171113.ebuild | 2 +- .../clementine/clementine-1.3.1_p20180219.ebuild | 2 +- media-sound/clementine/clementine-9999.ebuild | 2 +- media-sound/ecasound/Manifest | 5 +- media-sound/ecasound/ecasound-2.9.1-r1.ebuild | 9 +- .../ecasound/files/ecasound-2.8.1-ldflags.patch | 20 +- .../ecasound/files/ecasound-2.9.1-tinfo.patch | 21 + media-sound/mpg123/Manifest | 4 +- media-sound/mpg123/mpg123-1.25.10.ebuild | 107 ++++ media-sound/mpg123/mpg123-1.25.7.ebuild | 107 ---- media-sound/mps-youtube/Manifest | 2 + media-sound/mps-youtube/mps-youtube-0.2.8.ebuild | 26 + media-sound/picard/Manifest | 1 + media-sound/picard/picard-9999.ebuild | 74 +++ media-sound/qpitch/Manifest | 3 - media-sound/qpitch/metadata.xml | 8 - media-sound/qpitch/qpitch-1.0.1-r1.ebuild | 25 - media-sound/qtagconvert/Manifest | 4 - .../files/qtagconvert-2.0.0-desktop.patch | 21 - media-sound/qtagconvert/metadata.xml | 11 - .../qtagconvert/qtagconvert-2.0.0-r2.ebuild | 31 - media-sound/sooperlooper/Manifest | 5 +- .../files/sooperlooper-1.7.3-clash.patch | 661 +++++++++++++++++++++ .../files/sooperlooper-1.7.3-libsigc26.patch | 96 --- .../files/sooperlooper-1.7.3-libsigc28.patch | 124 ++++ .../sooperlooper/sooperlooper-1.7.3-r1.ebuild | 58 -- .../sooperlooper/sooperlooper-1.7.3-r2.ebuild | 62 ++ media-sound/spotify/Manifest | 6 +- media-sound/spotify/spotify-1.0.70-r1.ebuild | 118 ---- media-sound/spotify/spotify-1.0.72.ebuild | 119 ++++ media-sound/umix/Manifest | 2 + media-sound/umix/files/umix-1.0.2-tinfo.patch | 18 + media-sound/umix/umix-1.0.2-r1.ebuild | 37 ++ 37 files changed, 1329 insertions(+), 510 deletions(-) create mode 100644 media-sound/abcmidi/abcmidi-2018.02.22.ebuild create mode 100644 media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch create mode 100644 media-sound/mpg123/mpg123-1.25.10.ebuild delete mode 100644 media-sound/mpg123/mpg123-1.25.7.ebuild create mode 100644 media-sound/mps-youtube/mps-youtube-0.2.8.ebuild create mode 100644 media-sound/picard/picard-9999.ebuild delete mode 100644 media-sound/qpitch/Manifest delete mode 100644 media-sound/qpitch/metadata.xml delete mode 100644 media-sound/qpitch/qpitch-1.0.1-r1.ebuild delete mode 100644 media-sound/qtagconvert/Manifest delete mode 100644 media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch delete mode 100644 media-sound/qtagconvert/metadata.xml delete mode 100644 media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild create mode 100644 media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch delete mode 100644 media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc26.patch create mode 100644 media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch delete mode 100644 media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild create mode 100644 media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild delete mode 100644 media-sound/spotify/spotify-1.0.70-r1.ebuild create mode 100644 media-sound/spotify/spotify-1.0.72.ebuild create mode 100644 media-sound/umix/files/umix-1.0.2-tinfo.patch create mode 100644 media-sound/umix/umix-1.0.2-r1.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 7470952305d6..4e01d7ab9157 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest index b78e52886b1a..7b30e179630e 100644 --- a/media-sound/abcmidi/Manifest +++ b/media-sound/abcmidi/Manifest @@ -3,8 +3,10 @@ DIST abcMIDI-2017.11.27.zip 557045 BLAKE2B 8f341f7217c1a98732bdfe5e4383c67184767 DIST abcMIDI-2017.12.20.zip 558729 BLAKE2B 8f4ea8e1f162318f4d0abacab2f4f793e9acc6bbe4c1dc549c80a5d30ece9a5938fe0c3477ce5760cf87dff87dd70110ddea3e96a4ec2a3221bbcda1032cedd4 SHA512 3aa198e285e29d716953ab87b9a68a492b13dfba9121664c5457bd4ac1d0f210b4d4780a7c543b65c8b318ec99b547e54f4a30ec600f5608699e1eb7e4d57998 DIST abcMIDI-2018.01.02.zip 558817 BLAKE2B 6712e12397a793d37ca1e5ecbd8ec42e07e15c4a74addb01a4327b899f469957d3bbece9f627efe65657ded65f399a0d80eade6d1086e6842f8268c68c74a3ef SHA512 2862437f61b08e0fbcb3b456a65f1fd516e3c923376cad7ddc9a09324d67f0f2ff5b3b0466552a42ddd9f9ec70aefed8a0d41a7e968dc0d89b8b9c160ae49700 DIST abcMIDI-2018.02.07.zip 561598 BLAKE2B 1c699521796c9610f4b538f5bc60ab2afef311289f820a820ddd283c387a376f334dc6744038714f5908615ccdbcded750a86ea84645aa90abce0dec3c92e153 SHA512 c38b6f896c75c7adf17239b0403dc8896ccce05bfacb8329150d8c04c3a7a0db6c3be37ae8d7758f342a86a582957fb11dd100cd5c51211e206aef4de89a7b40 +DIST abcMIDI-2018.02.22.zip 561032 BLAKE2B 30bd7c8bf048d1713fc8b538c47ee6c391e429915659b4fdd1e7ab9464f6bc99ef2922678df28fc361e91cbec84fb4911ed390cb6b51fad3a3f4b23fcb976dc6 SHA512 d389b88cad6c7df152fd120f65dd5b02419f7bc2f94f68ab1995712c06ab9ab9cc99f81ec1d49a788cb968e8d3934d9953bc45c0732e87f76cc5b6dfbf1cf07c EBUILD abcmidi-2017.11.27.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 EBUILD abcmidi-2017.12.20.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 EBUILD abcmidi-2018.01.02.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 EBUILD abcmidi-2018.02.07.ebuild 794 BLAKE2B b90aae5681e9bd8fce4f4af39d21c857c39d1ff9f68bfc1a5351b17bec62288050dfe97aa3b3b7b4b28eb31e50f828ebd14a3d2caca06eab8180f984a5dc9be4 SHA512 c0afa40d4df71348b79c249a93848a09f1a869e6b1bc04b5dbe9a3e5ba5ca673c01efa3ae55c24a1c75028963a7910f9faeb1c8e9d44d733b1c388d722250a91 +EBUILD abcmidi-2018.02.22.ebuild 794 BLAKE2B cb7f2093d76dbef7e48a6bb6be064abbfa5ee07a1f803d59e237b78ebdd0bb1162545b34015a8e8c7252a2b531c4a618162f9a8b3a23c2a92f51c42e7babd33a SHA512 cfc6cd5172160f05db47ea4dbf61c5415f585b15a68f25d3440314b104e4bd33de76e78f60b330e4825e6e8f827aa20bcdabd75cc7926a033bdcdc6c64a7daa7 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a diff --git a/media-sound/abcmidi/abcmidi-2018.02.22.ebuild b/media-sound/abcmidi/abcmidi-2018.02.22.ebuild new file mode 100644 index 000000000000..d753279fefaa --- /dev/null +++ b/media-sound/abcmidi/abcmidi-2018.02.22.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +MY_P="abcMIDI-${PV}" +DESCRIPTION="Programs for processing ABC music notation files" +HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html" +SRC_URI="http://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() { + local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch ) + default + + rm configure Makefile || die + sed -i "s:-O2::" configure.ac || die + + eautoreconf +} + +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 +} diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 7d88f372ec69..74ae4c9b33a6 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -2,7 +2,7 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674 DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49 SHA512 7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146 -EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020 -EBUILD clementine-1.3.1_p20180219.ebuild 5580 BLAKE2B 6f6abf5ea7b7b86a5579854a42c194d4fb20e625cfb6e3fd6559bdd73869eae815a09948d4f3587788f88376a4d13bce73511e3b5c1963e81b850aa4ba8d8cdd SHA512 bdb8c69e0e949a0b14b5bfa27fd9764cdfb17357dc2d5c54dd4522743f4697906e91bc4e640a8d264eac9b33664d89b149999fd334482d05ac4416024c271fc2 -EBUILD clementine-9999.ebuild 5550 BLAKE2B 22ddba254824fe67400394ff564ca2f29e404ca74e130aea7b769e6df0a6d12952f515dfd4ffbda59727e2dedae5de46f8c82ea5ff200204f885b2154fbe8b6e SHA512 211b269365c423b0d1df92b6dfbfa5bfcc5a8c811fa7a13ab7de58112163ed34871a84977402f372af23cffbdd2e6bfd385e0c44331a8438812910da718fba65 +EBUILD clementine-1.3.1_p20171113.ebuild 4950 BLAKE2B 7c0efc0ab1517acb1d9aa21e115e0907afc0c806803066544f91482a7b183820a2c5927ba0c2dbc89c9590be399edcdecbef455e1c95e51e66131377c05fc116 SHA512 04cff9e9a96eb11d3bccabc1f95fd705eaf84593de06211faeb85876ae3b4ef595afb34f97ad526d377b53a307eccb8bc9a31b90da22ecdc1271a129ccf9a9cf +EBUILD clementine-1.3.1_p20180219.ebuild 5581 BLAKE2B b3829dd28ba74a66dfd6c45efebc1a5c8760a6c5b4d6c886d14a9ff9a385327a377b1bbaf03f06748a7e2ce9a6d09413cace3c6731787c0756d52fa6a60938e2 SHA512 b829f3736e8442b1ceb14f973e8bdc66e67cb8afa8d76436f55910c169e3bc74450428e522a47cfa37bfc0e96e8cf3bd9b43e4de865b9347c76662fd17d4b9d2 +EBUILD clementine-9999.ebuild 5551 BLAKE2B 669d11a55c9fc16754e7ce28437639ac2b957b60608f95110cb567350c55637396a8242186d15a27bc36e4c32a7db1f695cbc392c42fcaf6760865a1180f0606 SHA512 930d60dc71320e140b939080b33ef2a1d10123645e837440483aadca27a55b52b6c6761d12c1d52a6729d066e7c22d49b077ea54b3020041f84694191fac596e MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4 diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild index 0f4fc0d9ebbf..6abef56f6306 100644 --- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild @@ -160,7 +160,7 @@ pkg_postinst() { gnome2_icon_cache_update elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags " + elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " elog "depending on your preferences" } diff --git a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild index 7b677eabc6e3..1b51036575ce 100644 --- a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild @@ -181,7 +181,7 @@ pkg_postinst() { gnome2_icon_cache_update elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags " + elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " elog "depending on your preferences" } diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index e8465de79999..38adae3d11b3 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -181,7 +181,7 @@ pkg_postinst() { gnome2_icon_cache_update elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags " + elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " elog "depending on your preferences" } diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest index 2506787d65a1..51d2b8fca655 100644 --- a/media-sound/ecasound/Manifest +++ b/media-sound/ecasound/Manifest @@ -1,6 +1,7 @@ -AUX ecasound-2.8.1-ldflags.patch 2715 BLAKE2B 22621e1ef4abd7b0f0fdb0cc5046f8dbe8c0f1c0ab32b2f04a41777ac96bfcd3f514a92a343f0fd720364c399f84164918fa24f3b7f0a6cf7d5368916fb4e766 SHA512 2cf1d68b04c651480fdabb04e6e68c2d52d05405ea3c4813aa12cdca1c7fca8f80aa524d7424b98d4cf376cfabe372766a2fc2e5f564f8eff0125c7c4ad06d1b +AUX ecasound-2.8.1-ldflags.patch 2560 BLAKE2B 04c7c17b44385839a3b9dd5da0bad9306fd2e3029f74772be1d7792255cbfac36e8618c2b2880a45d72b1d57ea69040f1081f7a078a231efe285abef5cdbb3c0 SHA512 b5ecf1fc1de2e9f3087b2994f93841592e381bb38edfea33344e171cccdb9cdd70c010c2194e65eb6ef34d11b76f0a709efd175b44c7da65ff36bfeabf3d2c29 +AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54 DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033 EBUILD ecasound-2.6.0-r1.ebuild 1724 BLAKE2B 66e48a09caffbc34571c79ba51c185a9eff167ffe138bb2b12c9ee7e874d9dcf92ad420d070ef982f5763bc3617f684d7729b736242464a88c7688b4e8a68c49 SHA512 3ac59b9ebff9cfd07473258c5489363a4b34a3c957f9af1fd9adbed3d72d1e620f72b06886ce5bbf7a9030cd921c939ceb4a3c01774774119a48f34f5dd0cc30 -EBUILD ecasound-2.9.1-r1.ebuild 2278 BLAKE2B 56f17b8378ba04b7fb51029fff888064cf6c5fe30cf2d88a3a8962ff99d231a8c665d52255957535c759c37fe0fdf550f6e7bdffcbad89c7b89a76aea815118b SHA512 a8fa902eecb44188e5cd0f12505c1cdd19f257b28af3b6308652217b6839343537c372a2d16ac4aecad4fd225879c84018ce9868bac72bf66b15a04ea013c79f +EBUILD ecasound-2.9.1-r1.ebuild 2318 BLAKE2B ada746c2b6a2e544a9fd3638659b6da4b285894c4dd5ebecb00860b37b34280f4068830ef37c32874422615c055861c67bb0aec749b7e3a1c54cff910f8cdd92 SHA512 4ac154c8d5b2dec60d8516f358f1c2bd2fd250b12dbb8b8049f6c615ab3bfe5dfef7bcbdf52b0dc03c145ad8898957d802b419a3a22f02275ca69faf9510b904 MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild index 5485c1404a08..52575e945b5c 100644 --- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild +++ b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -34,14 +34,17 @@ RDEPEND="sys-libs/readline:0= sndfile? ( media-libs/libsndfile:= )" DEPEND="${RDEPEND} virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-2.8.1-ldflags.patch + "${FILESDIR}"/${PN}-2.9.1-tinfo.patch +) pkg_setup() { use python && python-single-r1_pkg_setup } src_prepare() { - eapply "${FILESDIR}"/${PN}-2.8.1-ldflags.patch - eapply_user + default # if use python ; then # sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \ diff --git a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch index 8dca486f06e1..162e0224e6e4 100644 --- a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch +++ b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch @@ -1,5 +1,5 @@ ---- ecasound-2.8.1.orig/kvutils/Makefile.am -+++ ecasound-2.8.1/kvutils/Makefile.am +--- a/kvutils/Makefile.am ++++ b/kvutils/Makefile.am @@ -56,13 +56,12 @@ kvu_value_queue.h @@ -15,8 +15,8 @@ libkvutils_tester_LDADD = $(lib_LTLIBRARIES) noinst_HEADERS = $(kvutil_headers) ---- ecasound-2.8.1.orig/libecasound/Makefile.am -+++ ecasound-2.8.1/libecasound/Makefile.am +--- a/libecasound/Makefile.am ++++ b/libecasound/Makefile.am @@ -364,7 +364,7 @@ libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src) @@ -26,8 +26,8 @@ libecasound_la_LIBADD = $(eca_libadd) libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS) libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD) ---- ecasound-2.8.1.orig/libecasound/plugins/Makefile.am -+++ ecasound-2.8.1/libecasound/plugins/Makefile.am +--- a/libecasound/plugins/Makefile.am ++++ b/libecasound/plugins/Makefile.am @@ -105,7 +105,7 @@ libecasound_plugins_la_SOURCES = audioio_dummy.cpp $(plugin_cond_sources) EXTRA_libecasound_plugins_la_SOURCES = $(plugin_all_sources) @@ -37,8 +37,8 @@ libecasound_plugins_debug_la_SOURCES = $(libecasound_plugins_la_SOURCES) EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES) ---- ecasound-2.8.1.orig/libecasoundc/Makefile.am -+++ ecasound-2.8.1/libecasoundc/Makefile.am +--- a/libecasoundc/Makefile.am ++++ b/libecasoundc/Makefile.am @@ -14,9 +14,9 @@ # !!! # remember to update eca-version.cpp @@ -51,8 +51,8 @@ endif INCLUDES = -I$(srcdir) ---- ecasound-2.8.1.orig/pyecasound/Makefile.am -+++ ecasound-2.8.1/pyecasound/Makefile.am +--- a/pyecasound/Makefile.am ++++ b/pyecasound/Makefile.am @@ -28,7 +28,7 @@ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py endif diff --git a/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch new file mode 100644 index 000000000000..c4953420b18c --- /dev/null +++ b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -810,7 +810,9 @@ + dnl switch to C for testing + AC_LANG_C + +-AC_CHECK_LIB(ncurses, main, termcap_library=ncurses, ++AC_CHECK_LIB(ncurses, main, ++ [termcap_library=ncurses] ++ AC_SEARCH_LIBS(tigetstr, tinfo), + AC_CHECK_LIB(termcap, main, termcap_library=termcap, + termcap_library=none)) + +@@ -821,6 +823,7 @@ + y | yes) + AC_MSG_RESULT(yes) + termcap_library=ncurses ++ + ;; + + n | no) diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index 00d71d21155e..6c1b35804e33 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.6.tar.bz2 919169 BLAKE2B 7b330d67465f332f608fa7efbfbfe1bbe69f8912a5678f72c56080b2deb44407d66bac6af23fb8c1359373eb90966ba67901235555f1776a00dc27e66167b0a5 SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c -DIST mpg123-1.25.7.tar.bz2 920705 BLAKE2B 4d70c89235058c5da145d1b38d76e5af166681befc741b17ed64d60099ada95b164399a344aa89099b5ff36a4f56cf36cafa0910dc02eb7dcfc9634f1a048a0d SHA512 4e0972149ce4f792cc361d96d638551eb5184942465e69713202d0830a0a54b33e3effe2e460683b996024772edba5e0be341048b9d0c73dace557c640d4414e DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203 +EBUILD mpg123-1.25.10.ebuild 3038 BLAKE2B 66ede65ec5bcb5386e528453f4de90d1281a612e5553c6664289a90fa5ad364f0a30744f551e836f5e6bc3115c7fe6acc9a7df3a82187d3f9bedd93afecc743e SHA512 227ded390109efe7112e6766cb0ff0ebe2d9043d0c5b9c3fccc1aa1889d0a6d03fa9290173a9d1c104399ff7ea147e7c2925c2e02ad93fb9c235d93254414e28 EBUILD mpg123-1.25.6.ebuild 3030 BLAKE2B 186e3eacfe1aa802b5a63f823fe5d68a2306cafa6574a8f0314ad01cc10912460a3cd94d0dbf023a2f17b3c26cff8f527889621f1ddea6bc36b20078c8a54acf SHA512 ff19843589d37864e210114b1d69a5246bd62222e3572f07853bf356c6932898a6a9afea2ce88121261d4c2b641f67fe7225a6715d65733a07031e0915f7218c -EBUILD mpg123-1.25.7.ebuild 3038 BLAKE2B 45530f1d7820be57fd588ae39f4348d97c9c925975603adc7ccc98b109e3e885c42b021118cc4f4bc2e1bc6ebeed430b7f58d3e996be3ea81679b1b5aa2cd796 SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441 EBUILD mpg123-1.25.8.ebuild 3038 BLAKE2B 45530f1d7820be57fd588ae39f4348d97c9c925975603adc7ccc98b109e3e885c42b021118cc4f4bc2e1bc6ebeed430b7f58d3e996be3ea81679b1b5aa2cd796 SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7 diff --git a/media-sound/mpg123/mpg123-1.25.10.ebuild b/media-sound/mpg123/mpg123-1.25.10.ebuild new file mode 100644 index 000000000000..8882ebf1b0d0 --- /dev/null +++ b/media-sound/mpg123/mpg123-1.25.10.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic toolchain-funcs libtool multilib-minimal + +DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3" +HOMEPAGE="https://www.mpg123.org/" +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-fbsd ~x86-fbsd ~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" + +# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. +RDEPEND="app-eselect/eselect-mpg123 + dev-libs/libltdl:0 + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack ) + nas? ( media-libs/nas ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + )" +DEPEND="${RDEPEND} + sys-devel/libtool + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README ) + +pkg_setup() { + # Build fails without -D_GNU_SOURCE like this: + # error: ‘struct hostent’ has no member named ‘h_addr’ + append-cflags -D_GNU_SOURCE +} + +src_prepare() { + default + elibtoolize # for Darwin bundles +} + +multilib_src_configure() { + local _audio=dummy + local _output=dummy + local _cpu=generic_fpu + + if $(multilib_is_native_abi) ; then + for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do + if use ${flag}; then + _audio+=" ${flag/pulseaudio/pulse}" + _output=${flag/pulseaudio/pulse} + fi + done + fi + + use altivec && _cpu=altivec + + if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then + use cpu_flags_x86_sse && _cpu=x86-64 + elif use x86 && gcc-specs-pie ; then + # Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504 + _cpu=generic_fpu + elif use x86-macos ; then + # ASM doesn't work quite as expected with the Darwin linker + _cpu=generic_fpu + else + use cpu_flags_x86_mmx && _cpu=mmx + use cpu_flags_x86_3dnow && _cpu=3dnow + use cpu_flags_x86_sse && _cpu=x86 + use cpu_flags_x86_3dnowext && _cpu=x86 + fi + + local myconf="" + multilib_is_native_abi || myconf="${myconf} --disable-modules" + + ECONF_SOURCE="${S}" econf \ + --with-optimization=0 \ + --with-audio="${_audio}" \ + --with-default-audio=${_output} \ + --with-cpu=${_cpu} \ + --enable-network \ + $(use_enable ipv6) \ + --enable-int-quality=$(usex int-quality) \ + ${myconf} + + if ! $(multilib_is_native_abi) ; then + sed -i -e 's:src doc:src/libmpg123:' Makefile || die + fi +} + +multilib_src_install_all() { + einstalldocs + mv "${ED}"/usr/bin/mpg123{,-mpg123} + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + +} + +pkg_postinst() { + eselect mpg123 update ifunset +} + +pkg_postrm() { + eselect mpg123 update ifunset +} diff --git a/media-sound/mpg123/mpg123-1.25.7.ebuild b/media-sound/mpg123/mpg123-1.25.7.ebuild deleted file mode 100644 index 34770e816b60..000000000000 --- a/media-sound/mpg123/mpg123-1.25.7.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic toolchain-funcs libtool multilib-minimal - -DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3" -HOMEPAGE="https://www.mpg123.org/" -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-fbsd ~x86-fbsd ~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" - -# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. -RDEPEND="app-eselect/eselect-mpg123 - dev-libs/libltdl:0 - alsa? ( media-libs/alsa-lib ) - jack? ( virtual/jack ) - nas? ( media-libs/nas ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - sdl? ( media-libs/libsdl ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - sys-devel/libtool - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README ) - -pkg_setup() { - # Build fails without -D_GNU_SOURCE like this: - # error: ‘struct hostent’ has no member named ‘h_addr’ - append-cflags -D_GNU_SOURCE -} - -src_prepare() { - default - elibtoolize # for Darwin bundles -} - -multilib_src_configure() { - local _audio=dummy - local _output=dummy - local _cpu=generic_fpu - - if $(multilib_is_native_abi) ; then - for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do - if use ${flag}; then - _audio+=" ${flag/pulseaudio/pulse}" - _output=${flag/pulseaudio/pulse} - fi - done - fi - - use altivec && _cpu=altivec - - if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then - use cpu_flags_x86_sse && _cpu=x86-64 - elif use x86 && gcc-specs-pie ; then - # Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504 - _cpu=generic_fpu - elif use x86-macos ; then - # ASM doesn't work quite as expected with the Darwin linker - _cpu=generic_fpu - else - use cpu_flags_x86_mmx && _cpu=mmx - use cpu_flags_x86_3dnow && _cpu=3dnow - use cpu_flags_x86_sse && _cpu=x86 - use cpu_flags_x86_3dnowext && _cpu=x86 - fi - - local myconf="" - multilib_is_native_abi || myconf="${myconf} --disable-modules" - - ECONF_SOURCE="${S}" econf \ - --with-optimization=0 \ - --with-audio="${_audio}" \ - --with-default-audio=${_output} \ - --with-cpu=${_cpu} \ - --enable-network \ - $(use_enable ipv6) \ - --enable-int-quality=$(usex int-quality) \ - ${myconf} - - if ! $(multilib_is_native_abi) ; then - sed -i -e 's:src doc:src/libmpg123:' Makefile || die - fi -} - -multilib_src_install_all() { - einstalldocs - mv "${ED}"/usr/bin/mpg123{,-mpg123} - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + -} - -pkg_postinst() { - eselect mpg123 update ifunset -} - -pkg_postrm() { - eselect mpg123 update ifunset -} diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest index 46adece8385c..96c8bebedf12 100644 --- a/media-sound/mps-youtube/Manifest +++ b/media-sound/mps-youtube/Manifest @@ -1,4 +1,6 @@ DIST mps-youtube-0.2.7.1.tar.gz 78128 BLAKE2B 1883ac93ec06b657f72463291d4844b4cf5c1edfb14088769d32bb7590ea676c06a1022724c40b94230ee5469864b402a07c56e535ac3001d57c87cf6937d370 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b +DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620 EBUILD mps-youtube-0.2.7.1.ebuild 595 BLAKE2B 04662825aa2b74998ba8a1b0fe8d29250246663d269632cc17336228008a2db3c685596cf34cc5ca116257d30ac3c347156e0af800beef79b2d121ca5f16f569 SHA512 943e533d9c73d2973d13d16b996eac6202ed7133d65475451fa586f0c9fc870483f03d87d09eac74c35e5aadb8b920ea26bacb82dff4eeaa957a4c1353d4abc7 +EBUILD mps-youtube-0.2.8.ebuild 718 BLAKE2B f9245b0ef224040e69fe84f0e3e28056e2b844d5f09d5ee615a9fd81f4aebb0a4f241d95b4b2eccd33168125f4d9aab34f16cabcec9251699b0a50c9e8c5cab9 SHA512 6f9e527323e1c52505df7d4da8963695f288b0d8f3b44b734d2c85ae66f750e1fabc1657f3000b52994457b96624584bdfb40f8789f83999fcdc27337b72f69b EBUILD mps-youtube-9999.ebuild 718 BLAKE2B c2a4bd4cb6a5060468e6f5a992cefaed4f8239f00ab058fd293074af3c50e89ab9ecac1602f618cd647cf4666ddf5862cf744bdfde62697b630820f422104378 SHA512 588eb771d1cabe9fa622987e87ed7e9a088eb29916d8fe99e6ca61f52b1e533cd49f9c1b8a4894bda852f9d7f1e031dd6de0275c9cbc7709b9a0ea571ce261bb MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70 diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild new file mode 100644 index 000000000000..40c962d0e306 --- /dev/null +++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +inherit distutils-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/mps-youtube/mps-youtube.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Terminal-based YouTube player and downloader" +HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube" + +LICENSE="GPL-3" +SLOT="0" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + dev-python/pafy[${PYTHON_USEDEP}] + virtual/ffmpeg + || ( media-video/mplayer media-video/mpv )" diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest index 85de666e1153..90673eae0f0c 100644 --- a/media-sound/picard/Manifest +++ b/media-sound/picard/Manifest @@ -1,3 +1,4 @@ DIST picard-1.4.2.tar.gz 2116021 BLAKE2B 9629d312df20a8c69b383b424724ef4cf9f774ae70b9e11b1c6c7f96cafea575657875642af70a73633ca79eb8c79237ada16dd5ff7c021d4bdb4a0df7890de3 SHA512 5e4a6a8cfadd86b7015ab77da1969acec26e0ed92564c6634afeee5060d33d34e8fc83015880e6c8f17df66c8d15b86a85031dbe5b596c995579fb449cf8a74e EBUILD picard-1.4.2.ebuild 1580 BLAKE2B 6eb8fdc3564238a16750c5d3d4872430bfc57d8fdda0901549fc6d9ffb77451d888995abe3690c8fac65da465181bbbeadd1b2988680ee4b062cdef9611cb9b2 SHA512 4026302891e66e1bec8c76d99559f88a336454beab29a22c09e355d32378b0f7d648fb33c50a209ec5da6f696aef2195795e70ba4339f71a8e44cbbe0e80fc3f +EBUILD picard-9999.ebuild 1633 BLAKE2B 8452d681019ae06f61be3257d120acc36b3d999d03e2f58b97a082deb9c55545d9768ae5b2a5376978d9a65b0355df4132c92242c4f75a7228ef71d8ee3428fa SHA512 4fe7b209a51dbb3a6940367cf5868174034cdb603c382f3efaf3ea6ce1f07f14840e3dc16e9ac4ec3b9c25373dd32d56cd4516387d3feb935dfa1cf2bce26cbd MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild new file mode 100644 index 000000000000..a182c7b674a9 --- /dev/null +++ b/media-sound/picard/picard-9999.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,6} ) +DISTUTILS_SINGLE_IMPL=1 +DISABLE_AUTOFORMATTING=true + +EGIT_REPO_URI="https://github.com/metabrainz/picard" +inherit distutils-r1 git-r3 readme.gentoo-r1 xdg-utils + +DESCRIPTION="A cross-platform music tagger" +HOMEPAGE="https://picard.musicbrainz.org" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="" +IUSE="nls" + +RDEPEND=" + dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] + dev-qt/qtgui:5[accessibility] + >=media-libs/mutagen-1.38" +DEPEND=" + nls? ( dev-qt/linguist-tools:5 ) +" + +RESTRICT="test" # doesn't work with ebuilds + +python_compile() { + local build_args=( + --disable-autoupdate + ) + if ! use nls; then + build_args+=( --disable-locales ) + fi + distutils-r1_python_compile ${build_args[@]} +} + +python_install() { + local install_args=( + --disable-autoupdate + --skip-build + ) + if ! use nls; then + install_args+=( --disable-locales ) + fi + distutils-r1_python_install ${install_args[@]} +} + +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_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-sound/qpitch/Manifest b/media-sound/qpitch/Manifest deleted file mode 100644 index 857b54c7d389..000000000000 --- a/media-sound/qpitch/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qpitch-1.0.1.tar.gz 116676 BLAKE2B e68351a301388b1bc61a231a45bba94c741ca90d46519f2d62a40fbef705a90538a09236c81032d039216c5b90bb0bf97d9bfe7adb64dbe6da4767ae1024b8d9 SHA512 d732d0b2a7c07741586d3724a6a2c73bb02b4390bbd4baa5e7fe4abe3531ad12e7be208a470ca6f0da38334e4cb556cebe5c0df3839547c3f55c5b37b9944e94 -EBUILD qpitch-1.0.1-r1.ebuild 519 BLAKE2B 188b34b409ccb42f5aba68234de2cda73f4b7b848b1b67ce34b14b0522e32cd6065fcabc1e1a9c1e80b58f7d1e4362955f81b2eaf51ad38fadf369665b37731b SHA512 cee418bb2f3da5ba23c2f1cf6a009127f2840e2fd390f7c566e16b6756a21c94140512e8217f12d66d9565ef3ec3caf8a480b78d5ef918d4a8427b01ad526858 -MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml deleted file mode 100644 index ee7258ac28eb..000000000000 --- a/media-sound/qpitch/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - sound@gentoo.org - Gentoo Sound project - - diff --git a/media-sound/qpitch/qpitch-1.0.1-r1.ebuild b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild deleted file mode 100644 index 036eaa3fd026..000000000000 --- a/media-sound/qpitch/qpitch-1.0.1-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="A program to tune musical instruments using Qt4" -HOMEPAGE="http://wspinell.altervista.org/qpitch/" -SRC_URI="http://download.gna.org/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - >=media-libs/portaudio-19_pre20071207 - >=sci-libs/fftw-3.1.0 -" -RDEPEND="${DEPEND}" - -DOCS=( README changelog ) diff --git a/media-sound/qtagconvert/Manifest b/media-sound/qtagconvert/Manifest deleted file mode 100644 index 353d518ec08b..000000000000 --- a/media-sound/qtagconvert/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX qtagconvert-2.0.0-desktop.patch 469 BLAKE2B 9298fe97ee963a5d41d6b041a4c879f077149b8faacd7870f2c11cdb578538f4b793a5a5b057e888e49dc3d5f6a12587794e75206fef85e87353807d92e511ee SHA512 49c9a8fcdfe431be1e8289f94fda3d704a0b75f9b6461f03294ca30e3bc98ca65779bd7d4bf5d6a1061e668f8fd09516207d10ef0ed5e996c2bafd69a8867fe9 -DIST qtagconvert-2.0.0.tar.gz 95475 BLAKE2B c0a7085a6fd53fc7df9c9290b79426013f0157aad45ac6965da3700081c3154b776dc668172c0991e99f6164e1783c046e426944f2a6a5b6b142af0d7bb27de7 SHA512 dec5ac042dbe9219fceaeaa3d2aa7476ac12321157421bcd2f1dce9fb9dcabffc8c059ec86ac16b2043f168161d3b3b13c9f4e24fad469a955575d4df8733390 -EBUILD qtagconvert-2.0.0-r2.ebuild 668 BLAKE2B 73fc1983ad8df905078db8203b689a9c81794d469a0b7592febb64103805065be38cecc0b3ab6f9260bec71933bcc0043e45f82d226cab8a46b94972826a7b9d SHA512 7d425a8c624d48df30d496b2567bcbb9b745a6fe551f42b66c59586f4c423bf5b238cf673b9b000a99a1d7707dc971650158a70eadf026a619a407e8aee8fb0e -MISC metadata.xml 328 BLAKE2B f1bf6f73ddad2b673141f118bc70d8dc49d71b0373cf83c34d31a41f257f862351631db99656af468fd824ba136813c450d2627494d8af4f24a68e9f61d27712 SHA512 31b63461293758d449b0d2da10b701e79a6e619fe15c796b81728eb0f9f18ca811e703f9a4737ea1698fb4b09edeee21352f13235a9c5db4579e53147ac563dd diff --git a/media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch b/media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch deleted file mode 100644 index 57465247db9f..000000000000 --- a/media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch +++ /dev/null @@ -1,21 +0,0 @@ -Solve validation errors and add an additional category. - ---- qtagconvert.desktop -+++ qtagconvert.desktop -@@ -1,14 +1,12 @@ - [Desktop Entry] - Type=Application --Version=2.0.0 --Encoding=UTF-8 -+Version=1.0 - Name=QTagConvert - Name[ru]=QTagConvert - GenericName=Tag Editor - GenericName[ru]=Редактор тегов - Exec=qtagconvert --Comment=QTagConvert - Icon=qtagconvert - MimeType=audio/mpeg;audio/x-mp3; - Terminal=false --Categories=AudioVideo; -+Categories=Qt;AudioVideo; diff --git a/media-sound/qtagconvert/metadata.xml b/media-sound/qtagconvert/metadata.xml deleted file mode 100644 index a80c00098ea8..000000000000 --- a/media-sound/qtagconvert/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - qt@gentoo.org - Gentoo Qt Project - - - qtagconvert - - diff --git a/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild b/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild deleted file mode 100644 index 79ab013b30b0..000000000000 --- a/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit qt4-r2 - -DESCRIPTION="Qt4 tag editor for mp3 files" -HOMEPAGE="http://www.qt-apps.org/content/show.php/QTagConvert2?content=100481" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND="dev-libs/glib:2 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - media-libs/taglib" -RDEPEND="${DEPEND}" - -DOCS=( README.utf8 ) -PATCHES=( "${FILESDIR}/${P}-desktop.patch" ) - -src_prepare() { - sed -e "/INSTALLS +=/s/documentation//" -i ${PN}.pro \ - || die "failed to remove unneeded docs" - - qt4-r2_src_prepare -} diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest index 5d9e1636b5ff..26a87552bb13 100644 --- a/media-sound/sooperlooper/Manifest +++ b/media-sound/sooperlooper/Manifest @@ -1,6 +1,7 @@ -AUX sooperlooper-1.7.3-libsigc26.patch 3433 BLAKE2B 63b8d4632dc1d5319c3ddcc1e43950588c0626f52f0528006349efb59913718e250e06a33c51af58f6c21d0274c29e21738aad82b4d4fd6af57c3d08449add38 SHA512 1510cca7f336a181da752019f7572fceaa21c78317eb135f31ceddc4ea8d677ccdb11c1f36ded13f4313df89ffdde644b6b68be049a6efc98f50f22c82d03553 +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-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-r1.ebuild 1363 BLAKE2B d521c11ca8a3608c8449536c5905dd1b29fabf2c43154f75b5c5a5c5ae3290570fe1b0805c2f2a93b07a6a743560929927d66aca7ad525dc2b4a21dee501c07b SHA512 e2412107dd3b1b8cc1366dcbe8a3299b0db81a5931d53a9ccff70df70c8d24631e80d640f4fc8c9f5e571e3fd13f03a3a837853262a10027b7b5a96b16268412 +EBUILD sooperlooper-1.7.3-r2.ebuild 1397 BLAKE2B df9629f99238644202529d7d468077643d6c72d13a199ee4501cd955b87ffbfa2f0515fcc4027cb562d08b073ec5e93319086a56deb43f5caf3b1bc25ff8fd04 SHA512 46caa1bac63f47adbb9ea129b66e8a5baf10b5ea7287dc410a8c34e94003d0deee7e54d3cd3ce37be792bf80523e99d0ae476f4ae4030e08ddfb9be078f2fde2 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 new file mode 100644 index 000000000000..a5df2e2c2252 --- /dev/null +++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch @@ -0,0 +1,661 @@ +From 0cb1e65166c777250cf3737c418fcfc12ffac815 Mon Sep 17 00:00:00 2001 +From: vixus0 +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-libsigc26.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc26.patch deleted file mode 100644 index 51ac10c33789..000000000000 --- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc26.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ur a/sooperlooper-1.7.3/src/control_osc.hpp b/sooperlooper-1.7.3/src/control_osc.hpp ---- a/sooperlooper-1.7.3/src/control_osc.hpp 2013-10-18 18:37:39.000000000 +0300 -+++ b/sooperlooper-1.7.3/src/control_osc.hpp 2015-12-05 01:40:01.848107565 +0200 -@@ -27,7 +27,7 @@ - #include - #include - --#include -+#include - - #include "event.hpp" - #include "event_nonrt.hpp" -diff -ur a/sooperlooper-1.7.3/src/gui/app_frame.hpp b/sooperlooper-1.7.3/src/gui/app_frame.hpp ---- a/sooperlooper-1.7.3/src/gui/app_frame.hpp 2014-02-03 18:52:15.000000000 +0200 -+++ b/sooperlooper-1.7.3/src/gui/app_frame.hpp 2015-12-05 01:40:01.844774250 +0200 -@@ -26,7 +26,7 @@ - #include - #include - --#include -+#include - #include - #include - -diff -ur a/sooperlooper-1.7.3/src/gui/config_panel.hpp b/sooperlooper-1.7.3/src/gui/config_panel.hpp ---- a/sooperlooper-1.7.3/src/gui/config_panel.hpp 2013-10-18 18:37:39.000000000 +0300 -+++ b/sooperlooper-1.7.3/src/gui/config_panel.hpp 2015-12-05 01:40:01.841440935 +0200 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - - class wxListCtrl; - class wxSpinCtrl; -diff -ur a/sooperlooper-1.7.3/src/gui/keys_panel.hpp b/sooperlooper-1.7.3/src/gui/keys_panel.hpp ---- a/sooperlooper-1.7.3/src/gui/keys_panel.hpp 2013-10-18 18:37:39.000000000 +0300 -+++ b/sooperlooper-1.7.3/src/gui/keys_panel.hpp 2015-12-05 01:40:01.838107619 +0200 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - - class wxListCtrl; - -diff -ur a/sooperlooper-1.7.3/src/gui/latency_panel.hpp b/sooperlooper-1.7.3/src/gui/latency_panel.hpp ---- a/sooperlooper-1.7.3/src/gui/latency_panel.hpp 2013-10-18 18:37:39.000000000 +0300 -+++ b/sooperlooper-1.7.3/src/gui/latency_panel.hpp 2015-12-05 01:40:01.834774304 +0200 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - - class wxListCtrl; - -diff -ur a/sooperlooper-1.7.3/src/gui/main_panel.hpp b/sooperlooper-1.7.3/src/gui/main_panel.hpp ---- a/sooperlooper-1.7.3/src/gui/main_panel.hpp 2014-02-04 18:39:55.000000000 +0200 -+++ b/sooperlooper-1.7.3/src/gui/main_panel.hpp 2015-12-05 01:40:01.831440989 +0200 -@@ -26,7 +26,7 @@ - #include - #include - --#include -+#include - #include - #include - -diff -ur a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp ---- a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp 2013-10-18 18:37:39.000000000 +0300 -+++ b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp 2015-12-05 01:40:01.828107674 +0200 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - #include - - #include -diff -ur a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp ---- a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp 2013-10-18 18:37:39.000000000 +0300 -+++ b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp 2015-12-05 01:40:01.824774358 +0200 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - - class wxListCtrl; - class wxSpinCtrl; \ No newline at end of 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 new file mode 100644 index 000000000000..653303cfb55d --- /dev/null +++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch @@ -0,0 +1,124 @@ +From 920443d3f7afb26f735f4002f3beed8766530d9b Mon Sep 17 00:00:00 2001 +From: vixus0 +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 + #include + +-#include ++#include + + #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 + #include + +-#include ++#include + #include + #include + +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 + #include +-#include ++#include + + 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 + #include +-#include ++#include + + 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 + #include +-#include ++#include + + 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 + #include + +-#include ++#include + #include + #include + +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 + #include +-#include ++#include + #include + + #include +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 + #include +-#include ++#include + + class wxListCtrl; + class wxSpinCtrl; diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild deleted file mode 100644 index 7364e6cd4648..000000000000 --- a/media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -WX_GTK_VER=3.0 - -inherit autotools eutils flag-o-matic wxwidgets toolchain-funcs - -DESCRIPTION="Live looping sampler with immediate loop recording" -HOMEPAGE="http://essej.net/sooperlooper/index.html" -SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz - mirror://gentoo/${PN}-1.6.5-m4.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="wxwidgets" - -RDEPEND=" - media-sound/jack-audio-connection-kit - >=media-libs/liblo-0.10 - >=dev-libs/libsigc++-2.2.10:2 - >=media-libs/libsndfile-1.0.2 - >=media-libs/libsamplerate-0.0.13 - dev-libs/libxml2 - >=media-libs/rubberband-0.0.13 - sci-libs/fftw:3.0 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/${P/_p*} - -DOCS=( OSC README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-libsigc26.patch - epatch "${FILESDIR}"/${P}-wx3.0.patch - - cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed" - - AT_M4DIR="${S}"/aclocal eautoreconf -} - -src_configure() { - use wxwidgets && need-wxwidgets unicode - append-cppflags -std=c++11 # Its ugly build system honors CPPFLAGS instead of CXXFLAGS for this - econf \ - $(use_with wxwidgets gui) \ - --disable-optimize \ - --with-wxconfig-path="${WX_CONFIG}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild new file mode 100644 index 000000000000..5d2301bfa9d8 --- /dev/null +++ b/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER=3.0 + +inherit autotools flag-o-matic wxwidgets toolchain-funcs + +DESCRIPTION="Live looping sampler with immediate loop recording" +HOMEPAGE="http://essej.net/sooperlooper/index.html" +SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz + mirror://gentoo/${PN}-1.6.5-m4.tar.bz2 +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="wxwidgets" + +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 + dev-libs/libxml2:2 + >=media-libs/rubberband-0.0.13 + sci-libs/fftw:3.0= + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/${P/_p*}" + +DOCS=( OSC README ) + +PATCHES=( + "${FILESDIR}"/${P}-wx3.0.patch + "${FILESDIR}"/${P}-libsigc28.patch + "${FILESDIR}"/${P}-clash.patch +) + +src_prepare() { + default + cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed" + AT_M4DIR="${S}"/aclocal eautoreconf +} + +src_configure() { + use wxwidgets && need-wxwidgets unicode + append-cppflags -std=c++11 # Its ugly build system honors CPPFLAGS instead of CXXFLAGS for this + econf \ + $(use_with wxwidgets gui) \ + --disable-optimize \ + --with-wxconfig-path="${WX_CONFIG}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 4548362a3994..61f66ed41a34 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,4 +1,4 @@ -DIST spotify-client_1.0.70.399.g5ffabd56-26_amd64.deb 89572934 BLAKE2B 70fa53d8bd4fac88133cd57171721636d17ccc1863a224048572c34eba132baf2642c5b51022f4dd59bbe8abe61c43440dc9339687bc2d3c0ba6fbbe5339a0fa SHA512 f5ce65a535daffe251152f6dc1c3affe2cbdf815ce1129e204ef03b589ebf7ac1015a9be2c77d7bcdd506fa23b9f24390b961843bb311366f6839756563912bf -DIST spotify-client_1.0.70.399.g5ffabd56-27_i386.deb 93896122 BLAKE2B 541de6cddb207440baabff6e43af6bd101ae43e8b30359a14078429506b742faf6bd32719bc6579068196bd01859a24af35677b3b53233b79ff56007fa38a30c SHA512 b72a7b4286d067a0a825b423ff62d426a82d8a7cc111500e1d5ab64df000f0cce024a6c7d9cc5cbf253800152907ae2889f55eead46556739f8d5069e7c0abf2 -EBUILD spotify-1.0.70-r1.ebuild 3310 BLAKE2B 8292faa7a87167cfe12ae704644b53c92797686e80abe5c2a6cc74d26e8402ce353d010f4e965729299ff7877b866914b979e967e337276868fd3cb65d343c1d SHA512 84365e58087e366426f41870d7d0caaea9ed21131748b8853db6fcb2f447d7a47791803759413a58d1b0188b8e8a37978f1af5942acecc5369864a5ca4c9c2f5 +DIST spotify-client_1.0.72.117.g6bd7cc73-35_amd64.deb 90872908 BLAKE2B 9eb06a175c8321effc4404c0a2abc978bed4e4f7654d907b4e8232249b5d07e70f54a39fd1ec7cc4e14f1348d1a71ca6abf3622992063e2402d2100f227c627a SHA512 fd33a5cd86edd4bf759849669516ffce35d89a77c6fcfb3ed0eb0ecb69024de5011499f36e48b8d37a873eb47da89eb21d9b9c7d280c498830a9fb1f8785db60 +DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f +EBUILD spotify-1.0.72.ebuild 3355 BLAKE2B 7d719c84c63cbf43013ff951b73f68c16da205340f29d6729eebe8584460125898285fdff32e84b4c918678ffef7acf7df64de6104cb24f7d00239edcd905e2b SHA512 f12f729906db68e06e756f08524afbf8f92f09c8d57bf2c47316fe46b05442b4a342bf5d0622f4dc647243dfa46700c343d01b0968c84853d6492fbc99cdc319 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316 diff --git a/media-sound/spotify/spotify-1.0.70-r1.ebuild b/media-sound/spotify/spotify-1.0.70-r1.ebuild deleted file mode 100644 index 2e5150da4748..000000000000 --- a/media-sound/spotify/spotify-1.0.70-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils xdg-utils gnome2-utils pax-utils unpacker - -DESCRIPTION="Spotify is a social music platform" -HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" -BUILD_ID_AMD64="399.g5ffabd56-26" -BUILD_ID_X86="399.g5ffabd56-27" -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" -SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb ) - x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )" -LICENSE="Spotify" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="systray pax_kernel pulseaudio" -RESTRICT="mirror strip" - -DEPEND="" -# zenety needed for filepicker -RDEPEND=" - ${DEPEND} - dev-libs/nss - gnome-base/gconf - gnome-extra/zenity - media-libs/alsa-lib - media-libs/harfbuzz - media-libs/fontconfig - media-libs/mesa - net-misc/curl[ssl,curl_ssl_openssl] - net-print/cups[ssl] - x11-libs/gtk+:2 - x11-libs/libXScrnSaver - x11-libs/libXtst - dev-python/pygobject:3 - dev-python/dbus-python - pulseaudio? ( media-sound/pulseaudio ) - systray? ( gnome-extra/gnome-integration-spotify )" - #sys-libs/glibc - -S=${WORKDIR}/ - -QA_PREBUILT="opt/spotify/spotify-client/spotify" - -src_prepare() { - # Fix desktop entry to launch spotify-dbus.py for systray integration - if use systray ; then - sed -i \ - -e 's/spotify \%U/spotify-dbus.py \%U/g' \ - usr/share/spotify/spotify.desktop || die "sed failed" - fi - default -} - -src_install() { - dodoc usr/share/doc/spotify-client/changelog.gz - - SPOTIFY_PKG_HOME=usr/share/spotify - insinto /usr/share/pixmaps - doins ${SPOTIFY_PKG_HOME}/icons/*.png - - # install in /opt/spotify - SPOTIFY_HOME=/opt/spotify/spotify-client - insinto ${SPOTIFY_HOME} - doins -r ${SPOTIFY_PKG_HOME}/* - fperms +x ${SPOTIFY_HOME}/spotify - - dodir /usr/bin - cat <<-EOF >"${D}"/usr/bin/spotify || die - #! /bin/sh - exec ${SPOTIFY_HOME}/spotify "\$@" - EOF - fperms +x /usr/bin/spotify - - local size - for size in 16 22 24 32 48 64 128 256 512; do - newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ - "spotify-client.png" - done - domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" - if use pax_kernel; then - #create the headers, reset them to default, then paxmark -m them - pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die - eqawarn "You have set USE=pax_kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "If Spotify crashes after an upgrade its cache may be corrupt." - ewarn "To remove the cache:" - ewarn "rm -rf ~/.cache/spotify" - ewarn - ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon." - ewarn "Run" - ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache" - ewarn "Then log out and log in back to KDE." -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-sound/spotify/spotify-1.0.72.ebuild b/media-sound/spotify/spotify-1.0.72.ebuild new file mode 100644 index 000000000000..7cf02df1c2e8 --- /dev/null +++ b/media-sound/spotify/spotify-1.0.72.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils xdg-utils gnome2-utils pax-utils unpacker + +DESCRIPTION="Spotify is a social music platform" +HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" +BUILD_ID_AMD64="117.g6bd7cc73-35" +BUILD_ID_X86="117.g6bd7cc73-35" +SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" +SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb ) + x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )" +LICENSE="Spotify" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="libnotify systray pax_kernel pulseaudio" +RESTRICT="mirror strip" + +DEPEND="" +# zenety needed for filepicker +RDEPEND=" + ${DEPEND} + dev-libs/nss + gnome-base/gconf + gnome-extra/zenity + media-libs/alsa-lib + media-libs/harfbuzz + media-libs/fontconfig + media-libs/mesa + net-misc/curl[ssl,curl_ssl_openssl] + net-print/cups[ssl] + x11-libs/gtk+:2 + x11-libs/libXScrnSaver + x11-libs/libXtst + dev-python/pygobject:3 + dev-python/dbus-python + libnotify? ( x11-libs/libnotify ) + pulseaudio? ( media-sound/pulseaudio ) + systray? ( gnome-extra/gnome-integration-spotify )" + #sys-libs/glibc + +S=${WORKDIR}/ + +QA_PREBUILT="opt/spotify/spotify-client/spotify" + +src_prepare() { + # Fix desktop entry to launch spotify-dbus.py for systray integration + if use systray ; then + sed -i \ + -e 's/spotify \%U/spotify-dbus.py \%U/g' \ + usr/share/spotify/spotify.desktop || die "sed failed" + fi + default +} + +src_install() { + dodoc usr/share/doc/spotify-client/changelog.gz + + SPOTIFY_PKG_HOME=usr/share/spotify + insinto /usr/share/pixmaps + doins ${SPOTIFY_PKG_HOME}/icons/*.png + + # install in /opt/spotify + SPOTIFY_HOME=/opt/spotify/spotify-client + insinto ${SPOTIFY_HOME} + doins -r ${SPOTIFY_PKG_HOME}/* + fperms +x ${SPOTIFY_HOME}/spotify + + dodir /usr/bin + cat <<-EOF >"${D}"/usr/bin/spotify || die + #! /bin/sh + exec ${SPOTIFY_HOME}/spotify "\$@" + EOF + fperms +x /usr/bin/spotify + + local size + for size in 16 22 24 32 48 64 128 256 512; do + newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ + "spotify-client.png" + done + domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" + if use pax_kernel; then + #create the headers, reset them to default, then paxmark -m them + pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die + eqawarn "You have set USE=pax_kernel meaning that you intend to run" + eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" + eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is being broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "If Spotify crashes after an upgrade its cache may be corrupt." + ewarn "To remove the cache:" + ewarn "rm -rf ~/.cache/spotify" + ewarn + ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon." + ewarn "Run" + ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache" + ewarn "Then log out and log in back to KDE." +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest index c1d6f83e487f..2838cb2910eb 100644 --- a/media-sound/umix/Manifest +++ b/media-sound/umix/Manifest @@ -1,3 +1,5 @@ +AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468 +EBUILD umix-1.0.2-r1.ebuild 695 BLAKE2B 185a36534971d34df0b11c6cf6d0140ec595556edbc0148cffb19b5182a9653ea1e1e22a6b48080d1d7d17a34421cefc0e8ecdbfc8531212082db0c4cc80eb8c SHA512 de04eaa64f8507652711c5773c14aac6cba458d9d920ec046edeaf04a465076158ae69e882d4cc190122cfd642c7435ba5d05570801ff5f5d8e753fd1ad76b61 EBUILD umix-1.0.2.ebuild 619 BLAKE2B 27033382ab54d79fc3244a7958a13bed0541ba4211b077812e3ec64dd9087decf0c430910de961400fde087e8ca52e47e9157c8f2b662527dd16a3cd2338b444 SHA512 f214255a8ebb1704abe450b155b15a563563368e1328a821ab46b61690cb1394d35c73fb479a41347ea488722c11c3abceb4b7e70c3fc802068d6455da76b9c1 MISC metadata.xml 327 BLAKE2B 8c7901bd5f9eac11aa6e16d5df9e6a2ea87475effc0623deb6fc73d741f1ea92b8dc00f77f5edc95b05fe9ef643478497aeb9ebf28274155c4d21b6ebec783ee SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71 diff --git a/media-sound/umix/files/umix-1.0.2-tinfo.patch b/media-sound/umix/files/umix-1.0.2-tinfo.patch new file mode 100644 index 000000000000..65c0d7158375 --- /dev/null +++ b/media-sound/umix/files/umix-1.0.2-tinfo.patch @@ -0,0 +1,18 @@ +--- a/configure.in ++++ b/configure.in +@@ -89,6 +89,7 @@ + then + AC_CHECK_LIB(curses, initscr, NCURSLIB="curses", NCURSLIB="") + fi ++ AC_SEARCH_LIBS(stdscr,tinfo) + fi + if test "x$NCURSLIB" != "x" + then +@@ -97,6 +98,7 @@ + AC_DEFINE(HAVE_NCURSES) + LIBS="$LIBS -l$NCURSLIB" + umix_CONDOBJS="$umix_CONDOBJS ui_ncurses.o" ++ AC_SEARCH_LIBS(stdscr,tinfo) + else + have_ncurses="no" + fi diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild new file mode 100644 index 000000000000..8af3d98d5b02 --- /dev/null +++ b/media-sound/umix/umix-1.0.2-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="Program for adjusting soundcard volumes" +HOMEPAGE="http://umix.sf.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="ncurses oss" + +DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )" +RDEPEND=" + ${DEPEND} +" +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch +) +DOCS=( + AUTHORS ChangeLog NEWS README TODO +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf + use ncurses || myconf="--disable-ncurses" + use oss || myconf="${myconf} --disable-oss" + econf ${myconf} +} -- cgit v1.2.3