rpms/k3guitune/F-9 import.log, NONE, 1.1 k3guitune-1.01-fftw.patch, NONE, 1.1 k3guitune-1.01-fix-multiple-parameters-bug.patch, NONE, 1.1 k3guitune-desktop-file.patch, NONE, 1.1 k3guitune.spec, NONE, 1.1 k3guitune.xpm, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
David Timms
dtimms at fedoraproject.org
Fri Mar 13 12:39:47 UTC 2009
Author: dtimms
Update of /cvs/pkgs/rpms/k3guitune/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9013/F-9
Modified Files:
.cvsignore sources
Added Files:
import.log k3guitune-1.01-fftw.patch
k3guitune-1.01-fix-multiple-parameters-bug.patch
k3guitune-desktop-file.patch k3guitune.spec k3guitune.xpm
Log Message:
initial import of k3guitune
--- NEW FILE import.log ---
k3guitune-1_01-4_fc10:F-9:k3guitune-1.01-4.fc10.src.rpm:1236947925
k3guitune-1.01-fftw.patch:
--- NEW FILE k3guitune-1.01-fftw.patch ---
diff -Naur k3guitune-1.01/k3guitune/osziview.cpp k3guitune-1.01_1/k3guitune/osziview.cpp
--- k3guitune-1.01/k3guitune/osziview.cpp 2007-12-15 18:16:27.000000000 +0500
+++ k3guitune-1.01_1/k3guitune/osziview.cpp 2008-10-23 03:21:11.000000000 +0600
@@ -254,12 +254,12 @@
}
fftw_in = (double*) fftw_malloc(sizeof(double) * nr);
fftw_out = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * nr);
- fftw_p = fftw_plan_dft_r2c_1d(nr, fftw_in, fftw_out, FFTW_FORWARD);
+ fftw_p = fftw_plan_dft_r2c_1d(nr, fftw_in, fftw_out, FFTW_MEASURE);
fftw_in2 = (double*) fftw_malloc(sizeof(double) * nr * 2);
fftw_out2 = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * nr * 2);
- fftw_p2 = fftw_plan_dft_r2c_1d(nr*2, fftw_in2, fftw_out2, FFTW_FORWARD);
- fftw_p3 = fftw_plan_dft_c2r_1d(nr*2, fftw_out2, fftw_in2, FFTW_BACKWARD);
+ fftw_p2 = fftw_plan_dft_r2c_1d(nr*2, fftw_in2, fftw_out2, FFTW_MEASURE);
+ fftw_p3 = fftw_plan_dft_c2r_1d(nr*2, fftw_out2, fftw_in2, FFTW_MEASURE);
}
void OsziView::setNotch(bool n)
k3guitune-1.01-fix-multiple-parameters-bug.patch:
--- NEW FILE k3guitune-1.01-fix-multiple-parameters-bug.patch ---
diff -ur k3guitune-1.01.orig/k3guitune/soundinput.h k3guitune-1.01/k3guitune/soundinput.h
--- k3guitune-1.01.orig/k3guitune/soundinput.h 2005-08-10 19:42:59.000000000 +1000
+++ k3guitune-1.01/k3guitune/soundinput.h 2009-01-31 00:25:15.000000000 +1100
@@ -41,7 +41,7 @@
*/
class SoundInput {
public:
- static SoundInput *autodetect( const char *alsa_devicename, const char *dsp_devicename, int &blksize, int &sampfreq, double &sampfreq );
+ static SoundInput *autodetect( const char *alsa_devicename, const char *dsp_devicename, int &blksize, int &sampfreq, double &sampfreq_exact );
virtual ~SoundInput();
virtual int getData( short int *buf, int blksize ) = 0;
};
Only in k3guitune-1.01/k3guitune: soundinput.h~
k3guitune-desktop-file.patch:
--- NEW FILE k3guitune-desktop-file.patch ---
diff -ur k3guitune-1.01.orig/k3guitune/k3guitune.desktop k3guitune-1.01/k3guitune/k3guitune.desktop
--- k3guitune-1.01.orig/k3guitune/k3guitune.desktop 2007-12-16 00:16:27.000000000 +1100
+++ k3guitune-1.01/k3guitune/k3guitune.desktop 2009-03-08 11:32:24.000000000 +1100
@@ -3,10 +3,11 @@
Encoding=UTF-8
Type=Application
Exec=k3guitune -caption "%c" %i %m
-Icon=
+Icon=k3guitune
DocPath=k3guitune/index.html
-Comment=
+Comment=Musical instrument tuning application
Comment[de]=
+Comment[tr]=Müzik Aleti Akort Etme Uygulaması
Terminal=0
Name=K3GuiTune
Name[de]=K3GuiTune
--- NEW FILE k3guitune.spec ---
Name: k3guitune
Version: 1.01
Release: 4%{?dist}
Summary: Musical instrument tuner
Group: Applications/Multimedia
License: GPLv2 and GPLv2+
URL: http://home.planet.nl/~lamer024/k3guitune.html
Source0: http://home.planet.nl/~lamer024/files/k3guitune-%{version}.tar.gz
# guitune author made guitune_logo.xpm available in gtkguitune, available in
# http://www.geocities.com/harpin_floh/mysoft/gtkguitune-0.7.tar.gz
Source1: %{name}.xpm
# patch by dtimms to fix the parameters supplied in some calling functions,
# without this compile dies:
Patch0: %{name}-1.01-fix-multiple-parameters-bug.patch
Patch1: %{name}-desktop-file.patch
# from http://www.kde-apps.org/content/show.php/K3Guitune?content=15358
# fix fftw library usage bugs:
Patch2: %{name}-1.01-fftw.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs3-devel
BuildRequires: alsa-lib-devel
BuildRequires: fftw-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
# investigate when it becomes available
#BuildRequires: bio2jack-devel
%description
K3Guitune is a guitar-and-other-instruments tuner. It takes a signal from the
microphone, calculates its frequency, and displays it on a note scale
graphic and an oscilloscope. It supports normal, Wien, and physical tuning.
%prep
%setup -q
%patch0 -p1 -b .fix-multiple-parameters-bug
%patch1 -p1 -b .desktop-file
%patch2 -p1 -b .fftw
%{__rm} -rf po/*.gmo
# fix UTF-8 encodings
for nonutffile in ChangeLog AUTHORS; do
iconv -f iso8859-1 -t utf-8 $nonutffile > $nonutffile.conv
touch -r $nonutffile $nonutffile.conv
%{__mv} -f $nonutffile.conv $nonutffile
done
%build
%configure --disable-rpath
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
%find_lang %{name}
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
%{__install} -p -m 644 %{SOURCE1} \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
desktop-file-install \
--add-category="AudioVideo" \
--add-category="Audio" \
--delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applnk/Multimedia/%{name}.desktop
# remove symlinks with absolute paths, and recreate with relative paths
%{__rm} %{buildroot}/%{_docdir}/HTML/*/%{name}/common
cd %{buildroot}/%{_docdir}/HTML/
for lang in *; do
ln -sf ../common $lang/%{name}/
done
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%clean
%{__rm} -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
%{_datadir}/applications/%{name}.desktop
%{_datadir}/apps/%{name}/
%{_docdir}/HTML/*/%{name}/
%changelog
* Wed Mar 11 2009 David Timms <iinet.net.au at dtimms> - 1.01-4
- fix command order for nonutffile timestamping
* Tue Mar 10 2009 David Timms <iinet.net.au at dtimms> - 1.01-3
- mod icon cache update to use newly ratified scriptlets
- enable jack audio support via BR: bio2jack
- mod symlink fix to be more flexible in the future
- remove install of INSTALL
- mod to use more macro style invocations, except url and source
- del Requires: hicolor-icon-them since it wil be detected via kdelibs3
- clarify License tag since some source files are licensed GPLv2 only.
- fix previous changelog date
* Sun Mar 8 2009 David Timms <iinet.net.au at dtimms> - 1.01-2
- add missing BR: alsa-lib-devel
- add patch for fftw library usage bug
- fix absolute symlink to be a relative symlink
* Fri Jan 30 2009 David Timms <iinet.net.au at dtimms> - 1.01-1
- Initial spec for Fedora based on Dries Verachtert's package
- Updated to release 1.01, the final release.
* Sun Feb 12 2006 Dries Verachtert <dries at ulyssis.org> - 0.5.2-1
- Updated to release 0.5.2.
--- NEW FILE k3guitune.xpm ---
/* XPM */
static char * guitune_logo_xpm[]={
"32 32 16 1",
"f c #808080",
"k c #ffa858",
"g c #a0a0a0",
"e c #c3c3c3",
"b c #00ff00",
". c None",
"i c #c05800",
"# c #000000",
"j c #ff8000",
"m c #400000",
"n c #800000",
"l c #ffdca8",
"d c #585858",
"a c #ffffff",
"c c #ff0000",
"h c #00c0c0",
"................................",
"................................",
"................................",
"................................",
".....................#######....",
"#################..##aaaaaaa##..",
"##b#####b#####b####aaabbbbbaaa##",
"##b#####b#####b###aaccbbbddccaa#",
"#b#b###b#b###b#b#.#accaaadacca#.",
"#b#b###b#b###b#b#.#aaaaaedaaaa#.",
"#b#b###b#b###b#b#..#aaaafgaaa#..",
"hhhbhhbhhbhhbhhbh###aaaadgaaa#..",
"####b#b###b#b####iii#a#####a#...",
"####b#b###b#b####iji##iiii###...",
"####b#b###b#b####ijiiiijjii#....",
"#####b#####b########jjjjjji#....",
"#####b#####b######k#kikjkii#####",
"#################l#l#ljlklmlmlml",
"#iijijjjnmmjlil#l#l#l#lilnlnlnln",
"#iiijjjjnmmlilil#l#l#lilklnlnlnl",
"#iijjjjjnmmjlil#k#k#k#kjkii#####",
"#iiijjjjjmmjkkki#####ijjjji#....",
"#iijjjjjjmmjjjjki###ijjjjji#....",
".#iijjjjjmmjjjjjiiiijjjjjji#....",
".#ijijjjjjjjjjjjjjjjjjjjjj#.....",
".#iiijjjjjjjjjjjjjjjjjjjji#.....",
"..#ijijjjjjjjjjji###jjjjii#.....",
"...#iiijjjjijjii#nnn#iiin#......",
"....##iijjijji##.....####.......",
"......########..................",
"................................",
"................................"};
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3guitune/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Mar 2009 02:38:00 -0000 1.1
+++ .cvsignore 13 Mar 2009 12:39:15 -0000 1.2
@@ -0,0 +1 @@
+k3guitune-1.01.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3guitune/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Mar 2009 02:38:00 -0000 1.1
+++ sources 13 Mar 2009 12:39:17 -0000 1.2
@@ -0,0 +1 @@
+b8202c935f47c18003e8cba14faf18d6 k3guitune-1.01.tar.gz
More information about the fedora-extras-commits
mailing list