From ce204fb08187a939aff94b9efb40764c54fefc06 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Oct 23 2009 15:27:31 +0000 Subject: - Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes. --- diff --git a/.cvsignore b/.cvsignore index abd952f..b70e9be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audacious-plugin-fc-0.3.tar.bz2 +audacious-plugin-fc-0.4.tar.bz2 diff --git a/audacious-plugin-fc-0.3-audacious2.patch b/audacious-plugin-fc-0.3-audacious2.patch deleted file mode 100644 index 7f9d45c..0000000 --- a/audacious-plugin-fc-0.3-audacious2.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur audacious-plugin-fc-0.3-orig/src/Main.cpp audacious-plugin-fc-0.3/src/Main.cpp ---- audacious-plugin-fc-0.3-orig/src/Main.cpp 2007-11-21 17:40:43.000000000 +0100 -+++ audacious-plugin-fc-0.3/src/Main.cpp 2009-06-07 12:16:04.000000000 +0200 -@@ -1,5 +1,5 @@ - // --// => basic port to Audacious <= -+// => basic port to Audacious 2 <= - // - // AMIGA Future Composer music player plugin for XMMS - // Copyright (C) 2000 Michael Schwendt -@@ -23,7 +23,6 @@ - { - #include - #include --#include - } - - #ifdef FC_HAVE_OLD_CPP_HEADERS -@@ -94,8 +93,6 @@ - ip_pause, - ip_seek, - -- NULL, -- - ip_get_time, - - NULL, -@@ -108,11 +105,6 @@ - NULL, - ip_get_song_info, - NULL, -- -- NULL, -- -- NULL, -- NULL, - NULL, - - // 1.3.0 diff --git a/audacious-plugin-fc-0.3-dialog.patch b/audacious-plugin-fc-0.3-dialog.patch deleted file mode 100644 index b5b2ad0..0000000 --- a/audacious-plugin-fc-0.3-dialog.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -Nur audacious-plugin-fc-0.3-orig/src/configure.c audacious-plugin-fc-0.3/src/configure.c ---- audacious-plugin-fc-0.3-orig/src/configure.c 2007-11-21 16:24:10.000000000 +0100 -+++ audacious-plugin-fc-0.3/src/configure.c 2009-06-07 12:42:25.000000000 +0200 -@@ -69,6 +69,7 @@ - if (!fc_config_window) - { - fc_config_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); -+ gtk_window_set_type_hint(GTK_WINDOW(fc_config_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "fc_config_window", fc_config_window); - gtk_window_set_title(GTK_WINDOW(fc_config_window), "Future Composer player configuration"); - gtk_window_set_policy(GTK_WINDOW(fc_config_window), FALSE, FALSE, FALSE); -@@ -81,34 +82,28 @@ - - notebook1 = gtk_notebook_new(); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "notebook1", notebook1); -- gtk_widget_show(notebook1); - gtk_box_pack_start(GTK_BOX(vbox), notebook1, TRUE, TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(notebook1), 3); - - vbox1 = gtk_vbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "vbox1", vbox1); -- gtk_widget_show(vbox1); - - hbox1 = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "hbox1", hbox1); -- gtk_widget_show(hbox1); - gtk_box_pack_start(GTK_BOX(vbox1), hbox1, TRUE, TRUE, 0); - - bitsPerSample_Frame = gtk_frame_new("Bits per sample:"); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "bitsPerSample_Frame", bitsPerSample_Frame); -- gtk_widget_show(bitsPerSample_Frame); - gtk_box_pack_start(GTK_BOX(hbox1), bitsPerSample_Frame, TRUE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(bitsPerSample_Frame), 5); - - vbox4 = gtk_vbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "vbox4", vbox4); -- gtk_widget_show(vbox4); - gtk_container_add(GTK_CONTAINER(bitsPerSample_Frame), vbox4); - - Bits16 = gtk_radio_button_new_with_label(bitsPerSample_group, "16 bit"); - bitsPerSample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Bits16)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Bits16", Bits16); -- gtk_widget_show(Bits16); - gtk_box_pack_start(GTK_BOX(vbox4), Bits16, TRUE, TRUE, 0); - if (fc_myConfig.precision == 16) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Bits16), TRUE); -@@ -116,26 +111,22 @@ - Bits8 = gtk_radio_button_new_with_label(bitsPerSample_group, "8 bit"); - bitsPerSample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Bits8)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Bits8", Bits8); -- gtk_widget_show(Bits8); - gtk_box_pack_start(GTK_BOX(vbox4), Bits8, TRUE, TRUE, 0); - if (fc_myConfig.precision == 8) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Bits8), TRUE); - - Channels_Frame = gtk_frame_new("Channels:"); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Channels_Frame", Channels_Frame); -- gtk_widget_show(Channels_Frame); - gtk_box_pack_start(GTK_BOX(hbox1), Channels_Frame, TRUE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(Channels_Frame), 5); - - vbox5 = gtk_vbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "vbox5", vbox5); -- gtk_widget_show(vbox5); - gtk_container_add(GTK_CONTAINER(Channels_Frame), vbox5); - - Stereo = gtk_radio_button_new_with_label(vbox5_group, "Stereo"); - vbox5_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Stereo)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Stereo", Stereo); -- gtk_widget_show(Stereo); - gtk_box_pack_start(GTK_BOX(vbox5), Stereo, TRUE, TRUE, 0); - if (fc_myConfig.channels == 2) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Stereo), TRUE); -@@ -143,26 +134,22 @@ - Mono = gtk_radio_button_new_with_label(vbox5_group, "Mono"); - vbox5_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Mono)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Mono", Mono); -- gtk_widget_show(Mono); - gtk_box_pack_start(GTK_BOX(vbox5), Mono, TRUE, TRUE, 0); - if (fc_myConfig.channels == 1) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Mono), TRUE); - - frequency_Frame = gtk_frame_new("Sample frequency:"); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Frequency_Frame", frequency_Frame); -- gtk_widget_show(frequency_Frame); - gtk_box_pack_start(GTK_BOX(vbox1), frequency_Frame, TRUE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(frequency_Frame), 5); - - vbox3 = gtk_vbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "vbox3", vbox3); -- gtk_widget_show(vbox3); - gtk_container_add(GTK_CONTAINER(frequency_Frame), vbox3); - - Sample_48 = gtk_radio_button_new_with_label(sample_group, "48000 Hz"); - sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_48)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Sample_48", Sample_48); -- gtk_widget_show(Sample_48); - gtk_box_pack_start(GTK_BOX(vbox3), Sample_48, TRUE, TRUE, 0); - if (fc_myConfig.frequency == FREQ_SAMPLE_48) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_48), TRUE); -@@ -170,7 +157,6 @@ - Sample_44 = gtk_radio_button_new_with_label(sample_group, "44100 Hz"); - sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_44)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Sample_44", Sample_44); -- gtk_widget_show(Sample_44); - gtk_box_pack_start(GTK_BOX(vbox3), Sample_44, TRUE, TRUE, 0); - if (fc_myConfig.frequency == FREQ_SAMPLE_44) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_44), TRUE); -@@ -178,7 +164,6 @@ - Sample_22 = gtk_radio_button_new_with_label(sample_group, "22050 Hz"); - sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_22)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Sample_22", Sample_22); -- gtk_widget_show(Sample_22); - gtk_box_pack_start(GTK_BOX(vbox3), Sample_22, TRUE, TRUE, 0); - if (fc_myConfig.frequency == FREQ_SAMPLE_22) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_22), TRUE); -@@ -186,14 +171,12 @@ - Sample_11 = gtk_radio_button_new_with_label(sample_group, "11025 Hz"); - sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_11)); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Sample_11", Sample_11); -- gtk_widget_show(Sample_11); - gtk_box_pack_start(GTK_BOX(vbox3), Sample_11, TRUE, TRUE, 0); - if (fc_myConfig.frequency == FREQ_SAMPLE_11) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_11), TRUE); - - Quality_Label = gtk_label_new("Quality"); - gtk_object_set_data(GTK_OBJECT(fc_config_window), "Quality_Label", Quality_Label); -- gtk_widget_show(Quality_Label); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook1), vbox1, Quality_Label); - - bbox = gtk_hbutton_box_new(); -@@ -205,19 +188,14 @@ - gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(config_ok), NULL); - GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT); - gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0); -- gtk_widget_show(ok); - gtk_widget_grab_default(ok); - - cancel = gtk_button_new_with_label("Cancel"); - gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(fc_config_window)); - GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT); - gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0); -- gtk_widget_show(cancel); - -- gtk_widget_show(bbox); -- -- gtk_widget_show(vbox); -- gtk_widget_show(fc_config_window); -+ gtk_widget_show_all(fc_config_window); - } - else - { diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec index c8a1f8b..fc91fb5 100644 --- a/audacious-plugin-fc.spec +++ b/audacious-plugin-fc.spec @@ -1,18 +1,16 @@ # Minimum audacious/audacious-plugins version in inter-package -# dependencies. We have 2.1 for both, so we enforce 2.1. -%define aud_ver 2.1 +# dependencies. We need 2.2 for both. +%define aud_ver 2.2 %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 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} @@ -29,14 +27,12 @@ music files from AMIGA. Song-length detection and seek are implemented, too. %prep %setup -q -%patch0 -p1 -b .audacious2 -%patch1 -p1 -b .dialog %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 +54,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 23 2009 Michael Schwendt - 0.4-1 +- Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes. + * Fri Jul 24 2009 Fedora Release Engineering - 0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 13edd7d..62fcb7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96975f144e0e9f19d340f16e4bad27c6 audacious-plugin-fc-0.3.tar.bz2 +a36fbbddf41b162e1ed6df0b3a6637c7 audacious-plugin-fc-0.4.tar.bz2