rpms/timidity++/devel TiMidity++-2.13.0-detect.patch, 1.1, 1.2 timidity++.spec, 1.16, 1.17 TiMidity++-2.13.0-esd.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Oct 14 19:40:18 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22682
Modified Files:
TiMidity++-2.13.0-detect.patch timidity++.spec
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)
TiMidity++-2.13.0-detect.patch:
Index: TiMidity++-2.13.0-detect.patch
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/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 19:39:45 -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++/devel/timidity++.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- timidity++.spec 13 Oct 2007 07:27:13 -0000 1.16
+++ timidity++.spec 14 Oct 2007 19:39:45 -0000 1.17
@@ -14,7 +14,6 @@
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: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: timidity++-X11
@@ -48,7 +47,6 @@
# fix for x86_64 and s390x
%patch5 -p1 -b .64bit
%patch6 -p1 -b .warnings
-%patch7 -p1 -b .esd
%build
@@ -56,7 +54,6 @@
%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
@@ -124,6 +121,8 @@
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)
--- TiMidity++-2.13.0-esd.patch DELETED ---
More information about the fedora-extras-commits
mailing list