rpms/timidity++/F-7 fedora-timidity.desktop, NONE, 1.1 TiMidity++-2.13.0-detect.patch, 1.1, 1.2 timidity++.spec, 1.13, 1.14 TiMidity++-2.13.0-esd.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/timidity++/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30662

Modified Files:
	TiMidity++-2.13.0-detect.patch timidity++.spec 
Added Files:
	fedora-timidity.desktop 
Removed Files:
	TiMidity++-2.13.0-esd.patch 
Log Message:
* Sat Oct 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-4
- Split the patches of into a seperate sub package so that they can be used
  by other wavetable midi synthesizers, without dragging in a bunch of unwanted
  dependencies (bz 250735)
- There is no reason to install the icon in /usr/share/pixmaps if it also gets
  installed under /usr/share/icons
- Rewrite autodetection of wether to use esd, aRts or alsa as output patch,
  so that it actually works (bz 200688)



--- NEW FILE fedora-timidity.desktop ---
[Desktop Entry]
Name=TiMidity++
Comment=Real-time software synthesizer
Icon=timidity
Type=Application
Exec=timidity -ig
Terminal=false
Categories=Audio;AudioVideo;Midi;X-Synthesis;X-Jack;

TiMidity++-2.13.0-detect.patch:

Index: TiMidity++-2.13.0-detect.patch
===================================================================
RCS file: /cvs/extras/rpms/timidity++/F-7/TiMidity++-2.13.0-detect.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TiMidity++-2.13.0-detect.patch	9 Sep 2004 13:24:18 -0000	1.1
+++ TiMidity++-2.13.0-detect.patch	14 Oct 2007 20:01:35 -0000	1.2
@@ -1,38 +1,86 @@
---- TiMidity++-2.11.3/timidity/timidity.c.detect	Wed Jan 16 04:31:56 2002
-+++ TiMidity++-2.11.3/timidity/timidity.c	Thu Jan 24 16:01:59 2002
-@@ -5126,6 +5126,7 @@
-     int nfiles;
-     char **files;
-     int main_ret;
-+    int mode_set=0;
-     int longind;
- 
- #if defined(DANGEROUS_RENICE) && !defined(__W32__) && !defined(main)
-@@ -5225,6 +5226,27 @@
-     }
- #endif
- 
-+#ifdef AU_ARTS
-+    if(arts_init()==0) {
-+	    arts_free();
-+	    set_play_mode("k");
-+	    mode_set=1;
-+    }
-+#endif
-+#ifdef AU_ESD
-+    if(!mode_set) {
-+	    if(!access("/usr/lib/libesd.so.0", R_OK)) {
-+		    setenv("ESD_NO_SPAWN", "1", 0);
-+		    set_play_mode("e");
-+		    mode_set=1;
-+	    }
-+    }
-+#endif
-+#ifdef AU_OSS
-+    if(!mode_set)
-+	    set_play_mode("d");
-+#endif
-+    
-     if((err = timidity_pre_load_configuration()) != 0)
- 	return err;
+diff -up TiMidity++-2.13.2/timidity/timidity.c.detect TiMidity++-2.13.2/timidity/timidity.c
+--- TiMidity++-2.13.2/timidity/timidity.c.detect	2007-10-14 21:26:13.000000000 +0200
++++ TiMidity++-2.13.2/timidity/timidity.c	2007-10-14 21:26:41.000000000 +0200
+@@ -5152,10 +5152,6 @@ MAIN_INTERFACE int timidity_post_load_co
+ 	char *output_id;
+ 
+ 	output_id = getenv("TIMIDITY_OUTPUT_ID");
+-#ifdef TIMIDITY_OUTPUT_ID
+-	if(output_id == NULL)
+-	    output_id = TIMIDITY_OUTPUT_ID;
+-#endif /* TIMIDITY_OUTPUT_ID */
+ 	if(output_id != NULL)
+ 	{
+ 	    for(i = 0; play_mode_list[i]; i++)
+diff -up TiMidity++-2.13.2/timidity/esd_a.c.detect TiMidity++-2.13.2/timidity/esd_a.c
+--- TiMidity++-2.13.2/timidity/esd_a.c.detect	2003-09-18 11:23:59.000000000 +0200
++++ TiMidity++-2.13.2/timidity/esd_a.c	2007-10-14 21:18:54.000000000 +0200
+@@ -67,7 +67,7 @@ PlayMode dpm = {
+     -1,
+     {0}, /* default: get all the buffer fragments you can */
+     "Enlightened sound daemon", 'e',
+-    "/dev/dsp",
++    "esd",
+     open_output,
+     close_output,
+     output_data,
+@@ -93,7 +93,7 @@ static int try_open(void)
+     /* Open the audio device */
+     esdformat = (dpm.encoding & PE_16BIT) ? ESD_BITS16 : ESD_BITS8;
+     esdformat |= (dpm.encoding & PE_MONO) ? ESD_MONO : ESD_STEREO;
+-    return esd_play_stream_fallback(esdformat,dpm.rate,NULL,"timidity");
++    return esd_play_stream(esdformat,dpm.rate,NULL,"timidity");
+ }
+ 
  
+@@ -101,8 +101,7 @@ static int detect(void)
+ {
+     int fd;
+ 
+-    /* FIXME: do we need to set this? */
+-    /* setenv("ESD_NO_SPAWN", "1", 0); */
++    setenv("ESD_NO_SPAWN", "1", 0);
+     fd = try_open();
+     if (fd < 0)
+ 	return 0;
+diff -up TiMidity++-2.13.2/timidity/output.c.detect TiMidity++-2.13.2/timidity/output.c
+--- TiMidity++-2.13.2/timidity/output.c.detect	2004-05-14 03:32:34.000000000 +0200
++++ TiMidity++-2.13.2/timidity/output.c	2007-10-14 21:18:54.000000000 +0200
+@@ -133,18 +133,6 @@ extern PlayMode gogo_play_mode;
+ extern PlayMode modmidi_play_mode;
+ 
+ PlayMode *play_mode_list[] = {
+-#ifdef DEV_PLAY_MODE
+-  DEV_PLAY_MODE,
+-#endif
+-
+-#ifdef AU_ALSA
+-  &alsa_play_mode,
+-#endif /* AU_ALSA */
+-
+-#ifdef AU_HPUX_ALIB
+-  &hpux_nplay_mode,
+-#endif /* AU_HPUX_ALIB */
+-
+ #if defined(AU_ARTS)
+   &arts_play_mode,
+ #endif /* AU_ARTS */
+@@ -153,6 +141,18 @@ PlayMode *play_mode_list[] = {
+   &esd_play_mode,
+ #endif /* AU_ESD */
+ 
++#ifdef AU_ALSA /* Try alsa (aka DEV_PLAY_MODE 2 on Linux) first */
++  &alsa_play_mode,
++#endif /* AU_ALSA */
++
++#ifdef DEV_PLAY_MODE /* OS dependent direct hardware access, OSS on Linux */
++  DEV_PLAY_MODE,
++#endif
++
++#ifdef AU_HPUX_ALIB
++  &hpux_nplay_mode,
++#endif /* AU_HPUX_ALIB */
++
+ #if defined(AU_PORTAUDIO)
+ #ifndef AU_PORTAUDIO_DLL
+   &portaudio_play_mode,


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/F-7/timidity++.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- timidity++.spec	12 Jul 2006 08:28:56 -0000	1.13
+++ timidity++.spec	14 Oct 2007 20:01:35 -0000	1.14
@@ -1,29 +1,43 @@
-Summary: A software wavetable MIDI synthesizer.
+Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 1.2.2
+Release: 4%{?dist}
 Group: Applications/Multimedia
-Source: http://www.goice.co.jp/member/mo/timidity/dist/TiMidity++-%{version}.tar.bz2
+Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
 Source2: timidity.cfg
 Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2
 Source4: http://www.stardate.bc.ca/eawpatches/eawpats/pistol.pat.bz2
+Source5: fedora-timidity.desktop
 URL: http://timidity.sourceforge.net
 Patch: TiMidity++-2.13.0-redhat.patch
 Patch3: TiMidity++-2.13.0-detect.patch
 Patch5: TiMidity++-2.13.0-64bit.patch
 Patch6: TiMidity++-2.13.0-warnings.patch
-Patch7: TiMidity++-2.13.0-esd.patch
-License: GPL
-BuildRoot: %{_tmppath}/%{name}-root
+License: GPLv2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: timidity++-X11
-BuildRequires: arts-devel esound-devel autoconf alsa-lib-devel ncurses-devel
+BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel
+BuildRequires: desktop-file-utils
+Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme
 
 %description
 TiMidity++ is a MIDI format to wave table format converter and
-player. Install timitidy++ if you'd like to play MIDI files and your
+player. Install timidity++ if you'd like to play MIDI files and your
 sound card does not natively support wave table format.
 
+
+%package        patches
+Summary:        Instrument (patch) files for %{name}
+Group:          Applications/Multimedia
+
+%description    patches
+This package contains samples of instruments (called patches) for use in
+wavetable midi synthesizers like %{name}. These patches are in the Gravis
+Ultasound .pat format and can be used by any wavetable midi synthesizer which
+understands this format.
+
+
 %prep
 %setup -q -n TiMidity++-%{version}
 # Put config files etc. to sane locations
@@ -33,41 +47,92 @@
 # fix for x86_64 and s390x
 %patch5 -p1 -b .64bit
 %patch6 -p1 -b .warnings
-%patch7 -p1 -b .esd
+
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export LDFLAGS="-s"
-autoconf
-%configure --enable-dynamic \
-	--enable-interface=ncurses,slang,vt100,alsaseq,server,network \
+export EXTRACFLAGS="$RPM_OPT_FLAGS"
+%configure --enable-dynamic --disable-dependency-tracking \
+	--enable-interface=ncurses,slang,vt100,alsaseq,server,network,gtk \
 	--enable-audio=oss,arts,alsa,esd,vorbis \
-	--with-default-output=alsa
+	--enable-gtk
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg
 ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg
-cd $RPM_BUILD_ROOT%{_datadir}/timidity
+pushd $RPM_BUILD_ROOT%{_datadir}/timidity
 tar xvjf %{SOURCE1}
 bzip2 -dck %{SOURCE3} >instruments/britepno.pat
 bzip2 -dck %{SOURCE4} >instruments/pistol.pat
+popd
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor fedora              \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  %{SOURCE5}
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+install -m 644 interface/pixmaps/timidity.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+# update icon themes
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+# update icon themes
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
-%defattr(-,root,root)
-%config(noreplace) /etc/timidity.cfg
+%defattr(-,root,root,-)
 %{_bindir}/*
-%{_datadir}/timidity
 %{_mandir}/*/*
+%{_datadir}/applications/fedora-timidity.desktop
+%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
+
+%files patches
+%defattr(-,root,root,-)
+%config(noreplace) /etc/timidity.cfg
+%{_datadir}/timidity
+
 
 %changelog
+* Sat Oct 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-4
+- Split the patches of into a seperate sub package so that they can be used
+  by other wavetable midi synthesizers, without dragging in a bunch of unwanted
+  dependencies (bz 250735)
+- There is no reason to install the icon in /usr/share/pixmaps if it also gets
+  installed under /usr/share/icons
+- Rewrite autodetection of wether to use esd, aRts or alsa as output patch,
+  so that it actually works (bz 200688)
+
+* Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 2.13.2-3
+- fix typo in package description (#185328) 
+- use RPM_OPT_FLAGS, make debuginfo package usable (#249968),
+  thanks to Ville Skitta
+- compile with GTK interface (#231745), thanks to Brian Jedsen
+  
+* Mon Sep 24 2007 Jindrich Novy <jnovy at redhat.com> 2.13.2-2
+- spec/license fixes
+  
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2.2
 - rebuild
 


--- TiMidity++-2.13.0-esd.patch DELETED ---