rpms/audacious-plugin-fc/F-12 audacious-plugin-fc-0.4-aud21.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 audacious-plugin-fc.spec, 1.15, 1.16 sources, 1.3, 1.4 audacious-plugin-fc-0.3-audacious2.patch, 1.1, NONE audacious-plugin-fc-0.3-dialog.patch, 1.1, NONE

Michael Schwendt mschwendt at fedoraproject.org
Sat Oct 24 10:49:43 UTC 2009 

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugin-fc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19867

Modified Files:
	.cvsignore audacious-plugin-fc.spec sources 
Added Files:
	audacious-plugin-fc-0.4-aud21.patch 
Removed Files:
	audacious-plugin-fc-0.3-audacious2.patch 
	audacious-plugin-fc-0.3-dialog.patch 
Log Message:
* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
- Patch temporarily to backport to Audacious 2.1 API.


audacious-plugin-fc-0.4-aud21.patch:
 configure    |   16 ++++++++--------
 src/Main.cpp |   15 ++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

--- NEW FILE audacious-plugin-fc-0.4-aud21.patch ---
diff -Nur audacious-plugin-fc-0.4-orig/configure audacious-plugin-fc-0.4/configure
--- audacious-plugin-fc-0.4-orig/configure	2009-10-23 12:31:35.000000000 +0200
+++ audacious-plugin-fc-0.4/configure	2009-10-24 12:10:42.318420354 +0200
@@ -6464,23 +6464,23 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for audacious >= 2.2" >&5
-$as_echo_n "checking for audacious >= 2.2... " >&6; }
+        { $as_echo "$as_me:$LINENO: checking for audacious >= 2.1" >&5
+$as_echo_n "checking for audacious >= 2.1... " >&6; }
 
-        if $PKG_CONFIG --exists "audacious >= 2.2" ; then
+        if $PKG_CONFIG --exists "audacious >= 2.1" ; then
             { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
             { $as_echo "$as_me:$LINENO: checking AUDACIOUS_CFLAGS" >&5
 $as_echo_n "checking AUDACIOUS_CFLAGS... " >&6; }
-            AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 2.2"`
+            AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 2.1"`
             { $as_echo "$as_me:$LINENO: result: $AUDACIOUS_CFLAGS" >&5
 $as_echo "$AUDACIOUS_CFLAGS" >&6; }
 
             { $as_echo "$as_me:$LINENO: checking AUDACIOUS_LIBS" >&5
 $as_echo_n "checking AUDACIOUS_LIBS... " >&6; }
-            AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 2.2"`
+            AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 2.1"`
             { $as_echo "$as_me:$LINENO: result: $AUDACIOUS_LIBS" >&5
 $as_echo "$AUDACIOUS_LIBS" >&6; }
         else
@@ -6488,7 +6488,7 @@
             AUDACIOUS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audacious >= 2.2"`
+            AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audacious >= 2.1"`
             echo $AUDACIOUS_PKG_ERRORS
         fi
 
@@ -6503,8 +6503,8 @@
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (audacious >= 2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (audacious >= 2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (audacious >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (audacious >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
diff -Nur audacious-plugin-fc-0.4-orig/src/Main.cpp audacious-plugin-fc-0.4/src/Main.cpp
--- audacious-plugin-fc-0.4-orig/src/Main.cpp	2009-10-23 17:21:56.000000000 +0200
+++ audacious-plugin-fc-0.4/src/Main.cpp	2009-10-24 12:28:28.616417561 +0200
@@ -263,13 +263,14 @@
         FC_init(fileBuf,fileLen,0,0);
         mixerInit(myFormat.freq,myFormat.bits,myFormat.channels,myFormat.zeroSample);
 
-        Tuple *t = aud_tuple_new_from_filename( playback->filename );
-        aud_tuple_associate_int(t, FIELD_LENGTH, NULL, msecSongLen);
-        aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
-        playback->set_tuple( playback, t );
-
         gint bitsPerSec = myFormat.freq * myFormat.channels * myFormat.bits;
-        playback->set_params( playback, NULL, 0, bitsPerSec, myFormat.freq, myFormat.channels );
+        gchar* title;
+        gchar* pathSepPos = strrchr( playback->filename, '/' );
+        if ( pathSepPos!=0 && pathSepPos[1]!=0 )  // found file name
+            title = pathSepPos+1;
+        else
+            title = playback->filename;
+        playback->set_params( playback, title, msecSongLen, bitsPerSec, myFormat.freq, myFormat.channels );
         
         playback->playing = true;
         playback->set_pb_ready(playback);
@@ -337,7 +338,7 @@
     Tuple *t = aud_tuple_new_from_filename(filename);
 
     // delay length detection to start of playback
-    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, 0);
+    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, -1);
     aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
     //aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmp);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Oct 2008 09:50:58 -0000	1.3
+++ .cvsignore	24 Oct 2009 10:49:43 -0000	1.4
@@ -1 +1 @@
-audacious-plugin-fc-0.3.tar.bz2
+audacious-plugin-fc-0.4.tar.bz2


Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/F-12/audacious-plugin-fc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- audacious-plugin-fc.spec	24 Jul 2009 17:31:42 -0000	1.15
+++ audacious-plugin-fc.spec	24 Oct 2009 10:49:43 -0000	1.16
@@ -1,18 +1,16 @@
 # Minimum audacious/audacious-plugins version in inter-package
-# dependencies. We have 2.1 for both, so we enforce 2.1.
+# dependencies. We need 2.1 for both.
 %define aud_ver 2.1
 
 %define plugindir %(pkg-config audacious --variable=input_plugin_dir)
 
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
-Version: 0.3
-Release: 5
+Version: 0.4
+Release: 1%{?dist}
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://download.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
-Patch0: audacious-plugin-fc-0.3-audacious2.patch
-Patch1: audacious-plugin-fc-0.3-dialog.patch
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -21,6 +19,9 @@ BuildRequires: pkgconfig
 Provides: audacious-plugins-fc = %{version}-%{release}
 Requires: audacious >= %{aud_ver}
 
+# temporary patch to backport to Audacious 2.1 API
+Patch0: audacious-plugin-fc-0.4-aud21.patch
+
 
 %description
 This is an input plugin for Audacious which can play back Future Composer
@@ -29,14 +30,13 @@ music files from AMIGA. Song-length dete
 
 %prep
 %setup -q
-%patch0 -p1 -b .audacious2
-%patch1 -p1 -b .dialog
+%patch0 -p1 -b .aud21
 
 
 %build
 %configure
 # temporary work-around for #454364
-ln -s Config.h src/config.h
+#ln -s Config.h src/config.h
 # ---
 make %{?_smp_mflags}
 
@@ -58,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
+- Patch temporarily to backport to Audacious 2.1 API.
+
+* Fri Oct 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
+- Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Oct 2008 09:50:58 -0000	1.3
+++ sources	24 Oct 2009 10:49:43 -0000	1.4
@@ -1 +1 @@
-96975f144e0e9f19d340f16e4bad27c6  audacious-plugin-fc-0.3.tar.bz2
+a36fbbddf41b162e1ed6df0b3a6637c7  audacious-plugin-fc-0.4.tar.bz2


--- audacious-plugin-fc-0.3-audacious2.patch DELETED ---


--- audacious-plugin-fc-0.3-dialog.patch DELETED ---

More information about the fedora-extras-commits mailing list