Revision: 1660
Author:   gentoid
Date:     2010-04-29 17:16:52 +0200 (Thu, 29 Apr 2010)
Log Message:
-----------
freqtweak: cleanup, repoman payment, fix patchset

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/freqtweak/ChangeLog
    trunk/overlays/proaudio/media-sound/freqtweak/Manifest
    
trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.0_pre20070214-r1.ebuild
    trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.2.ebuild
    trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/freqtweak/files/10_configure-fixes.patch
    
trunk/overlays/proaudio/media-sound/freqtweak/files/20_wx-strings.patch.tar.bz2
    trunk/overlays/proaudio/media-sound/freqtweak/files/30_64bit-safe.patch
    trunk/overlays/proaudio/media-sound/freqtweak/files/40_manpage.patch

Removed Paths:
-------------
    
trunk/overlays/proaudio/media-sound/freqtweak/files/freqtweak-patches-1.tar.bz2

Modified: trunk/overlays/proaudio/media-sound/freqtweak/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/freqtweak/ChangeLog     2010-04-28 
19:22:39 UTC (rev 1659)
+++ trunk/overlays/proaudio/media-sound/freqtweak/ChangeLog     2010-04-29 
15:16:52 UTC (rev 1660)
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Apr 2010; Viktor Lazarev <[email protected]>
+  +files/10_configure-fixes.patch, freqtweak-0.7.0_pre20070214-r1.ebuild,
+  +files/20_wx-strings.patch.tar.bz2, freqtweak-0.7.2.ebuild,
+  +files/30_64bit-safe.patch, -files/freqtweak-patches-1.tar.bz2,
+  +files/40_manpage.patch, freqtweak-9999.ebuild:
+  cleanup, repoman payment, fix patchset
+
 *freqtweak-9999 (09 Mar 2010)
 
   09 Mar 2010; Frieder Buerzele <[email protected]>

Modified: trunk/overlays/proaudio/media-sound/freqtweak/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/freqtweak/Manifest      2010-04-28 
19:22:39 UTC (rev 1659)
+++ trunk/overlays/proaudio/media-sound/freqtweak/Manifest      2010-04-29 
15:16:52 UTC (rev 1660)
@@ -1,8 +1,11 @@
-AUX freqtweak-patches-1.tar.bz2 10993 RMD160 
d8e8fe4fb209a6146528abf46c6aa17af22cd8e7 SHA1 
1565d280472e5cf796058258124ffc57202cbff1 SHA256 
109204b3e173e7aedffc81619917d04693e9993a64eacfa03c65024f4ab3235b
+AUX 10_configure-fixes.patch 954 RMD160 
9e03d8d56598ed71f3f21093f7415b359f3c181b SHA1 
25c68eb35c118263ee41ca285a6dc629738735c1 SHA256 
047c169d2be4d8ab96fe1999897c9640ecdc8123de67531ef31bab9cfdd22d7d
+AUX 20_wx-strings.patch.tar.bz2 8506 RMD160 
ada4cea02916a158bd48cf6e514d4ac96cd82d9b SHA1 
42ad00e58cc679aa1d2b789383eb6948e370082a SHA256 
4d520ab165289f1513bdf6dc2fb7b34aa0437a673bf4931a81be1cac37bd0337
+AUX 30_64bit-safe.patch 1496 RMD160 b953a6cbad89f0d786fc1ffc1f829d44e82f0969 
SHA1 6451410cfa602bc3443eec4084722165f7469643 SHA256 
9f08518417c592429b7375aef127149fb7c03537022e66ac0a6785b713ed19e3
+AUX 40_manpage.patch 3985 RMD160 7bc08b30364c8a454c61ae4f55f4d5027e0846a7 SHA1 
e4fe08c2ce7872c2dddc493476b3e00e13ae0e2c SHA256 
113d1d2a24c4b94378af43105653cccb556b5fc7406e5700fa0318eb4045773c
 DIST freqtweak-0.7.0_pre20070214.tar.bz2 439719 RMD160 
903d9ca8a77763ddd82c26960cbb688f80806fa7 SHA1 
1457cac5be6207d9f1e2eb3944496d42e3a4a355 SHA256 
127be439280ec7830d6b3d38868fbaec60bd99f28bb0894dd7858ce49ece8a19
 DIST freqtweak-0.7.2.tar.gz 239792 RMD160 
6edae0087241428f3498629cc5ccc410c55582f0 SHA1 
f66bc46739dc91067f8bd7d433de71eb12bc029a SHA256 
49cd35ecc95ae566886cd9029f8ed98b79ee1217d01395f500f8033476e155de
-EBUILD freqtweak-0.7.0_pre20070214-r1.ebuild 981 RMD160 
c1244f1811fc6c6c9e2a269f41c8924f0887bcad SHA1 
a50389e14b6053fbd9131444ada02ce477675c71 SHA256 
b2804e2eaa6c095c21187c0f2f3d926d72c5bfd70658ab8874147e85179e9e43
-EBUILD freqtweak-0.7.2.ebuild 852 RMD160 
a2e34a9c073e36c4a83a5c09d24cd807564eaf65 SHA1 
e990e9182623180bd65556006f892fe032ddcfaf SHA256 
2d7592ebbd1184fc86a4813b4ac324a5922f2c447bd84dd6dca59229323d55c9
-EBUILD freqtweak-9999.ebuild 1014 RMD160 
3c678ff12bb4d6968a4540c1268d2b697e7015df SHA1 
8b522ba84bdac7e679685ac1fec72643abffd01a SHA256 
3bead9ccbb95682f62dcce24579627587d6e03dc8bdf0b33fe5981962ab5cc54
-MISC ChangeLog 568 RMD160 903031eed942c70177d4e5d326cd6f819bb777af SHA1 
ceea46aaa48dc35445e5f1dd933f8a625e91012a SHA256 
fbaacb2dc2dfe0d3eed8af20230517a9b1a1e4b2bbe40c6dfeffb5bfece3aba4
+EBUILD freqtweak-0.7.0_pre20070214-r1.ebuild 1135 RMD160 
943b4470b30ff2cdd6f247923358117df0e09ac1 SHA1 
d0763543766b28a60e977923eb07927b77948b66 SHA256 
8d77b614e73adc84c7ffcdf64c642812c4660f2c4b45cdba7f362395bf908142
+EBUILD freqtweak-0.7.2.ebuild 842 RMD160 
053b28a718c545dacc490867cbcf681137b41723 SHA1 
94a62a5aff583f5240d6f65aa74ea396167eb359 SHA256 
6a18593b3e2d807e3e691c07c1cc674924e5f4701ca66a60174c7b208405a114
+EBUILD freqtweak-9999.ebuild 1008 RMD160 
b654892adc51d67245ce3bbce66c4ce84e546d65 SHA1 
23f137a43d494906f855acfcb965d86db9d82bb0 SHA256 
212a48f8dd638084e23e94325ef3fa6055c355c373d9ece87c9135dc7ad72f58
+MISC ChangeLog 915 RMD160 8aa87eccfe3781c96caf477b69a21d5f65a66ce0 SHA1 
3fd307531df5f9ae3d6a36d7b72d436c00d318ff SHA256 
11225b4b7f966e49f8b552a91aa40a3a7c9128966593d02e0de135f793f2bc4c
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 
703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 
dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b

Added: 
trunk/overlays/proaudio/media-sound/freqtweak/files/10_configure-fixes.patch
===================================================================
--- 
trunk/overlays/proaudio/media-sound/freqtweak/files/10_configure-fixes.patch    
                            (rev 0)
+++ 
trunk/overlays/proaudio/media-sound/freqtweak/files/10_configure-fixes.patch    
    2010-04-29 15:16:52 UTC (rev 1660)
