From 737067e55faf6d6ed26fd96be7f18d9f4a8da4a0 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Jul 16 2013 21:55:52 +0000 Subject: update to 4.0.5 - drop all patches - Audacious plugin moved to a separate package - XMMS plugin no longer available - patch to use pulseaudio by default --- diff --git a/.gitignore b/.gitignore index 0cb108f..73548cf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xmp-3.1.0-free.tar.gz /xmp-3.3.0-free.tar.gz /xmp-3.4.0-free.tar.gz /xmp-3.5.0-free.tar.gz +/xmp-4.0.5.tar.gz diff --git a/mktarball.sh b/mktarball.sh deleted file mode 100755 index 1987951..0000000 --- a/mktarball.sh +++ /dev/null @@ -1,11 +0,0 @@ -if test -n "$1" ; then - VERSION="$1" -else - VERSION=3.3.0 -fi -wget http://downloads.sourceforge.net/sourceforge/xmp/xmp-$VERSION.tar.gz && \ -tar xzf xmp-$VERSION.tar.gz && \ -rm xmp-$VERSION/docs/formats/gdm.txt && \ -tar czf xmp-$VERSION-free.tar.gz xmp-$VERSION && \ -rm -r xmp-$VERSION && \ -rm xmp-$VERSION.tar.gz diff --git a/sources b/sources index 8da8e0a..a3f3e5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd915c9c10eae05f0f75a92421e3247a xmp-3.5.0-free.tar.gz +b247a2eaebec616232a09e67f96e6a71 xmp-4.0.5.tar.gz diff --git a/xmp-3.4.0-audacious-3.1.patch b/xmp-3.4.0-audacious-3.1.patch deleted file mode 100644 index 250ae80..0000000 --- a/xmp-3.4.0-audacious-3.1.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c ---- xmp-3.4.0-orig/src/plugin/audacious3.c 2011-08-07 15:24:27.000000000 +0200 -+++ xmp-3.4.0/src/plugin/audacious3.c 2012-01-02 13:34:54.904832532 +0100 -@@ -16,12 +16,12 @@ - #include - #include - --#include -+#include -+#include - #include -+#include - #include - #include --#include --#include - - #include "xmp.h" - #include "common.h" -@@ -66,6 +66,19 @@ - - XMPConfig xmp_cfg; - -+static const gchar* const plugin_defaults[] = { -+ "mixing_freq", "0", -+ "convert8bit", "0", -+ "fixloops", "0", -+ "modrange", "0", -+ "force8bit", "0", -+ "force_mono", "0", -+ "interpolation", "TRUE", -+ "filter", "TRUE", -+ "pan_amplitude", "80", -+ NULL -+}; -+ - extern struct xmp_drv_info drv_smix; - - -@@ -158,8 +171,6 @@ - - static gboolean init(void) - { -- mcs_handle_t *cfg; -- - _D("Plugin init"); - xmp_drv_register(&drv_smix); - ctx = xmp_create_context(); -@@ -168,19 +179,10 @@ - seek_mutex = g_mutex_new(); - seek_cond = g_cond_new(); - -- xmp_cfg.mixing_freq = 0; -- xmp_cfg.convert8bit = 0; -- xmp_cfg.fixloops = 0; -- xmp_cfg.modrange = 0; -- xmp_cfg.force8bit = 0; -- xmp_cfg.force_mono = 0; -- xmp_cfg.interpolation = TRUE; -- xmp_cfg.filter = TRUE; -- xmp_cfg.pan_amplitude = 80; -+ aud_config_set_defaults("XMP",plugin_defaults); - --#define CFGREADINT(x) aud_cfg_db_get_int (cfg, "XMP", #x, &xmp_cfg.x) -+#define CFGREADINT(x) xmp_cfg.x = aud_get_int ("XMP", #x) - -- if ((cfg = aud_cfg_db_open())) { - CFGREADINT(mixing_freq); - CFGREADINT(force8bit); - CFGREADINT(convert8bit); -@@ -191,9 +193,6 @@ - CFGREADINT(filter); - CFGREADINT(pan_amplitude); - -- aud_cfg_db_close(cfg); -- } -- - configure_init(); - - xmp_init(ctx, 0, NULL); -@@ -412,7 +411,6 @@ - - static void configure_apply() - { -- mcs_handle_t *cfg; - struct xmp_options *opt; - - /* transfer Preferences UI config values back into XMPConfig */ -@@ -435,9 +433,7 @@ - opt = xmp_get_options(ctx); - opt->mix = xmp_cfg.pan_amplitude; - -- cfg = aud_cfg_db_open(); -- --#define CFGWRITEINT(x) aud_cfg_db_set_int (cfg, "XMP", #x, xmp_cfg.x) -+#define CFGWRITEINT(x) aud_set_int ("XMP", #x, xmp_cfg.x) - - CFGWRITEINT(mixing_freq); - CFGWRITEINT(force8bit); -@@ -448,8 +444,6 @@ - CFGWRITEINT(interpolation); - CFGWRITEINT(filter); - CFGWRITEINT(pan_amplitude); -- -- aud_cfg_db_close(cfg); - } - - static void configure_init(void) -@@ -532,22 +526,23 @@ - NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN}, - { WIDGET_LABEL, "Pan amplitude (%)", NULL, NULL, NULL, FALSE }, - { WIDGET_SPIN_BTN, "", &guicfg.panamp, NULL, NULL, FALSE, -- { .spin_btn = { 0.0, 100.0, 1.0, "" } }, -- .cfg_type = VALUE_FLOAT}, -+ .cfg_type = VALUE_FLOAT, NULL, NULL, -+ { .spin_btn = { 0.0, 100.0, 1.0, "" } } -+ }, - }; - - static PreferencesWidget prefs_opts_tab[] = { -- { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - {.box = { prefs_opts, G_N_ELEMENTS(prefs_opts), FALSE, FALSE}}}, - }; - - static PreferencesWidget prefs_qual_row1[] = { -- { WIDGET_BOX, "Resolution", NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, "Resolution", NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .box = { prefs_precision, G_N_ELEMENTS(prefs_precision), - FALSE, TRUE } - } - }, -- { WIDGET_BOX, "Channels", NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, "Channels", NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .box = { prefs_channels, G_N_ELEMENTS(prefs_channels), - FALSE, TRUE } - } -@@ -555,7 +550,7 @@ - }; - - static PreferencesWidget prefs_qual_row2[] = { -- { WIDGET_BOX, "Sampling rate", NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, "Sampling rate", NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .box = { prefs_frequency, G_N_ELEMENTS(prefs_frequency), - FALSE, TRUE } - } -@@ -563,12 +558,12 @@ - }; - - static PreferencesWidget prefs_qual_box1[] = { -- { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .box = { prefs_qual_row1, G_N_ELEMENTS(prefs_qual_row1), - TRUE, TRUE } - } - }, -- { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .box = { prefs_qual_row2, G_N_ELEMENTS(prefs_qual_row2), - FALSE, TRUE } - } -@@ -576,7 +571,7 @@ - }; - - static PreferencesWidget prefs_qual_tab[] = { -- { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, -+ { WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .box = { prefs_qual_box1, G_N_ELEMENTS(prefs_qual_box1), - FALSE, TRUE } - } -@@ -589,7 +584,7 @@ - }; - - static PreferencesWidget prefs[] = { -- {WIDGET_NOTEBOOK, NULL, NULL, NULL, NULL, FALSE, -+ {WIDGET_NOTEBOOK, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL, - { .notebook = { prefs_tabs, G_N_ELEMENTS(prefs_tabs) } }, - }, - }; -diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/Makefile xmp-3.4.0/src/plugin/Makefile ---- xmp-3.4.0-orig/src/plugin/Makefile 2011-08-06 15:51:13.000000000 +0200 -+++ xmp-3.4.0/src/plugin/Makefile 2012-01-02 13:34:33.429987960 +0100 -@@ -47,7 +47,7 @@ - eval $$CMD - - $(PLUGIN_PATH)/audacious3.lo: $(PLUGIN_PATH)/audacious3.c $(PLUGIN_PATH)/Makefile -- @CMD='$(CC) $(CFLAGS) -fPIC -D_REENTRANT $(XCFLAGS) `pkg-config --cflags audacious` -o $@ $(PLUGIN_PATH)/audacious3.c'; \ -+ @CMD='$(CC) $(CFLAGS) -fPIC -D_REENTRANT $(XCFLAGS) `pkg-config --cflags audacious glib-2.0 gtk+-3.0` -o $@ $(PLUGIN_PATH)/audacious3.c'; \ - if [ "$(V)" -gt 0 ]; then echo $$CMD; else echo CC $@ ; fi; \ - eval $$CMD - diff --git a/xmp-3.4.0-audacious-3.2.patch b/xmp-3.4.0-audacious-3.2.patch deleted file mode 100644 index a011b54..0000000 --- a/xmp-3.4.0-audacious-3.2.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c ---- xmp-3.4.0-orig/src/plugin/audacious3.c 2012-05-29 08:44:56.000000000 +0200 -+++ xmp-3.4.0/src/plugin/audacious3.c 2012-05-29 08:54:26.782843424 +0200 -@@ -250,9 +250,9 @@ - xmp_get_module_info(ctx, &mi); - - tuple = tuple_new_from_filename(filename); -- tuple_associate_string(tuple, FIELD_TITLE, NULL, mi.name); -- tuple_associate_string(tuple, FIELD_CODEC, NULL, mi.type); -- tuple_associate_int(tuple, FIELD_LENGTH, NULL, len); -+ tuple_set_str(tuple, FIELD_TITLE, NULL, mi.name); -+ tuple_set_str(tuple, FIELD_CODEC, NULL, mi.type); -+ tuple_set_int(tuple, FIELD_LENGTH, NULL, len); - - xmp_release_module(ctx); - xmp_free_context(ctx); -@@ -351,9 +351,9 @@ - xmp_get_module_info(ctx, &xmp_cfg.mod_info); - - tuple = tuple_new_from_filename(filename); -- tuple_associate_string(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name); -- tuple_associate_string(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type); -- tuple_associate_int(tuple, FIELD_LENGTH, NULL, lret); -+ tuple_set_str(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name); -+ tuple_set_str(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type); -+ tuple_set_int(tuple, FIELD_LENGTH, NULL, lret); - ipb->set_tuple(ipb, tuple); - - ipb->set_params(ipb, xmp_cfg.mod_info.chn * 1000, opt->freq, channelcnt); diff --git a/xmp-3.4.0-audacious-probe_for_tuple.patch b/xmp-3.4.0-audacious-probe_for_tuple.patch deleted file mode 100644 index 79a460a..0000000 --- a/xmp-3.4.0-audacious-probe_for_tuple.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c ---- xmp-3.4.0-orig/src/plugin/audacious3.c 2012-06-15 13:51:40.650150003 +0200 -+++ xmp-3.4.0/src/plugin/audacious3.c 2012-06-15 15:34:22.493836696 +0200 -@@ -31,6 +31,7 @@ - static GCond *seek_cond; - static gint jumpToTime = -1; - static gboolean stop_flag = FALSE; -+static GMutex *probe_mutex; - - static xmp_context ctx; - -@@ -175,6 +176,7 @@ - xmp_drv_register(&drv_smix); - ctx = xmp_create_context(); - -+ probe_mutex = g_mutex_new(); - jumpToTime = -1; - seek_mutex = g_mutex_new(); - seek_cond = g_cond_new(); -@@ -205,6 +207,7 @@ - { - g_cond_free(seek_cond); - g_mutex_free(seek_mutex); -+ g_mutex_free(probe_mutex); - xmp_free_context(ctx); - } - -@@ -233,6 +236,7 @@ - struct xmp_module_info mi; - struct xmp_options *opt; - -+ g_mutex_lock(probe_mutex); - _D("filename = %s", filename); - strip_vfs(filename); /* Sorry, no VFS support */ - -@@ -240,16 +244,18 @@ - opt = xmp_get_options(ctx); - opt->skipsmp = 1; /* don't load samples */ - len = xmp_load_module(ctx, filename); -- g_free(filename); - - if (len < 0) { -+ g_free(filename); - xmp_free_context(ctx); -+ g_mutex_unlock(probe_mutex); - return NULL; - } - - xmp_get_module_info(ctx, &mi); - - tuple = tuple_new_from_filename(filename); -+ g_free(filename); - tuple_set_str(tuple, FIELD_TITLE, NULL, mi.name); - tuple_set_str(tuple, FIELD_CODEC, NULL, mi.type); - tuple_set_int(tuple, FIELD_LENGTH, NULL, len); -@@ -257,6 +263,7 @@ - xmp_release_module(ctx); - xmp_free_context(ctx); - -+ g_mutex_unlock(probe_mutex); - return tuple; - } - -@@ -340,7 +347,6 @@ - _D("*** loading: %s", filename); - - lret = xmp_load_module(ctx, filename); -- g_free(filename); - - if (lret < 0) { - xmp_close_audio(ctx); -@@ -351,6 +357,7 @@ - xmp_get_module_info(ctx, &xmp_cfg.mod_info); - - tuple = tuple_new_from_filename(filename); -+ g_free(filename); - tuple_set_str(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name); - tuple_set_str(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type); - tuple_set_int(tuple, FIELD_LENGTH, NULL, lret); diff --git a/xmp-3.5.0-audacious-3.3.patch b/xmp-3.5.0-audacious-3.3.patch deleted file mode 100644 index 85e754b..0000000 --- a/xmp-3.5.0-audacious-3.3.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up xmp-3.5.0/src/plugin/audacious3.c.aud-api-3.3 xmp-3.5.0/src/plugin/audacious3.c ---- xmp-3.5.0/src/plugin/audacious3.c.aud-api-3.3 2012-09-05 14:53:54.000000000 +0200 -+++ xmp-3.5.0/src/plugin/audacious3.c 2012-09-05 15:13:46.000000000 +0200 -@@ -392,9 +392,6 @@ static gboolean play(InputPlayback *ipb, - if ((xmp_player_frame(ctx) != 0) && jumpToTime < 0) { - stop_flag = TRUE; - DRAIN: -- while (!stop_flag && ipb->output->buffer_playing()) { -- g_usleep(20000); -- } - break; - } - } -@@ -404,7 +401,6 @@ static gboolean play(InputPlayback *ipb, - g_cond_signal(seek_cond); /* wake up any waiting request */ - g_mutex_unlock(seek_mutex); - -- ipb->output->close_audio(); - xmp_player_end(ctx); - xmp_release_module(ctx); - xmp_close_audio(ctx); -@@ -598,13 +594,8 @@ static PreferencesWidget prefs[] = { - }; - - PluginPreferences xmp_aud_preferences = { --#if _AUD_PLUGIN_VERSION > 20 -- .domain = "xmpaudplugin", --#endif -- .title = "Extended Module Player Configuration", -- .prefs = prefs, -- .n_prefs = G_N_ELEMENTS(prefs), -- .type = PREFERENCES_WINDOW, -+ .widgets = prefs, -+ .n_widgets = G_N_ELEMENTS(prefs), - .init = configure_init, - .apply = configure_apply, - }; -@@ -631,7 +622,7 @@ AUD_INPUT_PLUGIN ( - #endif - .init = init, - .about = xmp_aud_about, -- .settings = &xmp_aud_preferences, -+ .prefs = &xmp_aud_preferences, - .play = play, - .stop = stop, - .pause = mod_pause, diff --git a/xmp-3.5.0-audacious-3.4.patch b/xmp-3.5.0-audacious-3.4.patch deleted file mode 100644 index 7e79739..0000000 --- a/xmp-3.5.0-audacious-3.4.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up xmp-3.5.0/configure.aud-3.4 xmp-3.5.0/configure ---- xmp-3.5.0/configure.aud-3.4 2012-01-27 18:05:33.000000000 +0100 -+++ xmp-3.5.0/configure 2013-04-28 15:09:51.840868312 +0200 -@@ -3847,10 +3847,9 @@ fi - - if test "${enable_audacious_plugin}" = "yes"; then - $as_echo_n "checking for Audacious flags... " -- audacious_cflags="`pkg-config --cflags audacious 2>/dev/null`" -- if test ! -z "${audacious_cflags}"; then -+ audacious_version="`pkg-config --modversion audacious 2>/dev/null`" -+ if test ! -z "${audacious_version}"; then - $as_echo "found" -- audacious_version="`pkg-config --modversion audacious 2>/dev/null`" - audacious_version_maj="`echo ${audacious_version}|cut -f1 -d.`" - audacious_version_min="`echo ${audacious_version}|cut -f2 -d.`" - $as_echo "checking for Audacious version... ${audacious_version_maj}.${audacious_version_min}" diff --git a/xmp-3.5.0-cve-2013-1980.patch b/xmp-3.5.0-cve-2013-1980.patch deleted file mode 100644 index 3a98c22..0000000 --- a/xmp-3.5.0-cve-2013-1980.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -U0 xmp-3.5.0/docs/ChangeLog.cve-2013-1980 xmp-3.5.0/docs/ChangeLog ---- xmp-3.5.0/docs/ChangeLog.cve-2013-1980 2012-01-27 17:40:58.000000000 +0100 -+++ xmp-3.5.0/docs/ChangeLog 2013-04-28 13:05:05.559593911 +0200 -@@ -26,0 +27 @@ -+ - fix buffer overflow in MASI loader (reported by Douglas Carmichael) -diff -up xmp-3.5.0/src/loaders/masi_load.c.cve-2013-1980 xmp-3.5.0/src/loaders/masi_load.c ---- xmp-3.5.0/src/loaders/masi_load.c.cve-2013-1980 2012-01-21 13:35:14.000000000 +0100 -+++ xmp-3.5.0/src/loaders/masi_load.c 2013-04-28 13:04:15.398503982 +0200 -@@ -144,9 +144,9 @@ static void get_dsmp(struct xmp_context - i = cur_ins; - m->xxi[i] = calloc(sizeof(struct xxm_instrument), 1); - -- fread(&m->xxih[i].name, 1, 34, f); -+ fread(&m->xxih[i].name, 1, 31, f); - str_adj((char *)m->xxih[i].name); -- fseek(f, 5, SEEK_CUR); -+ fseek(f, 8, SEEK_CUR); - read8(f); /* insno */ - read8(f); - m->xxs[i].len = read32l(f); diff --git a/xmp-pulse.patch b/xmp-pulse.patch new file mode 100644 index 0000000..4f58814 --- /dev/null +++ b/xmp-pulse.patch @@ -0,0 +1,12 @@ +diff -up xmp-4.0.4/src/xmp.conf.pulse xmp-4.0.4/src/xmp.conf +--- xmp-4.0.4/src/xmp.conf.pulse 2013-04-06 15:38:02.000000000 +0200 ++++ xmp-4.0.4/src/xmp.conf 2013-04-30 00:18:42.764147342 +0200 +@@ -19,7 +19,7 @@ + # driver = + # Output device to be used + # +-#driver = alsa ++driver = pulseaudio + + + # ALSA driver diff --git a/xmp.spec b/xmp.spec index ea15a13..9b9e7f4 100644 --- a/xmp.spec +++ b/xmp.spec @@ -1,103 +1,30 @@ -%define audacious_input_plugin_dir %(pkg-config --variable=input_plugin_dir audacious) -%define xmms_input_plugin_dir %(xmms-config --input-plugin-dir) - -%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/audacious/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!') -%if 0%{aud_plugin_api} > 0 -%global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api} -%endif - Name: xmp -Version: 3.5.0 -Release: 3%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: A multi-format module player Group: Applications/Multimedia -#Source: http://downloads.sourceforge.net/sourceforge/xmp/xmp-%{version}.tar.gz -#same source as above, with docs/formats/gdm.txt removed -Source: %{name}-%{version}-free.tar.gz -# run this to get the above tarball -Source1: mktarball.sh +Source0: http://downloads.sourceforge.net/project/xmp/xmp/%{version}/xmp-%{version}.tar.gz +# use pulseaudio output by default +Patch0: xmp-pulse.patch License: GPLv2+ URL: http://xmp.sourceforge.net/ Buildrequires: alsa-lib-devel -Buildrequires: audacious-devel +BuildRequires: libxmp-devel >= 4.1.1 BuildRequires: pulseaudio-libs-devel -Buildrequires: xmms-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) -# port to Audacious 3.1 Preferences API, albeit without connecting -# any GUI elements with config section/name pairs directly -Patch0: xmp-3.4.0-audacious-3.1.patch -Patch1: xmp-3.4.0-audacious-3.2.patch -# fix untimely g_free calls and make probe_for_tuple thread-safe -# (reported to xmp devel list) -Patch2: xmp-3.4.0-audacious-probe_for_tuple.patch -# -Patch3: xmp-3.5.0-audacious-3.3.patch -# empty cflags don't mean audacious-devel isn't installed -Patch4: xmp-3.5.0-audacious-3.4.patch -# backport fix for CVE-2013-1980 -Patch5: xmp-3.5.0-cve-2013-1980.patch - %description -The Extended Module Player is a modplayer for Unix-like systems that plays -over 80 mainstream and obscure module formats from Amiga, Atari, Acorn, -Apple IIgs and PC, including Protracker (MOD), Scream Tracker 3 (S3M), Fast -Tracker II (XM) and Impulse Tracker (IT) files. - -%package -n audacious-plugin-%{name} -Summary: A xmp plugin for Audacious -Group: Applications/Multimedia -%if 0%{?fedora} > 13 -%{?aud_plugin_dep} -%else -Requires: audacious -%endif - -%description -n audacious-plugin-%{name} -The Extended Module Player is a modplayer for Unix-like systems that plays -over 80 mainstream and obscure module formats from Amiga, Atari, Acorn, -Apple IIgs and PC, including Protracker (MOD), Scream Tracker 3 (S3M), Fast -Tracker II (XM) and Impulse Tracker (IT) files. - -This package contains the xmp plugin for the Audacious media player. - -%package -n xmms-%{name} -Summary: A xmp plugin for XMMS -Group: Applications/Multimedia -Requires: xmms - -%description -n xmms-%{name} -The Extended Module Player is a modplayer for Unix-like systems that plays -over 80 mainstream and obscure module formats from Amiga, Atari, Acorn, -Apple IIgs and PC, including Protracker (MOD), Scream Tracker 3 (S3M), Fast -Tracker II (XM) and Impulse Tracker (IT) files. - -This package contains the xmp plugin for XMMS. - +This is the Extended Module Player, a portable module player that plays +over 90 mainstream and obscure module formats, including Protracker MOD, +Fasttracker II XM, Scream Tracker 3 S3M and Impulse Tracker IT files. %prep -%if 0%{?fedora} > 13 -# Enforce availability of the audacious(plugin-api) dependency. -%{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1} -%endif - %setup -q -%patch0 -p1 -b .aud-api-3.1 -%patch1 -p1 -b .aud-api-3.2 -%patch2 -p1 -b .aud-probe_for_tuple -%patch3 -p1 -b .aud-api-3.3 -%patch4 -p1 -b .aud-3.4 -%patch5 -p1 -b .cve-2013-1980 -pushd docs -for file in ChangeLog CREDITS ; do - iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file -done +%patch0 -p1 -b .pulse %build %configure \ - --enable-audacious-plugin \ --enable-pulseaudio \ - --enable-xmms-plugin %{__make} V=1 %{?_smp_mflags} @@ -110,20 +37,19 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc README docs/COPYING docs/README.* docs/ChangeLog docs/CREDITS +%doc COPYING Changelog CREDITS README ub-name.it %config(noreplace) %{_sysconfdir}/* %{_bindir}/* %{_mandir}/man1/xmp.1* -%files -n audacious-plugin-%{name} -%defattr(-,root,root) -%{audacious_input_plugin_dir}/* - -%files -n xmms-%{name} -%defattr(-,root,root) -%{xmms_input_plugin_dir}/* - %changelog +* Tue Jul 16 2013 Dominik Mierzejewski - 4.0.5-1 +- update to 4.0.5 +- drop all patches +- Audacious plugin moved to a separate package +- XMMS plugin no longer available +- patch to use pulseaudio by default + * Sun Apr 28 2013 Dominik Mierzejewski - 3.5.0-3 - fix build against audacious 3.4 (empty pkg-config --cflags is not an error) - backport fix for CVE-2013-1890 (rhbz #954658)