Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5307
Modified Files:
solfege.info solfege.patch
Log Message:
New upstream version submitted by orloff:
https://sourceforge.net/tracker/?func=detail&aid=2922784&group_id=17203&atid=414256
Index: solfege.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/solfege.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- solfege.patch 17 Aug 2008 00:18:29 -0000 1.2
+++ solfege.patch 3 Jan 2010 09:02:08 -0000 1.3
@@ -1,21 +1,18 @@
-diff -urN -x '*~' solfege-3.10.4.orig/default.config
solfege-3.10.4/default.config
---- solfege-3.10.4.orig/default.config
-+++ solfege-3.10.4/default.config
-@@ -40,9 +40,9 @@
- rcfileversion=10
- random_function=random_by_random
- randomness=1.1
--midi_to_wav_cmd=/usr/bin/timidity -Ow %(in)s -o %(out)s
--wav_to_mp3_cmd=/usr/bin/lame %(in)s %(out)s
--wav_to_ogg_cmd=/usr/bin/oggenc %(in)s
-+midi_to_wav_c...@prefix@/bin/timidity -Ow %(in)s -o %(out)s
-+wav_to_mp3_c...@prefix@/bin/lame %(in)s %(out)s
-+wav_to_ogg_c...@prefix@/bin/oggenc %(in)s
+--- solfege-3.14.10.orig/Makefile.in
++++ solfege-3.14.10/Makefile.in
+@@ -146,7 +146,5 @@
+ compileall:
+ ifneq (x"$(nopycompile)",xYES)
+- for dir in src mpd soundcard; do\
+- $(PYTHON) -c "import compileall;
compileall.compile_dir('$(DESTDIR)/$(datadir)/$(PACKAGE)/$(dir)')" ;\
+- done
++ cd $(DESTDIR)$(datadir); $(PYTHON) -c "import compileall;
compileall.compile_dir('$(PACKAGE)')"
+ endif
- [mainwin]
- history_back_ak=<alt>Left
-@@ -50,13 +50,13 @@
- history_reload_ak=<ctrl>r
+--- solfege-3.14.10.orig/default.config
++++ solfege-3.14.10/default.config
+@@ -65,13 +65,13 @@
+ mma=mma
[sound]
-type=sequencer-device
Index: solfege.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/solfege.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- solfege.info 31 Jan 2009 23:58:16 -0000 1.5
+++ solfege.info 3 Jan 2010 09:02:08 -0000 1.6
@@ -1,42 +1,50 @@
Package: solfege
-Version: 3.10.4
+Version: 3.14.10
Revision: 1
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 74705388c446a10ed574e68bcd3134d4
+Source-MD5: d24ab1184ee1466fba9c965cb8ae8f58
Depends: <<
- python25,
- pygtk2-gtk-py25 (>=2.6.0),
- pygobject2-py25,
+ python26,
+ pygtk2-gtk-py26 (>=2.6.0),
+ pygobject2-py26,
libgtkhtml2-shlibs (>=1.99.6),
qtplay,
fontconfig-path,
pango1-xft2,
gtk+2,
- vorbis-tools, mpg123, lame
+ vorbis-tools,
+ mpg123,
+ lame
<<
BuildDepends: <<
- fink (>= 0.24.12),
- python25,
+ python26,
swig,
gettext-tools,
texinfo, glib2-dev (>=2.0),
pkgconfig (>=0.17.0),
- pygtk2-gtk-py25-dev (>=2.6.0),
- pygobject2-py25-dev,
+ pygtk2-gtk-py26-dev (>=2.6.0),
+ pygobject2-py26-dev,
libxml2 (>=2.4.0),
gtk+2-dev (>=2.2.0),
libgtkhtml2 (>=1.99.6),
docbook-xsl,
gnome-doc-utils,
- libxslt-bin
+ libxslt-bin,
+ libffi,
+ fink (>= 0.24.12)
+<<
+Recommends: <<
+ mma,
+ tetex,
+ lilypond
<<
PatchFile: %n.patch
-PatchFile-MD5: c428f0854ae770ee61acd79e6b6cb55c
-PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+PatchFile-MD5: 1c8d150c9f2c3754e820769febed54e2
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -l -p1
ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
--enable-docbook-stylesheet=%p/share/xml/xsl/docbook-xsl/html/chunk.xsl
CompileScript: <<
#!/bin/bash -ev
-export PYTHON="%p/bin/python2.5"
+export PYTHON="%p/bin/python2.6"
./configure %c
make
<<
@@ -64,47 +72,26 @@
<<
DescPackaging:<<
-* This packaging is a continuing effort of 1357190, which was closed by
- lack of response on my part during the hollidays.
-
-* I spent a lot of time scrutinizing all dependencies, and installing from
+* I spent some time scrutinizing all dependencies, and installing from
source or binaries on a fresh fink. For instance, Debian makes solfege
depend on lilypond, and thus ghostscript, which is not really necessary.
* $ fink validate solfege.info
+ $ fink -m -k --build-as-nobody rebuild solfege
Package looks good!
-* libgtkhtml2: allows to view html help pages with the application, instead of
default browser; ignore complaints at launch about
- "Checking for gtkhtml2... No module named gtkhtml2"
-Local .html docs are shown properly, and this error shows up on Debian version
too.
-
-* "warning: invalid directory in path: /Users/username/lessonfiles"
- can be avoided by creating the said directory.
+* depends on python26, but could work with 25 or 24: should maybe make 2
packages (splitoff??)
-* depends on python25, but could work with python24: should maybe make 2
packages (splitoff??)
+* It took me some time to get rid of absolute paths in .pyc files.
<<
DescUsage:<<
-* Needs a running X11: first launch /Applications/Utilities/X11.app
+* Needs X11: check if /Applications/Utilities/X11.app is there,
+ or install it from the original DVD.
* then, in a terminal, type:
$ solfege
-* if you get a long barking ending with:
- RuntimeError: could not open display
- type:
- $ export DISPLAY=":0.0"
-
-* The warning:
- Checking for gtkhtml2... No module named gtkhtml2
- is harmless.
-
-* If you get
- warning: invalid directory in path: /Users/username/lessonfiles
- create the directory
- $ mkdir ~/lessonfiles
- to store and enable homemade lessonfiles
-
* If you want to translate .midi files into .wav, install
$ fink install timidity-nox
Is not done by default because it loads 25Mb of sound patterns...
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