@@ -0,0 +1,30 @@
+diff -Nur freqtweak-0.7.0~cvs20070510/configure.ac 
freqtweak-0.7.0~cvs20070510.new/configure.ac
+--- configure.ac.old   2005-11-10 13:17:04.000000000 +0900
++++ configure.ac       2007-05-11 02:47:53.060636763 +0900
+@@ -11,7 +11,7 @@
+ AC_INIT(src/FTapp.cpp)
+ 
+ 
+-BETA=dev
++BETA=
+ 
+ FREQTWEAK_MAJOR_VERSION=0
+ FREQTWEAK_MINOR_VERSION=7
+@@ -353,14 +353,17 @@
+       [ if test "x$enable_debug" != "xno" ; then
+         CXXFLAGS="-g -Wall -D_REENTRANT $FFTW_CFLAGS $JACK_CFLAGS $WX_CFLAGS 
$XML_CFLAGS $SIGCPP_CFLAGS"
+         CFLAGS="$CXXFLAGS"
++        CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
+         else
+         CXXFLAGS="$FFTW_CFLAGS $JACK_CFLAGS $WX_CFLAGS $XML_CFLAGS 
$SIGCPP_CFLAGS -Wall -D_REENTRANT $ARCH_CFLAGS"
+         CFLAGS="$CXXFLAGS"
++        CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
+       fi
+       ],
+       [
+         CXXFLAGS="$FFTW_CFLAGS $JACK_CFLAGS $WX_CFLAGS $XML_CFLAGS 
$SIGCPP_CFLAGS -Wall -D_REENTRANT $ARCH_CFLAGS"
+         CFLAGS="$CXXFLAGS"
++        CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
+         ]
+ )
+ 
\ No newline at end of file

Added: 
trunk/overlays/proaudio/media-sound/freqtweak/files/20_wx-strings.patch.tar.bz2
===================================================================
(Binary files differ)


Property changes on: 
trunk/overlays/proaudio/media-sound/freqtweak/files/20_wx-strings.patch.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/overlays/proaudio/media-sound/freqtweak/files/30_64bit-safe.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/freqtweak/files/30_64bit-safe.patch     
                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/freqtweak/files/30_64bit-safe.patch     
