rpms/audacious-plugins/devel audacious-plugins-1.5.1-amidi-symbol.patch, NONE, 1.1 audacious-plugins-1.5.1-timidity-cfg.patch, NONE, 1.1 audacious-plugins-1.5.1-vorbis-oga.patch, NONE, 1.1 audacious-plugins.spec, 1.33, 1.34

[Ralf Ertzinger]

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27798

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-amidi-symbol.patch 
	audacious-plugins-1.5.1-timidity-cfg.patch 
	audacious-plugins-1.5.1-vorbis-oga.patch 
Log Message:
* Fri May 01 2009 Ralf Ertzinger <ralf at skytale.net> 1.5.1-4
- Accept .oga files (BZ#479120)
- Look for timitidy.cfg in /etc (BZ#450933)
- Fix missing symbols in amidi-plugin (BZ#478557)
- Include CD-audio plugin (BZ#442921)


audacious-plugins-1.5.1-amidi-symbol.patch:

--- NEW FILE audacious-plugins-1.5.1-amidi-symbol.patch ---
diff -uNr audacious-plugins-fedora-1.5.1-orig/src/amidi-plug/i_configure.c audacious-plugins-fedora-1.5.1/src/amidi-plug/i_configure.c
--- audacious-plugins-fedora-1.5.1-orig/src/amidi-plug/i_configure.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1/src/amidi-plug/i_configure.c	2009-05-01 14:32:02.744028553 +0200
@@ -29,6 +29,7 @@
 #include "i_configure-dummy.h"
 #include "i_utils.h"
 #include <audacious/auddrct.h>
+#include <audacious/plugin.h>
 
 
 amidiplug_cfg_backend_t * amidiplug_cfg_backend;

audacious-plugins-1.5.1-timidity-cfg.patch:

--- NEW FILE audacious-plugins-1.5.1-timidity-cfg.patch ---
diff -uNr audacious-plugins-fedora-1.5.1-orig/src/timidity/xmms-timidity.c audacious-plugins-fedora-1.5.1/src/timidity/xmms-timidity.c
--- audacious-plugins-fedora-1.5.1-orig/src/timidity/xmms-timidity.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1/src/timidity/xmms-timidity.c	2009-05-01 14:05:00.129006194 +0200
@@ -94,7 +94,7 @@
 
 	if (! aud_cfg_db_get_string(db, "timidity", "config_file",
                                 &xmmstimid_cfg.config_file))
-        xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg");
+        xmmstimid_cfg.config_file = g_strdup("/etc/timidity.cfg");
 
 	aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate);
 	aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits);

audacious-plugins-1.5.1-vorbis-oga.patch:

--- NEW FILE audacious-plugins-1.5.1-vorbis-oga.patch ---
diff -uNr audacious-plugins-fedora-1.5.1-orig/src/vorbis/vorbis.c audacious-plugins-fedora-1.5.1/src/vorbis/vorbis.c
--- audacious-plugins-fedora-1.5.1-orig/src/vorbis/vorbis.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1/src/vorbis/vorbis.c	2009-05-01 14:30:54.777004546 +0200
@@ -94,7 +94,7 @@
     NULL
 };
 
-gchar *vorbis_fmts[] = { "ogg", "ogm", NULL };
+gchar *vorbis_fmts[] = { "ogg", "ogm", "oga", NULL };
 
 InputPlugin vorbis_ip = {
     .description = "Ogg Vorbis Audio Plugin",  /* description */


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- audacious-plugins.spec	24 Feb 2009 03:05:57 -0000	1.33
+++ audacious-plugins.spec	1 May 2009 13:13:59 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plugins for the Audacious media player
 
 Group:          Applications/Multimedia
@@ -18,6 +18,9 @@ Patch0:         audacious-plugins-1.2.2-
 Patch1:         audacious-plugins-1.4.1-neon-locking.patch
 Patch2:         audacious-plugins-1.4.4-gcc43.patch
 Patch3:         audacious-plugins-1.5.1-libmtp.patch
+Patch4:         audacious-plugins-1.5.1-vorbis-oga.patch
+Patch5:         audacious-plugins-1.5.1-timidity-cfg.patch
+Patch6:         audacious-plugins-1.5.1-amidi-symbol.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  audacious-devel >= %{aud_ver}, esound-devel >= 0.2, libvorbis-devel >= 1.0
@@ -37,6 +40,10 @@ BuildRequires:  libmtp-devel
 BuildRequires:  neon-devel >= 0.25
 BuildRequires:  libmowgli >= 0.5.0
 BuildRequires:  mcs-devel >= 0.6.0
+BuildRequires:  libcdio-devel >= 0.70
+BuildRequires:  libcddb-devel >= 1.2.1
+ 
+
 
 Requires:       audacious >= %{aud_ver}
 
@@ -91,7 +98,7 @@ KDE arts sound server.
 
 
 %package        amidi
-Summary:        Audacious imput plugin for amidi
+Summary:        Audacious input plugin for amidi
 Group:          Applications/Multimedia
 
 Requires:       audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
@@ -103,7 +110,7 @@ amidi sound service.
 
 
 %package        wavpack
-Summary:        Audacious imput plugin for wavpack
+Summary:        Audacious input plugin for wavpack
 Group:          Applications/Multimedia
 
 Requires:       audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
@@ -115,7 +122,7 @@ compressed files.
 
 
 %package        metronome
-Summary:        Audacious imput plugin simulating a metronome
+Summary:        Audacious input plugin simulating a metronome
 Group:          Applications/Multimedia
 
 Requires:       audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
@@ -127,7 +134,7 @@ a metronome.
 
 
 %package        vortex
-Summary:        Audacious imput plugin for vortex audio files
+Summary:        Audacious input plugin for vortex audio files
 Group:          Applications/Multimedia
 
 Requires:       audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
@@ -153,6 +160,15 @@ vortex compressed files.
 # Use libmtp 0.3
 %patch3 -p1 -b .libmtp
 
+# accept .oga files
+%patch4 -p1 -b vorbis-oga
+
+# look for timidity.cfg in /etc
+%patch5 -p1 -b timidity-cfg
+
+# fix missing symbols in amidi
+%patch6 -p1 -b amidi-symbols
+
 perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
 
 %build
@@ -249,6 +265,12 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Fri May 01 2009 Ralf Ertzinger <ralf at skytale.net> 1.5.1-4
+- Accept .oga files (BZ#479120)
+- Look for timitidy.cfg in /etc (BZ#450933)
+- Fix missing symbols in amidi-plugin (BZ#478557)
+- Include CD-audio plugin (BZ#442921)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild