| [proaudio] [2313] media-sound/tapiir: bump 0.7.3 / cleanup |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2313
Author: gavlee
Date: 2012-11-16 01:57:25 +0100 (Fri, 16 Nov 2012)
Log Message:
-----------
media-sound/tapiir: bump 0.7.3 / cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/tapiir/ChangeLog
trunk/overlays/proaudio/media-sound/tapiir/Manifest
trunk/overlays/proaudio/media-sound/tapiir/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-alsa.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-mtd.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-multiline.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-buffersizecallback.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-gcc4.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0000-missing-m4.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0001-add-missing-fltk-link-flag.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0002-no-suid-bins.patch
trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.3.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-alsa.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-mtd.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-multiline.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-buffersizecallback.patch
trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-gcc4.patch
trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.1-r1.ebuild
trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.2.ebuild
Modified: trunk/overlays/proaudio/media-sound/tapiir/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/ChangeLog 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/ChangeLog 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,7 +1,27 @@
# ChangeLog for media-sound/tapiir
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*tapiir-0.7.3 (16 Nov 2012)
+
+ 16 Nov 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+ -tapiir-0.7.1-r1.ebuild, -files/tapiir-0.7.1-alsa.patch,
+ -files/tapiir-0.7.1-mtd.patch, -files/tapiir-0.7.1-multiline.patch,
+ +files/tapiir-0.7.1/tapiir-0.7.1-alsa.patch,
+ +files/tapiir-0.7.1/tapiir-0.7.1-mtd.patch,
+ +files/tapiir-0.7.1/tapiir-0.7.1-multiline.patch,
+ +files/tapiir-0.7.1/tapiir-buffersizecallback.patch,
+ +files/tapiir-0.7.1/tapiir-gcc4.patch, -tapiir-0.7.2.ebuild,
+ +tapiir-0.7.3.ebuild, +files/tapiir-0.7.3/0000-missing-m4.patch,
+ +files/tapiir-0.7.3/0001-add-missing-fltk-link-flag.patch,
+ +files/tapiir-0.7.3/0002-no-suid-bins.patch,
+ -files/tapiir-buffersizecallback.patch, -files/tapiir-gcc4.patch,
+ metadata.xml:
+ Bump to 0.7.3 updating SRC_URI and HOMEPAGE which were dangling.
+ Migrate to autotools-utils. Add patches for building on Gentoo.
+ Moved old patches to ${FILESDIR}/tapiir-0.7.1 to organise a bit better and
+ keeping those around for now as not sure if some are are still useful.
+
09 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
tapiir-0.7.1-r1.ebuild: KEEP: patches with more functionality
tapiir-0.7.2.ebuild: KEEP: more deps and useflag
Modified: trunk/overlays/proaudio/media-sound/tapiir/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/Manifest 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/Manifest 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,11 +1,12 @@
-AUX tapiir-0.7.1-alsa.patch 359 RMD160 02e121e47fa313173adfb7a2470b45cf1d85ffe7 SHA1 5dbe864bb0e084f582097950aaf87062b463933c SHA256 6783936fa45c1b434898316f143852e3f23aa1844ecbd054b227057080ba3913
-AUX tapiir-0.7.1-mtd.patch 621 RMD160 01bc3d75aa0ec77893f4ae2e8c8c483ae1c91c08 SHA1 a8efe894dbf8c5cfded6e73f1378669fb077c5c2 SHA256 716461d4b6fd55b516106ccef79123afc6ab0ab2b9b09bb4e37f9e0eb8715720
-AUX tapiir-0.7.1-multiline.patch 2616 RMD160 6f3881d40e9fd8cba374bedff9522bc42674d9a6 SHA1 9ca18dcd75d418efe6ea87e246b1504b5bfbb94a SHA256 175e5f97c0c11df75331460d3b48e4c223826eac2db27fe8dbffbab94171c4d8
-AUX tapiir-buffersizecallback.patch 452 RMD160 85d728cd60ab32e6a74d624de079accad2d0e798 SHA1 8381bb3d0ca3f9dc786fa5097cd3d0c30e63b259 SHA256 e3fd05476aec2ff4e2971f0c3472342d906d77891e2fd665ca0219e86546261f
-AUX tapiir-gcc4.patch 1876 RMD160 e34da793a2c8680318a231c2199b95fec2ffcdca SHA1 658e293f632b21eb5b45de72da896c862a4dd9ee SHA256 0dbab898408fe4358a90afa8b03a63002e0ef9a3a4ae4c3cf45474305a1bf1c4
-DIST tapiir-0.7.1.tar.gz 169778 RMD160 04f4ba95b2517e54ea8882f500701dd879217c9c SHA1 89fbf800148dc94ae35f16baebad44e615551600 SHA256 159e8ad7b1edb80b4431584f194fd440892d170483f96d43af6dd1afd74f4ec6
-DIST tapiir-0.7.2.tar.gz 164866 RMD160 74e8d3aee2e674cd9d2fd25dd806ab4baf4fcb6a SHA1 abe270432cc89f680efe668467eb2ad08e6c83f9 SHA256 633e09f2cbc3470340aca0c3dc15dc138946a609d63fc177c2e0766001cccb21
-EBUILD tapiir-0.7.1-r1.ebuild 1452 RMD160 b18044bedd3b49e6c01d3b6202b136594d8e9242 SHA1 ae1a1f5eb06072bd04078e425724e230e0080093 SHA256 b082e2cb50b73b5f22176afbf3f63c861f0286faf088efe2fa13f284665e48d1
-EBUILD tapiir-0.7.2.ebuild 1386 RMD160 b4e13c7fc2562c3f2b44524f053a5ab93d81d82c SHA1 8826c6b23c19f9787385e23b83436167874c6b75 SHA256 a24b3b4e6987afa1113537c6a7f0f8e240780d827fd7912bd43a3d0088a4b287
-MISC ChangeLog 380 RMD160 8ff7a6c5abff3328414626c91aad3fe422e6b94f SHA1 47b1a860a518fd43453377440204a258b9eebe19 SHA256 79a49ca617f62c7a9007c337758b743f74854f4a50d23623d57881908b10b1b1
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX tapiir-0.7.1/tapiir-0.7.1-alsa.patch 359 SHA256 6783936fa45c1b434898316f143852e3f23aa1844ecbd054b227057080ba3913 SHA512 b10ae69fc827c02f242e6f7b1a24823010e059bc8d0943e2d7a5ae9c50c6bfc497c350f9df009b2fcae03e6a34a61a5c4767e4ef272a140e844c597d08c506dc WHIRLPOOL bf10bbf172de4672734d034a119b1c7bb61fb3a85c40ff107dd06e60d71ad336d5314321a81aa566731374dff550268b75e3a352743828f4516fd505b6aa4953
+AUX tapiir-0.7.1/tapiir-0.7.1-mtd.patch 621 SHA256 716461d4b6fd55b516106ccef79123afc6ab0ab2b9b09bb4e37f9e0eb8715720 SHA512 52125fc6d300703c4f5857af4f78739166351197d3d1c5a7ffaa7dea9e6ac20f1b72a82230519d62a3df235938966d65169cd0a2d59c478ba29b9109606cab4d WHIRLPOOL 60af209cff2ba4c9ed07b15989dc9a496281eaf189ad0ed6136a75eae41d7491ebf37f9115e58cc6d5787e6980705a3c9f82c0e2cafffabdb213bdafd6b93806
+AUX tapiir-0.7.1/tapiir-0.7.1-multiline.patch 2616 SHA256 175e5f97c0c11df75331460d3b48e4c223826eac2db27fe8dbffbab94171c4d8 SHA512 1d9212558e5da5e8ba42deb54658a783ef46ef21ca9b373b074a3f74e44982c9e10b122b47314af4190f48449189cc546ea4cd4d54ffbd6e59c8454cacf548ee WHIRLPOOL 4ad35e784ff66facad4ffb283b23373a532adaa3094a57e002c19b7e74cc54307918d17096a6330f0dd34b8c2664deb017c1ff925c9dda94243d6f378d0c7406
+AUX tapiir-0.7.1/tapiir-buffersizecallback.patch 452 SHA256 e3fd05476aec2ff4e2971f0c3472342d906d77891e2fd665ca0219e86546261f SHA512 c33c8db42949b0f95dcd50c558882d5c5dac755951933f385b72920535fa6ce88e6440d80c1b2280dfab9eee4619c8e00266cb17bcb92920f17175aafc366c79 WHIRLPOOL 70cd95954335085df19d67f4088b3eeba9e4e390caf6f21eff85eae99fc9881b486c855292ce091774091e792fb19adbad811d2d33062b044e2b961c88b96df7
+AUX tapiir-0.7.1/tapiir-gcc4.patch 1876 SHA256 0dbab898408fe4358a90afa8b03a63002e0ef9a3a4ae4c3cf45474305a1bf1c4 SHA512 012239feafc06843c8f548c7a0c6330190bdd38833259ed2bff493908e151f8e962d644d7e1a3e1d0a604066bd6d480701368367e8b62bcebe0de12514891b09 WHIRLPOOL ea6b233266bbd718875d7de8d15e449f8bbdadd885e7420c176c14d65369933e674feee13c1928a73a9470d158f9c6f8c72b43adf2d08bfaf6a442810aef1f50
+AUX tapiir-0.7.3/0000-missing-m4.patch 7390 SHA256 8fd7c07738ef92e40eac3faa8df1fe6ce0c7235fb99b3559592b75a3ec7e6e0f SHA512 f2906fb7c59248919cd2ebae251518679689a164e6f83532d96dfdba85fcd2ee0a90f44b3bef63a04e84f28b5941a55896ddef3c5c3e2e4ed1d7541d0dbc4537 WHIRLPOOL 9994b823e622aab3eb1cae44073622af4c9ce8b0a5b3d6445298c3faa63c6c1e7636b68f04c874911e61dbe3f3d07157965241d1e51f2b495d3567bd5b0afbb8
+AUX tapiir-0.7.3/0001-add-missing-fltk-link-flag.patch 621 SHA256 a9e71320b34eb301bc5cf67d5f73904c2236c6ba057cdfdc369482f6c121e547 SHA512 e4179b4bf1b7ab175ab8fb3e04d9916c1dc76c1476147d03b109d2109f19d8aefca1f998f0fc66fa331c0520cd8a1498bee20ea5afbfc3d25b3576426ab5971f WHIRLPOOL fa46cdb82df1ff22e8cb4de8fb7f1b32c8514c1c337c3afa0f51186388972f5d76d60dd4df5556e508c8820a7e4be733d5f7da5272c4b941dec24f40a11d7caf
+AUX tapiir-0.7.3/0002-no-suid-bins.patch 892 SHA256 7c8d2c8218d76a56339125b10adb9de85990ac28dfd57dcee6458a6d648eaf3f SHA512 4cf26b4e99cffc6dbd005018ce1072356212d51d2240169af57539cbb0a864c73c2308474fafde35155cc47c9e0db21e07961f0c9d16f85f581df9070c98d557 WHIRLPOOL 0271436dd479a4df710d306e365aa28d6296cea9ab246ac6109265b860ba71e2d01f240564a8ea8af231bd8f459b8b99ee5482e8b00012acfa344878dccada41
+DIST tapiir-0.7.3.tgz 168651 SHA256 9b2f6f0c4f642c3b128f5dd5b3b8d44e80a6eb3310f8f59e0b7460f71cc36d5f SHA512 e9b935f775ddcaf9d6a2b963a1d002d400fc34220845122188b82f1d6075176afc195ae4320679d8990b57f71d0a44fb6ba0cee8a74cb732b92957596c13f4b3 WHIRLPOOL 20ea8a3d7e8b7afdea88278df4990fb5acdcb5224d95fb45fdbdbc3990abaf1ebf2f07e24b45e4f4e9ba371ce0575f20589a43d88712779aa2640282f9eda541
+EBUILD tapiir-0.7.3.ebuild 1101 SHA256 f6688c89582ad23c130187d08d8acd56d546fc5c0ae8173dfb5f3a6100385393 SHA512 5f947d2dd7db89af07dbfbb1c037a2aee58aa9dd57f959879806c0d66c0116954f0e99591dec4dcee77abd00de56b969443bcf612ce6168b14a0cd0aa7b0546f WHIRLPOOL 7fb7d0a10a303e468f60256377ab06ae9a3e29c61ade457bb092562e3abdf1437f374584e05420a2845dfeb0cb5902b9e576566c7770e27ca86120f70795a7a5
+MISC ChangeLog 1409 SHA256 01a2089bcfcd61a842cc3c055f81979a8d7a6b071f9a2a522fceec08f08a534c SHA512 589a81a8423da97607670b97a2e6dc50f7a1ec8d8c75b8c7d6e80fe852c351b049c3b00002804641262434ab1aacc954d4c7f732a819d8b7d92bb6b0aaebf1eb WHIRLPOOL 74b4ce30fe35d7e55bbb113df88a86be36318bef5df42f6fb5d01c90b7338359db1f1cddb96c0157644ebb94a7e1db53c55957ab6d6da1b737702c91426e2541
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Copied: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-alsa.patch (from rev 2311, trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-alsa.patch)
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-alsa.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-alsa.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,11 @@
+--- tapiir-0.7.1/src/alsaio.cxx~ 2003-11-12 16:42:58.000000000 -0800
++++ tapiir-0.7.1/src/alsaio.cxx 2003-11-12 16:44:05.000000000 -0800
+@@ -23,6 +23,8 @@
+ #include <sched.h>
+ #include <errno.h>
+ #include <getopt.h>
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#define ALSA_PCM_OLD_SW_PARAMS_API
+ #include <alsa/asoundlib.h>
+ #include <sys/time.h>
+ #include <math.h>
Copied: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-mtd.patch (from rev 2311, trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-mtd.patch)
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-mtd.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-mtd.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,18 @@
+--- tapiir-0.7.1/src/MTD.hxx~ 2003-02-21 09:06:16.000000000 -0800
++++ tapiir-0.7.1/src/MTD.hxx 2003-11-19 10:52:14.000000000 -0800
+@@ -193,6 +193,7 @@
+
+ /****************************** specializations ******************************/
+
++/*
+ float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
+ float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
+
+@@ -209,6 +210,7 @@
+
+ void MTD<int,float>::MulAdj( int& i) const { i>>=8; }
+ void MTD<int,short>::MulAdj( int& i) const { i>>=8; }
++*/
+
+ /*****************************************************************************/
+
Copied: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-multiline.patch (from rev 2311, trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-multiline.patch)
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-multiline.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-0.7.1-multiline.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,66 @@
+--- tapiir-0.7.1/src/alsaio.cxx~ 2003-02-25 05:24:24.000000000 -0800
++++ tapiir-0.7.1/src/alsaio.cxx 2003-11-08 17:11:09.000000000 -0800
+@@ -402,22 +402,21 @@
+ {
+ int k;
+ //-c,--channels channels default %d
+- printf("\
+-Usage: %s [OPTION]...
+--h,--help help
+--P,--pdevice playback device default %s
+--C,--cdevice capture device default %s
+--m,--min minimum latency in frames default %d
+--M,--max maximum latency in frames default %d
+--r,--rate rate default %d
+--b,--block block mode default: %s
+--t,--time maximal tick time in us
+--p,--poll use poll (wait for event - reduces CPU usage) default: %s
+-",
+-program,
+-pdevice,cdevice,
+-latency_min,latency_max,channels,rate,block?"on":"off",use_poll?"on":"off"
+-);
++ printf(
++"Usage: %s [OPTION]...\n"
++"-h,--help help\n"
++"-P,--pdevice playback device default %s\n"
++"-C,--cdevice capture device default %s\n"
++"-m,--min minimum latency in frames default %d\n"
++"-M,--max maximum latency in frames default %d\n"
++"-r,--rate rate default %d\n"
++"-b,--block block mode default: %s\n"
++"-t,--time maximal tick time in us\n"
++"-p,--poll use poll (wait for event - reduces CPU usage) default: %s\n",
++ program,
++ pdevice,cdevice,
++ latency_min,latency_max,channels,rate,block?"on":"off",use_poll?"on":"off"
++ );
+ }
+
+ #ifdef DEMO
+--- tapiir-0.7.1/src/jackio.cxx~ 2003-11-08 17:01:57.000000000 -0800
++++ tapiir-0.7.1/src/jackio.cxx 2003-11-08 17:11:44.000000000 -0800
+@@ -60,15 +60,14 @@
+ static void help(char* program)
+ {
+ int k;
+- printf("\
+-Usage: %s [OPTION]...
+--h,--help help
+--C,--cconnect <LEFT,RIGHT> jack-connect to capture client default none
+--P,--pconnect <LEFT,RIGHT> jack-connect to playback client default none
+--a,--alsaconnect jack-connect to alsa_pcm
+-",
+-program
+-);
++ printf(
++"Usage: %s [OPTION]...\n"
++"-h,--help help\n"
++"-C,--cconnect <LEFT,RIGHT> jack-connect to capture client default none\n"
++"-P,--pconnect <LEFT,RIGHT> jack-connect to playback client default none\n"
++ "-a,--alsaconnect jack-connect to alsa_pcm\n",
++ program
++ );
+ }
+
+ int run_jack(int argc, char *argv[])
Copied: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-buffersizecallback.patch (from rev 2311, trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-buffersizecallback.patch)
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-buffersizecallback.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-buffersizecallback.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,11 @@
+--- tapiir-0.7.1/src/jackio.cxx~ 2003-02-25 05:24:53.000000000 -0800
++++ tapiir-0.7.1/src/jackio.cxx 2003-03-06 16:47:03.000000000 -0800
+@@ -150,7 +150,7 @@
+ }
+
+ jack_set_process_callback (client, process, 0);
+- jack_set_buffer_size_callback (client, bufsize, 0);
++ /* jack_set_buffer_size_callback (client, bufsize, 0); */
+ jack_set_sample_rate_callback (client, srate, 0);
+
+ printf ("engine sample rate: %lu\n", jack_get_sample_rate (client));
Copied: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-gcc4.patch (from rev 2311, trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-gcc4.patch)
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-gcc4.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1/tapiir-gcc4.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,35 @@
+diff -ur tapiir-0.7.1-orig/src/MTD.hxx tapiir-0.7.1/src/MTD.hxx
+--- tapiir-0.7.1-orig/src/MTD.hxx 2003-02-21 18:06:16.000000000 +0100
++++ tapiir-0.7.1/src/MTD.hxx 2005-06-30 17:43:41.000000000 +0200
+@@ -194,22 +194,22 @@
+ /****************************** specializations ******************************/
+
+ /*
+-float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
+-float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
++template <> inline float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
++template <> inline float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
+
+-int MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
+-int MTD<int,float>::ToGain(const float& f) const { return (int)(f*256.); }
++template <> inline int MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
++template <> inline int MTD<int,float>::ToGain(const float& f) const { return (int)(f*256.); }
+
+-void MTD<float,short>::Clip( float& f) const
++template <> inline void MTD<float,short>::Clip( float& f) const
+ { if (f>32767.) f = 32767.; else if (f<-32767.) f = -32767.; }
+-void MTD<int ,short>::Clip( int& i) const
++template <> inline void MTD<int ,short>::Clip( int& i) const
+ { if (i>32767) i = 32767; else if (i<-32767) i = -32767; }
+-void MTD<float,float>::Clip( float& f) const
++template <> inline void MTD<float,float>::Clip( float& f) const
+ { if (f>1.) f = 1.; else if (f<-1.) f = -1.; }
+
+
+-void MTD<int,float>::MulAdj( int& i) const { i>>=8; }
+-void MTD<int,short>::MulAdj( int& i) const { i>>=8; }
++template <> inline void MTD<int,float>::MulAdj( int& i) const { i>>=8; }
++template <> inline void MTD<int,short>::MulAdj( int& i) const { i>>=8; }
+ */
+
+ /*****************************************************************************/
Deleted: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-alsa.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-alsa.patch 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-alsa.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,11 +0,0 @@
---- tapiir-0.7.1/src/alsaio.cxx~ 2003-11-12 16:42:58.000000000 -0800
-+++ tapiir-0.7.1/src/alsaio.cxx 2003-11-12 16:44:05.000000000 -0800
-@@ -23,6 +23,8 @@
- #include <sched.h>
- #include <errno.h>
- #include <getopt.h>
-+#define ALSA_PCM_OLD_HW_PARAMS_API
-+#define ALSA_PCM_OLD_SW_PARAMS_API
- #include <alsa/asoundlib.h>
- #include <sys/time.h>
- #include <math.h>
Deleted: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-mtd.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-mtd.patch 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-mtd.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,18 +0,0 @@
---- tapiir-0.7.1/src/MTD.hxx~ 2003-02-21 09:06:16.000000000 -0800
-+++ tapiir-0.7.1/src/MTD.hxx 2003-11-19 10:52:14.000000000 -0800
-@@ -193,6 +193,7 @@
-
- /****************************** specializations ******************************/
-
-+/*
- float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
- float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
-
-@@ -209,6 +210,7 @@
-
- void MTD<int,float>::MulAdj( int& i) const { i>>=8; }
- void MTD<int,short>::MulAdj( int& i) const { i>>=8; }
-+*/
-
- /*****************************************************************************/
-
Deleted: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-multiline.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-multiline.patch 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.1-multiline.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,66 +0,0 @@
---- tapiir-0.7.1/src/alsaio.cxx~ 2003-02-25 05:24:24.000000000 -0800
-+++ tapiir-0.7.1/src/alsaio.cxx 2003-11-08 17:11:09.000000000 -0800
-@@ -402,22 +402,21 @@
- {
- int k;
- //-c,--channels channels default %d
-- printf("\
--Usage: %s [OPTION]...
---h,--help help
---P,--pdevice playback device default %s
---C,--cdevice capture device default %s
---m,--min minimum latency in frames default %d
---M,--max maximum latency in frames default %d
---r,--rate rate default %d
---b,--block block mode default: %s
---t,--time maximal tick time in us
---p,--poll use poll (wait for event - reduces CPU usage) default: %s
--",
--program,
--pdevice,cdevice,
--latency_min,latency_max,channels,rate,block?"on":"off",use_poll?"on":"off"
--);
-+ printf(
-+"Usage: %s [OPTION]...\n"
-+"-h,--help help\n"
-+"-P,--pdevice playback device default %s\n"
-+"-C,--cdevice capture device default %s\n"
-+"-m,--min minimum latency in frames default %d\n"
-+"-M,--max maximum latency in frames default %d\n"
-+"-r,--rate rate default %d\n"
-+"-b,--block block mode default: %s\n"
-+"-t,--time maximal tick time in us\n"
-+"-p,--poll use poll (wait for event - reduces CPU usage) default: %s\n",
-+ program,
-+ pdevice,cdevice,
-+ latency_min,latency_max,channels,rate,block?"on":"off",use_poll?"on":"off"
-+ );
- }
-
- #ifdef DEMO
---- tapiir-0.7.1/src/jackio.cxx~ 2003-11-08 17:01:57.000000000 -0800
-+++ tapiir-0.7.1/src/jackio.cxx 2003-11-08 17:11:44.000000000 -0800
-@@ -60,15 +60,14 @@
- static void help(char* program)
- {
- int k;
-- printf("\
--Usage: %s [OPTION]...
---h,--help help
---C,--cconnect <LEFT,RIGHT> jack-connect to capture client default none
---P,--pconnect <LEFT,RIGHT> jack-connect to playback client default none
---a,--alsaconnect jack-connect to alsa_pcm
--",
--program
--);
-+ printf(
-+"Usage: %s [OPTION]...\n"
-+"-h,--help help\n"
-+"-C,--cconnect <LEFT,RIGHT> jack-connect to capture client default none\n"
-+"-P,--pconnect <LEFT,RIGHT> jack-connect to playback client default none\n"
-+ "-a,--alsaconnect jack-connect to alsa_pcm\n",
-+ program
-+ );
- }
-
- int run_jack(int argc, char *argv[])
Added: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0000-missing-m4.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0000-missing-m4.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0000-missing-m4.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,215 @@
+--- /dev/null 2012-11-13 01:08:02.458030050 +0000
++++ m4/alsa.m4 2012-11-15 19:42:48.849919276 +0000
+@@ -0,0 +1,141 @@
++dnl Configure Paths for Alsa
++dnl Some modifications by Richard Boulton <richard-alsa@xxxxxxxxxxxx>
++dnl Christopher Lansdown <lansdoct@xxxxxxxxxxxxx>
++dnl Jaroslav Kysela <perex@xxxxxxxx>
++dnl Last modification: $Id: alsa.m4,v 1.24 2004/09/15 18:48:07 tiwai Exp $
++dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
++dnl enables arguments --with-alsa-prefix=
++dnl --with-alsa-enc-prefix=
++dnl --disable-alsatest
++dnl
++dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
++dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
++dnl
++AC_DEFUN([AM_PATH_ALSA],
++[dnl Save the original CFLAGS, LDFLAGS, and LIBS
++alsa_save_CFLAGS="$CFLAGS"
++alsa_save_LDFLAGS="$LDFLAGS"
++alsa_save_LIBS="$LIBS"
++alsa_found=yes
++
++dnl
++dnl Get the cflags and libraries for alsa
++dnl
++AC_ARG_WITH(alsa-prefix,
++[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)],
++[alsa_prefix="$withval"], [alsa_prefix=""])
++
++AC_ARG_WITH(alsa-inc-prefix,
++[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)],
++[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
++
++dnl FIXME: this is not yet implemented
++AC_ARG_ENABLE(alsatest,
++[ --disable-alsatest Do not try to compile and run a test Alsa program],
++[enable_alsatest="$enableval"],
++[enable_alsatest=yes])
++
++dnl Add any special include directories
++AC_MSG_CHECKING(for ALSA CFLAGS)
++if test "$alsa_inc_prefix" != "" ; then
++ ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
++ CFLAGS="$CFLAGS -I$alsa_inc_prefix"
++fi
++AC_MSG_RESULT($ALSA_CFLAGS)
++
++dnl add any special lib dirs
++AC_MSG_CHECKING(for ALSA LDFLAGS)
++if test "$alsa_prefix" != "" ; then
++ ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
++ LDFLAGS="$LDFLAGS $ALSA_LIBS"
++fi
++
++dnl add the alsa library
++ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
++LIBS="$ALSA_LIBS $LIBS"
++AC_MSG_RESULT($ALSA_LIBS)
++
++dnl Check for a working version of libasound that is of the right version.
++min_alsa_version=ifelse([$1], ,0.1.1,$1)
++AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
++no_alsa=""
++ alsa_min_major_version=`echo $min_alsa_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ alsa_min_minor_version=`echo $min_alsa_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ alsa_min_micro_version=`echo $min_alsa_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++AC_LANG_SAVE
++AC_LANG_C
++AC_TRY_COMPILE([
++#include <alsa/asoundlib.h>
++], [
++/* ensure backward compatibility */
++#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
++#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
++#endif
++#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
++#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
++#endif
++#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
++#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
++#endif
++
++# if(SND_LIB_MAJOR > $alsa_min_major_version)
++ exit(0);
++# else
++# if(SND_LIB_MAJOR < $alsa_min_major_version)
++# error not present
++# endif
++
++# if(SND_LIB_MINOR > $alsa_min_minor_version)
++ exit(0);
++# else
++# if(SND_LIB_MINOR < $alsa_min_minor_version)
++# error not present
++# endif
++
++# if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
++# error not present
++# endif
++# endif
++# endif
++exit(0);
++],
++ [AC_MSG_RESULT(found.)],
++ [AC_MSG_RESULT(not present.)
++ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)])
++ alsa_found=no]
++)
++AC_LANG_RESTORE
++
++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
++if test "x$enable_alsatest" = "xyes"; then
++AC_CHECK_LIB([asound], [snd_ctl_open],,
++ [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
++ alsa_found=no]
++)
++fi
++
++if test "x$alsa_found" = "xyes" ; then
++ ifelse([$2], , :, [$2])
++ LIBS=`echo $LIBS | sed 's/-lasound//g'`
++ LIBS=`echo $LIBS | sed 's/ //'`
++ LIBS="-lasound $LIBS"
++fi
++if test "x$alsa_found" = "xno" ; then
++ ifelse([$3], , :, [$3])
++ CFLAGS="$alsa_save_CFLAGS"
++ LDFLAGS="$alsa_save_LDFLAGS"
++ LIBS="$alsa_save_LIBS"
++ ALSA_CFLAGS=""
++ ALSA_LIBS=""
++fi
++
++dnl That should be it. Now just export out symbols:
++AC_SUBST(ALSA_CFLAGS)
++AC_SUBST(ALSA_LIBS)
++])
++
+--- /dev/null 2012-11-13 01:08:02.458030050 +0000
++++ m4/fltk.m4 2012-11-15 19:42:10.086104611 +0000
+@@ -0,0 +1,68 @@
++# Configure paths for FLTK
++# Alvin Beach 26/01/2007
++# Used sdl.m4 as example. Thanks SDL Team!
++# stole most of the commands from:
++# http://www.kdevelop.org/mediawiki/index.php/FLTK_hello_world_application_template
++
++dnl AM_PATH_FLTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for FLTK, and define FLTK_CXXFLAGS, FLTK_LIBS, and FLTK_LDFLAGS
++dnl
++AC_DEFUN([AM_PATH_FLTK],
++[dnl
++dnl Get the cflags and libraries from the fltk-config script
++dnl
++
++dnl Prefix where FLTK is installed
++AC_ARG_WITH(fltk-prefix,[ --with-fltk-prefix=PREFIX Prefix where FLTK is installed (default: /usr)],
++ fltk_prefix="$withval", fltk_prefix="/usr")
++
++dnl Switch to pass to fltk-config
++AC_ARG_WITH(fltk-ldopts,[ --with-fltk-ldopts=OPTS Linker options to pass to fltk-config (e.g "--use-images --use-gl")],
++ fltk_ldopts="$withval", fltk_ldopts="")
++
++AC_REQUIRE([AC_CANONICAL_TARGET])
++
++PATH="$fltk_prefix/bin:$prefix/bin:$prefix/usr/bin:$PATH"
++
++AC_PATH_PROG(FLTK_CONFIG, fltk-config, no, $PATH)
++
++dnl Assume fltk is not installed
++FLTK_CXXFLAGS=""
++FLTK_LIBS=""
++FLTK_LDFLAGS=""
++
++if test "$FLTK_CONFIG" != "no" ; then
++ min_fltk_version=ifelse([$1], ,0.0.0,$1)
++
++ AC_MSG_CHECKING(for FLTK - version >= $min_fltk_version)
++
++ fltk_version="`$FLTK_CONFIG --version`"
++
++ dnl Convert versions to an integer e.g. 1.1.7 becomes 117
++ min_vers=`echo $min_fltk_version | sed 's/\.//g'`
++ fltk_vers=`echo $fltk_version | sed 's/\.//g'`
++
++ if test -n "$fltk_vers" -a "$fltk_vers" -ge $min_vers; then
++ dnl All is good. Set the FLTK flags and such
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++
++ if test -n "$fltk_ldopts"; then
++ AC_MSG_NOTICE([FLTK linker options: $fltk_ldopts])
++ fi
++
++ FLTK_CXXFLAGS="`$FLTK_CONFIG --cxxflags`"
++ FLTK_LDFLAGS="`$FLTK_CONFIG $fltk_ldopts --ldflags`"
++ FLTK_LIBS="`$FLTK_CONFIG $fltk_ldopts --ldflags`"
++ else
++ dnl A version of FLTK less-than $min_fltk_version is installed...fltk should be upgraded
++ AC_MSG_RESULT(no)
++ AC_MSG_ERROR([Installed version of FLTK is too old. Please upgrade to atleast $min_fltk_version])
++ ifelse([$3], , :, [$3])
++ fi
++else
++ dnl fltk-config could not be found. fltk must not be installed
++ AC_MSG_ERROR([fltk-config could not be found. Either FLTK is not installed or FLTK's location needs to be specified with --with-fltk-prefix ])
++ ifelse([$3], , :, [$3])
++fi
++])
Added: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0001-add-missing-fltk-link-flag.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0001-add-missing-fltk-link-flag.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0001-add-missing-fltk-link-flag.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,25 @@
+From 57367ff9e69d144e12de93770ebd3e95861fdcfb Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Thu, 15 Nov 2012 18:08:26 +0000
+Subject: [PATCH 1/2] add missing fltk link flag
+
+---
+ configure.in | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e7fcd1b..9daa3b9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -25,6 +25,8 @@ fi
+
+ AM_PATH_FLTK(1.1.0,,AC_MSG_ERROR("missing fltk"))
+
++LIBS="$LIBS $FLTK_LIBS"
++
+ dnl Checks for header files.
+ AC_STDC_HEADERS
+ AC_HAVE_HEADERS(stdio.h string.h stdlib.h getopt.h \
+--
+1.7.8.6
+
Added: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0002-no-suid-bins.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0002-no-suid-bins.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-0.7.3/0002-no-suid-bins.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,31 @@
+From a2e7e508d3768a2a30fc4ffb2660a229f6aa1f63 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Thu, 15 Nov 2012 18:50:28 +0000
+Subject: [PATCH 2/2] no suid bins
+
+---
+ src/Makefile.am | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e90108c..e0612ad 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -38,14 +38,6 @@ tapiir_alsa_LDADD = @LIBS@ @ALSA_LIBS@
+
+ tapiir_jack_LDADD = @LIBS@ @ALSA_LIBS@ @JACK_LIBS@
+
+-install-exec-hook:
+- chown root $(DESTDIR)$(bindir)/tapiir
+- chmod u+s $(DESTDIR)$(bindir)/tapiir
+- chown root $(DESTDIR)$(bindir)/tapiir_alsa
+- chmod u+s $(DESTDIR)$(bindir)/tapiir_alsa
+- chown root $(DESTDIR)$(bindir)/tapiir_jack
+- chmod u+s $(DESTDIR)$(bindir)/tapiir_jack
+-
+ DISTCLEANFILES = Makefile.in
+
+ EXTRA_DIST = LayoutSet.cxx MTDConvert.cxx
+--
+1.7.8.6
+
Deleted: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-buffersizecallback.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-buffersizecallback.patch 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-buffersizecallback.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,11 +0,0 @@
---- tapiir-0.7.1/src/jackio.cxx~ 2003-02-25 05:24:53.000000000 -0800
-+++ tapiir-0.7.1/src/jackio.cxx 2003-03-06 16:47:03.000000000 -0800
-@@ -150,7 +150,7 @@
- }
-
- jack_set_process_callback (client, process, 0);
-- jack_set_buffer_size_callback (client, bufsize, 0);
-+ /* jack_set_buffer_size_callback (client, bufsize, 0); */
- jack_set_sample_rate_callback (client, srate, 0);
-
- printf ("engine sample rate: %lu\n", jack_get_sample_rate (client));
Deleted: trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-gcc4.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-gcc4.patch 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/files/tapiir-gcc4.patch 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,35 +0,0 @@
-diff -ur tapiir-0.7.1-orig/src/MTD.hxx tapiir-0.7.1/src/MTD.hxx
---- tapiir-0.7.1-orig/src/MTD.hxx 2003-02-21 18:06:16.000000000 +0100
-+++ tapiir-0.7.1/src/MTD.hxx 2005-06-30 17:43:41.000000000 +0200
-@@ -194,22 +194,22 @@
- /****************************** specializations ******************************/
-
- /*
--float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
--float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
-+template <> inline float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
-+template <> inline float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
-
--int MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
--int MTD<int,float>::ToGain(const float& f) const { return (int)(f*256.); }
-+template <> inline int MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
-+template <> inline int MTD<int,float>::ToGain(const float& f) const { return (int)(f*256.); }
-
--void MTD<float,short>::Clip( float& f) const
-+template <> inline void MTD<float,short>::Clip( float& f) const
- { if (f>32767.) f = 32767.; else if (f<-32767.) f = -32767.; }
--void MTD<int ,short>::Clip( int& i) const
-+template <> inline void MTD<int ,short>::Clip( int& i) const
- { if (i>32767) i = 32767; else if (i<-32767) i = -32767; }
--void MTD<float,float>::Clip( float& f) const
-+template <> inline void MTD<float,float>::Clip( float& f) const
- { if (f>1.) f = 1.; else if (f<-1.) f = -1.; }
-
-
--void MTD<int,float>::MulAdj( int& i) const { i>>=8; }
--void MTD<int,short>::MulAdj( int& i) const { i>>=8; }
-+template <> inline void MTD<int,float>::MulAdj( int& i) const { i>>=8; }
-+template <> inline void MTD<int,short>::MulAdj( int& i) const { i>>=8; }
- */
-
- /*****************************************************************************/
Modified: trunk/overlays/proaudio/media-sound/tapiir/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/metadata.xml 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/metadata.xml 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
Deleted: trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.1-r1.ebuild 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.1-r1.ebuild 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic
-DESCRIPTION="Tapiir is a simple and flexible audio effects processor"
-HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/tapiir/";
-SRC_URI="http://www.iua.upf.es/~mdeboer/projects/tapiir/download/${P}.tar.gz";
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="X"
-
-DEPEND="media-sound/jack-audio-connection-kit
- >=x11-libs/gtk+-2.0.0
- media-libs/libsndfile
- dev-libs/libxml2
- media-libs/libsamplerate
- media-libs/alsa-lib
- >=x11-libs/fltk-1.0.0"
-
-src_unpack() {
- append-ldflags -Wl,-z,now
- unpack ${A}
- cd ${S}
- #planetcrrma fixes
- epatch "${FILESDIR}/tapiir-0.7.1-alsa.patch"
- epatch "${FILESDIR}/tapiir-0.7.1-mtd.patch"
- epatch "${FILESDIR}/tapiir-0.7.1-multiline.patch"
- epatch "${FILESDIR}/tapiir-buffersizecallback.patch"
- epatch "${FILESDIR}/tapiir-gcc4.patch"
-
- # workaround for buggy Makefile
- sed -i 's/fltk_found=no/fltk_found=yes/g' configure
-}
-
-src_compile() {
- # check if fltk-1.* exists and set paths (ugly hack)
- [ -e /usr/lib/fltk-1.* ] && \
- local myconf="--with-fltk-inc-prefix=/usr/include/$(ls /usr/lib/|grep -m1 fltk-1)
- --with-fltk-prefix=/usr/lib/$(ls /usr/lib/|grep -m1 fltk-1)"
-
- econf $(use_with X x) ${myconf}|| die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR=${D} install || die "make install failed"
- dodoc AUTHORS
-}
Deleted: trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.2.ebuild 2012-11-15 19:19:15 UTC (rev 2312)
+++ trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.2.ebuild 2012-11-16 00:57:25 UTC (rev 2313)
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic
-DESCRIPTION="a flexible audio effects processor, inspired on the classical magnetic tape delay systems"
-HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/tapiir/";
-SRC_URI="http://www.iua.upf.es/~mdeboer/projects/tapiir/download/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="X"
-
-DEPEND="media-sound/jack-audio-connection-kit
- >=x11-libs/gtk+-2.0.0
- media-libs/libsndfile
- dev-libs/libxml2
- media-libs/libsamplerate
- >=media-libs/alsa-lib-0.9
- >=x11-libs/fltk-1.0.0"
-
-src_unpack() {
- append-ldflags -Wl,-z,now
- unpack ${A}
- cd ${S}
- # workaround for buggy Makefile
- sed -i 's/fltk_found=no/fltk_found=yes/g' configure
-}
-
-src_compile() {
- # check if fltk-1.* exists and set paths (ugly hack)
- [ -e /usr/lib/fltk-1.* ] && \
- local myconf="--with-fltk-inc-prefix=/usr/include/$(ls /usr/lib/|grep -m1 fltk-1)
- --with-fltk-prefix=/usr/lib/$(ls /usr/lib/|grep -m1 fltk-1)"
-
- econf $(use_with X x) ${myconf}|| die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- doman doc/${PN}.1
- dodoc AUTHORS doc/${PN}.txt
- dohtml doc/*.html doc/images/*.png
- insinto /usr/share/${PN}/examples
- doins doc/examples/*.mtd || die "doins failed."
-}
Added: trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.3.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/tapiir/tapiir-0.7.3.ebuild 2012-11-16 00:57:25 UTC (rev 2313)
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit autotools-utils flag-o-matic multilib
+
+DESCRIPTION="A flexible audio effects processor, inspired on the classical magnetic tape delay systems"
+HOMEPAGE="http://www.resorama.com/maarten/tapiir/";
+SRC_URI="http://www.resorama.com/maarten/files/${P}.tgz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="examples"
+
+DEPEND=">=media-libs/alsa-lib-0.9
+ media-sound/jack-audio-connection-kit
+ x11-libs/fltk:1"
+
+RESTRICT="mirror"
+
+DOCS=(AUTHORS doc/tapiir.txt)
+HTML_DOCS=(doc/)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}/*.patch
+
+ autotools-utils_src_prepare
+
+ AT_NOELIBTOOLIZE=yes AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ append-cppflags -I/usr/include/fltk-1
+ append-ldflags -L/usr/$(get_libdir)/fltk-1
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ doman doc/${PN}.1
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ insinto /usr/share/doc/${PF}/examples
+ doins doc/examples/*.mtd
+ fi
+}