2010-04-29 15:16:52 UTC (rev 1660)
@@ -0,0 +1,42 @@
+diff -Nur src/FTpresetBlender.cpp.old src/FTpresetBlender.cpp
+--- src/FTpresetBlender.cpp.old        2003-07-16 16:37:12.000000000 +0900
++++ src/FTpresetBlender.cpp    2007-05-13 01:10:01.162941366 +0900
+@@ -102,7 +102,7 @@
+                       // compare the proctype
+ 
+                       if (pvec.size() <= n ||  pm->getName() != 
pvec[n]->getName()) {
+-                              fprintf (stderr, "mismatch at %d %d: %s   
%u\n", i, n, pm->getName().c_str(), pvec.size());
++                              fprintf (stderr, "mismatch at %d %d: %s   
%lu\n", i, n, pm->getName().mb_str(), pvec.size());
+                               delete procvec;
+                               return false;
+                       }
+diff -Nur src/FTprocOrderDialog.cpp.old src/FTprocOrderDialog.cpp
+--- src/FTprocOrderDialog.cpp.old      2007-05-13 01:09:23.314688683 +0900
++++ src/FTprocOrderDialog.cpp  2007-05-13 01:09:23.662691006 +0900
+@@ -210,7 +210,7 @@
+       for (; mod != mlist.end(); ++mod)
+       {
+               item.SetText ((*mod)->getName());
+-              item.SetData ((unsigned) (*mod));
++              item.SetData ((unsigned long) (*mod));
+               item.SetId(pos++);
+               
+               _sourceList->InsertItem(item);
+@@ -230,7 +230,7 @@
+               for (unsigned int n=0; n < procmods.size(); ++n)
+               {
+                       item.SetText (procmods[n]->getName());
+-                      item.SetData ((unsigned) procmods[n]);
++                      item.SetData ((unsigned long) procmods[n]);
+                       item.SetId (n);
+                       
+                       _targetList->InsertItem(item);
+@@ -441,7 +441,7 @@
+ 
+               if (proc) {
+                       item.SetText (proc->getName());
+-                      item.SetData ((unsigned)proc);
++                      item.SetData ((unsigned long)proc);
+                       item.SetId (_targetList->GetItemCount());
+                       
+                       _targetList->InsertItem(item);
\ No newline at end of file

Added: trunk/overlays/proaudio/media-sound/freqtweak/files/40_manpage.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/freqtweak/files/40_manpage.patch        
                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/freqtweak/files/40_manpage.patch        
2010-04-29 15:16:52 UTC (rev 1660)
@@ -0,0 +1,154 @@
+diff -Nur freqtweak.1.old freqtweak.1
+--- freqtweak.1.old    2003-08-20 12:22:36.000000000 +0900
++++ freqtweak.1        2007-05-11 11:44:19.092008638 +0900
+@@ -14,39 +14,39 @@
+ .\" .fi        enable filling
+ .\" .br        insert line break
+ .\" .sp <n>    insert n+1 empty lines
+-.\" for manpage-specific macros, see man(7)
++.\" for manpage\(hyspecific macros, see man(7)
+ .SH NAME
+ freqtweak \- Realtime audio frequency spectral manipulation
+ .SH SYNOPSIS
+ .br
+ .B freqtweak
+-.RI [-h] 
++.RI [\-h] 
+ [
+-.B -c
++.B \-c
+ .I <num>
+ ]
+ [
+-.B -i
++.B \-i
+ .I <str>
+ ]
+ [
+-.B -o
++.B \-o
+ .I <str>
+ ]
+ [
+-.B -n 
++.B \-n 
+ .I <str>
+ ]
+ [
+-.B -D
++.B \-D
+ .I <str>
+ ]
+ [
+-.B -p
++.B \-p
+ .I <str>
+ ]
+ [
+-.B -r
++.B \-r
+ .I <str>
+ ]
+ .br
+@@ -58,16 +58,20 @@
+ manipulation and display. It provides several algorithms for
+ processing audio data in the frequency domain and a highly interactive
+ GUI to manipulate each associated filter. It also provides
+-high-resolution spectral displays in the form of scrolling-raster
++high\(hyresolution spectral displays in the form of scrolling\(hyraster
+ spectrograms and energy vs frequency plots displaying both pre and
+-post-processed spectra.
++post\(hyprocessed spectra.
++
++Freqtweak is a jack client.  You need to have jackd running in order to
++get sound input and output with freqtweak
++
+ .SH MOUSE CONTROL
+ .P
+ The processing filters are controlled through mouse operations on each
+ filter GUI window. The possible operations are:
+ .P
+ .I Left button click/drag
+-to draw filters. If Control is down, the y-axis is fixed at the last
++to draw filters. If Control is down, the y\(hyaxis is fixed at the last
+ cursor location (to draw nice horizontal lines).  If Control and Alt
+ are down you can draw nice arbitrary straight lines.
+ 
+@@ -81,19 +85,19 @@
+ modifies the alternate filter (on double filter graphs like Gate) for
+ the previous operations.
+ 
+-.I Middle-button
++.I Middle\(hybutton
+ pops up frequency axis menu.
+ 
+-.I Ctrl-Alt right-click
++.I Ctrl\(hyAlt right\(hyclick
+ resets a filter to default values.
+ 
+-.I Shift-Ctrl-Alt left-drag 
++.I Shift\(hyCtrl\(hyAlt left\(hydrag 
+ zooms in on the y axis.  Look at the status bar to see the values for
+ the cursor itself and the values of the filter at the cursor's
+ frequency.
+ 
+-.I Shift-Ctrl-Alt right-click
+-release resets the Y-zoom to full.
++.I Shift\(hyCtrl\(hyAlt right\(hyclick
++release resets the Y\(hyzoom to full.
+ 
+ The
+ .I B and BA buttons
+@@ -108,14 +112,14 @@
+ mean Toggle Grid and Toggle Grid Snap respectively.
+ .SH OPTIONS
+ This program follows the usual GNU command line syntax, with long
+-options starting with two dashes (`-').
++options starting with two dashes (`\-').
+ A summary of options is included below.
+ .TP
+ .B \-h, \-\-help
+ Show summary of options.
+ .TP
+ .B \-c <num>, \-\-channels=<num>
+-Processing channels (1-4). Default is 2.
++Processing channels (1\(hy4). Default is 2.
+ .TP
+ .B \-i <str>, \-\-inputs=<str>
+ Connect inputs from these jack ports (separate each channel with commas).
+@@ -125,17 +129,17 @@
+ Connect outputs to these jack ports (separate each channel with commas).
+ Defaults to 'alsa_pcm:playback_1,...'
+ .TP
+-.B \-n <str>, \-\-jack-name=<str>
++.B \-n <str>, \-\-jack\-name=<str>
+ Jack name. Default is freqtweak_1.
+ .TP
+ .B \-D <str>, \-\-tmpdir=<str>
+-Jack server tmp directory (should match jackd --tmpdir).
++Jack server tmp directory (should match jackd \-\-tmpdir).
+ .TP
+ .B \-p <str>, \-\-preset=<str>
+ Load the given preset initially.
+ .TP
+-.B \-r <str>, \-\-rc-dir=<str>
+-Specifies what directory to use for run-control state. Default is 
~/.freqtweak.
++.B \-r <str>, \-\-rc\-dir=<str>
++Specifies what directory to use for run\(hycontrol state. Default is 
~/.freqtweak.
+ 
+ .SH EXAMPLES
+ 
+@@ -146,11 +150,11 @@
+ Start freqtweak first with this command line:
+ 
+ .T
+-.B freqtweak -n ft &
++.B freqtweak \-n ft &
+ 
+ Then start alsaplayer like so: 
+ 
+-.B alsaplayer -o jack -d ft:in_1,ft:in_2 &
++.B alsaplayer \-o jack \-d ft:in_1,ft:in_2 &
+ 
+ 
+ .SH SEE ALSO
\ No newline at end of file

Deleted: 
trunk/overlays/proaudio/media-sound/freqtweak/files/freqtweak-patches-1.tar.bz2
===================================================================
(Binary files differ)

Modified: 
trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.0_pre20070214-r1.ebuild
===================================================================
--- 
trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.0_pre20070214-r1.ebuild
 2010-04-28 19:22:39 UTC (rev 1659)
+++ 
trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.0_pre20070214-r1.ebuild
 2010-04-29 15:16:52 UTC (rev 1660)
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils autotools wxwidgets flag-o-matic unipatch-001
+inherit eutils autotools wxwidgets flag-o-matic
 
 DESCRIPTION="FFT-based realtime audio spectral manipulation and display"
 HOMEPAGE="http://freqtweak.sourceforge.net";
@@ -13,11 +13,13 @@
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="=x11-libs/wxGTK-2.6*
+RDEPEND="=x11-libs/wxGTK-2.6*
        >=sci-libs/fftw-3.0
        =dev-libs/libsigc++-1.2*
        dev-libs/libxml2
        media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
@@ -25,7 +27,10 @@
        unpack ${A}
        cd "${S}"
 
-       unipatch "${FILESDIR}"/freqtweak-patches-1.tar.bz2
+       epatch "${FILESDIR}/10_configure-fixes.patch"
+       epatch "${FILESDIR}/20_wx-strings.patch.tar.bz2"
+       epatch "${FILESDIR}/30_64bit-safe.patch"
+       epatch "${FILESDIR}/40_manpage.patch"
        eautoreconf
 }
 

Modified: trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.2.ebuild        
2010-04-28 19:22:39 UTC (rev 1659)
+++ trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-0.7.2.ebuild        
2010-04-29 15:16:52 UTC (rev 1660)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils autotools wxwidgets flag-o-matic
+inherit eutils wxwidgets flag-o-matic
 
 DESCRIPTION="FFT-based realtime audio spectral manipulation and display"
 HOMEPAGE="http://freqtweak.sourceforge.net";

Modified: trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-9999.ebuild 
2010-04-28 19:22:39 UTC (rev 1659)
+++ trunk/overlays/proaudio/media-sound/freqtweak/freqtweak-9999.ebuild 
2010-04-29 15:16:52 UTC (rev 1660)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils autotools wxwidgets flag-o-matic cvs
+inherit eutils wxwidgets flag-o-matic cvs
 
 DESCRIPTION="FFT-based realtime audio spectral manipulation and display"
 HOMEPAGE="http://freqtweak.sourceforge.net";
@@ -24,10 +24,10 @@
        dev-libs/libxml2
        media-sound/jack-audio-connection-kit"
 
-src_unpack() {
-       cvs_src_unpack
-       cd "${S}"
-}
+#src_unpack() {
+#      cvs_src_unpack
+#      cd "${S}"
+#}
 
 src_compile() {
        WX_GTK_VER="2.6"

Reply via email to